Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

Conflicts:
smoketestoo_native/data/Global.xml
smoketestoo_native/data/OptionsDlg.xml
smoketestoo_native/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/smoketest.cxx
test/source/cpp/getargument.cxx
test/source/cpp/officeconnection.cxx
testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
testautomation/framework/optional/includes/filedlg_cjk_folders.inc
testautomation/global/sid/all.sid
testautomation/global/sid/bars.sid
testautomation/global/sid/e_all.sid
testautomation/global/win/bars.win
testautomation/graphics/optional/includes/impress/i_slideshow2.inc
testautomation/graphics/optional/includes/impress/i_slideshow3.inc
testtools/source/bridgetest/bridgetest.cxx
testtools/source/bridgetest/constructors.cxx
testtools/source/bridgetest/makefile.mk
testtools/source/bridgetest/testComponent.component

19 files changed, 57 insertions, 110 deletions

diff --git a/testautomation/global/tools/includes/optional/t_accels.inc b/testautomation/global/tools/includes/optional/t_accels.inc
index 04718449b13b..c700d887b8d5 100755..100644
--- a/testautomation/global/tools/includes/optional/t_accels.inc
+++ b/testautomation/global/tools/includes/optional/t_accels.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : handle accelerators
 '*
diff --git a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
index f7537d52700c..536ffb99dda6 100755..100644
--- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : tools for the property-browser test
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
index f63d610dbdb8..83c037b83f0e 100755..100644
--- a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : tools for tools/macro test
 ' **
diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc
index b1da7d7e8d95..266243d93bb1 100755..100644
--- a/testautomation/global/tools/includes/optional/t_control_objects.inc
+++ b/testautomation/global/tools/includes/optional/t_control_objects.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Functions to manipulate controls by accessing them as objects
 '*
