[ooo-build-commit] Branch 'ooo/master' - 3 commits - qadevOOo/makefile.mk qadevOOo/runner qadevOOo/tests testautomation/framework testautomation/global testtools/com testtools/source

Jan Holesovsky kendy at kemper.freedesktop.org
Wed Sep 16 19:54:01 PDT 2009


 qadevOOo/makefile.mk                                             |    3 
 qadevOOo/runner/basicrunner/basichelper/Filter.java              |    3 
 qadevOOo/runner/lib/MultiMethodTest.java                         |    2 
 qadevOOo/runner/makefile.mk                                      |    2 
 qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java     |    7 
 qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java          |    3 
 testautomation/framework/required/f_first.bas                    |    6 
 testautomation/global/required/includes/g_option.inc             |  612 ---------
 testautomation/global/required/includes/g_option_application.inc |  669 ++++++++++
 testautomation/global/win/etab_e_g.win                           |    1 
 testautomation/global/win/tab_t_z.win                            |    2 
 testtools/com/sun/star/comp/bridge/TestComponentMain.java        |   10 
 testtools/source/bridgetest/idl/makefile.mk                      |    4 
 testtools/source/bridgetest/makefile.mk                          |    7 
 testtools/source/bridgetest/pyuno/main.py                        |    3 
 testtools/source/bridgetest/pyuno/makefile.mk                    |   13 
 testtools/source/servicetests/LocalServiceTest.java              |    4 
 testtools/source/servicetests/RemoteServiceTest.java             |    4 
 testtools/source/servicetests/TestBase.java                      |    8 
 19 files changed, 717 insertions(+), 646 deletions(-)

New commits:
commit 712b9b7929d3493f604260472d95e385b280e09f
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Wed Sep 16 16:04:37 2009 +0000

    CWS-TOOLING: integrate CWS automationdev300m57cat0
    2009-09-09 tb121644 #i104895# split options test into 2 files one for first.bas and the other for X_updt.bas'es
    2009-09-09 tb121644 #i100286# add HElpId HID_OPTIONS_JAVA_LIST
    2009-09-08 tb121644 #i103219 CB_KEEP_LIST -> CB_REMOVE_LIST; clean hid.lst
    2009-09-08 tb121644 #i103219 revert of revert of change; clean hid.lst

diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index 71533eb..26e9bd3 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -46,6 +46,7 @@ sub main
 
     use "framework\required\includes\first.inc"
     use "framework\required\includes\graphics_import.inc"
+    use "global\required\includes\g_option_application.inc"
     
     call hStatusIn ("framework", "f_first.bas")
     call tAllNew
@@ -56,7 +57,7 @@ sub main
     call tJava
     
     gApplication = "WRITER"
-    call tToolsOptionsTest
+    call tToolsOptionsTestFirst
     call tDatabaseCheck
     call tHelpRegistration
     call hStatusOut   
@@ -69,9 +70,6 @@ sub LoadIncludeFiles
 
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    
-    use "global\required\includes\g_option.inc"
-    
     use "global\tools\includes\optional\t_ui_filters.inc"
     use "global\tools\includes\optional\t_filetools.inc"
     use "global\tools\includes\optional\t_docfuncs.inc"
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 5dc71a9..3ecfd3b 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -41,20 +41,13 @@ global sErrMes as String
 global iSectionNumber as Integer
 
 sub tToolsOptionsTest
-
-    dim sPreviousApplication as string
-
-    sPreviousApplication = gApplication
-    ' subs and functions has been placed there
-    use "global/tools/includes/required/t_option2.inc"
-
     ' To prevent users from running just a subsection from this file, without THIS
     ' subroutine, in every subsection the value of 'iSectionNumber' is checked.
     ' The test will exit with warnlog, if iSectionNumber is 0
     sErrMes = ""
     select case uCase(gApplication)
-    case "WRITER","MASTERDOCUMENT","HTML"   : iSectionNumber = 8
-    case "IMPRESS","DRAW","MATH","CALC"     : iSectionNumber = 7
+       case "WRITER","MASTERDOCUMENT","HTML"   : iSectionNumber = 8
+       case "IMPRESS","DRAW","MATH","CALC"     : iSectionNumber = 7
     end select
     ' common testcases are placed in this library
     ' these tab-sets are always available:
@@ -65,18 +58,6 @@ sub tToolsOptionsTest
     Call tToolsOptionsChart
     Call tToolsOptionsInternet
     Call tToolsOptionsImprovementProgram
-
-    ' these tabpages only exist in the respective application
-    select case uCase(gApplication)
-    case "WRITER"  : Call tToolsOptionsTextdocument
-    case "HTML"    : Call tToolsOptionsHTMLDocument
-    case "CALC"    : Call tToolsOptionsSpreadsheet
-    case "IMPRESS" : Call tToolsOptionsPresentation
-    case "DRAW"    : Call tToolsOptionsDrawing
-    case "MATH"    : Call tToolsOptionsFormula
-    end select
-
-    gApplication = sPreviousApplication
 end sub
 
 '-------------------------------------------------------------------------
@@ -773,592 +754,6 @@ endcase
 
 '-------------------------------------------------------------------------
 
