dr77: rebase to DEV300m96

3 files changed, 8 insertions, 33 deletions

diff --git a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
index d53c23fbbe3d..a12fbb764115 100755..100644
--- a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
+++ b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
@@ -57,31 +57,6 @@ end sub
 '
 '-------------------------------------------------------------------------------
 '
-function IsItLoaded as boolean
-    '/// IsItLoaded
-    '/// Wait until document is loaded
-    Dim iLoop as integer
-
-    IsItLoaded = FALSE
-    sleep(3)
-    for iLoop =1 to 20
-        try
-            'Calling slot 'IsDocLoading'
-            IsItLoaded = IsDocLoading
-        catch
-            IsItLoaded = FALSE
-        endcatch
-
-        if IsItLoaded = TRUE then
-            exit for
-        end if
-        sleep(1)
-    next iLoop
-    sleep(2)
-end function
-'
-'-------------------------------------------------------------------------------
-'
 testcase tLoadSpreadsheetDocument (SourceFile)
 
     Dim sOnlyFileName as string
@@ -102,7 +77,7 @@ testcase tLoadSpreadsheetDocument (SourceFile)
     if sOnlyFileName > "" then
         'Some extensions make no sense to load
         if sOnlyFileExtension <> "so" AND sOnlyFileExtension <> "tmp" AND sOnlyFileExtension <> "dbt" then
-            if fCalcFileOpen(SourceFile) AND IsItLoaded()then                
+            if fCalcFileOpen(SourceFile) then
                 if (hIsNamedDocLoaded (SourceFile)) then
                     printlog "-  loaded"
                     sleep(15)
diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
index 9e25d898d8ce..f55bd6318ffd 100644
--- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
+++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
@@ -125,10 +125,10 @@ testcase tIBIS111158
     Kontext "TabGeneralControl"
     '/// Enter in 'Help URL' as value exactly 'HID:123456'
     TabGeneralControl.TypeKeys "<TAB>" , true
-    HelpURL.setText "HID:123456"
+    HelpURL.setText "customcontrol1"
     HelpURL.TypeKeys "<RETURN>",true
-    if HelpURL.GetText <> "HID:123456" then
-        warnlog "'HID:123456' has not been accepted as 'Help URL' value."
+    if HelpURL.GetText <> "customcontrol1" then
+        warnlog "'customcontrol1' has not been accepted as 'Help URL' value."
     end if
 
     Kontext "ControlPropertiesDialog"
diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
index ea8efd09dd2c..38c25d41bde5 100644
--- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
@@ -358,10 +358,10 @@ endcase
 
 testcase tFileRecentDocuments
 
-'if gPlatform = "lin" then
-'    warnlog "#110649# Due to bug this testcase is not available"
-'    goto endsub
-'end if
+if gPlatform = "lin" then
+    warnlog "#110649# Due to bug this testcase is not available"
+    goto endsub
+end if
     
     dim sTestFile as string