@@ -115,7 +115,7 @@ function lb_test( oControl as object, items as integer, preset as integer, issue
             endif
         endif
         
-        for con_iterator = 1 to items
+        for con_iterator = 1 to con_items
             oControl.select( con_iterator )
         next con_iterator
         
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index 7f43b7211630..5e3e76028e6b 100755..100644
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : misc functions to handle documents
 '*
diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
index 654b1b76c515..4b7c481ffe8f 100755..100644
--- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease working with the extension manager
 '*
diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc
index 070427ef3c5b..dd8a9affc1be 100755..100644
--- a/testautomation/global/tools/includes/optional/t_filetools.inc
+++ b/testautomation/global/tools/includes/optional/t_filetools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Functions that work with files like deleting, loading...
 '*
@@ -260,80 +260,6 @@ end function
 
 '*******************************************************************************
 
-function hGetWorkPath() as string
-
-    '///<h3>Retrieve the users work directory</h3>
-    '///<i>Uses: Call to UNO service</i><br>
-    '///<i>Errorhandling: Fixes &quot;$(user)&quot;-type path (uses fallback)</i><br>
-    '///<i>Errorhandling: Handles broken UNO connection (uses fallback)</i><br>
-    '///<u>Input</u>:
-    '///<ol>
-    '///+<li>Nothing</li>
-    '///</ol>
-    '///<u>Returns</u>:
-    '///<ol>
-    '///+<li>Path to local workdir (string)</li>
-    '///<ul>
-    '///+<li>Includes trailing slash/backslash</li>
-    '///</ul>
-    '///</ol>
-    '///<u>Description</u>:
-    '///<ul>
-
-    dim sPath as string
-    dim sDefaultPath as string
-        sDefaultPath = convertpath( gOfficePath & "user/work" )
-    dim oOfficeConnect as object
-    dim oOfficeConfig as object
-    dim bPathIsFromAPI as boolean
-
-    const CFN     = "hGetWorkPath::"
-
-    '///+<li>Create an UNO service and ask it for the location of &quot;Work&quot;</li>
-    try
-        oOfficeConnect = hGetUnoService( true )
-        oOfficeConfig  = oOfficeConnect.createInstance( "com.sun.star.util.PathSettings" )
-        sPath = convertFromURL( oOfficeConfig.Work ) 
-        bPathIsFromAPI = true
-    catch
-        '///+<li>Handle broken UNO connection</li>
-        printlog( CFN & "Could not access service, connection broken?" )
-        sPath = ""
-        bPathIsFromAPI = false
-    endcatch
-
-    '///+<li>If the path differs from the default do a warnlog</li>
-    if ( sPath <> sDefaultPath ) then
-        printlog( CFN & "Default path is: " & sDefaultPath )
-        printlog( CFN & "Workpath is not defaultpath: " & sPath )
-        printlog( CFN & "Overriding UNO path" )
-        sPath = convertpath( gOfficePath & "user\work" )
-        bPathIsFromAPI = false
-    endif
-                
-    '///+<li>Apply fallback in case of broken connection or invalid path</li>
-    if ( instr( sPath , "$(user)" ) > 0 ) then
-        printlog( CFN & "sPath has $(user)-type string, using fallback" )
-        sPath = sDefaultPath
-        bPathIsFromAPI = false
-    endif
-
-    '///+<li>Add trailing pathseparator, do convertpath</li>
-    sPath = sPath & "/"
-    sPath = convertpath( sPath ) 
-    
-    '///+<li>Print info to the log and return the path</li>
-    if ( GVERBOSE ) then
-        if ( bPathIsFromAPI ) then
-        	printlog( CFN & "(From API): " & sPath )
-        else
-            qaerrorlog( CFN & "(Junked API-Path): " & sPath )
-        endif
-    endif
-    hGetWorkPath() = sPath 
-    '///</ul>
-
-end function
 
 '*******************************************************************************
 
@@ -389,24 +315,5 @@ end function
 
 '*******************************************************************************
 
-function hGetWorkFile( cFileName as string ) as string
-
-    '///<h3>Returns a fully qualified filename to a workfile</h3>
-    '///<u>Input</u>:
-    '///<ol>
-    '///+<li>Filename without path (string)</li>
-    '///</ol>
-    '///<u>Returns</u>:
-    '///<ol>
-    '///+<li>Filename including path to user work directory (string)</li>
-    '///</ol>
-    '///<u>Description</u>:
-    '///<ul>
-    
-    '///+<li>Concatenate workpath and filename, convertpath</li>
-    hGetWorkFile() = convertpath( hGetWorkPath() & cFileName )
-    '///</ul>
-
-end function
 
 
diff --git a/testautomation/global/tools/includes/optional/t_key_tools.inc b/testautomation/global/tools/includes/optional/t_key_tools.inc
index 14906c127c68..f32984f963e3 100755..100644
--- a/testautomation/global/tools/includes/optional/t_key_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_key_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : tools for evaluation of key=value datalists
 '*
diff --git a/testautomation/global/tools/includes/optional/t_listfuncs.inc b/testautomation/global/tools/includes/optional/t_listfuncs.inc
index c90d077db651..cb020d343662 100755..100644
--- a/testautomation/global/tools/includes/optional/t_listfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_listfuncs.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Replacements for routines in t_lists.inc adds some
 '*
diff --git a/testautomation/global/tools/includes/optional/t_locale_strings1.inc b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
index 29c4bcf3cb6b..29c4bcf3cb6b 100755..100644
--- a/testautomation/global/tools/includes/optional/t_locale_strings1.inc
+++ b/testautomation/global/tools/includes/optional/t_locale_strings1.inc
diff --git a/testautomation/global/tools/includes/optional/t_macro_tools.inc b/testautomation/global/tools/includes/optional/t_macro_tools.inc
index 6c1fcc478e5a..c4b432135739 100755..100644
--- a/testautomation/global/tools/includes/optional/t_macro_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_macro_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 ' **
-' ** owner : joerg.skottke@oracle.com
+' ** owner : gregor.hartmann@oracle.com
 ' **
 ' ** short description : Helper functions for Macro tests
 ' **
@@ -172,4 +172,44 @@ function hBasicIDERunMacro( cIdentifier as string ) as boolean
         hBasicIDERunMacro() = false
     endif
 
+end function
+
+'*******************************************************************************
+
+function hExecMacro( cMacro as string ) as boolean
+
+    const CFN = "global::tools::includes::optional::t_macro_tools.inc::hExecMacro(): "
+
+    dim iCurrentModule as integer
+    dim iCurrentMacro as integer
+    hEXECMacro() = FALSE
+
+    ToolsMacro_uno
+
+    kontext "Makro"
+    if ( Makro.exists( 2 ) ) then
+        ' Iterate through the left treelist
+        for iCurrentModule = hExpandAllNodes( MakroAus ) to 1 step -1
+            MakroAus.select( iCurrentModule )
+            ' Iterate through the Macros list (right pane)
+            for iCurrentMacro = 1 to MakroListe.getItemCount()
+                MakroListe.select( iCurrentMacro )
+                ' Try to find the macro
+                if ( cMacro = MakroListe.getSelText() ) then
+                    ' Run the macro
+                    if ( Ausfuehren.isEnabled() ) then
+                        Ausfuehren.click()
+                        hExecMacro() = TRUE
+                        exit function
+                    else
+                        warnlog( CFN & "Macro found but <Ausfuehren> is not enabled" )
+                        exit function
+                    endif
+                endif
+            next iCurrentMacro
+        next iCurrentModule
+    else
+        warnlog( CFN & "Macro Organizer is not open within 2 seconds" )
+    endif
+
 end function
\ No newline at end of file
diff --git a/testautomation/global/tools/includes/optional/t_ole.inc b/testautomation/global/tools/includes/optional/t_ole.inc
index 13138dfc52ab..23b3e02a7ae8 100755..100644
--- a/testautomation/global/tools/includes/optional/t_ole.inc
+++ b/testautomation/global/tools/includes/optional/t_ole.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools for OLE objects
 '*
diff --git a/testautomation/global/tools/includes/optional/t_security_tools.inc b/testautomation/global/tools/includes/optional/t_security_tools.inc
index 6952f7ea16b3..b86894a68eb1 100755..100644
--- a/testautomation/global/tools/includes/optional/t_security_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_security_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Tools to ease testing of security related funtionality
 '*
diff --git a/testautomation/global/tools/includes/optional/t_stringtools.inc b/testautomation/global/tools/includes/optional/t_stringtools.inc
index 7f946fd3b046..6ffb2f467a1b 100755..100644
--- a/testautomation/global/tools/includes/optional/t_stringtools.inc
+++ b/testautomation/global/tools/includes/optional/t_stringtools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Functions for manipulation of strings
 '*
diff --git a/testautomation/global/tools/includes/optional/t_treelist_tools.inc b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
index e9c254ac07b4..3ce78163d843 100755..100644
--- a/testautomation/global/tools/includes/optional/t_treelist_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_treelist_tools.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'* owner : joerg.skottke@oracle.com
+'* owner : gregor.hartmann@oracle.com
 '*
 '* short description : Helpers for accessing treelists
 '*
diff --git a/testautomation/global/tools/includes/optional/t_ui_filters.inc b/testautomation/global/tools/includes/optional/t_ui_filters.inc
index 7b9dd66e1a40..d4c536b73718 100644
--- a/testautomation/global/tools/includes/optional/t_ui_filters.inc
+++ b/testautomation/global/tools/includes/optional/t_ui_filters.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Get the UI names for default filters
 '*
diff --git a/testautomation/global/tools/includes/optional/t_user_info.inc b/testautomation/global/tools/includes/optional/t_user_info.inc
index d4771be2e3c9..429aad5d2e8e 100644
--- a/testautomation/global/tools/includes/optional/t_user_info.inc
+++ b/testautomation/global/tools/includes/optional/t_user_info.inc
@@ -25,7 +25,7 @@
 '
 '/******************************************************************************
 '*
-'*  owner : joerg.skottke@oracle.com
+'*  owner : gregor.hartmann@oracle.com
 '*
 '*  short description : Extension Update Test
 '*
diff --git a/testautomation/global/tools/includes/optional/t_xml1.inc b/testautomation/global/tools/includes/optional/t_xml1.inc
index 5afd05cbb22f..5afd05cbb22f 100755..100644
--- a/testautomation/global/tools/includes/optional/t_xml1.inc
+++ b/testautomation/global/tools/includes/optional/t_xml1.inc
diff --git a/testautomation/global/tools/includes/optional/t_xml2.inc b/testautomation/global/tools/includes/optional/t_xml2.inc
index 46dc9b350393..46dc9b350393 100755..100644
--- a/testautomation/global/tools/includes/optional/t_xml2.inc
+++ b/testautomation/global/tools/includes/optional/t_xml2.inc