incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1231427 [1/5] - in /incubator/ooo/trunk/main/testautomation: chart2/optional/includes/loadsave/ chart2/required/includes/ chart2/tools/ dbaccess/tools/ framework/optional/includes/ framework/required/includes/ framework/tools/includes/ glo...
Date Sat, 14 Jan 2012 00:57:11 GMT
Author: arist
Date: Sat Jan 14 00:57:08 2012
New Revision: 1231427

URL: http://svn.apache.org/viewvc?rev=1231427&view=rev
Log:
revert and fix header updates in .inc files

Modified:
    incubator/ooo/trunk/main/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc
    incubator/ooo/trunk/main/testautomation/chart2/required/includes/ch2_menu.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_axes.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_chart_type.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_data_labels.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_grids.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_legend.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_select.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_statistics.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_pages.inc
    incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_titles.inc
    incubator/ooo/trunk/main/testautomation/dbaccess/tools/controltools.inc
    incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbcreatetools.inc
    incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbinit.inc
    incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbtools.inc
    incubator/ooo/trunk/main/testautomation/dbaccess/tools/formtools.inc
    incubator/ooo/trunk/main/testautomation/dbaccess/tools/querytools.inc
    incubator/ooo/trunk/main/testautomation/dbaccess/tools/reporttools.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_documents.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_ide.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_issues.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_macros.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_modulenames.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_usertemplate.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/f_usage_tracking.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_document_properties.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_1.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_3.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/options_lan1.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/options_ooo_java.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/options_ooo_security.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/options_ooo_view.inc
    incubator/ooo/trunk/main/testautomation/framework/optional/includes/security_macrosecurity.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/first.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/help_browser.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/printer_administration.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/script_organizers.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/tools_customize.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/topten.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/window_functions.inc
    incubator/ooo/trunk/main/testautomation/framework/required/includes/wizard_mailmerge.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/CJK_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/customize_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/fileoperations.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/formcontrols.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/help_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/options_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/pbrowser_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/private_environment.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/scriptorganizer_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/spadmin_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/template_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/toolbar_tools.inc
    incubator/ooo/trunk/main/testautomation/framework/tools/includes/wizards.inc
    incubator/ooo/trunk/main/testautomation/global/required/includes/g_findbar.inc
    incubator/ooo/trunk/main/testautomation/global/required/includes/g_printing.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_accels.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_control_objects.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_docfuncs.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_filetools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_key_tools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_listfuncs.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_macro_tools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_ole.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_security_tools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_set_standard_controls.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_stringtools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_toolbar_tools1.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_toolbar_writer.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_treelist_tools.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_ui_filters.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/optional/t_xml1.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_doc1.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_files.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_filters.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_lists.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_menu.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_option2.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_tools1.inc
    incubator/ooo/trunk/main/testautomation/global/tools/includes/required/t_tools3.inc
    incubator/ooo/trunk/main/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/draw/d_002_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/draw/d_003_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/draw/d_005_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/draw/d_007.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/impress/im_002_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/impress/im_003_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/impress/im_004_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/impress/im_005_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/impress/im_007_.inc
    incubator/ooo/trunk/main/testautomation/graphics/required/includes/impress/im_011_.inc
    incubator/ooo/trunk/main/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc
    incubator/ooo/trunk/main/testautomation/spreadsheet/tools/includes/c_cell_tools.inc
    incubator/ooo/trunk/main/testautomation/spreadsheet/tools/includes/c_select_tools.inc

Modified: incubator/ooo/trunk/main/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,45 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'* short description : Load file of one Spreadsheet format and save to another
+'*
+'\******************************************************************************
+
+sub subLoSaFromTo
+
+    dim sSourcePath as string
+    dim lsInputFileList ( 500 ) as string
+    dim iFilesInList as integer
+    dim sCurrentFileInList as string
+    dim iMainIndex as integer
+
+    dim cRelativePath as string
+        cRelativePath = "chart2\optional\input\" & gsDirectoryInSourcePath &"\"
+
+    '///<u><b>Load/Save files with charts</b></u>
+    printLog Chr(13) + "---------  Save with filter: " & gsFileFormat & "  ----------"
+    sSourcePath = convertPath ( gtesttoolpath & cRelativePath )
+
+    '///+<ul><li>Determine list of files to test (All files in 'chart2\loadsave\input\<gsDirectoryInSourcePath>\')</li>
+    GetAllFileList( sSourcePath , "*." & gsDirectoryInSourcePath , lsInputFileList() )
+    iFilesInList = ListCount( lsInputFileList() )
+    '///+<li>Run testcase 'tLoadSaveFromTo' for each file in list</li></ul>
+    for iMainIndex = 2 to iFilesInList
+
+        sCurrentFileInList = lsInputFileList( iMainIndex )
+        printlog "* * * * * * *"
+        printlog "Loop " & ( iMainIndex - 1 ) & " of " & ( iFilesInList - 1 )
+        printlog "Test document: " & sCurrentFileInList
+        call tLoadSaveFromTo ( sCurrentFileInList )
+
+    next iMainIndex
 
-*****
+end sub
+
+'*******************************************************************************
 
 function hLoSaEscape() as boolean
 