-testcase tToolsOptionsTextdocument
-  dim EchteAnzahl as Integer, i as Integer
-  dim gefunden as Boolean
-    
-     PrintLog "- Tools/Options/Text document  ( Extras/Optionen/Textdokument )"
-    if (0 = iSectionNumber) then 
-        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
-        goto endsub
-    endif
-'/// Create a new document    
-    if gApplication <> "BACKGROUND" then   
-        Call hNewDocument
-    end if
- '/// <i>Tools</i> / <i>Options</i> / <i>Text document</i>
-   ToolsOptions
-   Kontext "Active"
-   if Active.Exists (3) then
-      if Active.GetText <> sErrMes then Warnlog "A messagebox exists => BUG : " + Active.GetText
-      Active.OK
-   end if
-   ToPosInOptionlist ( 4 )
-   EchteAnzahl = Optionsliste.GetItemCount - iSectionNumber
-   if EchteAnzahl = 10 AND ( gAsianSup = TRUE OR gCTLSup = TRUE ) then
-      Warnlog "There are only 10 pages in 'text document'-section, but asian support or CTL support are activated! => a section is missing?"
-   else
-      printlog "Asian support and CTL support are not activated ( on languages-page )!"
-   end if
-   if bDebugVersion = TRUE  then EchteAnzahl = EchteAnzahl - 1
-   if gAsianSup     = FALSE then EchteAnzahl = EchteAnzahl + 1
-   if gCTLSup       = FALSE then EchteAnzahl = EchteAnzahl + 1
-   for i=1 to EchteAnzahl
-      gefunden = FALSE
-      Kontext "OptionenDlg"
-      Optionsliste.TypeKeys "<Down>"
-      if gAsianSup = FALSE AND gCTLSup = FALSE AND i=6 then i=i+2
-      if gAsianSup = FALSE AND gCTLSup = TRUE  AND i=6 then i=i+1
-      if gAsianSup = TRUE  AND gCTLSup = FALSE AND i=7 then i=i+1
-      select case i
-       case 1 : Kontext "TabLaden"
-                '///+<ul><li>General</li>
-                printlog "  - General / Allgemein"
-                if TabLaden.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabLaden )
-                end if
-       case 2 : Kontext "TabInhalteWriter"
-                '///+<li>View</li>
-                printlog "  - View / Ansicht"
-                if TabInhalteWriter.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabInhalteWriter )
-                end if
-       case 3 : Kontext "TabDirektCursor"
-                '///+<li>Formating aids</li>
-                printlog "  - Formating aids / Formatierungshilfen"
-                if TabDirektCursor.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabDirektCursor )
-                end if
-       case 4 : Kontext "TabRaster"
-                '///+<li>Grid</li>
-                printlog "  - Grid / Raster"
-                if TabRaster.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabRaster )
-                end if
-       case 5 : Kontext "TabGrundschriften"
-                '///+<li>Default fonts</li>
-                printlog "  - Default Fonts / Grundschriften"
-                if TabGrundschriften.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabGrundschriften )
-                end if
-       case 6 : Kontext "TabGrundschriftenAsian"
-                '///+<li>Default fonts asian</li>
-                printlog "  - Default Fonts Asian / Grundschriften Asiatisch"
-                if TabGrundschriftenAsian.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabGrundschriftenAsian )
-                end if
-       case 7 : Kontext "TabGrundschriftenCTL"
-                '///+<li>Default fonts CTL</li>
-                printlog "  - Default Fonts CTL / Grundschriften CTL"
-                if TabGrundschriftenCTL.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabGrundschriftenCTL )
-                end if
-       case 8 : Kontext "TabDruckenWriter"
-                '///+<li>Print</li>
-                printlog "  - Print / Drucken"
-                if TabDruckenWriter.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabDruckenWriter )
-                end if
-       case 9 : Kontext "TabTabelleOptionen"
-                '///+<li>Table</li>
-                printlog "  - Table / Tabellen"
-                if TabTabelleOptionen.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabTabelleOptionen )
-                end if
-       case 10: Kontext "TabAenderungenWriter"
-                '///+<li>Changes</li>
-                printlog "  - Changes / Aenderungen"
-                if TabAenderungenWriter.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabAenderungenWriter )
-                end if
-       case 11: Kontext "TabCompatibility"
-                '///+<li>Compatibility</li>
-                printlog "  - Compatibility"
-                if TabCompatibility.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabCompatibility )
-                end if
-       case 12: Kontext "TabAutoCaption"
-                '///+<li>AutoCaption</li>
-                printlog "  - AutoCaption"
-                if TabAutoCaption.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabAutoCaption )
-                end if
-       case 13: Kontext "TabMailMergeEMail"
-                '///+<li>Mail Merge E-mail</li></ul>
-                printlog "  - Mail Merge E-mail"
-                if TabMailMergeEMail.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabMailMergeEMail )
-                   ServerAuthentication.click
-                   kontext "ServerAuthentication"
-                   Call DialogTest ( ServerAuthentication )
-                   ServerAuthentication.cancel
-                   Kontext "TabMailMergeEMail"
-                   TestSettings.click
-                   
-                   ' in case java is not enabled
-                   sleep( 2 )
-                   try   
-                       Kontext "Messagebox"
-                       if ( MessageBox.exists()) then            
-                           sleep(2)                
-                           warnlog(Messagebox.GetText())                
-                           try
-                   Messagebox.Cancel()
-                               sleep( 2 )
-               catch
-                           Messagebox.OK() ' if "OK" works, we are in an undefined state
-                   warnlog( "" )
-                           endcatch                
-                       end if             
-           catch
-               warnlog( "A messagebox was displayed but coul not be closed." )
-                   endcatch
-                   
-                   Kontext "TestaccountSettings"
-                   Call DialogTest ( TestaccountSettings )
-                   TestaccountSettings.cancel
-                end if
-      end select
-      if gefunden=FALSE then
-         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
-         EchteAnzahl = EchteAnzahl - 1
-         if EchteAnzahl < 12 then
-            i=13
-         else
-            i=1-1
-         end if
-      end if
-   next i
-'/// Close the options dialog
-   Kontext "OptionenDlg"
-   OptionenDlg.Cancel
-'/// Close the document  
-    if gApplication <> "BACKGROUND" then 
-        Call hCloseDocument
-    end if
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tToolsOptionsHTMLDocument
-  dim EchteAnzahl as Integer, i as Integer
-  dim gefunden as Boolean
-    
-   PrintLog "- Tools/Options/HTML-Document  ( Extras/Optionen/HTML-Dokument )"
-    if (0 = iSectionNumber) then 
-        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
-        goto endsub
-    endif
-'/// Create a new document    
-    if gApplication <> "BACKGROUND" then    
-        Call hNewDocument
-    end if
- '/// <i>Tools</i> / <i>options</i> / <i>HTML Document</i>
-   ToolsOptions
-   ToPosInOptionlist ( 5 )
-   i = 6
-   if bDebugVersion = TRUE  then i = i + 1  ' here exists the special debug-tabpage, too
-   EchteAnzahl = OptionTabPageZaehler (i)
-   if bDebugVersion = TRUE  then EchteAnzahl = EchteAnzahl - 1
-   for i=1 to EchteAnzahl
-      gefunden = FALSE
-      Kontext "OptionenDlg"
-      Optionsliste.TypeKeys "<Down>"
-      select case i
-       case 1 : Kontext "TabInhalteHTML"
-                '/// View
-                printlog "  - View / Ansicht"
-                if TabInhalteHTML.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabInhalteHTML )
-                end if
-       case 2 : Kontext "TabDirektCursor"
-                '/// Formating aids
-                printlog "  - Formatting aids / Formatierungshilfen"
-                if TabDirektCursor.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabDirektCursor )
-                end if
-       case 3 : Kontext "TabRaster"
-                '/// Grid
-                printlog "  - Grid / Raster"
-                if TabRaster.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabRaster )
-                end if
-       case 4 : Kontext "TabDruckenHTML"
-                '/// Print
-                printlog "  - Print / Drucken"
-                if TabDruckenHTML.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabDruckenHTML )
-                end if
-       case 5 : Kontext "TabTabelleOptionen"
-                '/// Table
-                printlog "  - Table / Tabelle"
-                if TabTabelleOptionen.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabTabelleOptionen )
-                end if
-       case 6 : Kontext "TabHintergrund"
-                '/// Background
-                printlog "  - Background / Hintergrund"
-                Sleep 1
-                if TabHintergrund.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabHintergrund )
-                end if
-      end select
-      if gefunden=FALSE then
-         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
-         EchteAnzahl = EchteAnzahl - 1
-         if EchteAnzahl < 6 then
-            i=11
-         else
-            i=1-1
-         end if
-      end if
-   next i
-'/// Close the options dialog
-    Kontext "OptionenDlg"
-    OptionenDlg.Cancel
-'/// Close the document    
-    if gApplication <> "BACKGROUND" then 
-        Call hCloseDocument
-    end if
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tToolsOptionsSpreadsheet
-  dim EchteAnzahl as Integer, i as Integer
-  dim gefunden as Boolean
-    
-    PrintLog "- Tools/Options/Spreadsheet  ( Extras/Optionen/Tabellendokument )"
-    if (0 = iSectionNumber) then 
-        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
-        goto endsub
-    endif
-'/// Create a new document
-    if gApplication <> "BACKGROUND" then 
-        Call hNewDocument
-    end if
- '/// <i>Tools</i> / <i>Options</i> / <i>Spreadsheet</i>
-   ToolsOptions
-   ToPosInOptionlist ( 4 )
-   EchteAnzahl = OptionTabPageZaehler ( 7, FALSE )
-   for i=1 to EchteAnzahl
-      gefunden = FALSE
-      Kontext "OptionenDlg"
-      Optionsliste.TypeKeys "<Down>"
-      select case i
-       case 1 : Kontext "TabLayoutCalc"
-                '/// General
-                printlog "  - General / Allgemein"
-                if TabLayoutCalc.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabLayoutCalc )
-                end if
-       case 2 : Kontext "TabInhaltCalc"
-                '/// View
-                printlog "  - View / Ansicht"
-                if TabInhaltCalc.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabInhaltCalc )
-                end if
-       case 3 : Kontext "TabBerechnen"
-                '/// Calculate
-                printlog "  - Calculate / Berechnen"
-                if TabBerechnen.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabBerechnen )
-                end if
-       case 4 : Kontext "TabSortierlisten"
-                '/// Sort lists
-                printlog "  - Sort Lists / Sortierliste"
-                if TabSortierlisten.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabSortierlisten )
-                end if
-       case 5 : Kontext "TabAenderungenCalc"
-                '/// Changes
-                printlog "  - Changes / Aenderungen"
-                if TabAenderungenCalc.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabAenderungenCalc )
-                end if
-       case 6 : Kontext "TabRaster"
-                '/// Grid
-                printlog "  - Grid / Raster"
-                if TabRaster.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabRaster )
-                end if
-       case 7 : Kontext "TabPrintCalcOptions"
-                '/// Print
-                printlog "  - Print / Drucken"
-                if TabPrintCalcOptions.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabPrintCalcOptions )
-                end if
-      end select
-      if gefunden=FALSE then
-         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
-         EchteAnzahl = EchteAnzahl - 1
-         if EchteAnzahl < 7 then
-            i=11
-         else
-            i=1-1
-         end if
-      end if
-   next i
-'/// Close the options dialog
-    Kontext "OptionenDlg"
-    OptionenDlg.Cancel
-'/// Close the document
-    if gApplication <> "BACKGROUND" then 
-        Call hCloseDocument
-    end if
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tToolsOptionsPresentation
-  dim EchteAnzahl as Integer, i as Integer
-  dim gefunden as Boolean
-  dim iTemp as integer
-    
-   PrintLog "- Tools/Options/Presentation  ( Extras/Optionen/Praesentation )"
-    if (0 = iSectionNumber) then 
-        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
-        goto endsub
-    endif
-'/// Create a new document
-    if gApplication <> "BACKGROUND" then 
-        Call hNewDocument
-    end if
-   kontext "DocumentImpress"
-   if DocumentImpress.exists(5) then
-       printlog "  - An application of type Presentation is available."
-       '--- workaround #i48383#
-       DocumentImpress.MouseDown (10,10)
-       DocumentImpress.MouseUp (10,10)
-   else
-       qaErrorLog "  - No application of type Presentation is available"
-   end if
- '/// <i>Tools</i> / <i>Options</i> / <i>Presentation</i>
-   ToolsOptions
-   ToPosInOptionlist ( 4 )
-   EchteAnzahl = OptionTabPageZaehler ( 4, FALSE )
-   for i=1 to EchteAnzahl
-      gefunden = FALSE
-      Kontext "OptionenDlg"
-      Optionsliste.TypeKeys "<Down>"
-      select case i
-       case 1 : Kontext "TabSonstigesDraw"
-                '/// General
-                printlog "  - General / Allgemein"
-                if TabSonstigesDraw.exists then
-                    if TabSonstigesDraw.IsVisible then
-                       gefunden = TRUE
-                       Call DialogTest ( TabSonstigesDraw )
-                    end if
-                else
-                    ' Trying to get root cause on some systems it seems the backing window is used. #i48383#
-                    Kontext "OptionenDlg"
-                    OptionenDlg.SnapShot convertPath(gOfficePath + "user/work/"+gApplication+".bmp")
-                    qaErrorLog "#i48383# Trying to get root cause for wrong window; check picture: " + convertPath(gOfficePath + "user/work/"+gApplication+".bmp")
-                    for iTemp = 1 to Optionsliste.getItemCount
-                        qaErrorLog "" + iTemp + ": '" + Optionsliste.getItemText(iTemp) + "'"
-                    next iTemp
-                    gefunden = TRUE
-                end if
-       case 2 : Kontext "TabInhalteDraw"
-                '/// View
-                printlog "  - View / Ansicht"
-                if TabInhalteDraw.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabInhalteDraw )
-                end if
-       case 3 : Kontext "TabRaster"
-                '/// Grid
-                printlog "  - Grid / Raster"
-                if TabRaster.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabRaster )
-                end if
-       case 4 : Kontext "TabDruckenDraw"
-                '/// Print
-                printlog "  - Print / Drucken"
-                if TabDruckenDraw.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabDruckenDraw )
-                end if
-      end select
-      if gefunden=FALSE then
-         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
-         EchteAnzahl = EchteAnzahl - 1
-         if EchteAnzahl < 4 then
-            i=11
-         else
-            i=1-1
-         end if
-      end if
-   next i
-'/// Close the options dialog
-    Kontext "OptionenDlg"
-    OptionenDlg.Cancel
-'/// Close the document    
-    if gApplication <> "BACKGROUND" then 
-        Call hCloseDocument
-    end if
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tToolsOptionsDrawing
-  Dim EchteAnzahl as Integer, i as Integer
-  Dim gefunden as Boolean
-    
-   PrintLog "- Tools/Options/Drawing  ( Extras/Optionen/Zeichnung )"
-    if (0 = iSectionNumber) then 
-        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
-        goto endsub
-    end if
-'/// Create a new document
-    if gApplication <> "BACKGROUND" then 
-        Call hNewDocument
-    end if
-   Kontext "DocumentDraw"
-   if DocumentDraw.exists(5) then
-       printlog "  - An application of type Draw is available."
-       '--- workaround #i48383#
-       DocumentDraw.MouseDown (10,10)
-       DocumentDraw.MouseUp (10,10)
-   else
-       qaErrorLog "  - No application of type Draw is available"
-   end if
-'/// <i>Tools</i> / <i>Options</i> / <i>Drawing</i>
-   ToolsOptions
-   ToPosInOptionlist ( 4 )
-   EchteAnzahl = OptionTabPageZaehler ( 4, FALSE )
-   for i=1 to EchteAnzahl
-      gefunden = FALSE
-      Kontext "OptionenDlg"
-      Optionsliste.TypeKeys "<Down>"
-      select case i
-       case 1 : Kontext "TabSonstigesDraw"
-                '/// General
-                printlog "  - General / Allgemein"
-                if TabSonstigesDraw.exists then
-                    if TabSonstigesDraw.IsVisible then
-                       gefunden = TRUE
-                       Call DialogTest ( TabSonstigesDraw )
-                    end if
-                else
-                    ' Trying to get root cause on some systems it seems the backing window is used. #i48383#
-                    Kontext "OptionenDlg"
-                    qaErrorLog "#i48383# wrong focus on opening options"
-                    gefunden = TRUE
-                end if
-       case 2 : Kontext "TabInhalteDraw"
-                '/// View
-                printlog "  - View / Ansicht"
-                if TabInhalteDraw.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabInhalteDraw )
-                end if
-       case 3 : Kontext "Active"
-                if Active.Exists then
-                   Warnlog "A messagebox exists => BUG  : " + Active.GetText
-                   try
-                      Active.No
-                   catch
-                      Active.OK
-                   endcatch
-                end if
-                Kontext "TabRaster"
-                '/// Grid
-                printlog "  - Grid / Raster"
-                if TabRaster.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabRaster )
-                end if
-       case 4 : Kontext "TabDruckenDraw"
-                '/// Print
-                printlog "  - Print / Drucken"
-                if TabDruckenDraw.IsVisible then
-                   gefunden = TRUE
-                   Call DialogTest ( TabDruckenDraw )
-                end if
-      end select
-      if gefunden=FALSE then
-         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
-         EchteAnzahl = EchteAnzahl - 1
-         if EchteAnzahl < 4 then
-            i=11
-         else
-            i=1-1
-         end if
-      end if
-   next i
-'/// Close the options dialog
-    Kontext "OptionenDlg"
-     OptionenDlg.Cancel
-'/// Close the document
-     if gApplication <> "BACKGROUND" then 
-    Call hCloseDocument
-    end if
-endcase
-
-'-------------------------------------------------------------------------
-
-testcase tToolsOptionsFormula
-  dim EchteAnzahl as Integer, i as Integer
-    
-   PrintLog "- Tools/Options/Formula  ( Extras/Optionen/Formel )"
-    if (0 = iSectionNumber) then 
-        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
-        goto endsub
-    endif
-'/// Create a new document
-    if gApplication <> "BACKGROUND" then 
-        Call hNewDocument
-    end if
-'/// <i>Tools</i> / <i>Options</i> / <i>Formula</i>    
-   ToolsOptions
-   ToPosInOptionlist ( 4 )
-   EchteAnzahl = OptionTabPageZaehler ( 1, FALSE )
-   Kontext "OptionenDlg"
-   '/// Print
-   Optionsliste.TypeKeys "<Down>"
-   printlog "  - Print / Drucken"
-   Kontext "TabDruckenMath"
-   Call DialogTest ( TabDruckenMath )
-'/// Close the options dialog
-   Kontext "OptionenDlg"
-   OptionenDlg.Cancel
-'/// Close the document   
-    if gApplication <> "BACKGROUND" then 
-        Call hCloseDocument
-    end if
-endcase
-
-'-------------------------------------------------------------------------
-
 testcase tToolsOptionsChart
     Dim EchteAnzahl as Integer, i as Integer
 
