gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing

5 files changed, 99 insertions, 90 deletions

diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc
index ef20c2a2f1e5..c52ae61c0945 100644
--- a/testautomation/framework/optional/includes/f_usage_tracking.inc
+++ b/testautomation/framework/optional/includes/f_usage_tracking.inc
@@ -100,7 +100,7 @@ testcase tUsageTracking3
             
             kontext "Active"
             if ( Active.exists( 2 ) ) then
-                qaerrorlog( "Messagebox not required as control should not be enabled (see #i97340#)" )
+                warnlog( "Messagebox not required as control should not be enabled (see #i97340#)" )
                 Active.ok()
             
                 kontext "TextImport"
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 2f7b6aa33ac2..0c40d3c3d08e 100644
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -756,7 +756,7 @@ testcase tToolsOptionsImprovementProgram
             Active.ok()
         else
             if ( NOT bImportDialogHasBeenDisplayed ) then
-                qaerrorlog( "#i97340# Show Data button enabled but no logged data found" )
+                warnlog( "#i97340# Show Data button enabled but no logged data found" )
             endif
         endif
 
@@ -767,8 +767,13 @@ testcase tToolsOptionsImprovementProgram
         endif
 
         Kontext "OptionenDlg"
-        OptionenDlg.cancel()
-        
+        if OptionenDlg.Exists then
+            OptionenDlg.cancel()
+        endif
+
+        if GetDocumentCount = 1 then
+            Call hCloseDocument
+        endif
     else
         ' hDeleteFile() returns FALSE if the file is still present for some weird reason
         ' We should warn about this because the test breaks at a later point then.
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index da1f30a7f696..7cd8e58ed94e 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -114,91 +114,91 @@ Currency sym:WIZARDS_HID_DLGDEPOT_LSTMARKETS
 OKButton sym:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY
 CancelButton sym:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY
 
-*Printing .HelpId:vcl:PrintDialog:Dialog
-PreviewWindow .HelpId:vcl:PrintDialog:Preview
-PreviewPageNumber .HelpId:vcl:PrintDialog:PageEdit
-ScrollBackward .HelpId:vcl:PrintDialog:BackwardBtn
-ScrollForward .HelpId:vcl:PrintDialog:ForwardBtn
-Print .HelpId:vcl:PrintDialog:OK
-Cancel .HelpId:vcl:PrintDialog:Cancel
+*Printing .HelpID:vcl:PrintDialog:Dialog
+PreviewWindow .HelpID:vcl:PrintDialog:Preview
+PreviewPageNumber .HelpID:vcl:PrintDialog:PageEdit
+ScrollBackward .HelpID:vcl:PrintDialog:BackwardBtn
+ScrollForward .HelpID:vcl:PrintDialog:ForwardBtn
+Print .HelpID:vcl:PrintDialog:OK
+Cancel .HelpID:vcl:PrintDialog:Cancel
    