Modified: incubator/ooo/trunk/main/testautomation/chart2/required/includes/ch2_menu.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/required/includes/ch2_menu.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/required/includes/ch2_menu.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/required/includes/ch2_menu.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Resource Test for chart2 main menus
+'*
+'**************************************************************************************************
 '*
 ' #1 tMainMenu          'Checking the count of menu entries in each menu
 '*

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_axes.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_axes.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_axes.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_axes.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Library for automation of the 'Insert::Axes...' dialog
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeAxesDialog
 ' #1 fCloseAxesDialogOK

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_chart_type.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_chart_type.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_chart_type.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_chart_type.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for chart type dialog
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeChartTypeDialog
 ' #1 fCloseChartTypeDialogOK

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_data_labels.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_data_labels.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_data_labels.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_data_labels.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for Data Labels dialog
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeDataLabelsDialog
 ' #1 fCloseDataLabelsDialogOK

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_grids.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_grids.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_grids.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_grids.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for Grids dialog
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeGridsDialog
 ' #1 fCloseGridsDialogOK

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_legend.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_legend.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_legend.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_legend.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for Legend dialog
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeLegendDialog
 ' #1 fCloseLegendDialogOK

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_select.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_select.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_select.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_select.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : selecting charts
+'*
+'**************************************************************************************************
 '*
 ' #1 fSelectChartByNumber
 ' #1 fCalcSelectSheet

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_statistics.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_statistics.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_statistics.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_statistics.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for Statistics dialog
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeTrendlinesDialog
 ' #1 fInvokeInsertYErrorBarsDialog

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_borders_lines.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for Borders and Lines tab-page
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeTabLine
 ' #1 fCloseTabLineOK

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_pages.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_pages.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_pages.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_tab_pages.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for Borders and Lines tab-page
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeTabPage
 ' #1 fCloseTabLineOK

Modified: incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_titles.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_titles.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_titles.inc (original)
+++ incubator/ooo/trunk/main/testautomation/chart2/tools/ch_tools_titles.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-************************
+'  
+'**************************************************************
+'*
+'* short description : Tool library for Titles dialog
+'*
+'**************************************************************************************************
 '*
 ' #1 fInvokeTitlesDialog
 ' #1 fCloseTitlesDialogOK

Modified: incubator/ooo/trunk/main/testautomation/dbaccess/tools/controltools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/dbaccess/tools/controltools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/dbaccess/tools/controltools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/dbaccess/tools/controltools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-*************
+'  
+'**************************************************************
+'*
+'* short description : Helper Routines for Form and Control Tests
+'*
+'***************************************************************************************
 '*
 ' #1 fSwitchAutopilotOff
 ' #1 fSetControlProperty

Modified: incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbcreatetools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbcreatetools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbcreatetools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbcreatetools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-*************
+'  
+'**************************************************************
+'*
+'* short description : Library with function for creating all possible databases
+'*
+'***************************************************************************************
 '*
 ' #1 fCreateMySQL_ODBC_Datasource
 ' #1 fCreateMySQL_JDBC_Datasource

Modified: incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbinit.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbinit.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbinit.inc (original)
+++ incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbinit.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-*************
+'  
+'**************************************************************
+'*
+'* short description : Helper Routines for Base tests.
+'*
+'***************************************************************************************
 '*
 ' #1 null
 '*

Modified: incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbtools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbtools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbtools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/dbaccess/tools/dbtools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-*************
+'  
+'**************************************************************
+'*
+'* short description : Helper Routines for Base tests.
+'*
+'***************************************************************************************
 '*
 ' #1 fSelectDatasourceInBeamer
 ' #1 fConnectToDatasourceInBeamer

Modified: incubator/ooo/trunk/main/testautomation/dbaccess/tools/formtools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/dbaccess/tools/formtools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/dbaccess/tools/formtools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/dbaccess/tools/formtools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-*************
+'  
+'**************************************************************
+'*
+'* short description : Helper Routines for Base tests.
+'*
+'***************************************************************************************
 '*
 '* #1 fOpenNewFormDesign
 '* #1 fCloseForm

Modified: incubator/ooo/trunk/main/testautomation/dbaccess/tools/querytools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/dbaccess/tools/querytools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/dbaccess/tools/querytools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/dbaccess/tools/querytools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-*************
+'  
+'**************************************************************
+'*
+'* short description : Helper Routines for Base tests.
+'*
+'***************************************************************************************
 '*
 ' #1 fFindQuery
 ' #1 fOpenNewQueryDesign