@@ -1393,6 +788,9 @@ endcase
 '-------------------------------------------------------------------------
 
 testcase tToolsOptionsDataSources
+   qaerrorlog "#i104508# crashes on quit or reload if this is run."
+   goto endsub
+   
    Dim EchteAnzahl as Integer, i as Integer
 
    PrintLog "- Tools/Options/Data Sources  ( Extras/Optionen/Datenbank )"
diff --git a/testautomation/global/required/includes/g_option_application.inc b/testautomation/global/required/includes/g_option_application.inc
new file mode 100644
index 0000000..3b6d9cd
--- /dev/null
+++ b/testautomation/global/required/includes/g_option_application.inc
@@ -0,0 +1,669 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'*
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: g_option.inc,v $
+'*
+'* $Revision: 1.2 $
+'*
+'* last change: $Author: rt $ $Date: 2008-07-31 19:25:49 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : thorsten.bosbach at sun.com
+'*
+'* short description : update and resouce test for all option pages (at tools/options)
+'*
+'\***********************************************************************
+
+global sErrMes as String
+global iSectionNumber as Integer
+
+sub tToolsOptionsTestFirst
+    dim sPreviousApplication as string
+
+    sPreviousApplication = gApplication
+
+    ' To prevent users from running just a subsection from this file, without THIS
+    ' subroutine, in every subsection the value of 'iSectionNumber' is checked.
+    ' The test will exit with warnlog, if iSectionNumber is 0
+    sErrMes = ""
+    select case uCase(gApplication)
+    case "WRITER","MASTERDOCUMENT","HTML"   : iSectionNumber = 8
+    case "IMPRESS","DRAW","MATH","CALC"     : iSectionNumber = 7
+    end select
+
+    ' these tabpages only exist in the respective application
+    gApplication = "WRITER"
+    iSectionNumber = 8
+    Call tToolsOptionsTextdocument
+
+    gApplication = "HTML"
+    Call tToolsOptionsHTMLDocument
+
+    gApplication = "CALC"
+    iSectionNumber = 7
+    Call tToolsOptionsSpreadsheet
+
+    gApplication = "IMPRESS"
+    iSectionNumber = 7
+    Call tToolsOptionsPresentation
+
+    gApplication = "DRAW"
+    iSectionNumber = 7
+    Call tToolsOptionsDrawing
+
+    gApplication = "MATH"
+    iSectionNumber = 7
+    Call tToolsOptionsFormula
+
+    gApplication = sPreviousApplication
+end sub
+
+'-------------------------------------------------------------------------
+
+testcase tToolsOptionsTextdocument
+  dim EchteAnzahl as Integer, i as Integer
+  dim gefunden as Boolean
+    
+     PrintLog "- Tools/Options/Text document  ( Extras/Optionen/Textdokument )"
+    if (0 = iSectionNumber) then 
+        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
+        goto endsub
+    endif
+'/// Create a new document    
+    if gApplication <> "BACKGROUND" then   
+        Call hNewDocument
+    end if
+ '/// <i>Tools</i> / <i>Options</i> / <i>Text document</i>
+   ToolsOptions
+   Kontext "Active"
+   if Active.Exists (3) then
+      if Active.GetText <> sErrMes then Warnlog "A messagebox exists => BUG : " + Active.GetText
+      Active.OK
+   end if
+   ToPosInOptionlist ( 4 )
+   EchteAnzahl = Optionsliste.GetItemCount - iSectionNumber
+   if EchteAnzahl = 10 AND ( gAsianSup = TRUE OR gCTLSup = TRUE ) then
+      Warnlog "There are only 10 pages in 'text document'-section, but asian support or CTL support are activated! => a section is missing?"
+   else
+      printlog "Asian support and CTL support are not activated ( on languages-page )!"
+   end if
+   if bDebugVersion = TRUE  then EchteAnzahl = EchteAnzahl - 1
+   if gAsianSup     = FALSE then EchteAnzahl = EchteAnzahl + 1
+   if gCTLSup       = FALSE then EchteAnzahl = EchteAnzahl + 1
+   for i=1 to EchteAnzahl
+      gefunden = FALSE
+      Kontext "OptionenDlg"
+      Optionsliste.TypeKeys "<Down>"
+      if gAsianSup = FALSE AND gCTLSup = FALSE AND i=6 then i=i+2
+      if gAsianSup = FALSE AND gCTLSup = TRUE  AND i=6 then i=i+1
+      if gAsianSup = TRUE  AND gCTLSup = FALSE AND i=7 then i=i+1
+      select case i
+       case 1 : Kontext "TabLaden"
+                '///+<ul><li>General</li>
+                printlog "  - General / Allgemein"
+                if TabLaden.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabLaden )
+                end if
+       case 2 : Kontext "TabInhalteWriter"
+                '///+<li>View</li>
+                printlog "  - View / Ansicht"
+                if TabInhalteWriter.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabInhalteWriter )
+                end if
+       case 3 : Kontext "TabDirektCursor"
+                '///+<li>Formating aids</li>
+                printlog "  - Formating aids / Formatierungshilfen"
+                if TabDirektCursor.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabDirektCursor )
+                end if
+       case 4 : Kontext "TabRaster"
+                '///+<li>Grid</li>
+                printlog "  - Grid / Raster"
+                if TabRaster.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabRaster )
+                end if
+       case 5 : Kontext "TabGrundschriften"
+                '///+<li>Default fonts</li>
+                printlog "  - Default Fonts / Grundschriften"
+                if TabGrundschriften.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabGrundschriften )
+                end if
+       case 6 : Kontext "TabGrundschriftenAsian"
+                '///+<li>Default fonts asian</li>
+                printlog "  - Default Fonts Asian / Grundschriften Asiatisch"
+                if TabGrundschriftenAsian.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabGrundschriftenAsian )
+                end if
+       case 7 : Kontext "TabGrundschriftenCTL"
+                '///+<li>Default fonts CTL</li>
+                printlog "  - Default Fonts CTL / Grundschriften CTL"
+                if TabGrundschriftenCTL.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabGrundschriftenCTL )
+                end if
+       case 8 : Kontext "TabDruckenWriter"
+                '///+<li>Print</li>
+                printlog "  - Print / Drucken"
+                if TabDruckenWriter.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabDruckenWriter )
+                end if
+       case 9 : Kontext "TabTabelleOptionen"
+                '///+<li>Table</li>
+                printlog "  - Table / Tabellen"
+                if TabTabelleOptionen.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabTabelleOptionen )
+                end if
+       case 10: Kontext "TabAenderungenWriter"
+                '///+<li>Changes</li>
+                printlog "  - Changes / Aenderungen"
+                if TabAenderungenWriter.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabAenderungenWriter )
+                end if
+       case 11: Kontext "TabCompatibility"
+                '///+<li>Compatibility</li>
+                printlog "  - Compatibility"
+                if TabCompatibility.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabCompatibility )
+                end if
+       case 12: Kontext "TabAutoCaption"
+                '///+<li>AutoCaption</li>
+                printlog "  - AutoCaption"
+                if TabAutoCaption.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabAutoCaption )
+                end if
+       case 13: Kontext "TabMailMergeEMail"
+                '///+<li>Mail Merge E-mail</li></ul>
+                printlog "  - Mail Merge E-mail"
+                if TabMailMergeEMail.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabMailMergeEMail )
+                   ServerAuthentication.click
+                   kontext "ServerAuthentication"
+                   Call DialogTest ( ServerAuthentication )
+                   ServerAuthentication.cancel
+                   Kontext "TabMailMergeEMail"
+                   TestSettings.click
+                   
+                   ' in case java is not enabled
+                   sleep( 2 )
+                   try   
+                       Kontext "Messagebox"
+                       if ( MessageBox.exists()) then            
+                           sleep(2)                
+                           warnlog(Messagebox.GetText())                
+                           try
+                   Messagebox.Cancel()
+                               sleep( 2 )
+               catch
+                           Messagebox.OK() ' if "OK" works, we are in an undefined state
+                   warnlog( "" )
+                           endcatch                
+                       end if             
+           catch
+               warnlog( "A messagebox was displayed but coul not be closed." )
+                   endcatch
+                   
+                   Kontext "TestaccountSettings"
+                   Call DialogTest ( TestaccountSettings )
+                   TestaccountSettings.cancel
+                end if
+      end select
+      if gefunden=FALSE then
+         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+         EchteAnzahl = EchteAnzahl - 1
+         if EchteAnzahl < 12 then
+            i=13
+         else
+            i=1-1
+         end if
+      end if
+   next i
+'/// Close the options dialog
+   Kontext "OptionenDlg"
+   OptionenDlg.Cancel
+'/// Close the document  
+    if gApplication <> "BACKGROUND" then 
+        Call hCloseDocument
+    end if
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tToolsOptionsHTMLDocument
+  dim EchteAnzahl as Integer, i as Integer
+  dim gefunden as Boolean
+    
+   PrintLog "- Tools/Options/HTML-Document  ( Extras/Optionen/HTML-Dokument )"
+    if (0 = iSectionNumber) then 
+        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
+        goto endsub
+    endif
+'/// Create a new document    
+    if gApplication <> "BACKGROUND" then    
+        Call hNewDocument
+    end if
+ '/// <i>Tools</i> / <i>options</i> / <i>HTML Document</i>
+   ToolsOptions
+   ToPosInOptionlist ( 5 )
+   i = 6
+   if bDebugVersion = TRUE  then i = i + 1  ' here exists the special debug-tabpage, too
+   EchteAnzahl = OptionTabPageZaehler (i)
+   if bDebugVersion = TRUE  then EchteAnzahl = EchteAnzahl - 1
+   for i=1 to EchteAnzahl
+      gefunden = FALSE
+      Kontext "OptionenDlg"
+      Optionsliste.TypeKeys "<Down>"
+      select case i
+       case 1 : Kontext "TabInhalteHTML"
+                '/// View
+                printlog "  - View / Ansicht"
+                if TabInhalteHTML.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabInhalteHTML )
+                end if
+       case 2 : Kontext "TabDirektCursor"
+                '/// Formating aids
+                printlog "  - Formatting aids / Formatierungshilfen"
+                if TabDirektCursor.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabDirektCursor )
+                end if
+       case 3 : Kontext "TabRaster"
+                '/// Grid
+                printlog "  - Grid / Raster"
+                if TabRaster.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabRaster )
+                end if
+       case 4 : Kontext "TabDruckenHTML"
+                '/// Print
+                printlog "  - Print / Drucken"
+                if TabDruckenHTML.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabDruckenHTML )
+                end if
+       case 5 : Kontext "TabTabelleOptionen"
+                '/// Table
+                printlog "  - Table / Tabelle"
+                if TabTabelleOptionen.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabTabelleOptionen )
+                end if
+       case 6 : Kontext "TabHintergrund"
+                '/// Background
+                printlog "  - Background / Hintergrund"
+                Sleep 1
+                if TabHintergrund.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabHintergrund )
+                end if
+      end select
+      if gefunden=FALSE then
+         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+         EchteAnzahl = EchteAnzahl - 1
+         if EchteAnzahl < 6 then
+            i=11
+         else
+            i=1-1
+         end if
+      end if
+   next i
+'/// Close the options dialog
+    Kontext "OptionenDlg"
+    OptionenDlg.Cancel
+'/// Close the document    
+    if gApplication <> "BACKGROUND" then 
+        Call hCloseDocument
+    end if
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tToolsOptionsSpreadsheet
+  dim EchteAnzahl as Integer, i as Integer
+  dim gefunden as Boolean
+    
+    PrintLog "- Tools/Options/Spreadsheet  ( Extras/Optionen/Tabellendokument )"
+    if (0 = iSectionNumber) then 
+        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
+        goto endsub
+    endif
+'/// Create a new document
+    if gApplication <> "BACKGROUND" then 
+        Call hNewDocument
+    end if
+ '/// <i>Tools</i> / <i>Options</i> / <i>Spreadsheet</i>
+   ToolsOptions
+   ToPosInOptionlist ( 4 )
+   EchteAnzahl = OptionTabPageZaehler ( 7, FALSE )
+   for i=1 to EchteAnzahl
+      gefunden = FALSE
+      Kontext "OptionenDlg"
+      Optionsliste.TypeKeys "<Down>"
+      select case i
+       case 1 : Kontext "TabLayoutCalc"
+                '/// General
+                printlog "  - General / Allgemein"
+                if TabLayoutCalc.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabLayoutCalc )
+                end if
+       case 2 : Kontext "TabInhaltCalc"
+                '/// View
+                printlog "  - View / Ansicht"
+                if TabInhaltCalc.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabInhaltCalc )
+                end if
+       case 3 : Kontext "TabBerechnen"
+                '/// Calculate
+                printlog "  - Calculate / Berechnen"
+                if TabBerechnen.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabBerechnen )
+                end if
+       case 4 : Kontext "TabSortierlisten"
+                '/// Sort lists
+                printlog "  - Sort Lists / Sortierliste"
+                if TabSortierlisten.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabSortierlisten )
+                end if
+       case 5 : Kontext "TabAenderungenCalc"
+                '/// Changes
+                printlog "  - Changes / Aenderungen"
+                if TabAenderungenCalc.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabAenderungenCalc )
+                end if
+       case 6 : Kontext "TabRaster"
+                '/// Grid
+                printlog "  - Grid / Raster"
+                if TabRaster.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabRaster )
+                end if
+       case 7 : Kontext "TabPrintCalcOptions"
+                '/// Print
+                printlog "  - Print / Drucken"
+                if TabPrintCalcOptions.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabPrintCalcOptions )
+                end if
+      end select
+      if gefunden=FALSE then
+         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+         EchteAnzahl = EchteAnzahl - 1
+         if EchteAnzahl < 7 then
+            i=11
+         else
+            i=1-1
+         end if
+      end if
+   next i
+'/// Close the options dialog
+    Kontext "OptionenDlg"
+    OptionenDlg.Cancel
+'/// Close the document
+    if gApplication <> "BACKGROUND" then 
+        Call hCloseDocument
+    end if
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tToolsOptionsPresentation
+  dim EchteAnzahl as Integer, i as Integer
+  dim gefunden as Boolean
+  dim iTemp as integer
+    
+   PrintLog "- Tools/Options/Presentation  ( Extras/Optionen/Praesentation )"
+    if (0 = iSectionNumber) then 
+        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
+        goto endsub
+    endif
+'/// Create a new document
+    if gApplication <> "BACKGROUND" then 
+        Call hNewDocument
+    end if
+   kontext "DocumentImpress"
+   if DocumentImpress.exists(5) then
+       printlog "  - An application of type Presentation is available."
+       '--- workaround #i48383#
+       DocumentImpress.MouseDown (10,10)
+       DocumentImpress.MouseUp (10,10)
+   else
+       qaErrorLog "  - No application of type Presentation is available"
+   end if
+ '/// <i>Tools</i> / <i>Options</i> / <i>Presentation</i>
+   ToolsOptions
+   ToPosInOptionlist ( 4 )
+   EchteAnzahl = OptionTabPageZaehler ( 4, FALSE )
+   for i=1 to EchteAnzahl
+      gefunden = FALSE
+      Kontext "OptionenDlg"
+      Optionsliste.TypeKeys "<Down>"
+      select case i
+       case 1 : Kontext "TabSonstigesDraw"
+                '/// General
+                printlog "  - General / Allgemein"
+                if TabSonstigesDraw.exists then
+                    if TabSonstigesDraw.IsVisible then
+                       gefunden = TRUE
+                       Call DialogTest ( TabSonstigesDraw )
+                    end if
+                else
+                    ' Trying to get root cause on some systems it seems the backing window is used. #i48383#
+                    Kontext "OptionenDlg"
+                    OptionenDlg.SnapShot convertPath(gOfficePath + "user/work/"+gApplication+".bmp")
+                    qaErrorLog "#i48383# Trying to get root cause for wrong window; check picture: " + convertPath(gOfficePath + "user/work/"+gApplication+".bmp")
+                    for iTemp = 1 to Optionsliste.getItemCount
+                        qaErrorLog "" + iTemp + ": '" + Optionsliste.getItemText(iTemp) + "'"
+                    next iTemp
+                    gefunden = TRUE
+                end if
+       case 2 : Kontext "TabInhalteDraw"
+                '/// View
+                printlog "  - View / Ansicht"
+                if TabInhalteDraw.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabInhalteDraw )
+                end if
+       case 3 : Kontext "TabRaster"
+                '/// Grid
+                printlog "  - Grid / Raster"
+                if TabRaster.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabRaster )
+                end if
+       case 4 : Kontext "TabDruckenDraw"
+                '/// Print
+                printlog "  - Print / Drucken"
+                if TabDruckenDraw.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabDruckenDraw )
+                end if
+      end select
+      if gefunden=FALSE then
+         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+         EchteAnzahl = EchteAnzahl - 1
+         if EchteAnzahl < 4 then
+            i=11
+         else
+            i=1-1
+         end if
+      end if
+   next i
+'/// Close the options dialog
+    Kontext "OptionenDlg"
+    OptionenDlg.Cancel
+'/// Close the document    
+    if gApplication <> "BACKGROUND" then 
+        Call hCloseDocument
+    end if
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tToolsOptionsDrawing
+  Dim EchteAnzahl as Integer, i as Integer
+  Dim gefunden as Boolean
+    
+   PrintLog "- Tools/Options/Drawing  ( Extras/Optionen/Zeichnung )"
+    if (0 = iSectionNumber) then 
+        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
+        goto endsub
+    end if
+'/// Create a new document
+    if gApplication <> "BACKGROUND" then 
+        Call hNewDocument
+    end if
+   Kontext "DocumentDraw"
+   if DocumentDraw.exists(5) then
+       printlog "  - An application of type Draw is available."
+       '--- workaround #i48383#
+       DocumentDraw.MouseDown (10,10)
+       DocumentDraw.MouseUp (10,10)
+   else
+       qaErrorLog "  - No application of type Draw is available"
+   end if
+'/// <i>Tools</i> / <i>Options</i> / <i>Drawing</i>
+   ToolsOptions
+   ToPosInOptionlist ( 4 )
+   EchteAnzahl = OptionTabPageZaehler ( 4, FALSE )
+   for i=1 to EchteAnzahl
+      gefunden = FALSE
+      Kontext "OptionenDlg"
+      Optionsliste.TypeKeys "<Down>"
+      select case i
+       case 1 : Kontext "TabSonstigesDraw"
+                '/// General
+                printlog "  - General / Allgemein"
+                if TabSonstigesDraw.exists then
+                    if TabSonstigesDraw.IsVisible then
+                       gefunden = TRUE
+                       Call DialogTest ( TabSonstigesDraw )
+                    end if
+                else
+                    ' Trying to get root cause on some systems it seems the backing window is used. #i48383#
+                    Kontext "OptionenDlg"
+                    qaErrorLog "#i48383# wrong focus on opening options"
+                    gefunden = TRUE
+                end if
+       case 2 : Kontext "TabInhalteDraw"
+                '/// View
+                printlog "  - View / Ansicht"
+                if TabInhalteDraw.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabInhalteDraw )
+                end if
+       case 3 : Kontext "Active"
+                if Active.Exists then
+                   Warnlog "A messagebox exists => BUG  : " + Active.GetText
+                   try
+                      Active.No
+                   catch
+                      Active.OK
+                   endcatch
+                end if
+                Kontext "TabRaster"
+                '/// Grid
+                printlog "  - Grid / Raster"
+                if TabRaster.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabRaster )
+                end if
+       case 4 : Kontext "TabDruckenDraw"
+                '/// Print
+                printlog "  - Print / Drucken"
+                if TabDruckenDraw.IsVisible then
+                   gefunden = TRUE
+                   Call DialogTest ( TabDruckenDraw )
+                end if
+      end select
+      if gefunden=FALSE then
+         Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
+         EchteAnzahl = EchteAnzahl - 1
+         if EchteAnzahl < 4 then
+            i=11
+         else
+            i=1-1
+         end if
+      end if
+   next i
+'/// Close the options dialog
+    Kontext "OptionenDlg"
+     OptionenDlg.Cancel
+'/// Close the document
+     if gApplication <> "BACKGROUND" then 
+    Call hCloseDocument
+    end if
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tToolsOptionsFormula
+  dim EchteAnzahl as Integer, i as Integer
+    
+   PrintLog "- Tools/Options/Formula  ( Extras/Optionen/Formel )"
+    if (0 = iSectionNumber) then 
+        warnlog "You can't run this testcase seperated! Ending now! Please run it via: tToolsOptionsTest"
+        goto endsub
+    endif
+'/// Create a new document
+    if gApplication <> "BACKGROUND" then 
+        Call hNewDocument
+    end if
+'/// <i>Tools</i> / <i>Options</i> / <i>Formula</i>    
+   ToolsOptions
+   ToPosInOptionlist ( 4 )
+   EchteAnzahl = OptionTabPageZaehler ( 1, FALSE )
+   Kontext "OptionenDlg"
+   '/// Print
+   Optionsliste.TypeKeys "<Down>"
+   printlog "  - Print / Drucken"
+   Kontext "TabDruckenMath"
+   Call DialogTest ( TabDruckenMath )
+'/// Close the options dialog
+   Kontext "OptionenDlg"
+   OptionenDlg.Cancel
+'/// Close the document   
+    if gApplication <> "BACKGROUND" then 
+        Call hCloseDocument
+    end if
+endcase
+
diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win
index 1b236be..69e4782 100755
--- a/testautomation/global/win/etab_e_g.win
+++ b/testautomation/global/win/etab_e_g.win
@@ -258,7 +258,6 @@ DefaultSelection2 HID_PROP_DEFAULT_SELECT_SEQ
 DefaultSelectionButton UID_PROP_DLG_SELECTION
 DefaultState HID_PROP_DEFAULT_STATE
 DefaultSpinValue HID_PROP_DEFAULT_SPINVALUE
