merged DEV300

4 files changed, 30 insertions, 13 deletions

diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc
index 01c6321b12e9..6ee654a7dee2 100644
--- a/testautomation/global/required/includes/g_printing.inc
+++ b/testautomation/global/required/includes/g_printing.inc
@@ -172,7 +172,8 @@ testcase tPrintGeneral()
             else
                 warnlog( "Pages setting disabled" )
             endif
-            
+
+            cb_test( PrintReverse, false, "" )
             'Selection.check()
             'AllPages.check()
             
@@ -485,7 +486,6 @@ testcase tPrintOptions()
         printlog( "Controls common for all applications" )
         cb_test( PrintToFile, false, "" )
         cb_test( PrintAsSingleJobs, false, "" )        
-        cb_test( PrintReverse, false, "" )
         
         printlog( "Application specific controls" )    
         select case( gApplication )
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 0b83af421eeb..3423584253fd 100644
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -115,17 +115,33 @@ sub GetIniInformation
     end if
     '--------
 
-   call GetTheInstallationType            ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation
-   gOfficeBasisPath = getOfficeBasisPath()
-   gOOoStartupTimeOut = fgetOOoStartupTimeOut()
-   gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
-   call sCheckValgrindStatus()
-    ' set a global path for custom scripts, like basepath, but outside of current environment
-   gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
+    call GetTheInstallationType            ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation
+    gOfficeBasisPath = getOfficeBasisPath()
+    gOOoStartupTimeOut = fgetOOoStartupTimeOut()
+    gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
+    call sCheckValgrindStatus()
+    ' set a global path for custom scripts outside of current environment
+    gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
     if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then
-        if NOT fileExists(gPrivateEnvironmentLocation) then
-            qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!"
-            gPrivateEnvironmentLocation = ""
+        ' check if the gPrivateEnvironmentLocation path exists
+        if fileExists(gPrivateEnvironmentLocation) then
+            ' check if the path ends with a path sign and add the path sign if not
+            if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then
+                gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne
+            endif
+        else
+            ' check if the gTesttoolPath plus the gPrivateEnvironmentLocation path exists
+            ' f.e. this is for a relative path
+            if fileExists(gTesttoolPath & gPrivateEnvironmentLocation) then
+                gPrivateEnvironmentLocation = gTesttoolPath & gPrivateEnvironmentLocation
+                ' check if the path ends with a path sign and add the path sign if not
+                if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then
+                    gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne
+                endif
+            else
+                qaErrorLog "[PrivateEnvironment] defined in: '" & gTesttoolIni & "', but the path '" & gPrivateEnvironmentLocation & "'does not exist!"
+                gPrivateEnvironmentLocation = ""
+            endif
         end if
     else
        gPrivateEnvironmentLocation = ""
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 926c153ae43b..6af13cd00f6c 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -264,6 +264,7 @@ Synchronisieren sym:sw:PushButton:DLG_SYNC_BTN:BTN_SYNC
 Zeichensatzliste sym:sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT
 Feldtrenner sym:sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP
 Texttrenner sym:sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP
+QuoteAll sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_QUOTEALL
 Zeichensatz sym:sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT
 FixedWidth sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_FIXEDWIDTH
 SaveAsShown sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_SAVESHOWN
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index 7cd8e58ed94e..c985d6512cc2 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -150,6 +150,7 @@ PageCount .HelpID:vcl:PrintDialog:NumPagesText
 PartsToPrint .HelpID:vcl:PrintDialog:PageContentType:ListBox
 SlidesPerPage .HelpID:vcl:PrintDialog:SlidesPerPage:ListBox
 ArrangeSlides .HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox            
+PrintReverse .HelpID:vcl:PrintDialog:OptPage:ToReverse
 
 *TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage
 PrintPageBackground .HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox
@@ -197,7 +198,6 @@ 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