Modified: incubator/ooo/trunk/main/testautomation/dbaccess/tools/reporttools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/dbaccess/tools/reporttools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/dbaccess/tools/reporttools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/dbaccess/tools/reporttools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,12 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
-
-*************
+'  
+'**************************************************************
+'*
+'* short description : Report Helper Routines for Base tests.
+'*
+'***************************************************************************************
 '*
 '* #1 fOpenNewReoprtDesign
 '* #1 fCloseReportDesign

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_documents.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_documents.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_documents.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_documents.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,130 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'*  short description : BASIC organizers and documents
+'*
+'\******************************************************************************
+
+private const IDOCS = 5
+    
+testcase tBasicDocuments
+
+    const CFN = "tBasicDocuments::"
+
+    dim sFileWriter as string
+    dim sFileCalc as string
+    dim iDocumentCount as integer
+    dim cNodeListA( 10 ) as string
+    dim cNodeListB( 10 ) as string
+    dim iSecLevel as integer
+    dim iHitCount as integer
+    
+    ' NOTE: hCreateBasicWorkFiles() creates files of the naming scheme 
+    ' basic.odt, ...odc etc. All these files will show up with just "basic"
+    ' in the Macro Organizer
+    const DOC_NAME = "basic"
+    
+    printlog( "Set macro security level to medium" )
+    iSecLevel = hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_MEDIUM )
+
+    printlog( "Open one single unchanged Writer document" )
+    hInitSingleDoc()
+    
+    kontext "DocumentWriter"
+    DocumentWriter.typeKeys( "tBasicDocuments - initial document - discard after test" )
+
+    gApplication = "WRITER"
+    printlog( "Create a Writer workfilename (build path and filename)" )
+    hCreateBasicWorkFiles()
+    sFileWriter = hGetBasicWorkFile( "current" )
+
+    gApplication = "CALC"
+    printlog( "Create a Calc workfilename (build path and filename)" )
+    hCreateBasicWorkFiles()
+    sFileCalc = hGetBasicWorkFile( "current" )
+
+    printlog( "Open the writer file" )
+    hFileOpen( sFileWriter )
+    if ( not hAllowMacroExecution() ) then
+        warnlog( "Missing Macro execution dialog. Please check the file/security settings" )
+    endif
+
+    printlog( "Open the Calc file" )
+    hFileOpen( sFileCalc )
+    if ( not hAllowMacroExecution() ) then
+        warnlog( "Missing Macro execution dialog. Please check the file/security settings" )
+    endif
+
+    printlog( "Open the BASIC organizer" )
+    ToolsMacro_uno
+    WaitSlot()
+
+    printlog( "Retreive the names of all nodes from the treelist" )
+    kontext "Makro"
+    hGetVisibleNodeNames( MakroAus , cNodeListA() )
+    
+    printlog( "Verify that both documents are listed - one Writer, one Calc with identical names" )
+    iHitCount = hCountMatchesInList( cNodeListA() , DOC_NAME )
+    if ( iHitCount <> 2 ) then
+        warnlog( "There should be two documents with the name " & DOC_NAME & "listed." )
+    endif
+
+    printlog( "Click Manage..." )
+    hClickButton( verwalten )
+    
+    printlog( "Get the nodes list from the object organizer tabs - first tab" )
+    hSelectBasicObjectOrganizerTab( 1 )
+    ListAllDelete( cNodeListB() )
+    hGetVisibleNodeNames( ModulListe , cNodeListB() )
+    
+    printlog( "Verify that both documents are listed on both relevant tabpages" )
+    iHitCount = hCountMatchesInList( cNodeListA() , DOC_NAME )
+    if ( iHitCount <> 2 ) then
+        warnlog( "There should be two documents with the name " & DOC_NAME & "listed." )
+    endif
+
+    printlog( "Switch to second tab" )
+    hSelectBasicObjectOrganizerTab( 2 )
+    ListAllDelete( cNodeListB() )
+    hGetVisibleNodeNames( ModuleList , cNodeListB() )
+    if ( listcount( cNodeListB() ) <> 5 ) then
+        warnlog( CFN & "#i49239# Incorrect object count in treelist" )
+        hListPrint( cNodeListB() , "List of objects found in treelist" )
+    endif     
+    
+    printlog( "Verify" )
+    iHitCount = hCountMatchesInList( cNodeListB() , DOC_NAME )
+    if ( iHitCount <> 2 ) then
+        warnlog( "There should be two documents with the name " & DOC_NAME & "listed." )
+    endif
+
+    printlog( "Third tab (should not list the document" )
+    hSelectBasicObjectOrganizerTab( 3 )
+    hTestLibraryListBox( cNodeListA() )
+    
+    printlog( CFN & "Closing dialogs..." )
+    hCloseDialog( TabBibliotheken, "cancel" )
+
+    printlog( "Cleanup: Close macro organizer" )
+    Kontext "Makro"
+    hCloseDialog( Makro, "cancel" )
+
+    printlog( "Cleanup: Close all files" )
+    hFileCloseAll()
+
+    printlog( "Cleanup: Remove workfiles" )
+    hDeleteFile( sFileWriter )
+    hDeleteFile( sFileCalc )
+
+    printlog( "Rest macro security level" )
+    hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
+    
+endcase
 
-*****
+'*******************************************************************************
 
 function hTestLibraryListBox( cNodeList() ) as boolean
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_ide.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_ide.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_ide.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_ide.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,129 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'* short description : Macro Dialogs opened from Basic-IDE
+'*
+'\******************************************************************************
+
+testcase tBasic_IDE_Toolbar_Module
+
+    printlog( "BASIC toolbars for modules" )
+
+    const DIALOG_DELAY = 2
+    const RC_FAILURE = -1
+
+    dim cTargetFile as string
+        cTargetFile = convertpath( gOfficepath & "user\work\global_test.bas" )
+
+    dim cSourceFile as string
+        cSourceFile = gTesttoolpath & "framework\optional\input\resetregistration.txt"
+        cSourceFile = convertpath( cSourceFile )
+
+    printlog "open a new writer-doc"
+    gApplication = "WRITER"
+    hCreateDocument()
+
+    if ( hInitBasicIDE( "tBasic_IDE_Toolbar_Module" ) ) then
+
+        kontext "macrobar"
+        printlog "- compile"
+        hClickButton( Compile )
+
+        printlog "- Run Basic"
+        hClickButton( BasicRun )
+
+        printlog "- Step Procedure"
+        hClickButton( ProcedureStep )
+
+        printlog "- Stop Basic"
+        hClickButton( BasicStop )
+
+        printlog "- Single Step"
+        hClickButton( SingleStep )
+
+        printlog "- Step Back"
+        hClickButton( StepBack )
+
+        printlog "- Breakpoint => activate"
+        hClickButton( Breakpoint )
+
+
+        printlog "- Breakpoint => deactivate"
+        hClickButton( Breakpoint )
+
+        printlog "- Add Watch => deactivate"
+        hClickButton( AddWatch )
+
+        printlog "- Find Paranthese"
+
+        kontext "macrobar"
+        hClickButton( FindParanthese )
+
+        try
+            Controls.TearOff()
+            warnlog "Controls are active in a module window => bug!"
+        catch
+            printlog( "Controls are not active->OK" )
+        endcatch
+        if ( WaitSlot <> WSFinished ) then
+            warnlog( "Slot not finished within 1 second" )
+        endif
+
+        kontext "MacroBar"
+        printlog( "- Insert Source Text (" & cSourceFile & ")" )
+        if ( hClickButton( InsertSourceText ) <> RC_FAILURE ) then
+
+            kontext "oeffnendlg"
+            if ( OeffnenDlg.exists( DIALOG_DELAY ) ) then
+                Dateiname.SetText( cSourceFile )
+                Oeffnen.click()
+                WaitSlot( 5000 )
+            else
+                warnlog( "File Open dialog did not open" )
+            endif
+
+            ' possible 'could not read from file' error-message -> this is a bug
+            kontext "Active"
+            if ( Active.exists( DIALOG_DELAY ) ) then
+                warnlog( "Unexpected active: " & active.gettext() )
+                active.ok()
+            endif
+        else
+            warnlog( "<File Open> dialog is not open, <Insert Source Text> button failed" )
+        endif
+
+        kontext "macrobar"
+        printlog "- Save Source Text "
+        if ( hClickButton( SaveSourceText ) <> RC_FAILURE ) then
+
+            kontext "speicherndlg"
+            if ( SpeichernDlg.exists( DIALOG_DELAY ) ) then
+                Dateiname.SetText( cTargetFile )
+                Speichern.click()
+            else
+                warnlog( "File Save dialog is missing" )
+            endif
+
+            kontext "active"
+            if ( Active.Exists( DIALOG_DELAY ) ) then
+                printlog( "Closing Messagebox with <Yes>")
+                Active.Yes()
+            endif
+        else
+            warnlog( "<File Save> dialog did not open, slot <SaveSourceText> did not work" )
+        endif
+
+        hFileCloseAll()
+    else
+        warnlog( "Unable to init BASIC IDE" )
+    endif
+
+endcase
 