-PrintingTabControl .HelpId:vcl:PrintDialog:TabPages
-TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage
-TabApplication .HelpId:vcl:PrintDialog:TabPage:10
-TabLayout .HelpId:vcl:PrintDialog:NUpPage
-TabOptions .HelpId:vcl:PrintDialog:OptPage
-
-*TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage
-PrinterList .HelpId:vcl:PrintDialog:JobPage:PrinterList
-NumberOfCopies .HelpId:vcl:PrintDialog:JobPage:Copies
-Collate .HelpId:vcl:PrintDialog:JobPage:Collate
-PrintNotes .HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox
-AllPages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
-AllSlides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
-AllSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
-Pages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
-Slides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
-SelectedSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
-PrintAllPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:0
-PrintPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:1                        
-PageRange .HelpId:vcl:PrintDialog:PageRange:Edit
-Selection .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2
-SelectedCells .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2
-Details .HelpId:vcl:PrintDialog:JobPage:DetailsBtn
-Properties .HelpId:vcl:PrintDialog:JobPage:Properties
-PageCount .HelpId:vcl:PrintDialog:NumPagesText
-PartsToPrint .HelpId:vcl:PrintDialog:PageContentType:ListBox
-SlidesPerPage .HelpId:vcl:PrintDialog:SlidesPerPage:ListBox
-ArrangeSlides .HelpId:vcl:PrintDialog:SlidesPerPageOrder:ListBox            
-
-*TabApplication .HelpId:vcl:PrintDialog:TabPage:10
-PrintPageBackground .HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox
-PrintGraphicsAndDiagrams .HelpId:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox
-PrintPicturesAndObjects .HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox
-PrintHiddenText .HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox
-PrintTextPlaceholder .HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox
-PrintFormControls .HelpId:vcl:PrintDialog:PrintControls:CheckBox
-PrintTextInBlack .HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox
-PrintBlankPages .HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox
-IncludeEmptyPages .HelpId:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox
-SlideName .HelpId:vcl:PrintDialog:IsPrintName:CheckBox
-DateAndTime .HelpId:vcl:PrintDialog:IsPrintDateTime:CheckBox
-HiddenPages .HelpId:vcl:PrintDialog:IsPrintHidden:CheckBox
-TilePaper .HelpId:vcl:PrintDialog:PageOptions:RadioButton:3
-OriginalColors .HelpId:vcl:PrintDialog:Quality:RadioButton:0
-Grayscale .HelpId:vcl:PrintDialog:Quality:RadioButton:1
-BlackAndWhite .HelpId:vcl:PrintDialog:Quality:RadioButton:2
-MultiplePages .HelpId:vcl:PrintDialog:PageOptions:RadioButton:2
-TitleRow .HelpId:vcl:PrintDialog:TitleRow:CheckBox
-FormulaText .HelpId:vcl:PrintDialog:FormulaText:CheckBox
-Borders .HelpId:vcl:PrintDialog:Border:CheckBox
-OriginalSize .HelpId:vcl:PrintDialog:PageOptions:RadioButton:0
-OriginalSizeMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:0
-FitToPage .HelpId:vcl:PrintDialog:PageOptions:RadioButton:1
-FitToPageMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:1            
-Scaling .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:2
-ScalingFactor .HelpId:vcl:PrintDialog:PrintScale:NumericField
-
-*TabLayout .HelpId:vcl:PrintDialog:NUpPage
-PagesPerSheet .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheet
-NumberOfPages .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheetBox
-NumberOfColumns .HelpId:vcl:PrintDialog:NUpPage:ColumnsBox
-NumberOfRows .HelpId:vcl:PrintDialog:NUpPage:RowsBox
-BorderAroundPages .HelpId:vcl:PrintDialog:NUpPage:BorderBox
-Brochure .HelpId:vcl:PrintDialog:NUpPage:Brochure
-DistanceBetweenPages .HelpId:vcl:PrintDialog:NUpPage:PageMarginBox
-MarginToSheetBorder .HelpId:vcl:PrintDialog:NUpPage:SheetMarginBox
-PaperOrientation .HelpId:vcl:PrintDialog:NUpPage:OrientationBox
-PrintOrder .HelpId:vcl:PrintDialog:NUpPage:OrderBox
-IncludePages .HelpId:vcl:PrintDialog:PrintLeftRightPages:ListBox
-PrintBrochureRTL .HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox
-BrochurePageSides .HelpId:vcl:PrintDialog:PrintProspectInclude:ListBox            
-
-*TabOptions .HelpId:vcl:PrintDialog:OptPage
-PrintToFile .HelpId:vcl:PrintDialog:OptPage:ToFile
-PrintAsSingleJobs .HelpId:vcl:PrintDialog:OptPage:SingleJobs
-PrintReverse .HelpId:vcl:PrintDialog:OptPage:Reverse
-PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox        
+PrintingTabControl .HelpID:vcl:PrintDialog:TabPages
+TabPrintGeneral .HelpID:vcl:PrintDialog:JobPage
+TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage
+TabLayout .HelpID:vcl:PrintDialog:NUpPage
+TabOptions .HelpID:vcl:PrintDialog:OptPage
+
+*TabPrintGeneral .HelpID:vcl:PrintDialog:JobPage
+PrinterList .HelpID:vcl:PrintDialog:JobPage:PrinterList
+NumberOfCopies .HelpID:vcl:PrintDialog:JobPage:Copies
+Collate .HelpID:vcl:PrintDialog:JobPage:Collate
+PrintNotes .HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText
+AllPages .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0
+AllSlides .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0
+AllSheets .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0
+Pages .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1
+Slides .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1
+SelectedSheets .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1
+PrintAllPages .HelpID:vcl:PrintDialog:PrintRange:RadioButton:0
+PrintPages .HelpID:vcl:PrintDialog:PrintRange:RadioButton:1                        
+PageRange .HelpID:vcl:PrintDialog:PageRange:Edit
+Selection .HelpID:vcl:PrintDialog:PrintContent:RadioButton:2
+SelectedCells .HelpID:vcl:PrintDialog:PrintContent:RadioButton:2
+Details .HelpID:vcl:PrintDialog:JobPage:DetailsBtn
+Properties .HelpID:vcl:PrintDialog:JobPage:Properties
+PageCount .HelpID:vcl:PrintDialog:NumPagesText
+PartsToPrint .HelpID:vcl:PrintDialog:PageContentType:ListBox
+SlidesPerPage .HelpID:vcl:PrintDialog:SlidesPerPage:ListBox
+ArrangeSlides .HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox            
+
+*TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage
+PrintPageBackground .HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox
+PrintGraphicsAndDiagrams .HelpID:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox
+PrintPicturesAndObjects .HelpID:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox
+PrintHiddenText .HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox
+PrintTextPlaceholder .HelpID:vcl:PrintDialog:PrintTextPlaceholder:CheckBox
+PrintFormControls .HelpID:vcl:PrintDialog:PrintControls:CheckBox
+PrintTextInBlack .HelpID:vcl:PrintDialog:PrintBlackFonts:CheckBox
+PrintBlankPages .HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox
+IncludeEmptyPages .HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox
+SlideName .HelpID:vcl:PrintDialog:IsPrintName:CheckBox
+DateAndTime .HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox
+HiddenPages .HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox
+TilePaper .HelpID:vcl:PrintDialog:PageOptions:RadioButton:3
+OriginalColors .HelpID:vcl:PrintDialog:Quality:RadioButton:0
+Grayscale .HelpID:vcl:PrintDialog:Quality:RadioButton:1
+BlackAndWhite .HelpID:vcl:PrintDialog:Quality:RadioButton:2
+MultiplePages .HelpID:vcl:PrintDialog:PageOptions:RadioButton:2
+TitleRow .HelpID:vcl:PrintDialog:TitleRow:CheckBox
+FormulaText .HelpID:vcl:PrintDialog:FormulaText:CheckBox
+Borders .HelpID:vcl:PrintDialog:Border:CheckBox
+OriginalSize .HelpID:vcl:PrintDialog:PageOptions:RadioButton:0
+OriginalSizeMath .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0
+FitToPage .HelpID:vcl:PrintDialog:PageOptions:RadioButton:1
+FitToPageMath .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1            
+Scaling .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2
+ScalingFactor .HelpID:vcl:PrintDialog:PrintScale:NumericField
+
+*TabLayout .HelpID:vcl:PrintDialog:NUpPage
+PagesPerSheet .HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet
+NumberOfPages .HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox
+NumberOfColumns .HelpID:vcl:PrintDialog:NUpPage:ColumnsBox
+NumberOfRows .HelpID:vcl:PrintDialog:NUpPage:RowsBox
+BorderAroundPages .HelpID:vcl:PrintDialog:NUpPage:BorderBox
+Brochure .HelpID:vcl:PrintDialog:NUpPage:Brochure
+DistanceBetweenPages .HelpID:vcl:PrintDialog:NUpPage:PageMarginBox
+MarginToSheetBorder .HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox
+PaperOrientation .HelpID:vcl:PrintDialog:NUpPage:OrientationBox
+PrintOrder .HelpID:vcl:PrintDialog:NUpPage:OrderBox
+IncludePages .HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox
+PrintBrochureRTL .HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox
+BrochurePageSides .HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox            
+
+*TabOptions .HelpID:vcl:PrintDialog:OptPage
+PrintToFile .HelpID:vcl:PrintDialog:OptPage:ToFile
+PrintAsSingleJobs .HelpID:vcl:PrintDialog:OptPage:SingleJobs
+PrintReverse .HelpID:vcl:PrintDialog:OptPage:ToReverse
+PaperTrayFromPrefs .HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox        
 
 *PurchaseStarOffice sym:TAB_HID_LICENSING_DIALOG
 TabPurchase sym:TAB_HID_TP_PURCHASE
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
index 4fca2bdbddb6..466b0c99ab15 100644
--- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
@@ -868,7 +868,7 @@ testcase tTextframes_28
     
     printlog "Insert a frame"
     Call fInsertFrame(30, 30, 60, 60)
-    
+    Sleep 2
     printlog "Naming the frame"
     Call fFormatFrame("TabZusaetze")
     ObjektName.SetText sFrameName1
@@ -885,7 +885,7 @@ testcase tTextframes_28
     
     printlog "Insert another frame"
     Call fInsertFrame(50, 50, 80, 80)
-    
+    Sleep 2
     printlog "Naming the frame"
     Call fFormatFrame("TabZusaetze")
     ObjektName.SetText sFrameName2
diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc
index 33ddca87709e..9bc7ed688d9b 100644
--- a/testautomation/writer/tools/includes/w_tool6.inc
+++ b/testautomation/writer/tools/includes/w_tool6.inc
@@ -38,6 +38,10 @@ sub wOfficeRestart
     FileExit "SynchronMode", TRUE
 
     Call hStartTheOffice
+
+    ' Open new document
+    Call hNewDocument
+
 end sub
 
 '--------------------------------------------------------------