-'DefaultValue HID_PROP_DEFAULT_LONG_VALUE
 DefaultValue HID_PROP_DEFAULTVALUE
 Delay HID_PROP_REPEAT_DELAY
 DropDown HID_PROP_DROPDOWN
diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win
index dd96b75..6196e65 100755
--- a/testautomation/global/win/tab_t_z.win
+++ b/testautomation/global/win/tab_t_z.win
@@ -341,7 +341,7 @@ AnnehmenMit svx:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY
 GesammelteWorte svx:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES
 EintragLoeschen svx:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES
 AppendSpace svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE
-KeepList svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_KEEP_LIST
+KeepList svx:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST
 
 *TabZahlen HID_NUMBERFORMAT
 Kategorie svx:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY
commit 7d674048e12397a0c209baf511701866dbfa2594
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Wed Sep 16 14:37:52 2009 +0000

    CWS-TOOLING: integrate CWS sb113
    2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012
    2009-08-28 sb #i102469# change back <T extends XInterface> to just <T> on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
    2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
    2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph)
    2009-08-26 sb merged in DEV300_m56
    2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc)
    2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
    2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader
    2009-08-17 Juergen Schmidt #i103749# integrate patch
    2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
    2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter
    2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec
    2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc)
    2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc)
    2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2)
    2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly
    2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH)
    2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued")