-*****
+'*******************************************************************************
 
 testcase tBasic_IDE_Toolbar_Dialogs
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_issues.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_issues.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_issues.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_issues.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,25 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'*  short description : Regression tests for especially annoying BASIC issues
+'*
+'\******************************************************************************
+
+function hIDERunMacro()
+
+    kontext "MacroBar"
+    if ( MacroBar.exists() ) then
+        BasicRun.click()
+    else
+        warnlog( "MacroBar not accessible" )
+    endif
+    
+end function
 
-*****
+'*******************************************************************************
 
 function hTestActive( cString as string , iMethod as integer , bExact as boolean ) as integer
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_macros.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_macros.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_macros.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_macros.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,58 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+' **
+' ** short description : check macro-dialogs / BASIC-IDE ( 1. part )
+' **
+'\******************************************************************************
+
+
+testcase tMakro_In_All_Apps
+
+    printlog( "Attach a macro to all application types" )
+    
+    dim iApp as Integer
+    
+    const CMACRO = "AppMakro"
+    const DIALOG_TIMEOUT = 2
+
+    for iApp = 1 to 7
+
+        printlog( hNumericDoctype( iApp ) )
+
+        printlog( "Open a new document" )
+        hCreateDocument()
+        
+        if ( hInitBasicIde( CMACRO ) ) then
+            printlog "Close the BASIC-IDE"
+            hCloseBasicIde()
+
+            printlog( "Close the navigator (Master-doc)" )
+            kontext "Navigator"
+            hCloseDialog( Navigator, "close,optional" )
+
+            printlog( "Close the document" )
+            hUseAsyncSlot( "FileClose" )
+
+            printlog( "Close the messagebox (document changed)" )
+            kontext "messagebox"
+            if ( MessageBox.Exists( DIALOG_TIMEOUT ) ) then
+                printlog( "MessageBox: " & MessageBox.getText() )
+                hCloseDialog( Messagebox, "no" )
+            else
+                warnlog( "No warning for changed document" )
+            end if
+        else
+            warnlog( "Could not open the BASIC Macro Organizer, aborting" )
+        endif
+
+    next iApp
+    
+endcase
 
-*****
+'*******************************************************************************
 
 testcase tMakro_Dialog
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_modulenames.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_modulenames.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_modulenames.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_modulenames.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,63 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'*  short description : Test modulenames on the tabbar
+'*
+'\******************************************************************************
+
+testcase tBasicIdeModuleNames
+
+    printlog( "Modulenames in BASIC IDE" )
+
+    const CMODULE_VALID1 = "tValidName"
+    const CMODULE_VALID2 = "tValidToo"
+    const TEST_MACRO = "TTMacro1"
+
+    const RC_SUCCESS = 0
+    const RC_FAILURE = 1
+    const ERR_NO_LINES_INSERTED = 0
+
+    dim iCurrentName as integer
+    dim cTabName as string
+
+    gApplication = "WRITER"
+    hCreateDocument()
+
+    hInitBasicIde( CMODULE_VALID1 )
+    if ( hInsertMacroFromFile( TEST_MACRO ) > ERR_NO_LINES_INSERTED ) then
+   
+        cTabName = hGetTabNameFromOrganizer()
+
+        Randomize
+        iCurrentName = Int( 24 * RND ) + 1 ' Range from 1 to 24
+
+        printlog( "Trying with invalid modulename" )
+        cTabName = hCreateInvalidModuleName( iCurrentName )
+        hRenameTab( cTabName )
+        if ( hHandleInvalidNameWarning( cTabname ) ) then
+            printlog( "Warning for invalid modulename displayed" )
+        else
+            warnlog( "Warning for invalid modulename is missing" )
+        endif
+
+        printlog( "Trying with valid modulename" )
+        hRenameTab( CMODULE_VALID2 )
+        if ( hHandleInvalidNameWarning( CMODULE_VALID2 ) ) then
+            warnlog( "Failed to set valid modulename" )
+        endif
 
