merge with m61

1 files changed, 33 insertions, 33 deletions

diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index 26fa3b81fe7d..ba82e92c8e80 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -70,51 +70,51 @@ PosterColors svx:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_
 Currency HID_DLGDEPOT_LSTMARKETS

 OKButton HID_DLGDEPOT_0_CMDGOON_HISTORY

 CancelButton HID_DLGDEPOT_0_CMDCANCEL_HISTORY

-
-*Printing                   .HelpId:vcl:PrintDialog:Dialog
+

+*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
-    
-    ' Note: The printing dialog is extremely application dependent. To improve readability
-    '       of the test scripts some controls are declared multiple times reflecting the
-    '       names found in the UI. Some of the controls have different functionality which
+    Cancel                  .HelpId:vcl:PrintDialog:Cancel

+    

+    ' Note: The printing dialog is extremely application dependent. To improve readability

+    '       of the test scripts some controls are declared multiple times reflecting the

+    '       names found in the UI. Some of the controls have different functionality which

     '       again depends on the calling application.

-
-    PrintingTabControl      .HelpId:vcl:PrintDialog:TabPages
-        TabPrintGeneral     .HelpId:vcl:PrintDialog:JobPage
-        TabApplication      .HelpId:vcl:PrintDialog:TabPage:10
-        TabLayout           .HelpId:vcl:PrintDialog:NUpPage
+

+    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
+            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                        
+            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
+            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

             PrintHiddenText             .HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox

@@ -125,21 +125,21 @@ CancelButton HID_DLGDEPOT_0_CMDCANCEL_HISTORY
             IncludeEmptyPages           .HelpId:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox

             SlideName                   .HelpId:vcl:PrintDialog:IsPrintName:CheckBox

             DateAndTime                 .HelpId:vcl:PrintDialog:IsPrintDateTime:CheckBox

-            HiddenPages                 .HelpId:vcl:PrintDialog:IsPrintHidden: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
+            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
+            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            
+            FitToPageMath               .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:1            

             Scaling                     .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:2

-            ScalingFactor               .HelpId:vcl:PrintDialog:PrintScale:NumericField
+            ScalingFactor               .HelpId:vcl:PrintDialog:PrintScale:NumericField

 

         *TabLayout                      .HelpId:vcl:PrintDialog:NUpPage

             PagesPerSheet               .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheet

@@ -153,14 +153,14 @@ CancelButton HID_DLGDEPOT_0_CMDCANCEL_HISTORY
             PaperOrientation            .HelpId:vcl:PrintDialog:NUpPage:OrientationBox

             PrintOrder                  .HelpId:vcl:PrintDialog:NUpPage:OrderBox

             IncludePages                .HelpId:vcl:PrintDialog:PrintLeftRightPages:ListBox

-            PrintBrochureRTL            .HelpId:vcl:PrintDialog:PrintProspectRTL: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:PaperTray:CheckBox    
+            PaperTrayFromPrefs          .HelpId:vcl:PrintDialog:PaperTray:CheckBox    

             PaperTrayFromPrefsWriter    .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox        

 

 *PurchaseStarOffice HID_LICENSING_DIALOG