diff --git a/qadevOOo/runner/basicrunner/basichelper/Filter.java b/qadevOOo/runner/basicrunner/basichelper/Filter.java
index 74360c0..5522096 100644
--- a/qadevOOo/runner/basicrunner/basichelper/Filter.java
+++ b/qadevOOo/runner/basicrunner/basichelper/Filter.java
@@ -35,6 +35,7 @@ import com.sun.star.lang.XTypeProvider;
 import com.sun.star.uno.Type;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.NoSuchElementException;
+import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.lang.XSingleServiceFactory;
 import com.sun.star.document.XFilter;
@@ -226,7 +227,7 @@ class FilterImpl implements XInitialization, XTypeProvider, XNameAccess {
     public void initialize(Object[] parm1) throws com.sun.star.uno.Exception {
         XFilter oFilter = (XFilter)UnoRuntime.queryInterface(
                                         XFilter.class, parm1[0]);
-        PropertyValue[] FilterDesc = (PropertyValue[])UnoRuntime.queryInterface(PropertyValue[].class, parm1[1]);
+        PropertyValue[] FilterDesc = (PropertyValue[])AnyConverter.toArray(parm1[1]);
         aState = "just initialized";
         FilterThread aThread = new FilterThread(oFilter, FilterDesc);
         aThread.start();
diff --git a/qadevOOo/runner/lib/MultiMethodTest.java b/qadevOOo/runner/lib/MultiMethodTest.java
index 237c169..0eb01d1 100644
--- a/qadevOOo/runner/lib/MultiMethodTest.java
+++ b/qadevOOo/runner/lib/MultiMethodTest.java
@@ -258,7 +258,7 @@ public class MultiMethodTest
      * Is called before calling method tests, but after initialization.
      * Subclasses may override to perform actions before method tests.
      */
-    protected void before()
+    protected void before() throws Exception
     {
     }
 
diff --git a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
index 0effa9b..61b2a22 100644
--- a/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
+++ b/qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryComposer.java
@@ -33,6 +33,7 @@ package ifc.sdb;
 import com.sun.star.sdb.XSingleSelectQueryComposer;
 import lib.MultiMethodTest;
 import com.sun.star.sdb.XSingleSelectQueryAnalyzer;
+import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.UnoRuntime;
 import lib.StatusException;
 import lib.Status;
@@ -80,7 +81,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
      * @see om.sun.star.sdb.XSingleSelectQueryAnalyzer
      * @see com.sun.star.beans.XPropertySet
      */
-    protected void before() {
+    protected void before() throws Exception {
 
         xQueryAna = (XSingleSelectQueryAnalyzer)
                       UnoRuntime.queryInterface(XSingleSelectQueryAnalyzer.class,
@@ -102,9 +103,7 @@ public class _XSingleSelectQueryComposer extends MultiMethodTest {
             
         }
     
-        colName = (String)
-                      UnoRuntime.queryInterface(String.class,
-                      tEnv.getObjRelation("colName"));
+        colName = AnyConverter.toString(tEnv.getObjRelation("colName"));
 
         if (colName == null) {
             throw new StatusException(Status.failed(
diff --git a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java
index 11c4c24..5c9c98f 100644
--- a/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java
+++ b/qadevOOo/tests/java/ifc/sheet/_FunctionDescription.java
@@ -37,6 +37,7 @@ import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.lang.XServiceInfo;
 import com.sun.star.sheet.FunctionArgument;
+import com.sun.star.uno.AnyConverter;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XInterface;
 
@@ -75,7 +76,7 @@ public class _FunctionDescription extends MultiMethodTest {
 
             XInterface FA = (XInterface)oDocMSF.
                 createInstance("com.sun.star.sheet.FunctionArgument");
-            FunctionArgument arg = (FunctionArgument)UnoRuntime.queryInterface
+            FunctionArgument arg = (FunctionArgument)AnyConverter.toObject
                 (FunctionArgument.class, FA);
 
             arg.Description = "FunctionDescription argument description" ;
diff --git a/testtools/com/sun/star/comp/bridge/TestComponentMain.java b/testtools/com/sun/star/comp/bridge/TestComponentMain.java
index e1d3d5e..71d36dd 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponentMain.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponentMain.java
@@ -104,11 +104,11 @@ public class TestComponentMain
 
         XComponentContext ctx = com.sun.star.comp.helper.Bootstrap.createInitialComponentContext( null );
         XMultiComponentFactory smgr = ctx.getServiceManager();
-        XMultiServiceFactory oldsmgr = (XMultiServiceFactory)
+        XMultiServiceFactory oldsmgr =
             UnoRuntime.queryInterface( XMultiServiceFactory.class, smgr );
 
         // prepare servicemanager
-        XSet set = (XSet) UnoRuntime.queryInterface(XSet.class, smgr);
+        XSet set = UnoRuntime.queryInterface(XSet.class, smgr);
         Object o = com.sun.star.comp.bridge.TestComponent.__getServiceFactory(
             "com.sun.star.comp.bridge.TestComponent$_TestObject", oldsmgr,null );
         set.insert(o);
@@ -121,7 +121,7 @@ public class TestComponentMain
 
             XConnection xConnection = xAcceptor.accept(conDcp);
             
-            XBridgeFactory xBridgeFactory = (XBridgeFactory)UnoRuntime.queryInterface(
+            XBridgeFactory xBridgeFactory = UnoRuntime.queryInterface(
                 XBridgeFactory.class,
                 smgr.createInstanceWithContext("com.sun.star.bridge.BridgeFactory",ctx));
             
@@ -130,8 +130,8 @@ public class TestComponentMain
 
             if (singleaccept) {
                 Listener listener = new Listener();
-                ((XComponent) UnoRuntime.queryInterface(
-                    XComponent.class, xBridge)).addEventListener(listener);
+                UnoRuntime.queryInterface(XComponent.class, xBridge).
+                    addEventListener(listener);
                 listener.await();
                 break;
             }
diff --git a/testtools/source/bridgetest/pyuno/main.py b/testtools/source/bridgetest/pyuno/main.py
index e63e36e..df1454b 100644
--- a/testtools/source/bridgetest/pyuno/main.py
+++ b/testtools/source/bridgetest/pyuno/main.py
@@ -34,11 +34,12 @@ import importer
 import unittest
 import core
 import impl
+import os
 import sys
 
 ctx = uno.getComponentContext()
 # needed for the tests 
-unohelper.addComponentsToContext(ctx,ctx,("cppobj.uno","bridgetest.uno","streams.uno","bootstrap.uno"),"com.sun.star.loader.SharedLibrary")
+unohelper.addComponentsToContext(ctx,ctx,(os.environ["FOO"]+"/cppobj.uno",os.environ["FOO"]+"/bridgetest.uno","streams.uno","bootstrap.uno"),"com.sun.star.loader.SharedLibrary")
 
 unohelper.addComponentsToContext(ctx,ctx,("vnd.openoffice.pymodule:samplecomponent",),"com.sun.star.loader.Python")
 
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index d3be595..44b9f98 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -51,7 +51,6 @@ DOLLAR_SIGN=$$
 .ENDIF
 
 #these are temporary
-REGCOMP=$(WRAPCMD) regcomp
 PYTHON=$(WRAPCMD) python
 
 .IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2"
@@ -112,10 +111,10 @@ doc .PHONY:
     @echo start test with  dmake runtest
 
 runtest : ALL
-    cd $(DLLDEST) && $(TEST_ENV) && python main.py 
-    cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \
+    cd $(DLLDEST) && $(TEST_ENV) && python main.py
+    cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \
             -l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i))
-    cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
+    cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
             -l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py
 .ENDIF # L10N_framework
 
diff --git a/testtools/source/servicetests/LocalServiceTest.java b/testtools/source/servicetests/LocalServiceTest.java
index 47589ae..235eb7f 100644
--- a/testtools/source/servicetests/LocalServiceTest.java
+++ b/testtools/source/servicetests/LocalServiceTest.java
@@ -44,8 +44,8 @@ public final class LocalServiceTest extends TestBase {
                         = Bootstrap.createInitialComponentContext(null);
                     XMultiComponentFactory serviceManager
                         = context.getServiceManager();
-                    ((XSet) UnoRuntime.queryInterface(
-                        XSet.class, serviceManager)).insert(new TestService());
+                    UnoRuntime.queryInterface(XSet.class, serviceManager).
+                        insert(new TestService());
                     return serviceManager.createInstanceWithContext(
                         "testtools.servicetests.TestService2", context);
                 }
diff --git a/testtools/source/servicetests/RemoteServiceTest.java b/testtools/source/servicetests/RemoteServiceTest.java
index bc89caf..68c2811 100644
--- a/testtools/source/servicetests/RemoteServiceTest.java
+++ b/testtools/source/servicetests/RemoteServiceTest.java
@@ -76,12 +76,12 @@ public final class RemoteServiceTest extends TestBase {
                 = Bootstrap.createInitialComponentContext(null);
             XMultiComponentFactory serviceManager
                 = context.getServiceManager();
-            ((XSet) UnoRuntime.queryInterface(XSet.class, serviceManager)).
+            UnoRuntime.queryInterface(XSet.class, serviceManager).
                 insert(new TestService());
             final Object instance = serviceManager.createInstanceWithContext(
                 "testtools.servicetests.TestService2", context);
             XBridgeFactory bridgeFactory
-                = (XBridgeFactory) UnoRuntime.queryInterface(
+                = UnoRuntime.queryInterface(
                     XBridgeFactory.class,
                     serviceManager.createInstanceWithContext(
                         "com.sun.star.bridge.BridgeFactory", context));
diff --git a/testtools/source/servicetests/TestBase.java b/testtools/source/servicetests/TestBase.java
index 203d104..2844047 100644
--- a/testtools/source/servicetests/TestBase.java
+++ b/testtools/source/servicetests/TestBase.java
@@ -41,7 +41,7 @@ public abstract class TestBase extends ComplexTestCase {
 
     public final void test() throws Exception {
         TestServiceFactory factory = getTestServiceFactory();
-        TestService2 t = (TestService2) UnoRuntime.queryInterface(
+        TestService2 t = UnoRuntime.queryInterface(
             TestService2.class, factory.get());
         assure(t != null);
         assure(UnoRuntime.queryInterface(TestService1.class, t) == t);
@@ -122,12 +122,10 @@ public abstract class TestBase extends ComplexTestCase {
         t.setProp8Long(0);
         assure(t.getProp8Long() == 0);
         assure(t.fn2() == 2);
-        XTestService3 t3 = (XTestService3) UnoRuntime.queryInterface(
-            XTestService3.class, t);
+        XTestService3 t3 = UnoRuntime.queryInterface(XTestService3.class, t);
         assure(t3 != null);
         assure(t3.fn3() == 3);
-        XTestService4 t4 = (XTestService4) UnoRuntime.queryInterface(
-            XTestService4.class, t);
+        XTestService4 t4 = UnoRuntime.queryInterface(XTestService4.class, t);
         assure(t4 == null);
         WaitUnreachable u = new WaitUnreachable(t);
         t = null;
commit e315ccbf62a6ccee7f9117c52721f1198857b9cd
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Sep 16 11:45:54 2009 +0000

    CWS-TOOLING: integrate CWS l10nframework01

diff --git a/qadevOOo/makefile.mk b/qadevOOo/makefile.mk
index de756b4..b6f816f 100755
--- a/qadevOOo/makefile.mk
+++ b/qadevOOo/makefile.mk
@@ -42,13 +42,14 @@ debug=true
 # ------------------------------------------------
 
 .INCLUDE : ant.mk
-
 TST:
     echo $(SOLAR_JAVA)
 
 .IF "$(SOLAR_JAVA)"=="TRUE"	
 .IF "$(ANT_HOME)"!="NO_ANT_HOME"
 ANT_FLAGS+=-Dbuild.source=1.5
+.IF "$(L10N_framework)"==""
 ALLTAR: ANTBUILD
 .ENDIF
 .ENDIF
+.ENDIF 
diff --git a/qadevOOo/runner/makefile.mk b/qadevOOo/runner/makefile.mk
index b3afff1..986111b 100644
--- a/qadevOOo/runner/makefile.mk
+++ b/qadevOOo/runner/makefile.mk
@@ -44,7 +44,7 @@ JARCOMMANDS_TESTS = $(foreach,i,$(SUBDIRS_TESTS) -C $(CLASSDIR) $i)
 JARCOMMANDS_RUNNER = $(foreach,i,$(SUBDIRS_RUNNER) -C $(CLASSDIR) $i)
 
 # --- Targets ------------------------------------------------------
-.IF "$(SOLAR_JAVA)"=="TRUE"
+.IF "$(SOLAR_JAVA)"=="TRUE" && "$(L10N_framework)"==""
 OWNJAR: ALLTAR
 
 
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk
index 0d44c6c..1b4b517 100644
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ b/testtools/source/bridgetest/idl/makefile.mk
@@ -35,7 +35,7 @@ TARGET := bridgetest_idl
 
 .INCLUDE: settings.mk
 .INCLUDE: target.mk
-
+.IF "$(L10N_framework)"==""
 ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done
 
 $(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb
@@ -70,3 +70,5 @@ $(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb
 
 .ENDIF
 .ENDIF # GUI, WNT
+.ENDIF # L10N_framework
+
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
index bad0d2f..3dfb18c 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -38,7 +38,7 @@ ENABLE_EXCEPTIONS=TRUE
 LIBTARGET=NO
 
 .INCLUDE: settings.mk
-
+.IF "$(L10N_framework)"==""
 DLLPRE = # no leading "lib" on .so files
 
 .IF "$(GUI)"=="WNT"
@@ -129,9 +129,10 @@ JAVATARGETS=\
 .ENDIF
 
 # --- Targets ------------------------------------------------------
+.ENDIF # L10N_framework
 
 .INCLUDE :	target.mk
-
+.IF "$(L10N_framework)"==""
 ALLTAR: \
         test \
         $(DLLDEST)$/uno_types.rdb \
@@ -242,3 +243,5 @@ $(MISC)$/$(TARGET)$/bootstrap.rdb .ERRREMOVE:
     $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
         -c javavm.uno$(DLLPOST) -c stocservices.uno$(DLLPOST)
 .ENDIF
+.ENDIF # L10N_framework
+
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index 83ea7b8..d3be595 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 # --- Files --------------------------------------------------------
-
+.IF "$(L10N_framework)"==""
 PYEXC=$(DLLDEST)$/python$(EXECPOST)
 REGEXC=$(DLLDEST)$/regcomp$(EXECPOST)
 
@@ -91,9 +91,10 @@ ALL : 	\
     $(DLLDEST)$/pyuno_regcomp.rdb		\
     doc					\
     ALLTAR
+.ENDIF # L10N_framework
 
 .INCLUDE :  target.mk
-
+.IF "$(L10N_framework)"==""
 $(DLLDEST)$/%.py: %.py
     cp $? $@
 
@@ -116,4 +117,5 @@ runtest : ALL
             -l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i))
     cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
             -l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py
+.ENDIF # L10N_framework
 


More information about the ooo-build-commit mailing list