-*****
+    else
+        warnlog( "Failed to insert macro" )
+    endif
+    
+    hFileCloseAll()
+
+endcase
+
+'*******************************************************************************
 
 testcase tInvalidModuleNames
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_usertemplate.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_usertemplate.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_usertemplate.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_usertemplate.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,187 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'*  short description : My Macros/standard execution with user defined template
+'*
+'\******************************************************************************
+
+testcase tMacroUsertemplate
+
+
+    ' requires: Default template path, default security level (medium)
+    
+    ' Details:
+    ' This test checks for some really weird behavior. A macro is created 
+    ' for the standard lib in My Macros - this means the macro is stored with
+    ' the application, not the document. 
+    ' When creating a document based on a user-created template the macro
+    ' will not execute, instead a com.sun.star... errormessage is displayed
+
+    dim irc as integer  ' returncode
+
+    dim cMacroName as string ' Temp variable to store the name of current macro
+    
+    const DOC_IDENTIFIER = "A test document for tMacroUserTemplate"
+
+    dim sPathOut as string ' output path for workfile
+    const FILEOUT = "tMacroUserTemplate"
+    const FILTER = "writer8_template" 
+        
+    dim iCurrentNode as integer
+
+    sPathOut = convertpath( gOfficePath & "user\template\" )
+    hDeleteFile( sPathOut & FILEOUT & ".ott" )
+    
+    hInitSingleDoc()
+    kontext "DocumentWriter"
+    DocumentWriter.typeKeys( DOC_IDENTIFIER )
+
+    printlog( "Create a new document" )
+    hCreateDocument()
+
+    printlog( "Open the macro organizer" )
+    ToolsMacro_uno
+
+    printlog( "Search for the module" )
+    kontext "Makro"
+    iCurrentNode = hSelectNodeByName( MakroAus, "Module1" )
+    if ( iCurrentNode = 0 ) then    
+        warnlog( "#i73521# - The expected node could not be found. Aborting test" )
+    	kontext "Makro"
+    	hCloseDialog( Makro, "close" )
+    	hDestroyDocument()
+    	goto endsub
+    endif        
+    
+    printlog( "Find the macro we are going to replace" )
+    if ( MakroListe.getItemCount() > 0 ) then
+    	cMacroName = MakroListe.getSelText()
+	    if ( lcase( cMacroName ) <> "main" ) then
+    	    warnlog( "Test abort: Incorrect macro is selected: " & cMacroName )
+        	printlog( "This should have been the <Main> Macro" )
+        	kontext "Makro"
+        	hCloseDialog( Makro, "cancel" )
+        	hDestroyDocument()
+        	goto endsub
+    	endif
+    else
+    	warnlog( "There is no macro listed for the current module, the test cannot continue" )
+    	kontext "Makro"
+    	hCloseDialog( Makro, "close" )
+    	hDestroyDocument()
+    	goto endsub
+    endif
+
+    printlog( "Edit" )
+    Bearbeiten.click()
+
+    printlog( "Insert test macro" )
+    hInsertMacro( 3 )
+
+    printlog( "Close BASIC IDE" )
+    hCloseBasicIde()
+
+    printlog( "Close Document" )
+    hDestroyDocument()
+
+    printlog( "Open new document" )
+    hCreateDocument
+
+    printlog( "Open Macro Organizer" )
+    ToolsMacrosRunMacro
+
+    printlog( "Find the Macro again" )
+    cMacroName = hExecScript_tMacroUserTemplate() ' local function, see below
+    if ( lcase( cMacroName ) <> "main" ) then
+        warnlog( "Test abort: Incorrect macro is selected: " & cMacroName )
+        printlog( "This should have been the <Main> Macro" )
+        ScriptSelector.cancel() 
+        hDestroyDocument()
+        goto endsub
+    endif
+
+    printlog( "Run the macro" )
+    ScriptSelector.ok()
+
+    printlog( "Check for macro" )
+    kontext "Active"
+    if ( active.exists( 3 ) ) then
+        printlog( "Messagebox: " & active.getText() )
+        active.ok()
+    else
+        warnlog( "The Macro has not been executed" )
+    endif
+
+    printlog( "Close the document" )
+    hDestroyDocument()
+
+    printlog( "Open a new document" )
+    hCreateDocument() 
+    
+    printlog( "" )
+    printlog( "Save as template" )
+    hFileSaveAsWithFilterKill( sPathOut & FILEOUT, FILTER )
+
+    printlog( "Close the document" )
+    hDestroyDocument()
+    
+    printlog( "" )
+    printlog( "File New from Template" )
+    FileNewFromTemplate
+
+    printlog( "Find the template" )
+    irc = hFindTemplate( FILEOUT )
+    hSelectDocumentObject( irc, 1 )
+    
+    printlog( "" )
+    printlog( "Open the <Run Macro> dialog" )
+    ToolsMacrosRunMacro
+
+    printlog( "Try to find the macro" )
+    cMacroName = hExecScript_tMacroUserTemplate() ' local function, see below
+    if ( lcase( cMacroName ) <> "main" ) then
+        warnlog( "Test abort: Incorrect macro is selected: " & cMacroName )
+        printlog( "This should have been the <Main> Macro" )
+        ScriptSelector.cancel() 
+        hDestroyDocument()
+        goto endsub
+    endif
+
+    printlog( "Run" )
+    ScriptSelector.ok()
+
+    printlog( "Verify macro execution" )
+    kontext "Active"
+    if ( active.exists( 3 ) ) then
+    
+        if ( instr( active.getText() , "com.sun" ) <> 0 ) then
+            warnlog( "#i58527# - unable to run macro with user-template loaded" )
+        endif
+        
+        if ( active.getText() = "TTMacro3" ) then
+            printlog( "The macro was executed" )
+        else
+            printlog( "Unknown dialog: " & hRemoveLineBreaks( active.getText() ) )
+        endif
+        
+        active.ok()
+    else
+        warnlog( "Macro not executed / no warning" )
+    endif
+
+    printlog( "Close all open documents" )
+    hFileCloseAll()
+
+    printlog( "Delete test template" )
+    hDeleteFile( sPathOut & FILEOUT & ".ott" )
+
+
+endcase
 
-*****
+'*******************************************************************************
 
 function hExecScript_tMacroUserTemplate() as string
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba-compat_xlsm-xlsb.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,108 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+*  
+'*  short description : Test VBA compatibility switches
+'*
+'\******************************************************************************
+
+testcase tBasicVBACompatXLSM_XLSB()
+
+    printlog( "Functionality of macros in XLSM/XLSB files" )
+    ' Based on issue #i111007
+
+    const IMPORT_EXCEL_MACROS  = TRUE
+    const EXEC_EXCEL_MACROS    = TRUE
+
+    const FILE_COUNT = 2
+    const MODULE_COUNT = 7
+
+    const MODULE_NOT_FOUND = 0
+    const MAX_DELAY = 3
+    const RC_TIMEOUT = -1
+
+    const THE_MODULE_THAT_BEHAVES_DIFFERENTLY = 6
+    
+    const RELATIVE_PATH = "framework/optional/input/vba-compat/"
+
+    ' We have two files to load, on e .xlsm and one .xlsb
+    dim cFileList( FILE_COUNT ) as string
+        cFileList( 1 ) = "vba-project.xlsm"
+        cFileList( 2 ) = "vba-project.xlsb"
+
+    ' both documents import the same modules
+    dim cTestModuleList( MODULE_COUNT )
+        cTestModuleList( 1 ) = "MyChartModule"
+        cTestModuleList( 2 ) = "MyCodeModule"
+        cTestModuleList( 3 ) = "MyPrivateClassModule"
+        cTestModuleList( 4 ) = "MyPublicClassModule"
+        cTestModuleList( 5 ) = "MySheetModule"
+        cTestModuleList( 6 ) = "MyUserForm"
+        cTestModuleList( 7 ) = "MyWorkbookModule"
+
+    dim cTestFile as string
+    dim iCurrentFile as integer
+    dim iCurrentModule as integer
+
+    printlog( "Set macro security to low" )
+    hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW )
+    
+    printlog( "Open Tools/Options" )
+    hSetExcelBasicImportMode( IMPORT_EXCEL_MACROS, EXEC_EXCEL_MACROS )
+    
+    for iCurrentFile = 1 to FILE_COUNT
+
+        cTestFile = gTesttoolPath & RELATIVE_PATH & cFileList( iCurrentFile )
+
+        printlog( "Loading document: " & cTestFile )
+        hFileOpen( cTestFile )
+
+        for iCurrentModule = 1 to MODULE_COUNT
+
+            printlog( "" )
+            printlog( "Tryng to execute macro: " & cTestModuleList( iCurrentModule ) )
+            ToolsMacro_uno
+
+            kontext "Makro"
+            if ( Makro.exists( MAX_DELAY ) ) then
+
+                if ( hSelectNodeByName( MakroAus, cTestModuleList( iCurrentModule ) ) <> MODULE_NOT_FOUND ) then
+
+                    printlog( "Execute the default macro <Test> for the current module" )
+
+                    if ( hClickButton( Ausfuehren ) <> RC_TIMEOUT ) then
+                        if ( iCurrentModule = THE_MODULE_THAT_BEHAVES_DIFFERENTLY ) then
+                            ' Fuzzy matching message string
+                            hTestMacroType2( cTestModuleList( iCurrentModule ) )
+                        else
+                            ' Exact matching message string
+                            hTestMacroType1( cTestModuleList( iCurrentModule ) )
+                        endif
+                    else
+                        warnlog( "No executable macro found for the current module / <Run> button is disabled" )
+                    endif
+                else
+                    warnlog( "the expected macro module could not be found" )
+                endif
+            else
+                warnlog( "BASIC Macro organizer did not open" )
+            endif
+
+        next iCurrentModule
 
-*****
+        printlog( "Close the document" )
+        hFileCloseAll()
+
+    next iCurrentFile
+
+    hSetExcelImportModeDefault()    
+    hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
+
+endcase
+
+'*******************************************************************************
 
 function hTestMacroType1( cMessage as string ) as boolean
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba_compat_tools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba_compat_tools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba_compat_tools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/basic_vba_compat_tools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,37 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'*  short description : Small helpers for Excel BASIC import modes
+'*
+'\******************************************************************************
+
+function hSetExcelBasicImportMode( bImport as boolean, bEnable as boolean )
+
+    printlog( "Changing Excel VBA import modes" )
+
+    ToolsOptions
+    hToolsOptions( "LoadSave", "VBAProperties" )
+   
+    if ( bImport ) then
+        ExcelBasicLaden.check()
+        if ( bEnable ) then
+            ExecutableCode.check()
+        else
+            ExecutableCode.uncheck()
+        endif
+    else
+        ExcelBasicLaden.uncheck()
+    endif
+    
+    Kontext "OptionenDlg"
+    OptionenDlg.ok()
+
+end function
 
-*****
+'*******************************************************************************
 
 function hSetExcelImportModeDefault()
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/f_usage_tracking.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/f_usage_tracking.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/f_usage_tracking.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/f_usage_tracking.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,16 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'*  short description : Usage tracking
+'*
+'\******************************************************************************
 
-*****
+private const LOGFILE = "user\temp\Feedback\Current.csv"
+
+'*******************************************************************************
 
 testcase tUsageTracking1
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_document_properties.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_document_properties.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_document_properties.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_document_properties.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,87 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'*  short description : Access document properties
+'*
+'\******************************************************************************
+
+testcase tFiledlgDocumentProperties()
+
+
+    dim cFileName as string
+        cFileName = "DigitalSignature" & hGetSuffix( "current" )
+        
+    dim cFilePath as string
+        cFilePath = gTesttoolPath & "framework\optional\input\security"
+        cFilePath = convertpath( cFilePath )
+        
+    dim cFileURL as string : cFileURL = cFilePath & gPathSigne & cFileName
+        
+    dim iFileSize as long
+    dim cFileSize as string
+    dim iFileSizeInfo as long
+    dim cSignatureCreator as string
+    
+    dim cTestExpression as string
+    
+    dim cSelectAll as string
+    dim cCopy as string
+
+    dim brc as boolean
+        
+    printlog( "Using filename: " & cFileName )
+    printlog( "Using filepath: " & cFilePath )
+    
+    if ( FileExists( cFileURL ) ) then
+    	iFileSize = FileLen( cFileURL )
+        printlog( "Testfile size is: " & iFileSize & " Bytes" )
+    else
+    	warnlog( "The workfile does not exist. aborting test" )
+    	goto endsub
+    endif
+    
+    hFileOpen( cFileURL )
+    
+    FileProperties
+    
+    brc = hDocumentInfoSelectTab( "General" )
+    if ( not brc ) then
+        warnlog( "Unable to switch to the requested tabpage, trying to recover" )
+        kontext "TabDokument"
+        TabDokument.cancel()
+        hDestroyDocument()
+    endif
+        
+    cTestExpression = hGetStringFromStaticTextField( FileLocationInfo )
+    if ( cTestExpression = cFilePath ) then
+    	printlog( "Path is correct" )
+    else
+        warnlog( "The path string is incorrect: " & cTestExpression )
+    endif
+
+    kontext "TabDokument"
+    cFileSize = hGetStringFromStaticTextField( FileSizeInfo )
+    iFileSizeInfo =  hConvertStringToLong( cFileSize )
+    if ( iFileSize <> iFileSizeInfo ) then	
+        warnlog( "Filesize does not match, please check" )
+        printlog( "Found...: " & iFileSizeInfo )
+        printlog( "Expected: " & iFileSize    )
+    else
+        printlog( "Filesize is correct" )
+    endif
+    
+    kontext "TabDokument"
+    TabDokument.cancel()
+    
+    hDestroyDocument()
+    
+
+endcase
 
-*****
+'*******************************************************************************
 
 function hDocumentInfoSelectTab( cTabPage as string ) as boolean
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_tools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_tools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_tools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/filedlg_tools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,86 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'* short description : check the internal file dialog ( 1. part )
+'*
+'\***************************************************************************
+
+sub CheckDirectoryName( dirname as string )
+    
+    ' Try to create a folder twice and make sure a warning comes up that the
+    ' folder already exists
+    
+    dim i as integer
+    dim FULLPATH as string
+    FULLPATH = gOfficePath + "user\work\" + dirname + "\"
+    
+    printlog( " - Create the folder and verify it's existence" )
+    
+    try
+        
+        for i=1 to 2
+            
+            printlog( " - creating folder for the " + i + ". time" )
+            
+            Kontext "OeffnenDlg"
+            printlog( " - press 'new folder' button" )
+            NeuerOrdner.Click()
+            
+            Kontext "NeuerOrdner"
+            if ( NeuerOrdner.exists( 2 ) ) then
+                printlog( " - name the folder" )
+                OrdnerName.SetText( dirname )
+                printlog( " - press OK")
+                NeuerOrdner.OK()
+            else
+                warnlog( "New Folder dialog not displayed" )
+            endif
+            
+            ' Take care of the File Exists Dialog
+            printlog( " - check for 'File Exists'-Dialog" )
+            Kontext "Active"
+            If Active.Exists() then
+                Active.OK()
+                
+                'if the file exists during first run of the test: just go on
+                if i =  1 then
+                    warnlog( "File exists. Did you clean the output-dir?" )
+                end if
+                
+                'if the active exists, we will return to the 'new folder' dialog
+                'it must be closed as well
+                Kontext "NeuerOrdner"
+                NeuerOrdner.Cancel()
+            else
+                'this should only be displayed on second run
+                if i = 2 then
+                    warnlog( "No message that the folder '" + dirname + "' exists!" )
+                end if
+            end if
+            
+        next i
+        
+        printlog( " - verify the existence of the new directory" )
+        if App.Dir ( ConvertPath ( FULLPATH ), 16 ) = "" then
+            Warnlog( "The directory'" + dirname + "' wasn't created!" )
+        else
+            printlog( " - delete it")
+            App.RmDir ( ConvertPath ( FULLPATH ) )
+        end if
+        
+        
+    catch
+        
+        warnlog( "Could not create the directory. Bugid: #108256# or #106510# ?" )
+        
+    endcatch
+    
+end sub
 
-*****
+'*******************************************************************************
 
 sub CreateInvalidDirectory( dirname as string )
     

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_1.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_1.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_1.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_1.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,146 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types
+'*
+'\******************************************************************************
+
+testcase tOLEWriter
+    
+    Dim i% : Dim k%
+    Dim sText$
+    
+    gApplication = "WRITER"
+    
+    Call hNewDocument
+    
+    PrintLog "- Writer :   Chart without table"
+    hUseAsyncSlot( "InsertObjectChart" )
 
-*****
+    Kontext "DocumentChart"
+    if ( DocumentChart.Exists( 5 ) ) then
+        FormatChartType
+        Kontext "ChartType"
+        if ( ChartType.Exists( 5 ) ) then
+            ChartType.Cancel
+        else
+            warnlog "Chart Type dialog did bot occour."
+        end if        
+        Kontext "DocumentChart"
+        DocumentChart.TypeKeys "<ESCAPE>"
+        Kontext "DocumentWriter"
+        DocumentWriter.TypeKeys "<DELETE>"
+    else
+        warnlog "Chart has not been inserted."
+    end if    
+
+    PrintLog "- Writer :   Chart out of a table only with numbers"
+    hUseAsyncSlot( "InsertTableWriter" )
+    
+    Kontext "TabelleEinfuegenWriter"
+    if ( TabelleEinfuegenWriter.exists( 1 ) ) then
+        Spalten.SetText "3"
+        Zeilen.SetText "10"
+        TabelleEinfuegenWriter.OK
+        TabelleEinfuegenWriter.notExists( 2 )
+    else
+        warnlog( "Dialog <TabelleEinfuegenWriter> did not open" )
+    endif
+    
+    Kontext "DocumentWriter"
+    for i%=1 to 10
+        for k%=1 to 3
+            sText$ = (i%+k%)*k%
+            DocumentWriter.TypeKeys  sText$
+            DocumentWriter.TypeKeys "<Right>"
+        next k%
+        DocumentWriter.TypeKeys "<Down>"
+        DocumentWriter.TypeKeys "<Left>", 3
+    next i%
+    
+    hUseAsyncSlot( "InsertObjectChart" )
+    hStepThroughChartWizard()
+    
+    Kontext "DocumentChart"
+    DocumentChart.typeKeys "<ESCAPE>"
+    Kontext "DocumentWriter"
+    DocumentWriter.TypeKeys "<Delete>"
+    Sleep 1
+    DocumentWriter.TypeKeys "<Down>", 20
+    DocumentWriter.TypeKeys "<Return>", 2
+    
+    PrintLog "- Writer :   Chart out of a table only with chars"
+    hUseAsyncSlot( "InsertTableWriter" )
+    
+    Kontext "TabelleEinfuegenWriter"
+    if ( TabelleEinfuegenWriter.exists( 1 ) ) then
+        Spalten.SetText "3"
+        Zeilen.SetText "10"
+        TabelleEinfuegenWriter.OK
+        TabelleEinfuegenWriter.notExists( 2 )
+    else
+        warnlog( "Dialog <TabelleEinfuegenWriter> did not open" )
+    endif
+    
+    Kontext "DocumentWriter"
+    for i%=1 to 10
+        for k%=1 to 3
+            sText$ = (i%+k%)*k%
+            DocumentWriter.TypeKeys  "Hallo" + sText$
+            DocumentWriter.TypeKeys "<Right>"
+        next k%
+        DocumentWriter.TypeKeys "<Down>"
+        DocumentWriter.TypeKeys "<Left>", 3
+    next i%
+    
+    hUseAsyncSlot( "InsertObjectChart" )
+    hStepThroughChartWizard()
+        
+    Kontext "DocumentChart"
+    DocumentChart.typeKeys "<ESCAPE>"
+    Kontext "DocumentWriter"
+    DocumentWriter.TypeKeys "<Delete>"
+    Sleep 1
+    DocumentWriter.TypeKeys "<Down>", 20
+    DocumentWriter.TypeKeys "<Return>", 2
+    
+    PrintLog "- Writer :   Math"
+    
+    hUseAsyncSlot( "InsertObjectFormulaWriter" )
+    gMouseClick ( 1, 1)
+    
+    Kontext "DocumentWriter"
+    DocumentWriter.TypeKeys "<Delete>"
+    
+    PrintLog "- Writer :   floating frame"
+    hUseAsyncSlot( "InsertFloatingFrame" )
+    
+    printlog( "Properties dialog for floating frame should open" )    
+    Kontext "TabEigenschaften"
+    if ( TabEigenschaften.exists( 1 ) and TabEigenschaften.isVisible() ) then
+
+        printlog( "Name the floating frame, close the dialog" )
+        FrameName.SetText "Hallo"
+        Inhalt.SetText ConvertPath ( gTesttoolPath+"global\input\graf_inp\borabora.jpg" )
+        
+        TabEigenschaften.OK
+        TabEigenSchaften.notExists( 2 )
+        
+    endif
+    
+    printlog( "Close the writer document" )
+    Kontext "DocumentWriter"
+    DocumentWriter.TypeKeys "<Delete>"
+    Sleep 1
+    
+    hCloseDocument
+    
+endcase
+
+'*******************************************************************************
 
 testcase tOLECalc
 

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_3.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_3.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_3.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_3.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,62 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'* short description :
+'*
+'\******************************************************************************
+
+testcase tDraw_As_OLE_Object()
+    
+    call ClosePresentationfloat()
+    call hInsertOLEObject( true, gOLEDraw, "DRAW" )
+    'call hInsertOLEObject( false, gOLEDraw, "DRAW" )
+    
+endcase
+
+testcase tCalc_as_OLE_Object()
+    
+    call ClosePresentationfloat()
+    call hInsertOLEObject( true, gOLECalc, "CALC" )
+    'call hInsertOLEObject( false, gOLECalc, "CALC" )
+    
+endcase
+
+testcase tImpress_As_OLE_Object()
+    
+    call ClosePresentationfloat()
+    call hInsertOLEObject( true, gOLEImpress, "IMPRESS" )
+    'call hInsertOLEObject( false, gOLEImpress, "IMPRESS" )
+    
+endcase
 
-*****
+testcase tWriter_As_OLE_Object()
+    
+    call ClosePresentationfloat()
+    call hInsertOLEObject( true, gOLEWriter, "WRITER" )
+    'call hInsertOLEObject( false, gOLEWriter, "WRITER" )
+    
+endcase
+
+testcase tMath_As_OLE_Object()
+    
+    call ClosePresentationfloat()
+    call hInsertOLEObject( true, gOLEMath, "MATH" )
+    'call hInsertOLEObject( false, gOLEMath, "MATH" )
+    
+endcase
+
+testcase tChart_As_OLE_Object()
+    
+    call ClosePresentationfloat()
+    call hInsertOLEObject( true, gOLEChart, "CHART" )
+    'call hInsertOLEObject( false, gOLEChart, "CHART" )
+    
+endcase
+
+'*******************************************************************************
 
 function hInsertOLEObject( bRemoveFocus as boolean, cOLEObject as string, cOleType as string ) as beoolean
     

Modified: incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_tools.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_tools.inc?rev=1231427&r1=1231426&r2=1231427&view=diff
==============================================================================
--- incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_tools.inc (original)
+++ incubator/ooo/trunk/main/testautomation/framework/optional/includes/ole_tools.inc Sat Jan 14 00:57:08 2012
@@ -1,6 +1,6 @@
 'encoding UTF-8  Do not remove or change this line!
-'*************************************************************************
-'
+'**************************************************************
+'  
 '  Licensed to the Apache Software Foundation (ASF) under one
 '  or more contributor license agreements.  See the NOTICE file
 '  distributed with this work for additional information
@@ -17,10 +17,22 @@
 '  KIND, either express or implied.  See the License for the
 '  specific language governing permissions and limitations
 '  under the License.
-'
-'*************************************************************************
+'  
+'**************************************************************
+'*
+'* short description : global-level-1-test -> insert all OLE-Objects out of OLE-dialog into all doc-types
+'*
+'\******************************************************************************
+
+sub hReopenDoc
+    'Only for bughandling if closing an OLE object fails
+    Warnlog "Cannot release Chart Object -> #107005#?"
+    hCloseDocument()
+    'if Active.Exists ( 1 ) then Active.TypeKeys "<RIGHT><ENTER>"
+    hNewDocument()
+end sub
 
-*****
+'*******************************************************************************
 
 sub hOleSelektieren ( xStart%, yStart%, xEnde%, yEnde% )
     WL_TB_ZF_Auswahl



Mime
View raw message