CWS-TOOLING: integrate CWS printerpullpages

53 files changed, 3747 insertions, 4431 deletions

diff --git a/testautomation/chart2/tools/ch_tools_statistics.inc b/testautomation/chart2/tools/ch_tools_statistics.inc
index 7666fac165e5..513e8c8b3f56 100644
--- a/testautomation/chart2/tools/ch_tools_statistics.inc
+++ b/testautomation/chart2/tools/ch_tools_statistics.inc
@@ -88,7 +88,7 @@ function fInvokeTrendlinesDialog() as INTEGER
     
     '/// Lookup if call was successful
 	Kontext
-	active.SetPage "TabTrendLineType"
+	active.SetPage (TabTrendLineType)
     Kontext "TabTrendLineType"
     if TabTrendLineType.exists(2) then
         printlog ">> Trend lines dialog is visible now."
diff --git a/testautomation/framework/optional/f_CJK_GridLayout.bas b/testautomation/framework/optional/f_CJK_GridLayout.bas
index d131afc451ba..7d3d212fc7de 100755
--- a/testautomation/framework/optional/f_CJK_GridLayout.bas
+++ b/testautomation/framework/optional/f_CJK_GridLayout.bas
@@ -43,7 +43,7 @@ sub main
     PrintLog "---------------------------------------------------------------------"
     Printlog "-----                    Grid Layout for CJK  in Writer         -----"
     PrintLog "---------------------------------------------------------------------"
-
+    
     use "framework\optional\includes\w_grid_layout1.inc"
    
     sAsianLanguageFlag = CheckAsianLanguageSupport("Current")
@@ -80,7 +80,9 @@ sub LoadIncludeFiles
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\required\t_doc1.inc"
     use "global\tools\includes\required\t_tools1.inc"
-    use "framework\tools\includes\CJK_tools.inc"    
+    use "global\tools\includes\optional\t_docfuncs.inc"
+   
+    use "framework\tools\includes\CJK_tools.inc"   
     gApplication   = "WRITER"
     Call GetUseFiles
 end sub
diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
index ce8dabdfaa7d..209e5b0ed0c9 100755..100644
--- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
+++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc
@@ -1,7 +1,7 @@
 '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
@@ -39,213 +39,220 @@
 
 testcase tLanguageTest_1
 
-  Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String
-  Dim sKeyTypeEnglishUSA    ,sKeyTypeSChinese   , sKeyTypeTChinese    , sKeyTypeJapanese    , sKeyTypeKoren    as String
-  Dim i as Integer
-
-
-  select case iSprache
-      case 01   :' English (USA)
-                   sKeyTypeEnglishUSA = "Alphanumeric"
-                   sKeyTypeSChinese   = "Character set"
-                   sKeyTypeTChinese   = "Numeric"
-                   sKeyTypeJapanese   = "Character set"
-                   sKeyTypeKoren      = "Character set"
-      case 49   :' German
-                   sKeyTypeEnglishUSA = "Alphanumerisch"
-                   sKeyTypeSChinese   = "Numerisch"
-                   sKeyTypeTChinese   = "Numerisch"
-                   sKeyTypeJapanese   = "Numerisch"
-                   sKeyTypeKoren      = "Numerisch"
-      case 55   :' Brazilian
-                   sKeyTypeEnglishUSA = "Alfanumérico"
-                   sKeyTypeSChinese   = "Conjunto de caracteres"
-                   sKeyTypeTChinese   = "numérico"
-                   sKeyTypeJapanese   = "Conjunto de caracteres"
-                   sKeyTypeKoren      = "Conjunto de caracteres"
-      case 81   :' Japanese
-                   sKeyTypeEnglishUSA = "英数字"
-                   sKeyTypeSChinese   = "ピンイン(中国語のローマ字表記法)"
-                   sKeyTypeTChinese   = "ピンイン(中国語のローマ字表記法)"
-                   sKeyTypeJapanese   = "数字"
-                   sKeyTypeKoren      = "数字"
-'      case 82   : ' Korean
-'                   sKeyTypeEnglishUSA = 1 'alphanumeric
-'                   sKeyTypeSChinese   = 1 'Character set
-'                   sKeyTypeTChinese   = 3 'Pin yin
-'                   sKeyTypeJapanese   = 2 'Character set
-'                   sKeyTypeKoren      = 3 'Character set
-      case 86   :' Chinese (simplified)
-                   sKeyTypeEnglishUSA = "字母数字式"
-                   sKeyTypeSChinese   = "字符集"
-                   sKeyTypeTChinese   = "拼音"
-                   sKeyTypeJapanese   = "字符集"
-                   sKeyTypeKoren      = "字典"
-      case 88   :' Chinese (traditional)
-                   sKeyTypeEnglishUSA = "字母數字式"
-                   sKeyTypeSChinese   = "字型"
-                   sKeyTypeTChinese   = "拼音"
-                   sKeyTypeJapanese   = "字型"
-                   sKeyTypeKoren      = "字典"
-      case else :' Fallback
-                   PrintLog "The test does not support the language " + iSprache
-                   Goto endsub
-  end select
-
-  sLanguageIDEnglishUSA = fGetCountryName(01)
-  sLanguageIDSChinese   = fGetCountryName(86)
-  sLanguageIDTChinese   = fGetCountryName(88)
-  sLanguageIDJapanese   = fGetCountryName(81)
-  sLanguageIDKoren      = fGetCountryName(82)
-
-  call hNewDocument
-
-  DocumentWriter.TypeKeys "test"
-  DocumentWriter.TypeKeys "<Shift Home>"
-  Sleep 1
-
-  ToolsSort
-   Kontext "Sortieren"
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       for i = 1 to Schluesseltyp1.getItemCount
-           printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
-       next i
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDSChinese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
-       ' try fallback to 'Chinese (simplyfied)'
-       try
-           Sprache.Select ("Chinese (simplyfied)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
-       endcatch
-   endcatch
-   Sleep 2
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDTChinese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'"
-       ' try fallback to 'Chinese (traditional)'
-       try
-           Sprache.Select ("Chinese (traditional)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'"
-           for i = 1 to Sprache.getItemCount
-               printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'"
-           next i
-       endcatch
-   endcatch
-   Sleep 2
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDJapanese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'"
-       ' try fallback to 'Japanese'
-       try
-           Sprache.Select ("Japanese")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Japanese'"
-       endcatch
-   endcatch
-   Sleep 2
-   if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then
-     warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'"
-   end if
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDKoren)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDKoren + "'"
-       ' try fallback to 'Korean (RoK)'
-       try
-           Sprache.Select ("Korean (RoK)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'"
-           for i = 1 to Sprache.getItemCount
-               printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'"
-           next i
-       endcatch
-   endcatch
-   Sleep 2
-   if Schluesseltyp1.GetSelText <> sKeyTypeKoren then
-      warnlog "The default key type for Korean should be " +  sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText
-   end if
-
-  Sortieren.Cancel
-
-  Call hCloseDocument
+    Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String
+    Dim sKeyTypeEnglishUSA    ,sKeyTypeSChinese   , sKeyTypeTChinese    , sKeyTypeJapanese    , sKeyTypeKoren    as String
+    Dim i as Integer
+
+    '/// Check if the default setting for &quot;key type&quot; is right for CJK when alphanumeric is chosen in English
+
+    select case iSprache
+    case 01   :' English (USA)
+        sKeyTypeEnglishUSA = "Alphanumeric"
+        sKeyTypeSChinese   = "Character set"
+        sKeyTypeTChinese   = "Numeric"
+        sKeyTypeJapanese   = "Character set"
+        sKeyTypeKoren      = "Character set"
+    case 49   :' German
+        sKeyTypeEnglishUSA = "Alphanumerisch"
+        sKeyTypeSChinese   = "Numerisch"
+        sKeyTypeTChinese   = "Numerisch"
+        sKeyTypeJapanese   = "Numerisch"
+        sKeyTypeKoren      = "Numerisch"
+    case 55   :' Brazilian
+        sKeyTypeEnglishUSA = "Alfanumérico"
+        sKeyTypeSChinese   = "Conjunto de caracteres"
+        sKeyTypeTChinese   = "numérico"
+        sKeyTypeJapanese   = "Conjunto de caracteres"
+        sKeyTypeKoren      = "Conjunto de caracteres"
+    case 81   :' Japanese
+        sKeyTypeEnglishUSA = "英数字"
+        sKeyTypeSChinese   = "ピンイン(中国語のローマ字表記法)"
+        sKeyTypeTChinese   = "ピンイン(中国語のローマ字表記法)"
+        sKeyTypeJapanese   = "数字"
+        sKeyTypeKoren      = "数字"
+        '      case 82   : ' Korean
+        '                   sKeyTypeEnglishUSA = 1 'alphanumeric
+        '                   sKeyTypeSChinese   = 1 'Character set
+        '                   sKeyTypeTChinese   = 3 'Pin yin
+        '                   sKeyTypeJapanese   = 2 'Character set
+        '                   sKeyTypeKoren      = 3 'Character set
+    case 86   :' Chinese (simplified)
+        sKeyTypeEnglishUSA = "字母数字式"
+        sKeyTypeSChinese   = "字符集"
+        sKeyTypeTChinese   = "拼音"
+        sKeyTypeJapanese   = "字符集"
+        sKeyTypeKoren      = "字典"
+    case 88   :' Chinese (traditional)
+        sKeyTypeEnglishUSA = "字母數字式"
+        sKeyTypeSChinese   = "字型"
+        sKeyTypeTChinese   = "拼音"
+        sKeyTypeJapanese   = "字型"
+        sKeyTypeKoren      = "字典"
+    case else :' Fallback
+        PrintLog "The test does not support the language " + iSprache
+        Goto endsub
+    end select
+
+    sLanguageIDEnglishUSA = fGetCountryName(01)
+    sLanguageIDSChinese   = fGetCountryName(86)
+    sLanguageIDTChinese   = fGetCountryName(88)
+    sLanguageIDJapanese   = fGetCountryName(81)
+    sLanguageIDKoren      = fGetCountryName(82)
+
+    call hNewDocument
+
+    DocumentWriter.TypeKeys "test"
+    DocumentWriter.TypeKeys "<Shift Home>"
+    Sleep 1
+
+    '/// Open Tools/Sort
+    ToolsSort
+    Kontext "Sortieren"
+
+    '/// Choose language: English and key type: alphanumeric
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        for i = 1 to Schluesseltyp1.getItemCount
+            printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
+        next i
+    endcatch
+
+    '/// Check to simplified Chinese
+    try
+        Sprache.Select (sLanguageIDSChinese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
+        ' try fallback to 'Chinese (simplyfied)'
+        try
+            Sprache.Select ("Chinese (simplyfied)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
+        endcatch
+    endcatch
+    Sleep 2
+
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+    endcatch
+
+    '/// Check to traditional Chinese
+    try
+        Sprache.Select (sLanguageIDTChinese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'"
+        ' try fallback to 'Chinese (traditional)'
+        try
+            Sprache.Select ("Chinese (traditional)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'"
+            for i = 1 to Sprache.getItemCount
+                printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'"
+            next i
+        endcatch
+    endcatch
+    Sleep 2
+
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+    endcatch
+
+    '/// Check to Japanese
+    try
+        Sprache.Select (sLanguageIDJapanese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'"
+        ' try fallback to 'Japanese'
+        try
+            Sprache.Select ("Japanese")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Japanese'"
+        endcatch
+    endcatch
+    Sleep 2
+    if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then
+        warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'"
+    end if
+
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+    endcatch
+
+    '/// Check to Korean
+    try
+        Sprache.Select (sLanguageIDKoren)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDKoren + "'"
+        ' try fallback to 'Korean (RoK)'
+        try
+            Sprache.Select ("Korean (RoK)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'"
+            for i = 1 to Sprache.getItemCount
+                printlog "("+i+"/"+ Sprache.getItemCount + "): '"+Sprache.getItemText(i)+"'"
+            next i
+        endcatch
+    endcatch
+    Sleep 2
+    if Schluesseltyp1.GetSelText <> sKeyTypeKoren then
+        warnlog "The default key type for Korean should be " +  sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText
+    end if
+
+    Sortieren.Cancel
+
+    Call hCloseDocument
 
 endcase
 
@@ -253,458 +260,452 @@ endcase
 
 testcase tLanguageTest_2
 
-  Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String
-  Dim sKeyTypeEnglishUSA    ,sKeyTypeSChinese   , sKeyTypeTChinese    , sKeyTypeJapanese    , sKeyTypeKoren    as String
-  Dim i                                                                                                        as Integer
-
-
-  select case iSprache
-      case 01   :' English (USA)
-                   sKeyTypeEnglishUSA = "Numeric"
-                   sKeyTypeSChinese   = "Numeric"
-                   sKeyTypeTChinese   = "Numeric"
-                   sKeyTypeJapanese   = "Numeric"
-                   sKeyTypeKoren      = "Numeric"
-      case 49   :' German
-                   sKeyTypeEnglishUSA = "Numerisch"
-                   sKeyTypeSChinese   = "Numerisch"
-                   sKeyTypeTChinese   = "Numerisch"
-                   sKeyTypeJapanese   = "Numerisch"
-                   sKeyTypeKoren      = "Numerisch"
-      case 55   :' Brazilian
-                   sKeyTypeEnglishUSA = "numérico"
-                   sKeyTypeSChinese   = "numérico"
-                   sKeyTypeTChinese   = "numérico"
-                   sKeyTypeJapanese   = "numérico"
-                   sKeyTypeKoren      = "numérico"
-      case 81   :' Japanese
-                   sKeyTypeEnglishUSA = "数字"
-                   sKeyTypeSChinese   = "数字"
-                   sKeyTypeTChinese   = "数字"
-                   sKeyTypeJapanese   = "数字"
-                   sKeyTypeKoren      = "数字"
-'      case 82    ' Korean
-'                   sKeyTypeEnglishUSA = 2 'numeric
-'                   sKeyTypeSChinese   = 4 'numeric
-'                   sKeyTypeTChinese   = 4 'numeric
-'                   sKeyTypeJapanese   = 4 'numeric
-'                   sKeyTypeKoren      = 4 'numeric
-      case 86   :' Chinese (simplified)
-                   sKeyTypeEnglishUSA = "数字"
-                   sKeyTypeSChinese   = "数字"
-                   sKeyTypeTChinese   = "数字"
-                   sKeyTypeJapanese   = "数字"
-                   sKeyTypeKoren      = "数字"
-      case 88   :' Chinese (traditional)
-                   sKeyTypeEnglishUSA = "數字"
-                   sKeyTypeSChinese   = "數字"
-                   sKeyTypeTChinese   = "數字"
-                   sKeyTypeJapanese   = "數字"
-                   sKeyTypeKoren      = "數字"
-      case else :' Fallback
-                   printLog "The test does not support the language " + iSprache
-                   Goto endsub
-  end select
-
-  sLanguageIDEnglishUSA = fGetCountryName(01)
-  sLanguageIDSChinese   = fGetCountryName(86)
-  sLanguageIDTChinese   = fGetCountryName(88)
-  sLanguageIDJapanese   = fGetCountryName(81)
-  sLanguageIDKoren      = fGetCountryName(82)
-
-  call hNewDocument
-
-  DocumentWriter.TypeKeys "123"
-  DocumentWriter.TypeKeys "<Shift Home>"
-  Sleep 1
-
-  ToolsSort
-   Kontext "Sortieren"
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-           for i = 1 to Sprache.getItemCount
-               printlog "" + i + ": '" + Sprache.getItemText(i) + "'"
-           next i
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       for i = 1 to Schluesseltyp1.getItemCount
-           printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
-       next i
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDSChinese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
-       ' try fallback to 'Chinese (simplyfied)'
-       try
-           Sprache.Select ("Chinese (simplyfied)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
-       endcatch
-   endcatch
-   Sleep 2
-   if Schluesseltyp1.GetSelText <> sKeyTypeSChinese then
-      warnlog "The default key type for Simplified Chinese should be: '" +  sKeyTypeSChinese + "' but is '" + Schluesseltyp1.GetSelText + "'"
-   end if
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDTChinese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'"
-       ' try fallback to 'Chinese (traditional)'
-       try
-           Sprache.Select ("Chinese (traditional)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'"
-       endcatch
-   endcatch
-   Sleep 2
-   if Schluesseltyp1.GetSelText <> sKeyTypeTChinese then
-      warnlog "The default key type for traditional Chinese should be " +  sKeyTypeTChinese + " but get " +  Schluesseltyp1.GetSelText
-   end if
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDJapanese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'"
-       ' try fallback to 'Japanese'
-       try
-           Sprache.Select ("Japanese")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Japanese'"
-       endcatch
-   endcatch
-   Sleep 2
-   if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then
-     warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'"
-   end if
-
-   try
-       Sprache.Select (sLanguageIDEnglishUSA)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
-       ' try fallback to 'English (USA)'
-       try
-           Sprache.Select ("English (USA)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'English (USA)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeEnglishUSA
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
-   endcatch
-
-   try
-       Sprache.Select (sLanguageIDKoren)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDKoren + "'"
-       ' try fallback to 'Korean (RoK)'
-       try
-           Sprache.Select ("Korean (RoK)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'"
-       endcatch
-   endcatch
-   Sleep 2
-   if Schluesseltyp1.GetSelText <> sKeyTypeKoren then
-      warnlog "The default key type for Korean should be " +  sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText
-   end if
-
-  Sortieren.Cancel
-
-  Call hCloseDocument
+    Dim sLanguageIDEnglishUSA ,sLanguageIDSChinese, sLanguageIDTChinese , sLanguageIDJapanese , sLanguageIDKoren as String
+    Dim sKeyTypeEnglishUSA    ,sKeyTypeSChinese   , sKeyTypeTChinese    , sKeyTypeJapanese    , sKeyTypeKoren    as String
+    Dim i                                                                                                        as Integer
+
+    '/// Check if the default setting for &quot;key type&quot; is right for CJK when numeric is chosen in English
+
+    select case iSprache
+    case 01   :' English (USA)
+        sKeyTypeEnglishUSA = "Numeric"
+        sKeyTypeSChinese   = "Numeric"
+        sKeyTypeTChinese   = "Numeric"
+        sKeyTypeJapanese   = "Numeric"
+        sKeyTypeKoren      = "Numeric"
+    case 49   :' German
+        sKeyTypeEnglishUSA = "Numerisch"
+        sKeyTypeSChinese   = "Numerisch"
+        sKeyTypeTChinese   = "Numerisch"
+        sKeyTypeJapanese   = "Numerisch"
+        sKeyTypeKoren      = "Numerisch"
+    case 55   :' Brazilian
+        sKeyTypeEnglishUSA = "numérico"
+        sKeyTypeSChinese   = "numérico"
+        sKeyTypeTChinese   = "numérico"
+        sKeyTypeJapanese   = "numérico"
+        sKeyTypeKoren      = "numérico"
+    case 81   :' Japanese
+        sKeyTypeEnglishUSA = "数字"
+        sKeyTypeSChinese   = "数字"
+        sKeyTypeTChinese   = "数字"
+        sKeyTypeJapanese   = "数字"
+        sKeyTypeKoren      = "数字"
+        '      case 82    ' Korean
+        '                   sKeyTypeEnglishUSA = 2 'numeric
+        '                   sKeyTypeSChinese   = 4 'numeric
+        '                   sKeyTypeTChinese   = 4 'numeric
+        '                   sKeyTypeJapanese   = 4 'numeric
+        '                   sKeyTypeKoren      = 4 'numeric
+    case 86   :' Chinese (simplified)
+        sKeyTypeEnglishUSA = "数字"
+        sKeyTypeSChinese   = "数字"
+        sKeyTypeTChinese   = "数字"
+        sKeyTypeJapanese   = "数字"
+        sKeyTypeKoren      = "数字"
+    case 88   :' Chinese (traditional)
+        sKeyTypeEnglishUSA = "數字"
+        sKeyTypeSChinese   = "數字"
+        sKeyTypeTChinese   = "數字"
+        sKeyTypeJapanese   = "數字"
+        sKeyTypeKoren      = "數字"
+    case else :' Fallback
+        printLog "The test does not support the language " + iSprache
+        Goto endsub
+    end select
+
+    sLanguageIDEnglishUSA = fGetCountryName(01)
+    sLanguageIDSChinese   = fGetCountryName(86)
+    sLanguageIDTChinese   = fGetCountryName(88)
+    sLanguageIDJapanese   = fGetCountryName(81)
+    sLanguageIDKoren      = fGetCountryName(82)
+
+    call hNewDocument
+
+    DocumentWriter.TypeKeys "123"
+    DocumentWriter.TypeKeys "<Shift Home>"
+    Sleep 1
+
+    '/// Open Tools/Sort
+    ToolsSort
+    Kontext "Sortieren"
+
+    '/// Choose language: English and key type: Numeric
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+            for i = 1 to Sprache.getItemCount
+                printlog "" + i + ": '" + Sprache.getItemText(i) + "'"
+            next i
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        for i = 1 to Schluesseltyp1.getItemCount
+            printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
+        next i
+    endcatch
+
+    '/// Check to simplified Chinese
+    try
+        Sprache.Select (sLanguageIDSChinese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
+        ' try fallback to 'Chinese (simplyfied)'
+        try
+            Sprache.Select ("Chinese (simplyfied)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
+        endcatch
+    endcatch
+    Sleep 2
+    if Schluesseltyp1.GetSelText <> sKeyTypeSChinese then
+        warnlog "The default key type for Simplified Chinese should be: '" +  sKeyTypeSChinese + "' but is '" + Schluesseltyp1.GetSelText + "'"
+    end if
+
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+    endcatch
+
+    '/// Check to traditional Chinese
+    try
+        Sprache.Select (sLanguageIDTChinese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDTChinese + "'"
+        ' try fallback to 'Chinese (traditional)'
+        try
+            Sprache.Select ("Chinese (traditional)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Chinese (traditional)'"
+        endcatch
+    endcatch
+    Sleep 2
+    if Schluesseltyp1.GetSelText <> sKeyTypeTChinese then
+        warnlog "The default key type for traditional Chinese should be " +  sKeyTypeTChinese + " but get " +  Schluesseltyp1.GetSelText
+    end if
+
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+    endcatch
+
+    '/// Check to Japanese
+    try
+        Sprache.Select (sLanguageIDJapanese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDJapanese + "'"
+        ' try fallback to 'Japanese'
+        try
+            Sprache.Select ("Japanese")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Japanese'"
+        endcatch
+    endcatch
+    Sleep 2
+    if Schluesseltyp1.GetSelText <> sKeyTypeJapanese then
+        warnlog "The default key type for Japanese should be: '" + sKeyTypeJapanese + "' but is: '" + Schluesseltyp1.GetSelText + "'"
+    end if
+
+    try
+        Sprache.Select (sLanguageIDEnglishUSA)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDEnglishUSA + "'"
+        ' try fallback to 'English (USA)'
+        try
+            Sprache.Select ("English (USA)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'English (USA)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeEnglishUSA
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeEnglishUSA + "'"
+    endcatch
+
+    '/// Check to Korean
+    try
+        Sprache.Select (sLanguageIDKoren)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDKoren + "'"
+        ' try fallback to 'Korean (RoK)'
+        try
+            Sprache.Select ("Korean (RoK)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Korean (RoK)'"
+        endcatch
+    endcatch
+    Sleep 2
+    if Schluesseltyp1.GetSelText <> sKeyTypeKoren then
+        warnlog "The default key type for Korean should be " +  sKeyTypeKoren + " but get " + Schluesseltyp1.GetSelText
+    end if
+
+    Sortieren.Cancel
+
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tStrokeSort
 
-   Dim testFile              as String
-   Dim sLanguageIDSChinese   as String
-   Dim sKeyTypeSChinese      as String
-   Dim aCorrectSequence()    as String
-
-   Dim i , j                 as Integer
-
-   testFile         = "sortTest.sxw"
-   aCorrectSequence = Array( "1" , "2" , "3" , "4" ,"5" )
-
-   j = UBound(aCorrectSequence)
-
-   select case iSprache
-      case 01   :  ' English (USA)
-                     sKeyTypeSChinese      =  "Stroke"
-      case 49   :  ' German
-                     sKeyTypeSChinese      =  "Stroke"
-      case 55   :  ' Brazilian
-                     sKeyTypeSChinese      =  "Traço"
-      case 81   :  ' Japanese
-                     sKeyTypeSChinese      =  "総画数"
-      case 86   :  ' Chinese (simplified)
-                     sKeyTypeSChinese      =  "笔画"
-      case 88   :  ' Chinese (simplified)
-                     sKeyTypeSChinese      =  "筆畫"
-      case else :  ' Fallback
-                     printLog "Now, the test does not support for the language " +iSprache
-                     Goto endsub
+    Dim testFile              as String
+    Dim sLanguageIDSChinese   as String
+    Dim sKeyTypeSChinese      as String
+    Dim aCorrectSequence()    as String
+
+    Dim i , j                 as Integer
+
+    testFile         = "sortTest.sxw"
+    aCorrectSequence = Array( "1" , "2" , "3" , "4" ,"5" )
+
+    j = UBound(aCorrectSequence)
+
+    select case iSprache
+    case 01   :  ' English (USA)
+        sKeyTypeSChinese      =  "Stroke"
+    case 49   :  ' German
+        sKeyTypeSChinese      =  "Stroke"
+    case 55   :  ' Brazilian
+        sKeyTypeSChinese      =  "Traço"
+    case 81   :  ' Japanese
+        sKeyTypeSChinese      =  "総画数"
+    case 86   :  ' Chinese (simplified)
+        sKeyTypeSChinese      =  "笔画"
+    case 88   :  ' Chinese (simplified)
+        sKeyTypeSChinese      =  "筆畫"
+    case else :  ' Fallback
+        printLog "Now, the test does not support for the language " +iSprache
+        Goto endsub
     end select
 
-   sLanguageIDSChinese =  fGetCountryName(86)
-
+    sLanguageIDSChinese =  fGetCountryName(86)
+
+    '/// Check Stroke sort for Simplified Chinese
+
+    Call hNewDocument
+    '/// Open a test file and check <i>No Grid</i> checkbox
+    Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile )
+    sMakeReadOnlyDocumentEditable
+    EditSelectAll
+
+    '/// Open <i>Tools/Sort</i>
+    ToolsSort
+    Kontext "Sortieren"
+
+    '/// Choose language: Simplified Chinese and key type <i>Stroke</i>
+    try
+        Sprache.Select (sLanguageIDSChinese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
+        ' try fallback to 'Chinese (simplyfied)'
+        try
+            Sprache.Select ("Chinese (simplyfied)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeSChinese
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'"
+        for i = 1 to Schluesseltyp1.getItemCount
+            printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
+        next i
+    endcatch
+
+    Sortieren.OK
+
+    Kontext "DocumentWriter"
+    DocumentWriter.TypeKeys "<MOD1 Home>"
+
+    For i = 0 to j
+        DocumentWriter.TypeKeys "<End>"
+        DocumentWriter.TypeKeys "<Shift Left>"
+
+        EditCopy
+        if GetClipboardText <> aCorrectSequence(i) then Warnlog "The Stroke sort is wrong , should be " +  aCorrectSequence(i) + " ,but get " +GetClipboardText
+
+        DocumentWriter.TypeKeys "<Down>"
+    next i
+
+    Call hCloseDocument
 
-  Call hNewDocument
-  Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile )
-  sMakeReadOnlyDocumentEditable
-  EditSelectAll
-
-  ToolsSort
-   Kontext "Sortieren"
-
-   try
-       Sprache.Select (sLanguageIDSChinese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
-       ' try fallback to 'Chinese (simplyfied)'
-       try
-           Sprache.Select ("Chinese (simplyfied)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeSChinese
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'"
-       for i = 1 to Schluesseltyp1.getItemCount
-           printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
-       next i
-   endcatch
-
-  Sortieren.OK
-
-  Kontext "DocumentWriter"
-  DocumentWriter.TypeKeys "<MOD1 Home>"
+endcase
 
-  For i = 0 to j
-    DocumentWriter.TypeKeys "<End>"
-    DocumentWriter.TypeKeys "<Shift Left>"
+'-------------------------------------------------------------------------
 
-    EditCopy
-    if GetClipboardText <> aCorrectSequence(i) then Warnlog "The Stroke sort is wrong , should be " +  aCorrectSequence(i) + " ,but get " +GetClipboardText
+testcase tPinyinSort
 
-    DocumentWriter.TypeKeys "<Down>"
-  next i
+    Dim testFile              as String
+    Dim sLanguageIDSChinese   as String
+    Dim sKeyTypeSChinese      as String
+    Dim aCorrectSequence()    as String
+
+    Dim i , j                 as Integer
+
+    testFile         = "sortTest.sxw"
+    aCorrectSequence = Array( "2" , "3" , "4" , "1" , "5"  )
+
+    j = UBound(aCorrectSequence)
+
+    select case iSprache
+    case 01   :  ' English (USA)
+        sKeyTypeSChinese      =  "Pinyin"
+    case 49   :  ' German
+        sKeyTypeSChinese      =  "Pinyin"
+    case 55   :  ' Brazilian
+        sKeyTypeSChinese      =  "Pinyin"
+    case 81   :  ' Japanese
+        sKeyTypeSChinese      =  "ピンイン(中国語のローマ字表記法)"
+    case 86   :  ' Chinese (simplified)
+        sKeyTypeSChinese      =  "拼音"
+    case 88   :  ' Chinese (simplified)
+        sKeyTypeSChinese      =  "拼音"
+    case else :  ' Fallback
+        printLog "Now, the test does not support for the language " +iSprache
+        Goto endsub
+    end select
 
-  Call hCloseDocument
+    sLanguageIDSChinese =  fGetCountryName(86)
+
+    '/// Check <i>Pinyin</i> sort for Simplified Chinese
+
+    Call hNewDocument
+    '/// Open a test file and check <i>No Grid</i> checkbox
+    Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile )
+    sMakeReadOnlyDocumentEditable
+    EditSelectAll
+
+    '/// Open <i>Tools/Sort</i>
+    ToolsSort
+    Kontext "Sortieren"
+
+    '/// Choose language: Simplified Chinese and key type <i>Pin yin</i>
+    try
+        Sprache.Select (sLanguageIDSChinese)
+    catch
+        qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
+        ' try fallback to 'Chinese (simplyfied)'
+        try
+            Sprache.Select ("Chinese (simplyfied)")
+        catch
+            qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
+        endcatch
+    endcatch
+    try
+        Schluesseltyp1.Select sKeyTypeSChinese
+    catch
+        qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'"
+        for i = 1 to Schluesseltyp1.getItemCount
+            printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
+        next i
+    endcatch
+
+    Sortieren.OK
+
+    Kontext "DocumentWriter"
+    DocumentWriter.TypeKeys "<MOD1 Home>"
+
+    For i = 0 to j
+        DocumentWriter.TypeKeys "<End>"
+        DocumentWriter.TypeKeys "<Shift Left>"
+
+        EditCopy
+        if GetClipboardText <> aCorrectSequence(i) then
+            Warnlog "The Pin yin sort is wrong, should be: '" +  aCorrectSequence(i) + "' ,but is: '" +GetClipboardText + "'"
+        endif
+
+        DocumentWriter.TypeKeys "<Down>"
+    next i
+
+    Call hCloseDocument
 
 endcase
 
 '-------------------------------------------------------------------------
 
-testcase tPinyinSort
+testcase tSortOptionTest_1
 
-   Dim testFile              as String
-   Dim sLanguageIDSChinese   as String
-   Dim sKeyTypeSChinese      as String
-   Dim aCorrectSequence()    as String
-
-   Dim i , j                 as Integer
-
-   testFile         = "sortTest.sxw"
-   aCorrectSequence = Array( "2" , "3" , "4" , "1" , "5"  )
-
-   j = UBound(aCorrectSequence)
-
-   select case iSprache
-      case 01   :  ' English (USA)
-                     sKeyTypeSChinese      =  "Pinyin"
-      case 49   :  ' German
-                     sKeyTypeSChinese      =  "Pinyin"
-      case 55   :  ' Brazilian
-                     sKeyTypeSChinese      =  "Pinyin"
-      case 81   :  ' Japanese
-                     sKeyTypeSChinese      =  "ピンイン(中国語のローマ字表記法)"
-      case 86   :  ' Chinese (simplified)
-                     sKeyTypeSChinese      =  "拼音"
-      case 88   :  ' Chinese (simplified)
-                     sKeyTypeSChinese      =  "拼音"
-      case else :  ' Fallback
-                     printLog "Now, the test does not support for the language " +iSprache
-                     Goto endsub
-   end select
-
-   sLanguageIDSChinese =  fGetCountryName(86)
-
-
-  Call hNewDocument
-  Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile )
-  sMakeReadOnlyDocumentEditable
-  EditSelectAll
-
-  ToolsSort
-   Kontext "Sortieren"
-
-   try
-       Sprache.Select (sLanguageIDSChinese)
-   catch
-       qaErrorLog "Can't select: '" + sLanguageIDSChinese + "'"
-       ' try fallback to 'Chinese (simplyfied)'
-       try
-           Sprache.Select ("Chinese (simplyfied)")
-       catch
-           qaErrorLog "Can't select even tha fallback: 'Chinese (simplyfied)'"
-       endcatch
-   endcatch
-   try
-       Schluesseltyp1.Select sKeyTypeSChinese
-   catch
-       qaErrorLog "Can't select: '" + sKeyTypeSChinese + "'"
-       for i = 1 to Schluesseltyp1.getItemCount
-           printlog "" + i + ": '" + Schluesseltyp1.getItemText(i) + "'"
-       next i
-   endcatch
-
-  Sortieren.OK
-
-  Kontext "DocumentWriter"
-  DocumentWriter.TypeKeys "<MOD1 Home>"
-
-  For i = 0 to j
-    DocumentWriter.TypeKeys "<End>"
-    DocumentWriter.TypeKeys "<Shift Left>"
-
-    EditCopy
-    if GetClipboardText <> aCorrectSequence(i) then
-        Warnlog "The Pin yin sort is wrong, should be: '" +  aCorrectSequence(i) + "' ,but is: '" +GetClipboardText + "'"
-    endif
-
-    DocumentWriter.TypeKeys "<Down>"
-  next i
-
-  Call hCloseDocument
+    Dim  i  , j  as Integer
+    Dim asList() as String
+
+    select case iSprache
+    case 81   :' Japanese
+        if iSystemSprache <> 81 then goto NOTest
+        asList = Array( "Sun,Mon,Tue,Wed,Thu,Fri,Sat"     , "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday"    , "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec"    , "January,February,March,April,May,June,July,August,September,October,November,December"    , "日,月,火,水,木,金,土"    , "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日"    , )
+    case 82   :' Korean
+        if iSystemSprache <> 82 then goto NOTest
+        asList = Array( "일,월,화,수,목,금,토" ,"일요일,월요일,화요일,수요일,목요일,금요일,토요일"  ,"1,2,3,4,5,6,7,8,9,10,11,12"    , "日,月,火,水,木,金,土"    , "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日"    , )
+    case 86   :' Chinese (simplified)
+        if iSystemSprache <> 86 then goto NOTest
+        asList = Array( "日,一,二,三,四,五,六"     , "星期日,星期一,星期二,星期三,星期四,星期五,星期六"    , "一,二,三,四,五,六,七,八,九,十,十一,十二"    , "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月"    , )
+    case 88   :' Chinese (traditional)
+        if iSystemSprache <> 88 then goto NOTest
+        asList = Array( "日,一,二,三,四,五,六"     , "星期日,星期一,星期二,星期三,星期四,星期五,星期六"    , "一,二,三,四,五,六,七,八,九,十,十一,十二"    , "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月"    , )
+    case else :' Fallback
+        NOTest:
+        printLog "The test does not support for the language " +iSprache + " System language " + iSystemSprache
+        Goto endsub
+    end select
 
-endcase
+    '/// Check if the entries in custom sort order is right in CJK version
 
-'-------------------------------------------------------------------------
+    call hNewDocument
 
-testcase tSortOptionTest_1
+    '/// Open <i>Data/Sort</i> -&gt; tabpage <i>option</i>
+
+    DataSort
+
+    Kontext
+    active.SetPage TabSortierenOptionen
+    Kontext "TabSortierenOptionen"
 
-Dim  i  , j  as Integer
-Dim asList() as String
-
-select case iSprache
-      case 81   :' Japanese
-                   if iSystemSprache <> 81 then goto NOTest
-                   asList = Array( _
-                                  "Sun,Mon,Tue,Wed,Thu,Fri,Sat"     , _
-                                  "Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday"    , _
-                                  "Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec"    , _
-                                  "January,February,March,April,May,June,July,August,September,October,November,December"    , _
-                                  "日,月,火,水,木,金,土"    , _
-                                  "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日"    , _
-                                  )
-      case 82   :' Korean
-                   if iSystemSprache <> 82 then goto NOTest
-                   asList = Array( _
-                                  "일,월,화,수,목,금,토" ,_
-                                  "일요일,월요일,화요일,수요일,목요일,금요일,토요일"  ,_
-                                   "1,2,3,4,5,6,7,8,9,10,11,12"    , _
-                                  "日,月,火,水,木,金,土"    , _
-                                  "日曜日,月曜日,火曜日,水曜日,木曜日,金曜日,土曜日"    , _
-                                 )
-      case 86   :' Chinese (simplified)
-                   if iSystemSprache <> 86 then goto NOTest
-                   asList = Array( _
-                                  "日,一,二,三,四,五,六"     , _
-                                  "星期日,星期一,星期二,星期三,星期四,星期五,星期六"    , _
-                                  "一,二,三,四,五,六,七,八,九,十,十一,十二"    , _
-                                  "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月"    , _
-                                  )
-      case 88   :' Chinese (traditional)
-                   if iSystemSprache <> 88 then goto NOTest
-                   asList = Array( _
-                                  "日,一,二,三,四,五,六"     , _
-                                  "星期日,星期一,星期二,星期三,星期四,星期五,星期六"    , _
-                                  "一,二,三,四,五,六,七,八,九,十,十一,十二"    , _
-                                  "一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月"    , _
-                                  )
-      case else :' Fallback
-NOTest:
-                   printLog "The test does not support for the language " +iSprache + " System language " + iSystemSprache
-                   Goto endsub
-end select
-
-
-  call hNewDocument
-
-
-   DataSort
-
-   Kontext
-   active.SetPage TabSortierenOptionen
-   Kontext "TabSortierenOptionen"
-
-   BenutzerdefinierteSortierreihenfolge.Check
+    BenutzerdefinierteSortierreihenfolge.Check
 
     For i = 1 to SortierreihenfolgeListe.GetItemCount
-     if  SortierreihenfolgeListe.GetItemText(i) <> asList(i-1) then
-         warnlog "Should get " +asList(i) + " but get " +SortierreihenfolgeListe.GetItemText(i)
-     end if
-   next i
+        if  SortierreihenfolgeListe.GetItemText(i) <> asList(i-1) then
+            warnlog "Should get " +asList(i) + " but get " +SortierreihenfolgeListe.GetItemText(i)
+        end if
+    next i
 
-  TabSortierenOptionen.Cancel
+    TabSortierenOptionen.Cancel
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
index 8e6f85afac01..37b905ec4e1e 100755..100644
--- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
+++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc
@@ -1,7 +1,7 @@
 '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
@@ -38,45 +38,69 @@
 '\***********************************************************************
 
 testcase tSwitchLocation
-  ToolsOptions
+    '/// Check if the switch "Asian Language support" exist -- tools/options/language settings/language
+    ToolsOptions
 
-  Call hToolsOptions("LANGUAGESETTINGS" , "LANGUAGES")
+    Call hToolsOptions("LANGUAGESETTINGS" , "LANGUAGES")
 
-  try
-    if Aktivieren.IsChecked = TRUE  then
-      printLog "CJK language is checked"
-    else
-      printLog "CJK language isn't checked"
-    end if
-  catch
-    warnlog "Something wrong in checkbox 'Asian Language Support'"
-  endcatch
+    try
+        if Aktivieren.IsChecked = TRUE  then
+            printLog "CJK language is checked"
+        else
+            printLog "CJK language isn't checked"
+        end if
+    catch
+        warnlog "Something wrong in checkbox 'Asian Language Support'"
+    endcatch
 
-  Kontext "ExtrasOptionenDlg"
-  ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest1
-  call  hNewDocument
+    '/// Check if checkbox "Snap to text grid" is enable or not -- Format/Paragraph tabpage "Alignment"
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
+    '/// turn on "Asian Language support" , check if checkbox "Snap to text grid" is enable
+    Call CheckAsianLanguageSupport("On")
 
-   Kontext
-   FormatParagraph
+    Kontext
+    FormatParagraph
     Active.SetPage TabAusrichtungAbsatz
     Kontext "TabAusrichtungAbsatz"
 
-   try
-    if TextrasterFangen.IsChecked = TRUE  then
-      printLog "snap to text grid is checked"
-    else
-      printLog "snap to text grid isn't checked"
+    try
+        if TextrasterFangen.IsChecked = TRUE  then
+            printLog "snap to text grid is checked"
+        else
+            printLog "snap to text grid isn't checked"
+        end if
+    catch
+        warnlog "Something wrong in checkbox 'snap to text grid'"
+    endcatch
+
+    TabAusrichtungAbsatz.Cancel
+
+    '/// turn off "Asian Language support" , check if checkbox "Snap to text grid" isn't enable
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+
+        Kontext
+        FormatParagraph
+        Active.SetPage TabAusrichtungAbsatz
+        Kontext "TabAusrichtungAbsatz"
+
+        try
+            if TextrasterFangen.IsChecked = TRUE Or TextrasterFangen.IsChecked <> TRUE then
+                warnlog "Something wrong in checkbox 'snap to text grid'"
+            end if
+        catch
+        endcatch
+
+        TabAusrichtungAbsatz.Cancel
     end if
-   catch
-    warnlog "Something wrong in checkbox 'snap to text grid'"
-   endcatch
 
    TabAusrichtungAbsatz.Cancel
 
@@ -104,278 +128,303 @@ endcase
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest2
-  call  hNewDocument
-
-  Call CheckAsianLanguageSupport("On")
-
-   Kontext
-   FormatParagraph
+    '/// Check if tabpage "Asian Typography" appear or not -- Format/Paragraph
+    call  hNewDocument
+
+    '/// turn on "Asian Language support" , check if tabpage "Asian Typography" appears
+    Call CheckAsianLanguageSupport("On")
+
+    Kontext
+    FormatParagraph
+
+    try
+        Active.SetPage TabAsianTypography
+        Kontext "TabAsianTypography"
+        TabAsianTypography.Cancel
+    catch
+        Active.SetPage TabAusrichtungAbsatz
+        Kontext "TabAusrichtungAbsatz"
+        TabAusrichtungAbsatz.Cancel
+        warnlog "Something wring in tabpage - Asian Typography!"
+    endcatch
+
+    '/// turn off "Asian Language support" , check if tabpage "Asian Typography" disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
 
-   try
-    Active.SetPage TabAsianTypography
-    Kontext "TabAsianTypography"
-    TabAsianTypography.Cancel
-   catch
-    Active.SetPage TabAusrichtungAbsatz
-    Kontext "TabAusrichtungAbsatz"
-    TabAusrichtungAbsatz.Cancel
-    warnlog "Something wring in tabpage - Asian Typography!"
-   endcatch
-
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
-
-      Kontext
-      FormatParagraph
+        Kontext
+        FormatParagraph
 
-      try
-       Active.SetPage TabAsianTypography
-       Kontext "TabAsianTypography"
-       TabAsianTypography.Cancel
-       warnlog "tabpage - Asian Typography should NOT appear!"
-      catch
-       Active.SetPage TabAusrichtungAbsatz
-       Kontext "TabAusrichtungAbsatz"
-       TabAusrichtungAbsatz.Cancel
-      endcatch
-   end if
+        try
+            Active.SetPage TabAsianTypography
+            Kontext "TabAsianTypography"
+            TabAsianTypography.Cancel
+            warnlog "tabpage - Asian Typography should NOT appear!"
+        catch
+            Active.SetPage TabAusrichtungAbsatz
+            Kontext "TabAusrichtungAbsatz"
+            TabAusrichtungAbsatz.Cancel
+        endcatch
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest3
-  call  hNewDocument
-
-  Call CheckAsianLanguageSupport("On")
-
-   Kontext
-   FormatCharacter
-   Kontext
-   active.SetPage TabFont
-   kontext "TabFont"
-     try
-      FontEast.Select 1
-     catch
-      warnlog "Something wrong in list box Asian text font when Asian Language support is on"
-     endcatch
-   TabFont.Cancel
+    '/// Check if list box "Asian text font" appear or not  -- Format/Character
+    call  hNewDocument
+
+    '/// turn on "Asian Language support" , Check if list box "Asian text font" appear
+    Call CheckAsianLanguageSupport("On")
+
+    Kontext
+    FormatCharacter
+    Kontext
+    active.SetPage TabFont
+    kontext "TabFont"
+    try
+        FontEast.Select 1
+    catch
+        warnlog "Something wrong in list box Asian text font when Asian Language support is on"
+    endcatch
+    TabFont.Cancel
+
+    '/// turn off "Asian Language support" , Check if list box "Asian text font" disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
-
-      Kontext
-      FormatCharacter
-      Kontext
-      active.SetPage TabFont
-      kontext "TabFont"
+        Kontext
+        FormatCharacter
+        Kontext
+        active.SetPage TabFont
+        kontext "TabFont"
         try
-         FontEast.Select 1
-         warnlog "Something wrong in list box Asian text font when Asian Language support is off"
+            FontEast.Select 1
+            warnlog "Something wrong in list box Asian text font when Asian Language support is off"
         catch
         endcatch
-      TabFont.Cancel
-   end if
+        TabFont.Cancel
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest4
-  call  hNewDocument
+    '/// Check if list box "Emphasis mark" appear or not -- Format/Character
+    call  hNewDocument
+
+    '/// turn on "Asian Language support" , Check if list box "Emphasis mark" appear
+    Call CheckAsianLanguageSupport("On")
+
+    Kontext
+    FormatCharacter
+    Kontext
+    active.SetPage TabFontEffects
+    kontext "TabFontEffects"
+    try
+        Emphasis.Select 1
+    catch
+        warnlog "Something wrong in list box Emphasis mark when Asian Language support is on"
+    endcatch
+    TabFontEffects.Cancel
+
+    '/// turn off "Asian Language support" , Check if list box "Emphasis mark" disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
 
-  Call CheckAsianLanguageSupport("On")
-
-   Kontext
-   FormatCharacter
-   Kontext
-   active.SetPage TabFontEffects
-   kontext "TabFontEffects"
-     try
-      Emphasis.Select 1
-     catch
-      warnlog "Something wrong in list box Emphasis mark when Asian Language support is on"
-     endcatch
-   TabFontEffects.Cancel
-
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
-
-      Kontext
-      FormatCharacter
-      Kontext
-      active.SetPage TabFontEffects
-      kontext "TabFontEffects"
+        Kontext
+        FormatCharacter
+        Kontext
+        active.SetPage TabFontEffects
+        kontext "TabFontEffects"
         try
-         Emphasis.Select 1
-         warnlog "Something wrong in list box Emphasis mark when Asian Language support is off"
+            Emphasis.Select 1
+            warnlog "Something wrong in list box Emphasis mark when Asian Language support is off"
         catch
         endcatch
-      TabFontEffects.Cancel
-   end if
+        TabFontEffects.Cancel
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest5
-  call  hNewDocument
+    '/// Check if tabpage "Searching in Japanese" appear or not -- tools/options/language settings/
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
+    '/// turn on "Asian Language support" , Check if tabpage "Searching in Japanese" appear
+    Call CheckAsianLanguageSupport("On")
 
-  ToolsOptions
-  if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE") <> TRUE then
-     warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is on"
-  end if
+    ToolsOptions
+    if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE") <> TRUE then
+        warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is on"
+    end if
 
-  Kontext "ExtrasOptionenDlg"
-  ExtrasOptionenDlg.Cancel
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.Cancel
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
-     ToolsOptions
+    '/// turn on "Asian Language support" , Check if tabpage "Searching in Japanese" disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        ToolsOptions
 
-     if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE" , TRUE) = FALSE then
-        printLog Chr(13) + "Yes, 'Searching Japanese'-page has been disabled after switching Asian Language Support 'off'."
-     else
-        warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is off"
-     end if
+        if hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE" , TRUE) = FALSE then
+            printLog Chr(13) & "Yes, 'Searching Japanese'-page has been disabled after switching Asian Language Support 'off'."
+        else
+            warnlog "Something wrong in tabpage Searching in Japanese when Asian Language support is off"
+        end if
 
-     Kontext "ExtrasOptionenDlg"
-     ExtrasOptionenDlg.Cancel
-  end if
+        Kontext "ExtrasOptionenDlg"
+        ExtrasOptionenDlg.Cancel
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest6
-  call  hNewDocument
+    '/// Check if tabpage "Asian Layout" appear or not -- tools/options/language settings/
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
+    '/// turn on "Asian Language support" , Check if tabpage "Asian Layout" appear
+    Call CheckAsianLanguageSupport("On")
 
-  ToolsOptions
-  if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT") <> TRUE then
-     warnlog "Something wrong in tabpage Asian Layout when Asian Language support is on"
-  end if
+    ToolsOptions
+    if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT") <> TRUE then
+        warnlog "Something wrong in tabpage Asian Layout when Asian Language support is on"
+    end if
 
-  Kontext "ExtrasOptionenDlg"
-  ExtrasOptionenDlg.Cancel
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.Cancel
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
-     ToolsOptions
+    '/// turn off "Asian Language support" , Check if tabpage "Asian Layout" disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        ToolsOptions
 
-     if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT", TRUE) = FALSE then
-        printLog Chr(13) + "Yes, 'Asian Layout'-page has been disabled after switching 'Asian Language Support' off."
-     else
-        warnlog "Something wrong in tabpage Asian Layout when Asian Language support is off"
-     end if
+        if hToolsOptions("LANGUAGESETTINGS","ASIANLAYOUT", TRUE) = FALSE then
+            printLog Chr(13) & "Yes, 'Asian Layout'-page has been disabled after switching 'Asian Language Support' off."
+        else
+            warnlog "Something wrong in tabpage Asian Layout when Asian Language support is off"
+        end if
 
-     Kontext "ExtrasOptionenDlg"
-     ExtrasOptionenDlg.Cancel
-  end if
+        Kontext "ExtrasOptionenDlg"
+        ExtrasOptionenDlg.Cancel
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest7
-  call  hNewDocument
+    '/// Check if menu format/Ruby is active or not
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
+    '/// turn on "Asian Language support" , Check if menu format/Ruby is actived
+    Call CheckAsianLanguageSupport("On")
 
-  try
-    formatRuby
-    Kontext "RubyDialog"
-    DialogClose.Click
-    Sleep 2
-  catch
-     warnlog "Something wrong in menu format/Ruby when Asian Language support is on"
-  endcatch
+    try
+        formatRuby
+        Kontext "RubyDialog"
+        DialogClose.Click
+        Sleep 2
+    catch
+        warnlog "Something wrong in menu format/Ruby when Asian Language support is on"
+    endcatch
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
+    '/// turn off "Asian Language support" , Check if menu format/Ruby is inactived
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
 
-     try
-       formatRuby
-       Kontext "RubyDialog"
-       DialogClose.Click
-       Sleep 2
-       QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off"
-     catch
-     endcatch
-  end if
+        try
+            formatRuby
+            Kontext "RubyDialog"
+            DialogClose.Click
+            Sleep 2
+            QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off"
+        catch
+        endcatch
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest8
+    '/// Check if the following submenus in format/change case is active or not
+    '/// -  Half width
+    '/// -  Full width
+    '/// -  Hiragana
+    '/// -  Katagana
+
+    call  hNewDocument
+
+    '/// turn on "Asian Language support" , Check if submenus in format/change case is actived
+    Call CheckAsianLanguageSupport("On")
+
+    try
+        FormatChangeCaseHalfWidth
+    catch
+        warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is on"
+    endcatch
+
+    try
+        FormatChangeCaseFullWidth
+    catch
+        warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is on"
+    endcatch
+
+    try
+        FormatChangeCaseHiragana
+    catch
+        warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is on"
+    endcatch
+
+    try
+        FormatChangeCaseKatagana
+    catch
+        warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is on"
+    endcatch
+
+    '/// turn off "Asian Language support" , Check if submenus in format/change case is inactived
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
 
-  call  hNewDocument
-
-  Call CheckAsianLanguageSupport("On")
-
-  try
-    FormatChangeCaseHalfWidth
-  catch
-    warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is on"
-  endcatch
-
-  try
-    FormatChangeCaseFullWidth
-  catch
-    warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is on"
-  endcatch
-
-  try
-    FormatChangeCaseHiragana
-  catch
-    warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is on"
-  endcatch
+        try
+            FormatChangeCaseHalfWidth
+            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off"
+        catch
+        endcatch
 
-  try
-    FormatChangeCaseKatagana
-  catch
-    warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is on"
-  endcatch
+        try
+            FormatChangeCaseFullWidth
+            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off"
+        catch
+        endcatch
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
+        try
+            FormatChangeCaseHiragana
+            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off"
+        catch
+        endcatch
 
-     try
-       FormatChangeCaseHalfWidth
-       QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off"
-     catch
-     endcatch
-
-     try
-       FormatChangeCaseFullWidth
-       QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off"
-     catch
-     endcatch
-
-     try
-       FormatChangeCaseHiragana
-       QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off"
-     catch
-     endcatch
-
-     try
-       FormatChangeCaseKatagana
-       QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off"
-     catch
-     endcatch
-  end if
+        try
+            FormatChangeCaseKatagana
+            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off"
+        catch
+        endcatch
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
@@ -383,76 +432,81 @@ endcase
 testcase tWriterUIChangesTest9
   call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
+    '/// turn on "Asian Language support" , Check if list box text direction appear
+    Call CheckAsianLanguageSupport("On")
 
-  FormatPageWriter
-  Kontext
-   Active.SetPage TabSeite
-   Kontext "TabSeite"
+    FormatPageWriter
+    Kontext
+    Active.SetPage TabSeite
+    Kontext "TabSeite"
 
-   try
-     Textfluss.select 1
-   catch
-     warnlog "Something wrong in list box text direction when Asian Language support is on"
-   endcatch
-  TabSeite.Cancel
+    try
+        Textfluss.select 1
+    catch
+        warnlog "Something wrong in list box text direction when Asian Language support is on"
+    endcatch
+    TabSeite.Cancel
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
+    '/// turn off "Asian Language support" , Check if list box text direction disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
 
-     FormatPageWriter
-     Kontext
-      Active.SetPage TabSeite
-      Kontext "TabSeite"
+        FormatPageWriter
+        Kontext
+        Active.SetPage TabSeite
+        Kontext "TabSeite"
 
-      try
-       Textfluss.select 1
-       warnlog "Something wrong in list box text direction when Asian Language support is off"
-      catch
-      endcatch
-     TabSeite.Cancel
-  end if
+        try
+            Textfluss.select 1
+            warnlog "Something wrong in list box text direction when Asian Language support is off"
+        catch
+        endcatch
+        TabSeite.Cancel
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tWriterUIChangesTest10
 
-  call  hNewDocument
+    '/// Check if vertical text box and callout appear or not
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
-   sleep(1)
-
-   Call hToolbarSelect("DRAWING", true)
-   try
-     VerticalText.Click
-   catch
-     warnlog "Something wrong in vertical text box when Asian Language support is on"
-   endcatch
-   try
-     VerticalCallout.Click
-   catch
-     warnlog "Something wrong in vertical text callout when Asian Language support is on"
-   endcatch
-
-   if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-       Call CheckAsianLanguageSupport("Off")
-       Kontext "Drawbar"
-       try
-           VerticalText.Click
-           warnlog "Something wrong in vertical text box when Asian Language support is off"
-       catch
-       endcatch
-       try
-           VerticalCallout.Click
-           warnlog "Something wrong in vertical text callout when Asian Language support is off"
-       catch
-       endcatch
-   end if
+    '/// turn on "Asian Language support" , Check if vertical text box and callout appear
+    Call CheckAsianLanguageSupport("On")
+    sleep(1)
 
-  Call hCloseDocument
+    Call hToolbarSelect("DRAWING", true)
+    try
+        VerticalText.Click
+    catch
+        warnlog "Something wrong in vertical text box when Asian Language support is on"
+    endcatch
+    try
+        VerticalCallout.Click
+    catch
+        warnlog "Something wrong in vertical text callout when Asian Language support is on"
+    endcatch
+
+    '/// turn off "Asian Language support" , Check if vertical text box and callout disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        Kontext "Drawbar"
+        try
+            VerticalText.Click
+            warnlog "Something wrong in vertical text box when Asian Language support is off"
+        catch
+        endcatch
+        try
+            VerticalCallout.Click
+            warnlog "Something wrong in vertical text callout when Asian Language support is off"
+        catch
+        endcatch
+    end if
+
+    Call hCloseDocument
 
 endcase
 
@@ -463,46 +517,52 @@ testcase tWriterUIChangesTest11
  dim i as integer
  dim iCount as integer
 
-  iHopeNumber1 = 38
-  iHopeNumber2 = 19
+    iHopeNumber1 = 38
+    iHopeNumber2 = 19
 
+    '/// Check if the number in listbox numbering  is right or not.
+    '/// [if the number of the listbox numbering is changed, this case should be modified according]
 
-  call  hNewDocument
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
+    '/// turn on "Asian Language support" , Check if the number in listbox numbering  is right
+    Call CheckAsianLanguageSupport("On")
 
     FormatNumberingBullets
-     Kontext
-     Active.SetPage TabOptionenNumerierung
-     Kontext "TabOptionenNumerierung"
-     
-     iCount = Numerierung.GetItemCount
-     if iCount = iHopeNumber1 then
+    Kontext
+    Active.SetPage TabOptionenNumerierung
+    Kontext "TabOptionenNumerierung"
+
+    iCount = Numerierung.GetItemCount
+    if iCount = iHopeNumber1 then
         Numerierung.Select 15
         TabOptionenNumerierung.OK
 
-        printLog Chr(13) + "Pls. go to the printer to find if you can get a paper"
-        printLog Chr(13) + "which is printed like '-'.Otherwise , something wrong!"
+        printLog Chr(13) & "Pls. go to the printer to find if you can get a paper"
+        printLog Chr(13) & "which is printed like '-'.Otherwise , something wrong!"
+        '/// --Pls. go to the printer to find if you can get a paper which is printed like '-'. Otherwise , something is wrong!
 
         FilePrint
         Kontext "Active"
-        if Active.Exists then
-          if Active.GetRT = 304 then
-            Active.Ok
-            QAErrorLog "No Default-Printer!"
-            Kontext "DruckenDlg"
-            Sleep 1
-            DruckenDlg.Cancel
-          end if
+        if Active.Exists( 1 ) then
+            if Active.GetRT = 304 then
+                Active.Ok
+                QAErrorLog "No Default-Printer!"
+                Kontext "Printing"
+                if ( Printing.exists( 1 ) ) then
+                    Printing.cancel()
+                endif
+            end if
         else
-          Kontext "DruckenDlg"
-          Sleep 1
-          DruckenDlg.OK
-          Sleep 5
-        end if
-     else
+            Kontext "Printing"
+            if ( Printing.exists( 2 ) ) then
+                Printing.cancel()
+                Printing.notExists( 5 )
+            endif
+        endif
+    else
         for i =1 to iCount
-            printlog "("+i+"/"+iCount+"): "+Numerierung.getItemText(i)
+            printlog "(" & i & "/" & iCount & "): " & Numerierung.getItemText(i)
         next i
         'Referenze:
         TabOptionenNumerierung.Cancel
@@ -516,47 +576,57 @@ testcase tWriterUIChangesTest11
          active.ok
      endif
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
+    'print warning if no printer is available
+    kontext
+    if active.exists(5) then
+        qaErrorlog "print warning: '" & active.getText & "'"
+        active.ok
+    endif
+
+    '/// turn off "Asian Language support" , Check if the number in listbox numbering  is right
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
 
-       FormatNumberingBullets
+        FormatNumberingBullets
         Kontext
         Active.SetPage TabOptionenNumerierung
         Kontext "TabOptionenNumerierung"
 
-         iCount = Numerierung.GetItemCount
+        iCount = Numerierung.GetItemCount
         if iCount <> iHopeNumber2 then
-        for i =1 to iCount
-            printlog "("+i+"/"+iCount+"): "+Numerierung.getItemText(i)
-        next i
-        'Referenze:
-        qaerrorlog "the number of list box numbering is wrong when Asian Language support is off; expected: " + iHopeNumber2 + "; is: " + iCount
+            for i =1 to iCount
+                printlog "(" & i & "/" & iCount & "): " & Numerierung.getItemText(i)
+            next i
+            'Referenze:
+            warnlog "the number of list box numbering is wrong when Asian Language support is off; expected: " & iHopeNumber2 & "; is: " & iCount
         end if
-       TabOptionenNumerierung.Cancel
-  end if
+        TabOptionenNumerierung.Cancel
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tProlongedVowelsTest1
+    '/// Check if the default setting of "Prolonged vowels (ka-/kaa) will be ACTIVATED.
 
-  call  hNewDocument
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
+    '/// turn on "Asian Language support" , Check if the default setting of "Prolonged vowels (ka-/kaa) is ACTIVATED.
+    Call CheckAsianLanguageSupport("On")
 
-  ToolsOptions
-  Call hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE")
+    ToolsOptions
+    Call hToolsOptions("LANGUAGESETTINGS","SEARCHINGINJAPANESE")
 
-  if ProlongedSoundmarks.IsChecked <> TRUE  then
-     warnlog "The default setting of 'Prolonged vowels (ka-/kaa)' isn't ACTIVATED."
-  end if
+    if ProlongedSoundmarks.IsChecked <> TRUE  then
+        warnlog "The default setting of 'Prolonged vowels (ka-/kaa)' isn't ACTIVATED."
+    end if
 
-  Kontext "ExtrasOptionenDlg"
-  ExtrasOptionenDlg.Cancel
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.Cancel
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
@@ -564,39 +634,42 @@ endcase
 
 testcase tCalcUIChangesTest_10
 
+    '/// Check if vertical text box and callout appear or not
 
-  call  hNewDocument
-
-  Call CheckAsianLanguageSupport("On")
-   sleep(1)
-   Call hToolbarSelect("DRAWING", true)
-   try
-     VerticalText.Click
-   catch
-     warnlog "Something wrong in vertical text box when Asian Language support is on"
-   endcatch
-   try
-     VerticalCallout.Click
-   catch
-     warnlog "Something wrong in vertical text callout when Asian Language support is on"
-   endcatch
+    call  hNewDocument
 
-  if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-     Call CheckAsianLanguageSupport("Off")
-      Kontext "Drawbar"
-      try
+    '/// turn on "Asian Language support" , Check if vertical text box and callout appear
+    Call CheckAsianLanguageSupport("On")
+    sleep(1)
+    Call hToolbarSelect("DRAWING", true)
+    try
         VerticalText.Click
-        warnlog "Something wrong in vertical text box when Asian Language support is off"
-      catch
-      endcatch
-      try
+    catch
+        warnlog "Something wrong in vertical text box when Asian Language support is on"
+    endcatch
+    try
         VerticalCallout.Click
-        warnlog "Something wrong in vertical text callout when Asian Language support is off"
-      catch
-      endcatch
-   end if
+    catch
+        warnlog "Something wrong in vertical text callout when Asian Language support is on"
+    endcatch
+
+    '/// turn off "Asian Language support" , Check if vertical text box and callout disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        Kontext "Drawbar"
+        try
+            VerticalText.Click
+            warnlog "Something wrong in vertical text box when Asian Language support is off"
+        catch
+        endcatch
+        try
+            VerticalCallout.Click
+            warnlog "Something wrong in vertical text callout when Asian Language support is off"
+        catch
+        endcatch
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
@@ -604,30 +677,33 @@ endcase
 
 testcase tImpressUIChangesTest_10
 
-  call  hNewDocument
+    '/// Check if vertical text box and callout and fit vertical text to frame appear or not
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
-   sleep(1)
-   Kontext "Drawbar"
-   sleep(1)
-   try
-     VerticalText.Click
-   catch
-     warnlog "Something wrong in vertical text box when Asian Language support is on"
-   endcatch
-
-   if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-      Call CheckAsianLanguageSupport("Off")
-      sleep(1)
-      Kontext "Drawbar"
-      try
+    '/// turn on "Asian Language support" , Check if vertical text box appear
+    Call CheckAsianLanguageSupport("On")
+    sleep(1)
+    Kontext "Drawbar"
+    sleep(1)
+    try
         VerticalText.Click
-        warnlog "Something wrong in vertical text box when Asian Language support is off"
-      catch
-      endcatch
-   end if
+    catch
+        warnlog "Something wrong in vertical text box when Asian Language support is on"
+    endcatch
+
+    '/// turn off "Asian Language support" , Check if vertical text box disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        sleep(1)
+        Kontext "Drawbar"
+        try
+            VerticalText.Click
+            warnlog "Something wrong in vertical text box when Asian Language support is off"
+        catch
+        endcatch
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
@@ -635,28 +711,31 @@ endcase
 
 testcase tDrawUIChangesTest_10
 
-  call  hNewDocument
+    '/// Check if vertical text box and callout and fit vertical text to frame appear or not
+    call  hNewDocument
 
-  Call CheckAsianLanguageSupport("On")
-   Kontext "Drawbar"
-   sleep(1)
-   try
-     VerticalText.Click
-   catch
-     warnlog "Something wrong in vertical text box when Asian Language support is on"
-   endcatch
-
-   if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-      Call CheckAsianLanguageSupport("Off")
-      Kontext "Drawbar"
-      try
+    '/// turn on "Asian Language support" , Check if vertical text box appear
+    Call CheckAsianLanguageSupport("On")
+    Kontext "Drawbar"
+    sleep(1)
+    try
         VerticalText.Click
-        warnlog "Something wrong in vertical text box when Asian Language support is off"
-      catch
-      endcatch
-   end if
+    catch
+        warnlog "Something wrong in vertical text box when Asian Language support is on"
+    endcatch
+
+    '/// turn off "Asian Language support" , Check if vertical text box disappear
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        Kontext "Drawbar"
+        try
+            VerticalText.Click
+            warnlog "Something wrong in vertical text box when Asian Language support is off"
+        catch
+        endcatch
+    end if
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
diff --git a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
index c4caed718803..0df9c6c97aae 100755..100644
--- a/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
+++ b/testautomation/framework/optional/includes/CJK_RubyDialogueProposal_1.inc
@@ -1,7 +1,7 @@
 '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
@@ -39,18 +39,23 @@
 
 testcase tRubyDialog_1
 
- Dim sBaseText , sRubyText   as String
- Dim sBaseText1 , sRubyText1 as String
+    Dim sBaseText , sRubyText   as String
+    Dim sBaseText1 , sRubyText1 as String
 
- sBaseText  = "BaseText"
- sRubyText  = "RubyText"
+    sBaseText  = "BaseText"
+    sRubyText  = "RubyText"
 
- sBaseText1 = "BaseText1"
- sRubyText1 = "RubyText1"
+    sBaseText1 = "BaseText1"
+    sRubyText1 = "RubyText1"
 
-  Call hNewDocument
+    '/// Check Apply and Close button in Ruby dialogue
+    Call hNewDocument
 
-   FormatRuby
+    '/// Check close button.
+    '/// open ruby dialogue , input base text and ruby text , then press close button
+    '/// 1) check if the ruby dialogue is closed
+    '/// 2) check if the base text and ruby text is recorded
+    FormatRuby
     Kontext "RubyDialog"
     Sleep 3
     BasisText1.SetText  sBaseText
@@ -58,19 +63,23 @@ testcase tRubyDialog_1
     RubyText1.SetText   sRubyText
     Sleep 1
 
-   DialogClose.Click
-   Sleep 1
+    DialogClose.Click
+    Sleep 1
 
-   if RubyDialog.Exists then
-       Warnlog "The Ruby dialogue is NOT closed !"
-   end if
+    if RubyDialog.Exists then
+        Warnlog "The Ruby dialogue is NOT closed !"
+    end if
 
-   FormatRuby
+    FormatRuby
     Kontext "RubyDialog"
     Sleep 3
     if Len(BasisText1.GetText) <> 0 then Warnlog "The base text should not been inputed"
     if Len(RubyText1.SetText)  <> 0 then Warnlog "The ruby text should not been inputed"
 
+    '/// Check Apply button -- Normally , we think it is RubyDialog.OK
+    '/// open ruby dialogue , input base text and ruby text , then press close button
+    '/// Press Apply button , then press close button
+    '/// check if the base text and ruby text is recorded
 
     BasisText1.SetText  sBaseText1
     Sleep 1
@@ -80,22 +89,22 @@ testcase tRubyDialog_1
     RubyDialog.OK
     Sleep 2
 
-   DialogClose.Click
-   Sleep 1
+    DialogClose.Click
+    Sleep 1
 
-   EditSelectAll
-   Sleep 1
+    EditSelectAll
+    Sleep 1
 
-   FormatRuby
-   Kontext "RubyDialog"
+    FormatRuby
+    Kontext "RubyDialog"
     Sleep 3
     if BasisText1.GetText <> sBaseText1 then Warnlog "The base text should be "+sBaseText1 + " but get " + BasisText1.GetText
     if RubyText1.GetText  <> sRubyText1 then Warnlog "The ruby text should be "+sRubyText1 + " but get " + RubyText1.GetText
 
-   DialogClose.Click
-   Sleep 1
+    DialogClose.Click
+    Sleep 1
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
@@ -103,61 +112,72 @@ endcase
 
 testcase tRubyDialog_2
 
-  Dim sBaseText as String
+    Dim sBaseText as String
 
-  sBaseText = "test1 test2 test3 test4 test5 test6 test7 test8 test9"
+    sBaseText = "test1 test2 test3 test4 test5 test6 test7 test8 test9"
+    '/// Test scrollbar in Ruby dialog
 
-  Call hNewDocument
+    Call hNewDocument
 
-   FormatRuby
+    '/// when there is less basetext,  the scrollbar should appear
+    FormatRuby
     Kontext "RubyDialog"
     if RubyDialog.HasScrollbar <> TRUE  then warnlog "The Scrollbar should appear when less basetext!"
-   DialogClose.Click
-   Sleep 1
+    DialogClose.Click
+    Sleep 1
 
-   Kontext "DocumentWriter"
-   DocumentWriter.TypeKeys sBaseText
-   DocumentWriter.TypeKeys "<Shift Home>"
+    '/// when there is more basetext(here is >4),  the scrollbar should appear
+    Kontext "DocumentWriter"
+    DocumentWriter.TypeKeys sBaseText
+    DocumentWriter.TypeKeys "<Shift Home>"
 
-   FormatRuby
+    FormatRuby
     Kontext "RubyDialog"
     if RubyDialog.HasScrollbar <> TRUE  then warnlog "The Scrollbar should appear when more basetext!"
-   DialogClose.Click
-   Sleep 1
+    DialogClose.Click
+    Sleep 1
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
 '-------------------------------------------------------------------------
 testcase tRubyDialog_3
 
-  Dim sTestText              as String
-  Dim sBaseText1, sBaseText2 as String
+    Dim sTestText              as String
+    Dim sBaseText1, sBaseText2 as String
 
-  sTestText  = "Test1 Test2"
-  sBaseText1 = "Test1"
-  sBaseText2 = "Test2"
+    sTestText  = "Test1 Test2"
+    sBaseText1 = "Test1"
+    sBaseText2 = "Test2"
 
+    '/// The list in ruby dialogure will be updated as soon as the uses
+    '/// selects new or further words of his text.
+    '/// The update will be done once the user changes his focus
+    '/// back to the Ruby-Dialogue from the text
 
-  Call hNewDocument
+    Call hNewDocument
 
-   DocumentWriter.TypeKeys sTestText
-   DocumentWriter.TypeKeys "<Shift Left>" , 5
+    '/// input 2 test words, and mark the second
+    DocumentWriter.TypeKeys sTestText
+    DocumentWriter.TypeKeys "<Shift Left>" , 5
 
-   FormatRuby
+    '/// There should be only the second test word in basetext1 in ruby dialogue
+    FormatRuby
     Kontext "RubyDialog"
     Sleep 2
     if BasisText1.GetText <> sBaseText2  then warnlog "The BaseText1 should be:" +sBaseText2 + " but get "+BasisText1.GetText
 
-   Kontext "DocumentWriter"
-   try
-    DocumentWriter.TypeKeys "<Shift Home>"
-    Sleep 2
-   catch
-    warnlog "The ruby dialogue is MODE less dialogue , the document can be edited!"
-   endcatch
+    '/// Mark 2 test words
+    Kontext "DocumentWriter"
+    try
+        DocumentWriter.TypeKeys "<Shift Home>"
+        Sleep 2
+    catch
+        warnlog "The ruby dialogue is MODE less dialogue , the document can be edited!"
+    endcatch
 
+    '/// Check if the 2 test words are all in the ruby dialogue when set forcus back to the dialogue
     Kontext "RubyDialog"
     Sleep 1
     'this step is meaningless, just let the focus back to ruby dialogue
@@ -167,10 +187,10 @@ testcase tRubyDialog_3
     Sleep 1
     if BasisText2.GetText <> sBaseText2  then warnlog "The BaseText2 should be:" +sBaseText2 + " but get "+BasisText2.GetText
 
-   DialogClose.Click
-   Sleep 1
+    DialogClose.Click
+    Sleep 1
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
@@ -178,41 +198,42 @@ endcase
 
 testcase tRubyDialog_4
 
-  Dim sCharacterStyle  as String
-  dim i as integer
-
-
-  select case iSprache
-      case 01   :  sCharacterStyle = "Rubies"
-      case 33   :  sCharacterStyle = "Rubys"
-      case 34   :  sCharacterStyle = "Rubys"
-      case 39   :  sCharacterStyle = "Testo Ruby"
-      case 46   :  sCharacterStyle = "Rubytext"
-      case 49   :  sCharacterStyle = "Rubys"
-      case 55   :  sCharacterStyle = "Rubys"
-      case 81   :  sCharacterStyle = "ふりがな"
-      case 82   :  sCharacterStyle = "윗주 달기" ' not sure TBO
-      case 86   :  sCharacterStyle = "拼音和注音符号"
-      case 88   :  sCharacterStyle = "注音符號"
-      case else :' QAErrorLog "Now, the test does not support for the language " +iSprache
-                   Goto endsub
-  end select
-
-  Call hNewDocument
-
-   FormatRuby
+    Dim sCharacterStyle  as String
+    dim i as integer
+
+    '/// Check default setting for Character Style of Ruby Text
+
+    select case iSprache
+    case 01   :  sCharacterStyle = "Rubies"
+    case 33   :  sCharacterStyle = "Rubys"
+    case 34   :  sCharacterStyle = "Rubys"
+    case 39   :  sCharacterStyle = "Testo Ruby"
+    case 46   :  sCharacterStyle = "Rubytext"
+    case 49   :  sCharacterStyle = "Rubys"
+    case 55   :  sCharacterStyle = "Rubys"
+    case 81   :  sCharacterStyle = "ふりがな"
+    case 82   :  sCharacterStyle = "윗주 달기" ' not sure TBO
+    case 86   :  sCharacterStyle = "拼音和注音符号"
+    case 88   :  sCharacterStyle = "注音符號"
+    case else :' QAErrorLog "Now, the test does not support for the language " +iSprache
+        Goto endsub
+    end select
+
+    Call hNewDocument
+
+    FormatRuby
     Kontext "RubyDialog"
     Sleep 3
-    if CharacterStyle.GetSelText <> sCharacterStyle  then 
-       warnlog "Default setting for Character Style of Ruby Text isn't right, should be "+sCharacterStyle + " but get "+CharacterStyle.GetSelText
-       for i = 1 to CharacterStyle.getItemCount
-           printlog "("+i+"/"+CharacterStyle.getItemCount+"): '"+CharacterStyle.getItemText(i)+"'"
-       next i
+    if CharacterStyle.GetSelText <> sCharacterStyle  then
+        warnlog "Default setting for Character Style of Ruby Text isn't right, should be "+sCharacterStyle + " but get "+CharacterStyle.GetSelText
+        for i = 1 to CharacterStyle.getItemCount
+            printlog "("+i+"/"+CharacterStyle.getItemCount+"): '"+CharacterStyle.getItemText(i)+"'"
+        next i
     endif
     DialogClose.Click
-   Sleep 1
+    Sleep 1
 
-  Call hCloseDocument
+    Call hCloseDocument
 
 endcase
 
@@ -220,45 +241,49 @@ endcase
 
 testcase tRubyDialog_5
 
-  Dim sCharacterStyle as String
-  Dim sStyleName as String
-  Dim i as Integer
-  dim iCount as integer
-  dim bError as boolean
-  dim bWileExit as boolean
-
-
-  select case iSprache
-      case 01   :  sCharacterStyle = "Rubies"
-      case 33   :  sCharacterStyle = "Rubys"
-      case 34   :  sCharacterStyle = "Rubys"
-      case 39   :  sCharacterStyle = "Testo Ruby"
-      case 46   :  sCharacterStyle = "Rubytext"
-      case 49   :  sCharacterStyle = "Rubys"
-      case 55   :  sCharacterStyle = "Rubys"
-      case 81   :  sCharacterStyle = "ふりがな"
-      case 82   :  sCharacterStyle = "윗주 달기" ' not sure TBO was "덧말"
-      case 86   :  sCharacterStyle = "拼音和注音符号"
-      case 88   :  sCharacterStyle = "注音符號"
-      case else :' QAErrorLog "Now, the test does not support for the language " +iSprache
-                   Goto endsub
-  end select
-
-  sStyleName = "ZZZ-Test-ZZZ"
-
-  Call hNewDocument
-
-   FormatRuby
+    Dim sCharacterStyle as String
+    Dim sStyleName as String
+    Dim i as Integer
+    dim iCount as integer
+    dim bError as boolean
+    dim bWileExit as boolean
+
+    '/// Check stylist
+
+    select case iSprache
+    case 01   :  sCharacterStyle = "Rubies"
+    case 33   :  sCharacterStyle = "Rubys"
+    case 34   :  sCharacterStyle = "Rubys"
+    case 39   :  sCharacterStyle = "Testo Ruby"
+    case 46   :  sCharacterStyle = "Rubytext"
+    case 49   :  sCharacterStyle = "Rubys"
+    case 55   :  sCharacterStyle = "Rubys"
+    case 81   :  sCharacterStyle = "ふりがな"
+    case 82   :  sCharacterStyle = "윗주 달기" ' not sure TBO was "덧말"
+    case 86   :  sCharacterStyle = "拼音和注音符号"
+    case 88   :  sCharacterStyle = "注音符號"
+    case else :' QAErrorLog "Now, the test does not support for the language " +iSprache
+        Goto endsub
+    end select
+
+    sStyleName = "ZZZ-Test-ZZZ"
+
+    Call hNewDocument
+
+    '/// Open ruby dialogue
+    FormatRuby
     Kontext "RubyDialog"
 
+    '/// Click stylist button
     CallStylist.Click
     Sleep 2
 
     Kontext "Stylist"
     if Stylist.NotExists then
-      Warnlog "No Stylist with clicking Stylist button!"
+        Warnlog "No Stylist with clicking Stylist button!"
     end if
 
+    '/// click Character Style
     Zeichenvorlagen.Click
 
     ' needed to update the listbox count :-(
@@ -282,22 +307,24 @@ testcase tRubyDialog_5
     endif
 
     if (NOT bError) then
+        '/// find entry ruby and add a new entry
         AusSelektion.OpenMenu
         Sleep 1
         printlog "hMenuSelect 1"
         hMenuSelectNr(1)
         printlog "hMenuSelect 1 survived"
         Sleep 1
-    
+
         Kontext "VorlageErzeugen"
         Sleep 1
         Vorlagenname.SetText sStyleName
         Sleep 1
         VorlageErzeugen.OK
         Sleep 2
-    
+
+        '/// check if the new entry is in the  Character Style list box in ruby dialogue
         Kontext "RubyDialog"
-        
+
         ' needed to update the listbox count :-(
         CharacterStyle.typeKeys ("<end><up><down>")
         iCount = CharacterStyle.GetItemCount
@@ -317,14 +344,14 @@ testcase tRubyDialog_5
             CharacterStyle.select (i)
             bError = false
         endif
-    
+
         if (NOT bError) then
             Kontext "Stylist"
             iCount = Vorlagenliste.getItemCount
             i=0
             while ((i<iCount) AND (Vorlagenliste.getItemText (i+1) <> sStyleName))
                 inc (i)
-            printlog "" + (i) + ": " + Vorlagenliste.getItemText (i)
+                printlog "" + (i) + ": " + Vorlagenliste.getItemText (i)
             wEnd
             if (i = iCount) then
                 warnlog "Style (Rubies) not found for deleting: '" + sStyleName + "' inside of entries: " + iCount
@@ -362,7 +389,7 @@ testcase tRubyDialog_5
     DialogClose.Click
     Sleep 1
 
-  Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 
diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc
index e0a07bb6b741..bda3b9a24d8f 100755
--- a/testautomation/framework/optional/includes/options_ooo_general.inc
+++ b/testautomation/framework/optional/includes/options_ooo_general.inc
@@ -1,16 +1,16 @@
 '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: options_ooo_general.inc,v $
+'* $RCSfile: w_grid_layout1.inc,v $
 '*
-'* $Revision: 1.1 $
+'* $Revision: 1.2 $
 '*
-'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:15 $
+'* last change: $Author: jsk $ $Date: 2008-06-17 07:50:24 $
 '*
 '* This file is part of OpenOffice.org.
 '*
@@ -31,20 +31,39 @@
 '*
 '/************************************************************************
 '*
-'* owner : joerg.skottke@sun.com
+'* owner : thorsten.bosbach@sun.com
 '*
-'* short description : 1. test for general group userdata ... view)
+'* short description : Grid Layout for CJK test in Writer
 '*
-'\******************************************************************************
+'\***********************************************************************
 
+private const SOURCE_PATH = "framework\optional\input\CJK\"
 
-testcase tOOoGeneral
+testcase tTextGridDialog_1
 
-   dim lsSave (4) as String
-   dim lbSave (3) as Boolean
+    '/// Check if tabpage 'Text Grid' disappears when "Asian Language support" is NOT checked
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        hNewDocument()
+        FormatPageWriter
+        try
+            Kontext
+            Active.SetPage TabGrid
+            Kontext "TabGrid"
+            TabGrid.Cancel
+            warnlog "Shouldn't get Tabpage: Grid Text"
+        catch
+            Kontext
+            Active.SetPage TabSeite
+            Kontext "TabSeite"
+            TabSeite.Cancel
+        endcatch
+    endif
 
-   hNewDocument
+    '/// Check if tabpage 'Text Grid' appears when "Asian Language support" is checked
+    Call CheckAsianLanguageSupport("On")
 
+    hNewDocument
    ToolsOptions
    hToolsOptions ( "StarOffice", "General" )
 
@@ -72,129 +91,499 @@ testcase tOOoGeneral
    if ( ExtrasOptionenDlg.notExists( 3 ) ) then
         printlog( "Options closed" )
     endif
+    hCloseDocument()
+endcase
 
+'-------------------------------------------------------------------------
 
-   hCloseDocument
+testcase tTextGridDialog_2
+    '/// No grid is active, no changes to existing version
+    Dim testFile , sCorrectResult as String
 
-   printlog " - exit/restart StarOffice"
-   ExitRestartTheOffice
+    testFile       = "gridtest.sxw"
+    sCorrectResult = "1"
 
-   printlog " - check data"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
+    Call hNewDocument
 
-   if Zweistellig.GetText <> "1950" then Warnlog "Year ( 2 digits ) => changes not saved: '" + Zweistellig.GetText +"' #i29810"
-   if Aktivieren.IsChecked <> TRUE then Warnlog "Enable HelpAgent => changes not saved"
-   Zuruecksetzen.Click
-   if gPlatgroup = "w95" then
-      if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!"
-   end if
-   If DruckenStatus.IsChecked = lbSave ( 3 ) then Warnlog "Printing sets 'Document modified' status => changes not saved!"
+    '/// open a test file , and check No Grid checkbox
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
 
-   printlog " - 2. change data"
-   Zweistellig.SetText "1800"
-   DruckenStatus.UnCheck
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
+    endif
+    Kontext "TabGrid"
+    NoGrid.Check
+    Sleep 1
+    TabGrid.OK
+    Sleep 1
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   if ( ExtrasOptionenDlg.notExists( 3 ) ) then
-        printlog( "Options closed" )
+    '/// Active navigator dialogue , set page to '2'  and wait for a while
+    Kontext
+    ViewNavigator
+    Kontext "NavigatorWriter"
+
+    Seitennummer.SetText "2"
+    Sleep 5
+    hCloseNavigator
+
+    '/// In No Grid mode, there should be only 1 page, the focus is before the first line
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<End>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<Shift Left>"
+    hUseAsyncSlot( "EditCopy" )
+
+    if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing NoGrid option!"
+
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tTextGridDialog_3
+    '/// Grid (lines only): The page is set up with a defined number of lines
+    Dim testFile  , sCorrectResult , sLinesPerPage as String
+
+    testFile       = "gridtest.sxw"
+    sCorrectResult = "G"
+    sLinesPerPage  = "10"
+
+    Call hNewDocument
+
+    '/// open a test file and check Grid(lines onle) checkbox ,
+    '/// + set 10 line/page
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
+    endif
+    Kontext "TabGrid"
+    LinesGrid.Check
+    LinesPerPage.SetText sLinesPerPage
+    Sleep 1
+    TabGrid.OK
+    Sleep 1
+
+    '/// Active navigator dialogue , set page to '2'  and wait for a while
+    Kontext
+    ViewNavigator
+    Kontext "NavigatorWriter"
+
+    Seitennummer.SetText "2"
+    Sleep 5
+    hCloseNavigator
+
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<End>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<Shift Left>"
+    hUseAsyncSlot( "EditCopy" )
+
+    if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines only) option!"
+
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tTextGridDialog_4
+    '/// Grid (lines and characters): The page is set up with a defined number of lines and a defined number of characters in each line
+    Dim testFile      , sCorrectResult as String
+    Dim sLinesPerPage , sCharsPerLine  as String
+
+    testFile       = "gridtest.sxw"
+    sCorrectResult = "E"
+    sLinesPerPage  = "10"
+    sCharsPerLine  = "9"
+
+    Call hNewDocument
+
+    '/// open a test file and check Grid(lines and characters) checkbox
+    '/// + set 10 line/page and 9 characters/line
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
     endif
+    Kontext "TabGrid"
+    CharsGrid.Check
+    LinesPerPage.SetText sLinesPerPage
+    CharsPerLine.SetText sCharsPerLine
+    Sleep 1
+    TabGrid.OK
+    Sleep 1
+
+    '/// Active navigator dialogue , set page to '2'  and wait for a while
+    Kontext
+    ViewNavigator
+    Kontext "NavigatorWriter"
+
+    Seitennummer.SetText "2"
+    Sleep 5
+    hCloseNavigator
+
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<End>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<Shift Left>"
+    hUseAsyncSlot( "EditCopy" )
+
+    if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines and characters) option!"
 
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase  tGridDisplay_1
+    '/// Print grid: The grid lines will be printed. Inactive if "Display grid" is inactive.
+    Call hNewDocument
+
+    '/// format / page  / tabpage Text grid
+    '/// + check "display grid" and check "print grid"
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
+    endif
+    Kontext "TabGrid"
+    CharsGrid.Check
+    Display.Check
+    Sleep 1
+    PrintGrid.Check
+    Sleep 1
+    TabGrid.OK
+    Sleep 1
 
-   'It's a little tricky to reproduce.
-   if gPlatgroup = "unx" then
-       hNewDocument()
-       FilePrint
-       Kontext "DruckenDLG"
-       if DruckenDLG.exists(5) then
-           if gPlatform <> "osx" then
-              Eigenschaften.click
-              kontext
-              active.setPage TabSPAPaper
-              Kontext "TabSPAPaper"
-              if TabSPAPaper.exists (5) then
-                  TabSPAPaper.OK
-                  sleep 5
-              else
-                  qaErrorlog "Properties of Printer didn't come up."
-              endif
-            end if
-            Kontext "DruckenDLG"
-            DruckenDLG.OK
-            ' check state
-            kontext
-            if active.exists(5) then
-                printlog "active: printing failed? '" + active.gettext + "'"
-                active.ok
+    '/// Print to printer
+    FilePrint
+    Kontext "Active"
+    if ( Active.Exists( 5 ) ) then
+        if Active.GetRT() = 304 then
+            Active.Ok()
+            QAErrorLog "No Default-Printer!"
+            Kontext "Printing"
+            if ( Printing.exists( 1 )) then
+                Printing.Cancel
             endif
-            try
-                FileSave
-                qaErrorlog "#i52248# Modify flag is set after printing though option is not set."
-                kontext "SpeichernDlg"
-                if SpeichernDlg.exists(5) then
-                    SpeichernDlg.cancel
-                endif
-            catch
-                printlog "#i52248# doesn't come up."
-            endcatch
-       else
-            qaErrorLog "No printer available - resuming."
-            kontext
-            if active.exists(5) then
-                printlog active.getText
-                active.ok
+        endif
+    else
+        Kontext "Printing"
+        if ( Printing.exists( 2 )) then
+            Printing.OK()
+            Printing.notExists( 5 )
+        endif
+        
+        kontext "Active"
+        if active.exists(5) then
+            qaErrorLog active.getText()
+            active.ok()
+        endif
+    endif
+
+    '/// format / page  / tabpage Text grid
+    '/// + check "display grid" and uncheck "print grid"
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
+    endif
+    Kontext "TabGrid"
+    CharsGrid.Check
+    Display.Check
+    Sleep 1
+    PrintGrid.UnCheck
+    Sleep 1
+    TabGrid.OK
+    Sleep 1
+
+    '/// Print to printer
+    FilePrint
+    Kontext "Active"
+    if ( Active.Exists( 5 ) )then
+        if Active.GetRT() = 304 then
+            Active.Ok()
+            QAErrorLog "No Default-Printer!"
+            Kontext "Printing"
+            if ( Printing.exists( 1 )) then
+                Printing.Cancel()
             endif
-       endif
-       hCloseDocument
-   endif
-   
-   printlog " - check data"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
+        endif
+    else
+        Kontext "Printing"
+        if( Printing.exists( 1 )) then
+            Printing.OK
+            Printing.notExists( 5 )
+        endif
+        kontext
+        if ( active.exists( 2 ) ) then
+            qaErrorLog active.getText
+            active.ok
+        endif
+    endif
 
-   if Zweistellig.GetText <> "1800" then Warnlog "Year ( 2 digits ) => changes not saved : '" + Zweistellig.GetText +"'"
-   If DruckenStatus.IsChecked <> FALSE then Warnlog "Printing sets 'Document modified' status => changes not saved!"
-   if StyleSheet.GetSelIndex <> 3 then Warnlog "Style sheet for StarOffice Help => changes not saved!"
+    Call hCloseDocument
+endcase
 
-   printlog " - reset to saved data"
-   Zweistellig.SetText lsSave ( 1 )
-   Aktivieren.Check
-   Zuruecksetzen.Click
-   if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck
-   if gPlatgroup = "w95" then
-      if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Check else StarOfficeDialogeBenutzen.UnCheck
-   end if
-   If lbSave(3)= TRUE then DruckenStatus.Check else DruckenStatus.UnCheck
-   StyleSheet.Select lsSave(3)
+'-------------------------------------------------------------------------
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   if ( ExtrasOptionenDlg.notExists( 3 ) ) then
-        printlog( "Options closed" )
+testcase tUserDefineLayout_1
+    '/// Decrease characters per line will cause lines per page decrease accordingly
+    Dim sLinesPerPage       , sCharsPerLine          as String
+    Dim sExpectLinesPerPage , sExpectLinesPerPage1   as String
+
+    sLinesPerPage  = "20"
+    sCharsPerLine  = "2"
+    sExpectLinesPerPage   = "2"
+    sExpectLinesPerPage1  = "3"
+
+    Call hNewDocument
+
+    '/// Format/page , set lines per page to 20, and set charsets per line to 2
+    '/// + wait for a moment , then check the the number  of lines per page.
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
     endif
+    Kontext "TabGrid"
+    CharsGrid.Check
 
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
+    LinesPerPage.SetText sLinesPerPage
+    Sleep 2
+    CharsPerLine.SetText sCharsPerLine
+    Sleep 2
 
-   printlog " - check the reset data"
-   if Zweistellig.GetText <> lsSave ( 1 ) then Warnlog "Year ( 2 digits ) => changes not saved"
-   if Aktivieren.IsChecked <> lbSave (1) then Warnlog "Enable HelpAgent => changes not saved"
-   Aktivieren.Check
-   Zuruecksetzen.Click
-   if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck
-   if gPlatgroup = "w95" then
-      if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!"
-   end if
-   If DruckenStatus.IsChecked <> lbSave(3) then Warnlog "Printing sets 'Document modified' status => changes not saved!"
-   if StyleSheet.GetSelText <> lsSave (3) then Warnlog "Style sheet for StarOffice Help => changes not saved!"
+    'This step is no use, just let the LinesPerPage change the number
+    CharsGrid.Check
 
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   if ( ExtrasOptionenDlg.notExists( 3 ) ) then
-        printlog( "Options closed" )
+    if LinesPerPage.GetText <> sExpectLinesPerPage AND LinesPerPage.GetText <> sExpectLinesPerPage1 then
+        Warnlog "The lines per page should be"  + sExpectLinesPerPage + " OR " + sExpectLinesPerPage1 +" but get " +LinesPerPage.GetText
     endif
 
+    TabGrid.Cancel
+
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tFontSizeChanges_1
+    '/// Change the font size to bigger enough will change the layout
+    Dim testFile      , sCorrectResult as String
+    Dim sLinesPerPage , sCharsPerLine  as String
+    dim sTemp as string
+
+    testFile       = "FontSizeChanges_1.sxw"
+    sCorrectResult = "1"
+    sLinesPerPage  = "2"
+    sCharsPerLine  = "9"
+
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<Shift Right>"
+
+    Kontext "FormatObjectbar"
+    Schriftgroesse.Select   "60"
+    Schriftgroesse.TypeKeys "<Return>"
+    Sleep 1
+
+    Kontext "DocumentWriter"
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
+    endif
+    Kontext "TabGrid"
+    if TabGrid.exists(5) then
+        sTemp = LinesPerPage.GetText
+        if sTemp <> sLinesPerPage then
+            Warnlog "The lines per page should be: '" + sLinesPerPage + "'; but get: '" + sTemp + "'"
+        endif
+        sTemp = CharsPerLine.GetText
+        if sTemp <> sCharsPerLine then
+            Warnlog "The chars per line should be: '" + sCharsPerLine + "'; but get: '" +sTemp + "'"
+        endif
+        TabGrid.Cancel
+    else
+        warnlog "TabGrid is not available."
+    endif
+
+    Kontext
+    ViewNavigator
+    Kontext "NavigatorWriter"
+    if NavigatorWriter.exists(5) then
+        Seitennummer.SetText "2"
+        Sleep 5
+    else
+        warnlog "Navigator not available"
+    endif
+    hCloseNavigator
+
+    Kontext "DocumentWriter"
+    sleep 3
+    Call DocumentWriter.TypeKeys  "<Shift Right>"
+
+    hUseAsyncSlot( "EditCopy" )
+    sTemp = GetClipboardText
+    if sTemp <> sCorrectResult then
+        Warnlog "Don't get the expected result , hope to be: '" + sCorrectResult + "'; but get: '" + sTemp + "'"
+    endif
+
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tRubyText_1
+    '/// If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself.
+    Dim testFile , sRubyText as String
+
+    testFile   = "rubytest.sxw"
+    sRubyText  = "Ruby Test Text ....................."
+
+    Call hNewDocument
+
+    '/// open a test file , and insert  long ruby test text
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<Shift Right>"
+    Sleep 1
+
+    FormatRuby
+    Kontext "RubyDialog"
+    Sleep 3
+    RubyText1.setText sRubyText
+    Sleep 2
+    RubyDialog.OK
+    Sleep 2
+    DialogClose.Click
+    Sleep 1
+
+    Kontext "DocumentWriter"
+    FormatAutoformatApply
+    Sleep 2
+    Call DocumentWriter.TypeKeys  "<End>"
+    Sleep 2
+    Call DocumentWriter.TypeKeys  "<Shift Left>"
+    hUseAsyncSlot( "EditCopy" )
+
+    if NOT(GetClipboardText = "5" OR GetClipboardText = "6") then
+        Warnlog "Don't get the correct result after inserting ruby text! Get " + GetClipboardText
+    endif
+
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tIndentsTest_1
+    '/// Indents should work and always indenting as close as possible to their measurements by snapping to the appropriate grid cell. Tabs therefore will be ignored.
+    Dim testFile , sCorrectPage1 , sCorrectPage2 as String
+
+    testFile       = "IndentsTest.sxw"
+    sCorrectPage1  = "1"
+    sCorrectPage2  = "2"
+
+    Call hNewDocument
+
+    '/// open a test file , and press TAB in second line
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<Down>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<Tab>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<End>"
+    Sleep 1
+
+    '/// Active navigator dialogue , check if the page number is 1
+    Kontext
+    ViewNavigator
+    Kontext "NavigatorWriter"
+    if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!"
+    hCloseNavigator
+
+    '/// press TAB in second line again
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<Home>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<Tab>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<End>"
+    Sleep 1
+
+    '/// Active navigator dialogue , check if the page number is 2
+    Kontext
+    ViewNavigator
+    Kontext "NavigatorWriter"
+    if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!"
+    hCloseNavigator
+
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tObjectsTest_1
+    '/// If objects are anchored to text they will "wander" with its surrounding text.
+    '/// If they are anchored as character they will snap to the appropriate grid cell (since they are a character).
+    Dim testFile , sCorrectPage1 , sCorrectPage2 as String
+
+    testFile       = "objectsTest.sxw"
+    sCorrectPage1  = "1"
+    sCorrectPage2  = "2"
+
+    Call hNewDocument
+
+    '/// open a test file , and press TAB in second line
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+
+    '/// If object is anchored as Character , check if it will snap to the appropriate grid cell
+    fStartupNavigator( "OLEObject" , 1 )
+    Sleep 1
+    Auswahlliste.TypeKeys "<Return>"
+    Sleep 1
+    hCloseNavigator
+
+    Kontext
+    FormatAnchorAsCharacter 
+    WaitSlot()
+
+
+    ViewNavigator
+    Kontext "NavigatorWriter"
+    Seitennummer.SetText   sCorrectPage2
+    Sleep 5
+    if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!"
+    hCloseNavigator
+
+    '/// If object is anchored to Character , check if it will NOT snap to the appropriate grid cell
+    fStartupNavigator( "OLEObject" , 1 )
+    Auswahlliste.TypeKeys "<Return>"
+    hCloseNavigator
+
+    Kontext
+    FormatAnchorToCharacter
+
+    ViewNavigator
+    Kontext "NavigatorWriter"
+    Seitennummer.SetText   sCorrectPage2
+    Sleep 5
+    if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!"
+    hCloseNavigator
+    Kontext
 
+    Call hCloseDocument
 endcase
 
diff --git a/testautomation/framework/optional/includes/options_so_4.inc b/testautomation/framework/optional/includes/options_so_4.inc
deleted file mode 100755
index e8c5639d5f35..000000000000
--- a/testautomation/framework/optional/includes/options_so_4.inc
+++ /dev/null
@@ -1,707 +0,0 @@
-'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: options_so_4.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:15 $
-'*
-'* 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@sun.com
-'*
-'* short description : options test (General/Memory/View) 
-'*
-'\******************************************************************************
-
-testcase func_StarOfficeGeneral_1
-   gApplication = "WRITER"
-  Dim sSave as String
-  Dim ClipText as String
-
-
- printlog " - other"
- printlog "   - years two digits => 1899"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   sSave = Zweistellig.GetText
-   Zweistellig.SetText "1899"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   gApplication = "CALC"
-   hNewDocument
-   DocumentCalc.TypeKeys "04.03.00<return>"
-   DocumentCalc.TypeKeys "<up>"
-   DocumentCalc.TypeKeys "<F2><Home><Shift End>"
-   Sleep (1)
-   EditCopy
-   DocumentCalc.TypeKeys "<Escape>"
-
-   ClipText = GetClipboardText
-   if ClipText <> "04.03.1900" AND ClipText <> "04/03/1900" then Warnlog "Wrong date not 04.03.1900 or 04/03/1900 :  => '" + ClipText + "'"
-
-   hCloseDocument
-
- printlog "   - years two digits => 2050"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Zweistellig.SetText "2050"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   gApplication = "CALC"
-   hNewDocument
-   DocumentCalc.TypeKeys "05.03.68<return>"
-   DocumentCalc.TypeKeys "<up>"
-   DocumentCalc.TypeKeys "<F2><Home><Shift End>"
-   Sleep (1)
-   EditCopy
-   DocumentCalc.TypeKeys "<Escape>"
-
-   ClipText = GetClipboardText
-   if ClipText <> "05.03.2068" AND ClipText <> "05/03/2068" then Warnlog "Wrong date not 05.03.2068 or 05/03/2068 :  => '" + ClipText + "'"
-
-   hCloseDocument
-
- printlog "   - reset to default"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Zweistellig.SetText sSave
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   gApplication = "WRITER"
-endcase
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficeGeneral_2
-  Dim bSave as Boolean
-  Dim sSave as String
-  Dim i as Integer, iTime as Integer
-
-  gApplication = "WRITER"
-
- printlog "tools / options / staroffice / general -> help agent"
- printlog "- check the minimum and the maximum of display duration for help agent ( 60sec and 5sec )"
- printlog "   activate the help agent options-dialog -> OK"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   bSave = Aktivieren.IsChecked
-   Aktivieren.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
- printlog "- working with activated HelpAgent"
- printlog "  - check display duration of 10sec"
- printlog "    new writer-doc"
-  gApplication = "WRITER"
-  hNewDocument
-
- printlog "    tools / options / staroffice / general -> help agent -> duration to 10 -> "
- printlog "    click also reset to delete the ignore-list for help-agent -> options-dialog OK"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Zuruecksetzen.Click
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
- printlog "    Format/Character - Font-Tabpage => help-agent must be activated"
- printlog "    check if agent closed after ~10sec"
-   FormatCharacter
-   Kontext
-   active.SetPage TabFont
-
-   Kontext "HelpAgent"
-   if HelpAgent.Exists(1) <> TRUE then
-      Warnlog "The help agent wasn't activated for autocorrection!"
-   else
-      for i=1 to 20
-         if HelpAgent.Exists then
-            Sleep 1
-         else
-            iTime = i
-            i=21
-         end if
-      next i
-      if iTime < 9 then Warnlog "The help agent is closed faster than 9 seconds!"
-      if iTime > 12 then Warnlog "The help agent isn't closed after 12 seconds!"
-      if HelpAgent.Exists then
-         Warnlog "The help agent isn't closed after 20 seconds, the test close it!"
-         HelpAgent.Close
-      end if
-   end if
-
-   Kontext "TabFont"
-   TabFont.Cancel
- printlog "    close options-dialog and close the writer-doc"
-   hCloseDocument
-
- printlog " - check another display duration of 40sec"
- printlog "    new writer-doc"
-   hNewDocument
- printlog "    tools / options / staroffice / general -> help agent -> duration to 40 -> options-dialog OK"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Aktivieren.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
- printlog "    Format/Character - Font-Tabpage => help-agent must be activated"
- printlog "    check if agent closed after ~40sec"
-   FormatCharacter
-   Kontext
-   active.SetPage TabFont
-
-   Kontext "HelpAgent"
-   if HelpAgent.Exists(1) <> TRUE then
-      Warnlog "The help agent wasn't activated for autocorrection!"
-   else
-      for i=1 to 60
-         if HelpAgent.Exists then
-            Sleep 1
-         else
-            iTime = i
-            i=61
-         end if
-      next i
-      if iTime < 35 then Warnlog "The help agent is closed faster than 35 seconds!"
-      if iTime > 45 then Warnlog "The help agent isn't closed after 45 seconds!"
-      if HelpAgent.Exists then
-         Warnlog "The help agent isn't closed after 40 seconds, the test close it!"
-         HelpAgent.Close
-      end if
-   end if
-   Kontext "TabFont"
-   TabFont.Cancel
-
- printlog "    close options-dialog and close the writer-doc"
-   hCloseDocument
-
- printlog " - check another display duration of 60sec"
- printlog "    new writer-doc"
-   hNewDocument
- printlog "    tools / options / staroffice / general -> help agent -> duration to 60 -> options-dialog OK"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Aktivieren.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
- printlog "    Format/Character - Font-Tabpage => help-agent must be activated"
-   FormatCharacter
-   Kontext
-   active.SetPage TabFont
-
-   Kontext "HelpAgent"
-   if HelpAgent.Exists(1) <> TRUE then
-      Warnlog "The help agent wasn't activated for autocorrection!"
-   else
-      for i=1 to 80
-         if HelpAgent.Exists then
-            Sleep 1
-         else
-            iTime = i
-            i=81
-         end if
-      next i
-      if iTime < 55 then Warnlog "The help agent is closed faster than 55 seconds!"
-      if iTime > 65 then Warnlog "The help agent isn't closed after 65 seconds!"
-      if HelpAgent.Exists then
-         Warnlog "The help agent isn't closed after 60 seconds, the test close it!"
-         HelpAgent.Close
-      end if
-   end if
-
-   Kontext "TabFont"
-   TabFont.Cancel
-
- printlog "    close options-dialog and close the writer-doc"
-   hCloseDocument
-
- printlog " - check if the help agent isn't active, when you ignore it 3 times ( inserted in the ignore-list )"
- printlog "    new writer-doc"
-   hNewDocument
-  printlog "    tools / options / staroffice / general -> help agent -> duration to 10 -> options-dialog OK"
-  ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Aktivieren.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
- printlog "    Format/Character - Font-Tabpage => help-agent should not be activated"
-   FormatCharacter
-   Kontext
-   active.SetPage TabFont
-
-   Kontext "HelpAgent"
-   if HelpAgent.Exists then
-      Warnlog "Ignore HelpAgent 3 time for the same slot does not work, HelpAgent is active!"
-      HelpAgent.Close
-   end if
-   Kontext "TabFont"
-   TabFont.Cancel
-
- printlog "    close options-dialog and close the writer-doc"
-   hCloseDocument
-
- printlog " - check if ignore-list can be deleted"
- printlog "    new writer-doc"
-   hNewDocument
-  printlog "    tools / options / staroffice / general -> help agent -> click on reset -> options-dialog OK"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Aktivieren.Check
-   Zuruecksetzen.Click
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
- printlog "    Format/Character - Font-Tabpage => help-agent should not be activated"
-   FormatCharacter
-   Kontext
-   active.SetPage TabFont
-
-   Kontext "HelpAgent"
-   if HelpAgent.Exists(2) <> TRUE then
-      Warnlog "Ignore-list isn't reset, the HelpAgent is not active"
-   else
-      HelpAgent.Close
-   end if
-   Kontext "TabFont"
-   TabFont.Cancel
-
- printlog "    close options-dialog and close the writer-doc"
-   hCloseDocument
-
- printlog " - working with deactivated the help agent"
- printlog "    new writer-doc"
-   hNewDocument
-  printlog "    tools / options / staroffice / general -> deactivate help agent -> options-dialog OK"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Aktivieren.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
- printlog "    Format/Character - Font-Tabpage => help-agent ust be activated"
-   FormatCharacter
-   Kontext
-   active.SetPage TabFont
-
-   Kontext "HelpAgent"
-   if HelpAgent.Exists(1) = TRUE then
-      Warnlog "The help agent was active!"
-      HelpAgent.Close
-   end if
-   Kontext "TabFont"
-   TabFont.Cancel
-
- printlog "    close options-dialog and close the writer-doc"
-   hCloseDocument
-
- printlog "  - reset help-agent-options"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   Aktivieren.Check
-   Zuruecksetzen.Click
-   if bSave = TRUE then Aktivieren.Check else Aktivieren.UnCheck
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-endcase
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficeGeneral_3
-  Dim bStatus as Boolean
-
-  gApplication = "WRITER"
-
-
- printlog "StarOffice / General => 'printing sets 'document modified' status'"
- printlog "save a writer-doc"
-   hNewDocument
-   Kontext "DocumentWriter"
-   DocumentWriter.TypeKeys "This is a file, for options test: <return> Tools / Options / StarOffice / General -> 'Printing sets 'document modified' status'"
-   DocumentWriter.TypeKeys "<Return><Return>This file is created by an automated test. It can be trashed after one day!<Return>Today is " + Date
-   hFileSaveAsKill ( gOfficePath + "user\work\opt.sxw" )
-
- printlog "- open tools/option/StarOffice/general and save the state of the checkbox"
- printlog "- check it"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   bStatus = DruckenStatus.IsChecked
-   DruckenStatus.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
- printlog "- file/print and click OK at the print-dialog"
-   FilePrint
-   
-   Kontext "Active"
-   if Active.Exists() then
-      warnlog( "Unexpected dialog, no default printer found (#108776?)" )
-      Active.OK()
-   else
-      Kontext "DruckenDlg"
-      DruckenDlg.OK
-      Sleep (5)
-   endif
-
- printlog "- file/close"
-   FileClose
-   Kontext "Active"
-   if Active.Exists(2) <> TRUE then
-      Warnlog "No warning, when this options is checked!"
-   else
-      Active.Cancel
-   end if
-
- printlog "- file/save"
-   FileSave
-
- printlog "- uncheck the checkbox"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   DruckenStatus.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
- printlog "- file/print"
-   FilePrint
-   Kontext "DruckenDlg"
-   DruckenDlg.OK
-   Sleep (5)
-
- printlog "- file/close"
-   FileClose
-   Kontext "Active"
-   if Active.Exists(2) then
-      Warnlog "The document is modified, a messagebox came up at closing"
-      Active.Yes
-   end if
-
- printlog "- reset this option"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "General" )
-   if bStatus = TRUE then DruckenStatus.Check else DruckenStatus.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-endcase
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficeGeneral_4
-  Dim bStatus as Boolean
-
-  gApplication = "WRITER"
-
-
-   hNewDocument
- printlog "StarOffice / General => 'use StarOffice dialogs'"
-   if gPlatgroup = "unx" then
-      printlog "This feature is only available on windows systems"
-   else
- printlog "- open tools/options/staroffice/general and uncheck 'use StarOffice dialogs'"
-      ToolsOptions
-      hToolsOptions ( "StarOffice", "General" )
-      bStatus = StarOfficeDialogeBenutzen.IsChecked
-      StarOfficeDialogeBenutzen.UnCheck
-      Kontext "ExtrasOptionenDlg"
-      ExtrasOptionenDlg.OK
-      Sleep (2)
-
- printlog "- file/open and check if the file-dialog is a system-dialog"
-      FileOpen
-      if ExistsSysDialog ( FilePicker ) = FALSE then
-         Warnlog "The file-open-dialog is no system dialog"
-         Kontext "OeffnenDlg"
-         OeffnenDlg.Cancel
-      else
-         CloseSysDialog ( FilePicker )
-      end if
-
- printlog Chr(13) + "check that StarOffice dialogs are used => state of the checkbox is checked"
- printlog "- open tools/options/staroffice/general"
-      ToolsOptions
-      hToolsOptions ( "StarOffice", "General" )
-      StarOfficeDialogeBenutzen.Check
-      Kontext "ExtrasOptionenDlg"
-      ExtrasOptionenDlg.OK
-      Sleep (2)
-
- printlog "- open tools/options/staroffice/general and check 'use StarOffice dialogs'"
-      FileOpen
-      Kontext "OeffnenDlg"
-      if OeffnenDlg.Exists (1) <> TRUE then
-         Warnlog "StarOffice dialogs are not used!"
-         if ExistsSysDialog ( FilePicker ) then CloseSysDialog ( FilePicker )
-      else
-         OeffnenDlg.Cancel
-      end if
-
- printlog Chr(13) + "reset the state of 'use StarOffice dialogs' to default"
-      ToolsOptions
-      hToolsOptions ( "StarOffice", "General" )
-      if bStatus = TRUE then StarOfficeDialogeBenutzen.Check else StarOfficeDialogeBenutzen.UnCheck
-      Kontext "ExtrasOptionenDlg"
-      ExtrasOptionenDlg.OK
-      Sleep (2)
-   end if
-
-   hCloseDocument
-
-endcase
-
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficeMemory_1
-   Dim sSave as String
-   Dim i, ilast as Integer
-   gApplication = "WRITER"
-
-
- printlog " - save"
- printlog "    - undo"
- printlog "    - set number of steps => 1"
-
-   hNewDocument
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Memory" )
-   sSave = UndoSteps.GetText
-   UndoSteps.SetText "1"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   DocumentWriter.TypeKeys "Hello "
-   DocumentWriter.TypeKeys "friends "
-
-   EditUndo
-   try
-      EditUndo
-      Warnlog "More than 1 undo was possible!"
-   catch
-   endcatch
-
- printlog "    - set number of steps => 15"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Memory" )
-   UndoSteps.SetText "15"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   for i=1 to 20
-      DocumentWriter.TypeKeys "Hello<return>"
-   next i
-   Sleep (2)
-
-   for i=1 to 20
-      if i<16 then
-         try
-            EditUndo
-         catch
-            iLast = i-1
-            Warnlog "The 15th undo was impossible! The test can do only " + iLast + " undos!  => BugID 83891"
-         endcatch
-      else
-         try
-            EditUndo
-            Warnlog "More than 15 undo was possible!"
-         catch
-         endcatch
-      end if
-   next i
-
- printlog "    - set number of steps => 99"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Memory" )
-   UndoSteps.SetText "99"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   for i=1 to 102
-      DocumentWriter.TypeKeys "Hello<return>"
-   next i
-
-   for i=1 to 102
-      if i<100 then
-         try
-            EditUndo
-         catch
-            iLast = i-1
-            Warnlog "The 99th undo was impossible! The test can do only " + iLast + " undos!  => BugID 83891"
-            i=105
-         endcatch
-      else
-         try
-            EditUndo
-            Warnlog "More than 99 undo are possible!"
-         catch
-            i=105
-         endcatch
-      end if
-   next i
-
-   hCloseDocument
-
- printlog "    - reset the number of steps"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Memory" )
-   UndoSteps.SetText sSave
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-endcase
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficeView_1
-  Dim bSave as Boolean
-  Dim iSave as Integer
-  Dim sSave as String
-
-hNewDocument
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
- printlog " - view"
- printlog "   - display"
- printlog "    - scaling"
-   sSave = FontScale.GetText
-   FontScale.SetText "50"
-   FontScale.More
-   FontScale.Less
- printlog "      - " + FontScale.GetText
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call DialogTestForViewOptions
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   FontScale.SetText "150"
-   FontScale.More
-   FontScale.Less
- printlog "      - " + FontScale.GetText
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call DialogTestForViewOptions
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   FontScale.SetText(sSave)
-   FontScale.More
-   FontScale.Less
- printlog "      - " + FontScale.GetText
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-   hclosedocument
-endcase
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficeView_2
-   Dim iSave as Integer
-
- printlog " - view"
- printlog "   - mouse positioning"
-
-   hNewDocument
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   iSave = MousePositioning.GetSelIndex
-   MousePositioning.Select 1
- printlog "      - " + MousePositioning.GetSelText
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   DocumentWriter.MouseMove 1, 1
-
-   DialogTestForViewOptions
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   MousePositioning.Select 2
- printlog "      - " + MousePositioning.GetSelText
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   DocumentWriter.MouseMove 1, 1
-
-   DialogTestForViewOptions
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   MousePositioning.Select 3
- printlog "      - " + MousePositioning.GetSelText
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   DocumentWriter.MouseMove 1, 1
-
-   DialogTestForViewOptions
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   MousePositioning.Select iSave
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   hCloseDocument
-endcase
-
-
diff --git a/testautomation/framework/optional/includes/options_so_5.inc b/testautomation/framework/optional/includes/options_so_5.inc
deleted file mode 100755
index 200e37ad47c1..000000000000
--- a/testautomation/framework/optional/includes/options_so_5.inc
+++ /dev/null
@@ -1,612 +0,0 @@
-'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: options_so_5.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:15 $
-'*
-'* 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@sun.com
-'*
-'* short description : general option test 
-'*                                           
-'\******************************************************************************
-
-
-testcase func_StarOfficeView_3
-
-   Dim bSave as Boolean
-   Dim iSave as Integer
-   Dim xPos, yPos as Integer
-
-   printlog " - view"
-   printlog "   - buttons"
-
-   hNewDocument
-
-   Kontext "DocumentWriter"
-   xPos = DocumentWriter.getSizeX
-   yPos = DocumentWriter.getSizeY
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   
-   iSave = IconScale.getSelIndex()
-   
-   printlog "     - set buttonsize to 'large'"
-   IconScale.Select( 3 )
-   
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   if DocumentWriter.getSizeX = xPos AND DocumentWriter.getSizeY = yPos then 
-      warnlog "Perhaps the buttons are not large!"
-      endif
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   
-   printlog "     - set buttonsize to 'small'"
-   IconScale.Select( 2 )
-   
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   if DocumentWriter.getSizeX <> xPos OR DocumentWriter.getSizeY <> yPos then 
-      warnlog "Perhaps the buttons are not small!"
-      endif
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   
-   printlog "     - large buttons => default"
-   if iSave <> 1 then 
-      IconScale.Select( iSave ) 
-      endif
-   
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   hCloseDocument
-endcase
-
-'*******************************************************************************
-
-testcase func_StarOfficeView_4
-  Dim bSave ( 10 ) as Boolean
-  Dim i as Integer, iCount as Integer
-
- printlog " - view"
- printlog "   - options"
-
-   hNewDocument
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   bSave(4) = VorschauInSchriftlisten.IsChecked
-   bSave(6) = SchriftenHistorie.IsChecked
-
- printlog "     - inactive menu items : => check"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   DocumentWriter.OpenContextMenu
-   iCount = hMenuItemGetCount
-   Sleep (2)
-   hMenuClose
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
- printlog "     - inactive menu items : => uncheck"
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "DocumentWriter"
-   DocumentWriter.OpenContextMenu
-   if hMenuItemGetCount <> iCount then
-      Warnlog "The number of entries at the context menu on a writer doc is NOT the same at 'show inactive' is checked or not => BUG!"
-   end if
-   Sleep (2)
-   hMenuClose
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
- printlog "     - preview in fontlist : => Uncheck"
-   VorschauInSchriftlisten.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "textobjectbar"
-   if textobjectbar.exists then
-   for i=1 to Schriftart.GetItemCount
-      Schriftart.Select i
-   next i
-   else
-   warnlog "No Textobjectbar?"
-   endif
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
- printlog "     - preview in fontlist : => check"
-   VorschauInSchriftlisten.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "textobjectbar"
-   for i=1 to Schriftart.GetItemCount
-      Schriftart.Select i
-   next i
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   if bSave(4) = TRUE then VorschauInSchriftlisten.Check else VorschauInSchriftlisten.UnCheck
- printlog "     - font history : => Uncheck"
-   SchriftenHistorie.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "textobjectbar"
-   for i=1 to Schriftart.GetItemCount
-      Schriftart.Select i
-   next i
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
- printlog "     - font history : => check"
-   SchriftenHistorie.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Kontext "textobjectbar"
-   for i=1 to Schriftart.GetItemCount
-      Schriftart.Select i
-   next i
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   if bSave(6) = TRUE then SchriftenHistorie.Check else SchriftenHistorie.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   hCloseDocument
-
-endcase
-
-'*******************************************************************************
-
-testcase func_StarOfficeView_5
-
-   Dim bSave ( 5 ) as Boolean
-   Dim i as Integer
-
-   printlog " - view"
-   printlog "   - 3D-view"
-
-   printlog "     - use OpenGL => Uncheck"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   bSave (1) = OpenGL.IsChecked
-   bSave (2) = OptimierteAusgabe.IsChecked
-   
-   OpenGL.Uncheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
-   printlog "     - use OpenGL => Check   + optimized output => UnCheck"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   OpenGL.Check
-   OptimierteAusgabe.Uncheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
-   printlog "     - use OpenGL => Check   + optimized output => Check"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   OpenGL.Check
-   OptimierteAusgabe.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
- printlog "     - use dithering => uncheck"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   if bSave(2) = TRUE then OptimierteAusgabe.Check else OptimierteAusgabe.Check
-   if bSave(1) = TRUE then OpenGL.Check else OpenGL.UnCheck
-   bSave (3) = Dithering.IsChecked
-   Dithering.Uncheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
- printlog "     - use dithering => Check"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   Dithering.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
- printlog "     - use OpenGL => UnCheck  + Dithering => UnCheck!"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   OpenGL.Uncheck
-   Dithering.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
- printlog "     - Object refresh after interaction => check!"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   if bSave(1) = TRUE then OpenGL.check else OpenGL.UnCheck
-   if bSave(3) = TRUE then Dithering.Check else Dithering.UnCheck
-   bSave (4) = Volldarstellung.IsChecked
-   Volldarstellung.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
- printlog "     - use OpenGL => UnCheck  + Object refresh after interaction => check!"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   OpenGL.Uncheck
-   Volldarstellung.Check
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
- printlog "     - Object refresh after interaction => UnCheck!"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   if bSave(1) = TRUE then OpenGL.check else OpenGL.UnCheck
-   Volldarstellung.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   Call Make3D
-
- printlog "     - reset to default"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   if bSave(4) = TRUE then Volldarstellung.check else Volldarstellung.UnCheck
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   gApplication = "WRITER"
-endcase
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficeView_6
-  Dim bSave as Boolean
-  Dim sSave as String
-  Dim i as Integer
-
-  if gPlatgroup <> "unx" then
-     printlog "No test for 'anti aliasing' fonts on windows platforms!"
-     goto endsub
-  end if
-
- printlog "open a new writer-document"
-   gApplication = "WRITER"
-   hNewDocument
-
- printlog " - view"
- printlog "   - anti aliasing"
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-
-   bSave = FontAntiAliasing.IsChecked
-   FontAntiAliasing.Check
-   sSave = AAPixel.GetText
-
- printlog " change pixelsize to 5"
-   AAPixel.SetText "5"
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-   for i=1 to 8
-      Kontext "DocumentWriter"
-      DocumentWriter.UseMenu
-      hMenuSelectNr i
-      Sleep (2)
-      hMenuClose
-   next i
-
- printlog " change pixelsize to 15"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   AAPixel.SetText "15"
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-   for i=1 to 8
-      Kontext "DocumentWriter"
-      DocumentWriter.UseMenu
-      hMenuSelectNr i
-      Sleep (2)
-      hMenuClose
-   next i
-
- printlog " change pixelsize to 25"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   AAPixel.SetText "25"
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-   for i=1 to 8
-      Kontext "DocumentWriter"
-      DocumentWriter.UseMenu
-      hMenuSelectNr i
-      Sleep (2)
-      hMenuClose
-   next i
-
- printlog " reset all changes to raw data"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "View" )
-   AAPixel.SetText sSave
-   if bSave = TRUE then FontAntiAliasing.Check else FontAntiAliasing.UnCheck
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-
-   hCloseDocument
-
-endcase
-
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-' > * > * > * > * > * > * > * > * > * > * > * > * > * > * > * > *
-testcase func_StarOfficePrint_1
-  Dim bSave as Boolean, bSave2 as Boolean
-  Dim i as Integer
-
-   gApplication = "DRAW"
-
- printlog "   - printer warnings"
-
- printlog "     - Paper size => active"
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Print" )
-
-   bSave = PaperSize.IsChecked
-   PaperSize.Check
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   hNewDocument
-   FormatSlideDraw
-   Kontext
-   Active.Setpage TabSeite
-   Kontext "TabSeite"
-   Papierformat.Select 1            ' select the format A0
-   TabSeite.OK
-
-   FilePrint
-   Kontext "DruckenDlg"
-   if DruckenDlg.Exists then
-      DruckenDlg.OK
-      Sleep 5
-      Kontext "WarningPrintOptions"
-      if WarningPrintOptions.Exists(3) then
-         WarningPrintOptions.Cancel
-      else
-         Warnlog "The warning-message for papersize does not turn up!"
-      end if
-   else
-      Kontext "Active"
-      if Active.Exists then Warnlog Active.GetText
-      Active.OK
-   end if
-
-   hCloseDocument
-
- printlog "     - Paper size => disabled"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Print" )
-
-   PaperSize.uncheck
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   hNewDocument
-   FormatSlideDraw
-   Kontext
-   Active.Setpage TabSeite
-   Kontext "TabSeite"
-   Papierformat.Select 1            ' select the format A0
-   TabSeite.OK
-
-   FilePrint
-   Kontext "DruckenDlg"
-   if DruckenDlg.Exists then
-      DruckenDlg.OK
-      Sleep 5
-      Kontext "WarningPrintOptions"
-      if WarningPrintOptions.Exists(3) then
-         WarningPrintOptions.Cancel
-         Printlog "The warning-message for papersize does exist => not realy a BUG"
-      end if
-   else
-      Kontext "Active"
-      if Active.Exists then Warnlog Active.GetText
-      Active.OK
-   end if
-
-   hCloseDocument
-
- printlog "     - Transparency => active"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Print" )
-
-   bSave2 = Transparency.IsChecked
-   PaperSize.Uncheck
-   Transparency.Check
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   hNewDocument
-   hRechteckErstellen ( 30, 30, 60, 60 )
-
-   FormatArea
-   Kontext
-   Active.Setpage TabTransparenz
-   Kontext "TabTransparenz"
-   LineareTransparenz.Check
-   TabTransparenz.OK
-
-   FilePrint
-   Kontext "DruckenDlg"
-   if DruckenDlg.Exists then
-      DruckenDlg.OK
-      Sleep 5
-      Kontext "WarningPrintOptions"
-      if WarningPrintOptions.Exists(3) then
-         WarningPrintOptions.Cancel
-      else
-         Warnlog "The warning-message for papersize does not turn up!"
-      end if
-   else
-      Kontext "Active"
-      if Active.Exists then Warnlog Active.GetText
-      Active.OK
-   end if
-
-   hCloseDocument
-
- printlog "     - Transparency => disabled"
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Print" )
-
-   Transparency.Uncheck
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-   hNewDocument
-   hRechteckErstellen ( 30, 30, 60, 60 )
-
-   FormatArea
-   Kontext
-   Active.Setpage TabTransparenz
-   Kontext "TabTransparenz"
-   LineareTransparenz.Check
-   TabTransparenz.OK
-
-   FilePrint
-   Kontext "DruckenDlg"
-   if DruckenDlg.Exists then
-      DruckenDlg.OK
-      Sleep 5
-      Kontext "WarningPrintTransparency"
-      if WarningPrintTransparency.Exists(3) then
-         WarningPrintTransparency.Cancel
-         Warnlog "The warning-message for papersize does exist => BUG!"
-      end if
-   else
-      Kontext "Active"
-      if Active.Exists then Warnlog Active.GetText
-      Active.OK
-   end if
-
-   for i=1 to 100
-      FileClose
-      Sleep 2
-      Kontext "Active"
-      if Active.Exists then
-         try
-            Active.OK
-            Sleep ( 5 )
-         catch
-            Active.No
-            i=101
-         endcatch
-      end if
-   next i
-
- printlog "     - reset the printing options"
-
-   ToolsOptions
-   hToolsOptions ( "StarOffice", "Print" )
-   if bSave  = TRUE then PaperSize.Check else PaperSize.Uncheck
-   if bSave2 = TRUE then Transparency.Check  else Transparency.Uncheck
-
-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
-   Sleep (2)
-
-endcase
-
diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc
index 8909045f288b..b467a7be3ae1 100755..100644
--- a/testautomation/framework/optional/includes/w_grid_layout1.inc
+++ b/testautomation/framework/optional/includes/w_grid_layout1.inc
@@ -1,7 +1,7 @@
 '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
@@ -41,265 +41,335 @@ private const SOURCE_PATH = "framework\optional\input\CJK\"
 
 testcase tTextGridDialog_1
 
- if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
-   Call CheckAsianLanguageSupport("Off")
-   hNewDocument()
-   FormatPageWriter
-   try
-      Kontext
-      Active.SetPage TabGrid
-      Kontext "TabGrid"
-      TabGrid.Cancel
-      warnlog "Shouldn't get Tabpage: Grid Text"
-   catch
-      Kontext
-      Active.SetPage TabSeite
-      Kontext "TabSeite"
-      TabSeite.Cancel
-   endcatch
- end if
-
-   Call CheckAsianLanguageSupport("On")
-
-   sleep 5
-   FormatPageWriter
-   Kontext
-   if Active.exists (10) then
-   try
-      Kontext
-      Active.SetPage TabGrid
-      Kontext "TabGrid"
-      TabGrid.Cancel
-   catch
-      Kontext
-      Active.SetPage TabSeite
-      Kontext "TabSeite"
-      TabSeite.Cancel
-      warnlog "Couldn't get Tabpage: Grid Text"
-   endcatch
-   else
-      warnlog "FormatPageWriter didn't bring up ndialog"
-   endif
-   hCloseDocument()
+    '/// Check if tabpage 'Text Grid' disappears when "Asian Language support" is NOT checked
+    if iSystemSprache <> 81 AND iSystemSprache <> 82 AND iSystemSprache <> 86 AND iSystemSprache <> 88 then
+        Call CheckAsianLanguageSupport("Off")
+        hNewDocument()
+        FormatPageWriter
+        try
+            Kontext
+            Active.SetPage TabGrid
+            Kontext "TabGrid"
+            TabGrid.Cancel
+            warnlog "Shouldn't get Tabpage: Grid Text"
+        catch
+            Kontext
+            Active.SetPage TabSeite
+            Kontext "TabSeite"
+            TabSeite.Cancel
+        endcatch
+    endif
+
+    '/// Check if tabpage 'Text Grid' appears when "Asian Language support" is checked
+    Call CheckAsianLanguageSupport("On")
+
+    sleep 5
+    FormatPageWriter
+    Kontext
+    if Active.exists (10) then
+        try
+            Kontext
+            Active.SetPage TabGrid
+            Kontext "TabGrid"
+            TabGrid.Cancel
+        catch
+            Kontext
+            Active.SetPage TabSeite
+            Kontext "TabSeite"
+            TabSeite.Cancel
+            warnlog "Couldn't get Tabpage: Grid Text"
+        endcatch
+    else
+        warnlog "FormatPageWriter didn't bring up ndialog"
+    endif
+    hCloseDocument()
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tTextGridDialog_2
-   Dim testFile , sCorrectResult as String
+    '/// No grid is active, no changes to existing version
+    Dim testFile , sCorrectResult as String
+
+    testFile       = "gridtest.sxw"
+    sCorrectResult = "1"
 
-   testFile       = "gridtest.sxw"
-   sCorrectResult = "1"
+    Call hNewDocument
 
-   Call hNewDocument
+    '/// open a test file , and check No Grid checkbox
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
 
-   Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-   sMakeReadOnlyDocumentEditable
-   
     FormatPageWriter
     Kontext
     if active.exists(5) then
         Active.SetPage TabGrid
     endif
-     Kontext "TabGrid"
-     NoGrid.Check
-     Sleep 1
+    Kontext "TabGrid"
+    NoGrid.Check
+    Sleep 1
     TabGrid.OK
     Sleep 1
 
+    '/// Active navigator dialogue , set page to '2'  and wait for a while
     Kontext
     ViewNavigator
-     Kontext "NavigatorWriter"
+    Kontext "NavigatorWriter"
 
-     Seitennummer.SetText "2"
-     Sleep 5
-    fCloseNavigator
+    Seitennummer.SetText "2"
+    Sleep 5
+    hCloseNavigator
 
+    '/// In No Grid mode, there should be only 1 page, the focus is before the first line
     Kontext "DocumentWriter"
     Call DocumentWriter.TypeKeys  "<End>"
     Sleep 1
     Call DocumentWriter.TypeKeys  "<Shift Left>"
-    Editcopy
+    hUseAsyncSlot( "EditCopy" )
 
     if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing NoGrid option!"
 
-   Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tTextGridDialog_3
-   Dim testFile  , sCorrectResult , sLinesPerPage as String
+    '/// Grid (lines only): The page is set up with a defined number of lines
+    Dim testFile  , sCorrectResult , sLinesPerPage as String
 
-   testFile       = "gridtest.sxw"
-   sCorrectResult = "G"
-   sLinesPerPage  = "10"
+    testFile       = "gridtest.sxw"
+    sCorrectResult = "G"
+    sLinesPerPage  = "10"
 
-   Call hNewDocument
+    Call hNewDocument
 
-   Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-   sMakeReadOnlyDocumentEditable
+    '/// open a test file and check Grid(lines onle) checkbox ,
+    '/// + set 10 line/page
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
     FormatPageWriter
     Kontext
     if active.exists(5) then
         Active.SetPage TabGrid
     endif
-     Kontext "TabGrid"
-     LinesGrid.Check
-     LinesPerPage.SetText sLinesPerPage
-     Sleep 1
+    Kontext "TabGrid"
+    LinesGrid.Check
+    LinesPerPage.SetText sLinesPerPage
+    Sleep 1
     TabGrid.OK
     Sleep 1
 
+    '/// Active navigator dialogue , set page to '2'  and wait for a while
     Kontext
     ViewNavigator
-     Kontext "NavigatorWriter"
+    Kontext "NavigatorWriter"
 
-     Seitennummer.SetText "2"
-     Sleep 5
-    fCloseNavigator
+    Seitennummer.SetText "2"
+    Sleep 5
+    hCloseNavigator
 
     Kontext "DocumentWriter"
     Call DocumentWriter.TypeKeys  "<End>"
     Sleep 1
     Call DocumentWriter.TypeKeys  "<Shift Left>"
-    Editcopy
+    hUseAsyncSlot( "EditCopy" )
 
     if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines only) option!"
 
-   Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tTextGridDialog_4
-   Dim testFile      , sCorrectResult as String
-   Dim sLinesPerPage , sCharsPerLine  as String
+    '/// Grid (lines and characters): The page is set up with a defined number of lines and a defined number of characters in each line
+    Dim testFile      , sCorrectResult as String
+    Dim sLinesPerPage , sCharsPerLine  as String
 
-   testFile       = "gridtest.sxw"
-   sCorrectResult = "E"
-   sLinesPerPage  = "10"
-   sCharsPerLine  = "9"
+    testFile       = "gridtest.sxw"
+    sCorrectResult = "E"
+    sLinesPerPage  = "10"
+    sCharsPerLine  = "9"
 
-   Call hNewDocument
+    Call hNewDocument
 
-   Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
-   sMakeReadOnlyDocumentEditable
+    '/// open a test file and check Grid(lines and characters) checkbox
+    '/// + set 10 line/page and 9 characters/line
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    sMakeReadOnlyDocumentEditable
     FormatPageWriter
     Kontext
     if active.exists(5) then
         Active.SetPage TabGrid
     endif
-     Kontext "TabGrid"
-     CharsGrid.Check
-     LinesPerPage.SetText sLinesPerPage
-     CharsPerLine.SetText sCharsPerLine
-     Sleep 1
+    Kontext "TabGrid"
+    CharsGrid.Check
+    LinesPerPage.SetText sLinesPerPage
+    CharsPerLine.SetText sCharsPerLine
+    Sleep 1
     TabGrid.OK
     Sleep 1
 
+    '/// Active navigator dialogue , set page to '2'  and wait for a while
     Kontext
     ViewNavigator
-     Kontext "NavigatorWriter"
+    Kontext "NavigatorWriter"
 
-     Seitennummer.SetText "2"
-     Sleep 5
-    fCloseNavigator
+    Seitennummer.SetText "2"
+    Sleep 5
+    hCloseNavigator
 
     Kontext "DocumentWriter"
     Call DocumentWriter.TypeKeys  "<End>"
     Sleep 1
     Call DocumentWriter.TypeKeys  "<Shift Left>"
-    Editcopy
+    hUseAsyncSlot( "EditCopy" )
 
     if GetClipboardText <> sCorrectResult then Warnlog "Something wrong when choosing Grid(lines and characters) option!"
 
-   Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase  tGridDisplay_1
-   Call hNewDocument
+    '/// Print grid: The grid lines will be printed. Inactive if "Display grid" is inactive.
+    Call hNewDocument
 
+    '/// format / page  / tabpage Text grid
+    '/// + check "display grid" and check "print grid"
     FormatPageWriter
     Kontext
     if active.exists(5) then
         Active.SetPage TabGrid
     endif
-     Kontext "TabGrid"
-     CharsGrid.Check
-     Display.Check
-     Sleep 1
-     PrintGrid.Check
-     Sleep 1
+    Kontext "TabGrid"
+    CharsGrid.Check
+    Display.Check
+    Sleep 1
+    PrintGrid.Check
+    Sleep 1
     TabGrid.OK
     Sleep 1
 
+    '/// Print to printer
     FilePrint
     Kontext "Active"
-    if Active.Exists(5) then
-      if Active.GetRT = 304 then
-        Active.Ok
-        QAErrorLog "No Default-Printer!"
-        Kontext "DruckenDlg"
-        Sleep 1
-        DruckenDlg.Cancel
-      end if
+    if ( Active.Exists( 5 ) ) then
+        if Active.GetRT() = 304 then
+            Active.Ok()
+            QAErrorLog "No Default-Printer!"
+            Kontext "Printing"
+            if ( Printing.exists( 1 )) then
+                Printing.Cancel
+            endif
+        endif
     else
-      Kontext "DruckenDlg"
-      Sleep 1
-      DruckenDlg.OK
-      Sleep 5
-      kontext
-      if active.exists(5) then
-          qaErrorLog active.getText
-          active.ok
-      end if
-    end if
+        Kontext "Printing"
+        if ( Printing.exists( 2 )) then
+            printing.cancel()
+            Printing.notExists( 5 )
+        endif
+
+        kontext "Active"
+        if active.exists(5) then
+            qaErrorLog active.getText()
+            active.ok()
+        endif
+    endif
 
+    '/// format / page  / tabpage Text grid
+    '/// + check "display grid" and uncheck "print grid"
     FormatPageWriter
     Kontext
     if active.exists(5) then
         Active.SetPage TabGrid
     endif
-     Kontext "TabGrid"
-     CharsGrid.Check
-     Display.Check
-     Sleep 1
-     PrintGrid.UnCheck
-     Sleep 1
+    Kontext "TabGrid"
+    CharsGrid.Check
+    Display.Check
+    Sleep 1
+    PrintGrid.UnCheck
+    Sleep 1
     TabGrid.OK
     Sleep 1
 
+    '/// Print to printer
     FilePrint
     Kontext "Active"
-    if Active.Exists(5) then
-      if Active.GetRT = 304 then
-        Active.Ok
-        QAErrorLog "No Default-Printer!"
-        Kontext "DruckenDlg"
-        Sleep 1
-        DruckenDlg.Cancel
-      end if
+    if ( Active.Exists( 5 ) )then
+        if Active.GetRT() = 304 then
+            Active.Ok()
+            QAErrorLog "No Default-Printer!"
+            Kontext "Printing"
+            if ( Printing.exists( 1 )) then
+                Printing.Cancel()
+            endif
+        endif
     else
-      Kontext "DruckenDlg"
-      Sleep 1
-      DruckenDlg.OK
-      Sleep 5
-      kontext
-      if active.exists(5) then
-          qaErrorLog active.getText
-          active.ok
-      end if
-    end if
-
-   Call hCloseDocument
+        Kontext "Printing"
+        if( Printing.exists( 1 )) then
+            printing.cancel()
+            Printing.notExists( 5 )
+        endif
+        kontext
+        if ( active.exists( 2 ) ) then
+            qaErrorLog active.getText
+            active.ok
+        endif
+    endif
+
+    Call hCloseDocument
+endcase
+
+'-------------------------------------------------------------------------
+
+testcase tUserDefineLayout_1
+    '/// Decrease characters per line will cause lines per page decrease accordingly
+    Dim sLinesPerPage       , sCharsPerLine          as String
+    Dim sExpectLinesPerPage , sExpectLinesPerPage1   as String
+
+    sLinesPerPage  = "20"
+    sCharsPerLine  = "2"
+    sExpectLinesPerPage   = "2"
+    sExpectLinesPerPage1  = "3"
+
+    Call hNewDocument
+
+    '/// Format/page , set lines per page to 20, and set charsets per line to 2
+    '/// + wait for a moment , then check the the number  of lines per page.
+    FormatPageWriter
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
+    endif
+    Kontext "TabGrid"
+    CharsGrid.Check
+
+    LinesPerPage.SetText sLinesPerPage
+    Sleep 2
+    CharsPerLine.SetText sCharsPerLine
+    Sleep 2
+
+    'This step is no use, just let the LinesPerPage change the number
+    CharsGrid.Check
+
+    if LinesPerPage.GetText <> sExpectLinesPerPage AND LinesPerPage.GetText <> sExpectLinesPerPage1 then
+        Warnlog( "#i106381# - LInes per page changed" )
+        printlog( "The lines per page should be"  + sExpectLinesPerPage & " OR " & sExpectLinesPerPage1 & " but get " &LinesPerPage.GetText )
+    endif
+
+    TabGrid.Cancel
+
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tFontSizeChanges_1
+
+    '/// Change the font size to bigger enough will change the layout
     Dim testFile      , sCorrectResult as String
     Dim sLinesPerPage , sCharsPerLine  as String
     dim sTemp as string
@@ -315,30 +385,30 @@ testcase tFontSizeChanges_1
     Call DocumentWriter.TypeKeys  "<Shift Right>"
 
     Kontext "FormatObjectbar"
-        Schriftgroesse.Select   "60"
-        Schriftgroesse.TypeKeys "<Return>"
-        Sleep 1
+    Schriftgroesse.Select   "60"
+    Schriftgroesse.TypeKeys "<Return>"
+    Sleep 1
 
     Kontext "DocumentWriter"
     FormatPageWriter
-        Kontext
-        if active.exists(5) then
-            Active.SetPage TabGrid
+    Kontext
+    if active.exists(5) then
+        Active.SetPage TabGrid
+    endif
+    Kontext "TabGrid"
+    if TabGrid.exists(5) then
+        sTemp = LinesPerPage.GetText
+        if sTemp <> sLinesPerPage then
+            Warnlog "The lines per page should be: '" & sLinesPerPage & "'; but get: '" & sTemp & "'"
         endif
-        Kontext "TabGrid"
-        if TabGrid.exists(5) then
-            sTemp = LinesPerPage.GetText
-            if sTemp <> sLinesPerPage then 
-                Warnlog "The lines per page should be: '" + sLinesPerPage + "'; but get: '" + sTemp + "'"
-            endif
-            sTemp = CharsPerLine.GetText
-            if sTemp <> sCharsPerLine then 
-                Warnlog "The chars per line should be: '" + sCharsPerLine + "'; but get: '" +sTemp + "'"
-            endif
-            TabGrid.Cancel
-        else
-            warnlog "TabGrid is not available."
+        sTemp = CharsPerLine.GetText
+        if sTemp <> sCharsPerLine then
+            Warnlog "The chars per line should be: '" & sCharsPerLine & "'; but get: '" &sTemp & "'"
         endif
+        TabGrid.Cancel
+    else
+        warnlog "TabGrid is not available."
+    endif
 
     Kontext
     ViewNavigator
@@ -349,16 +419,16 @@ testcase tFontSizeChanges_1
     else
         warnlog "Navigator not available"
     endif
-    fCloseNavigator
+    hCloseNavigator
 
     Kontext "DocumentWriter"
     sleep 3
     Call DocumentWriter.TypeKeys  "<Shift Right>"
-    sleep 3
-    Editcopy
+
+    hUseAsyncSlot( "EditCopy" )
     sTemp = GetClipboardText
-    if sTemp <> sCorrectResult then 
-        Warnlog "Don't get the expected result , hope to be: '" + sCorrectResult + "'; but get: '" + sTemp + "'"
+    if sTemp <> sCorrectResult then
+        Warnlog "Don't get the expected result , hope to be: '" & sCorrectResult & "'; but get: '" & sTemp & "'"
     endif
 
     Call hCloseDocument
@@ -367,26 +437,28 @@ endcase
 '-------------------------------------------------------------------------
 
 testcase tRubyText_1
-   Dim testFile , sRubyText as String
+    '/// If Ruby Text is applied and longer than its Base Text it will stretch over more grid cells than the base text itself.
+    Dim testFile , sRubyText as String
 
-   testFile   = "rubytest.sxw"
-   sRubyText  = "Ruby Test Text ....................."
+    testFile   = "rubytest.sxw"
+    sRubyText  = "Ruby Test Text ....................."
 
-   Call hNewDocument
+    Call hNewDocument
 
-   Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    '/// open a test file , and insert  long ruby test text
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
     sMakeReadOnlyDocumentEditable
-   Kontext "DocumentWriter"
-   Call DocumentWriter.TypeKeys  "<Shift Right>"
-   Sleep 1
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<Shift Right>"
+    Sleep 1
 
     FormatRuby
     Kontext "RubyDialog"
-     Sleep 3
-     RubyText1.setText sRubyText
-     Sleep 2
-     RubyDialog.OK
-     Sleep 2
+    Sleep 3
+    RubyText1.setText sRubyText
+    Sleep 2
+    RubyDialog.OK
+    Sleep 2
     DialogClose.Click
     Sleep 1
 
@@ -396,42 +468,46 @@ testcase tRubyText_1
     Call DocumentWriter.TypeKeys  "<End>"
     Sleep 2
     Call DocumentWriter.TypeKeys  "<Shift Left>"
-    Editcopy
+    hUseAsyncSlot( "EditCopy" )
 
     if NOT(GetClipboardText = "5" OR GetClipboardText = "6") then
-        Warnlog "Don't get the correct result after inserting ruby text! Get " + GetClipboardText
-    end if
+        Warnlog "Don't get the correct result after inserting ruby text! Get " & GetClipboardText
+    endif
 
-   Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
 
 testcase tIndentsTest_1
-   Dim testFile , sCorrectPage1 , sCorrectPage2 as String
+    '/// Indents should work and always indenting as close as possible to their measurements by snapping to the appropriate grid cell. Tabs therefore will be ignored.
+    Dim testFile , sCorrectPage1 , sCorrectPage2 as String
 
-   testFile       = "IndentsTest.sxw"
-   sCorrectPage1  = "1"
-   sCorrectPage2  = "2"
+    testFile       = "IndentsTest.sxw"
+    sCorrectPage1  = "1"
+    sCorrectPage2  = "2"
 
-   Call hNewDocument
+    Call hNewDocument
 
-   Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+    '/// open a test file , and press TAB in second line
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
     sMakeReadOnlyDocumentEditable
-   Kontext "DocumentWriter"
-   Call DocumentWriter.TypeKeys  "<Down>"
-   Sleep 1
-   Call DocumentWriter.TypeKeys  "<Tab>"
-   Sleep 1
-   Call DocumentWriter.TypeKeys  "<End>"
-   Sleep 1
+    Kontext "DocumentWriter"
+    Call DocumentWriter.TypeKeys  "<Down>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<Tab>"
+    Sleep 1
+    Call DocumentWriter.TypeKeys  "<End>"
+    Sleep 1
 
+    '/// Active navigator dialogue , check if the page number is 1
     Kontext
     ViewNavigator
-     Kontext "NavigatorWriter"
-     if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!"
-    fCloseNavigator
+    Kontext "NavigatorWriter"
+    if Seitennummer.GetText <> sCorrectPage1 then Warnlog "First test :Something wrong in indents test!"
+    hCloseNavigator
 
+    '/// press TAB in second line again
     Kontext "DocumentWriter"
     Call DocumentWriter.TypeKeys  "<Home>"
     Sleep 1
@@ -440,13 +516,67 @@ testcase tIndentsTest_1
     Call DocumentWriter.TypeKeys  "<End>"
     Sleep 1
 
+    '/// Active navigator dialogue , check if the page number is 2
     Kontext
     ViewNavigator
-     Kontext "NavigatorWriter"
-     if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!"
-    fCloseNavigator
+    Kontext "NavigatorWriter"
+    if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Second test :Something wrong in indents test!"
+    hCloseNavigator
 
-   Call hCloseDocument
+    Call hCloseDocument
 endcase
 
 '-------------------------------------------------------------------------
+
+testcase tObjectsTest_1
+    '/// If objects are anchored to text they will "wander" with its surrounding text.
+    '/// If they are anchored as character they will snap to the appropriate grid cell (since they are a character).
+    Dim testFile , sCorrectPage1 , sCorrectPage2 as String
+
+    testFile       = "objectsTest.sxw"
+    sCorrectPage1  = "1"
+    sCorrectPage2  = "2"
+
+    Call hNewDocument
+
+    '/// open a test file , and press TAB in second line
+    Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile )
+
+    '/// If object is anchored as Character , check if it will snap to the appropriate grid cell
+    fStartupNavigator( "OLEObject" , 1 )
+    Sleep 1
+    Auswahlliste.TypeKeys "<Return>"
+    Sleep 1
+    hCloseNavigator
+
+    Kontext
+    FormatAnchorAsCharacter
+    WaitSlot()
+
+
+    ViewNavigator
+    Kontext "NavigatorWriter"
+    Seitennummer.SetText   sCorrectPage2
+    Sleep 5
+    if Seitennummer.GetText <> sCorrectPage2 then Warnlog "Something wrong when object is anchored as Character!"
+    hCloseNavigator
+
+    '/// If object is anchored to Character , check if it will NOT snap to the appropriate grid cell
+    fStartupNavigator( "OLEObject" , 1 )
+    Auswahlliste.TypeKeys "<Return>"
+    hCloseNavigator
+
+    Kontext
+    FormatAnchorToCharacter
+
+    ViewNavigator
+    Kontext "NavigatorWriter"
+    Seitennummer.SetText   sCorrectPage2
+    Sleep 5
+    if Seitennummer.GetText <> sCorrectPage1 then Warnlog "Something wrong when object is anchored to Character!"
+    hCloseNavigator
+    Kontext
+
+    Call hCloseDocument
+endcase
+
diff --git a/testautomation/framework/required/includes/help_browser.inc b/testautomation/framework/required/includes/help_browser.inc
index 2b4ee6270fda..86ed8f3d81ba 100755
--- a/testautomation/framework/required/includes/help_browser.inc
+++ b/testautomation/framework/required/includes/help_browser.inc
@@ -41,9 +41,7 @@ testcase tHelp_DialogTest
 
     printlog( "Resource test for the Help Browser" )
 
-    Dim i as Integer
     dim brc as boolean
-    printlog "- open the help"
 
     brc = hOpenHelp()
     if ( not brc ) then
@@ -56,6 +54,11 @@ testcase tHelp_DialogTest
         goto endsub
     endif
 
+    hSelectHelpTab( "content" )
+    hSelectHelpTab( "index" )
+    hSelectHelpTab( "find" )
+    hSelectHelpTab( "bookmarks" )
+    
 
     brc = hSelectHelpTab( "content" )
     call DialogTest( ContentPage )
@@ -78,8 +81,10 @@ endcase
 
 testcase tHelp_ToolBar
 
-    Dim i as Integer
+    printlog( "Resource test for the help toolbar" )
+    
     dim brc as boolean
+    dim iExitCounter as integer : iExitCounter = 0
 
     brc = hOpenHelp()
     if ( not brc ) then
@@ -104,9 +109,13 @@ testcase tHelp_ToolBar
     ' Backward- and Forward-button
     printlog "- activate 'Index'-page"
     brc = hSelectHelpTab( "index" )
-    sleep( 2 )
+    
+    do while( SearchIndex.getItemCount() < 100 )
+        iExitCounter = iExitCounter + 1 : if ( iExitCounter = 20 ) then exit do
+        wait( 100 )
+    loop
 
-    SearchIndex.Select 4
+    SearchIndex.Select( 4 )
     DisplayIndex.Click()
     waitslot
 
@@ -126,37 +135,25 @@ testcase tHelp_ToolBar
     PrintButton.Click()
 
     kontext "active"
-
-    if Active.Exists ( 1 ) then
-
-        if Active.getRT() = 304 then
-            qaerrorlog "- Printing failed: Did you define a default printer?"
-            Active.OK()
-            
-            Kontext "DruckenDlg"
-            if ( druckenDlg.exists() ) then
-                printlog( "Printer dialog is still open, closing with cancel" )
-                druckenDlg. cancel()
-            endif
-            
-        endif
-
+    if ( Active.Exists ( 1 ) ) then
+        qaerrorlog( "Unexpected messagebox: " & Active.getText() )
+        qaerrorlog( "Probably missing default printer on this system, fix it!" )
+        Active.OK()
+    endif
+    
+    kontext "Printing"
+    if ( Printing.exists( 2 ) ) then
+        printlog( "Print dialog open, good." )
+        Printing.cancel()
     else
-        kontext "druckendlg"
-        if DruckenDlg.NotExists (2) then
-            warnlog "No print-dialog is open. => direct printing? - bug 93788!"
-        else
-            DruckenDlg.Cancel()
-        endif
-
+        warnlog( "Print dialog not open" )
     endif
     
-    printlog "- Set Bookmark"
-
     kontext "tb_help"
+    printlog "- Set Bookmark"
     SetBookmarks.Click()
 
-    kontext "addbookmark"
+    kontext "AddBookmark"
     call DialogTest ( AddBookmark )
     AddBookmark.Cancel()
 
diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc
index e877bbb2b3c5..7c6eec5b9896 100755
--- a/testautomation/framework/tools/includes/CJK_tools.inc
+++ b/testautomation/framework/tools/includes/CJK_tools.inc
@@ -37,10 +37,6 @@
 '*
 '\***********************************************************************
 
-
-'******************************************************************************
-' This function will check Asina Language Support on/off based on the parameter
-'******************************************************************************
 function CheckAsianLanguageSupport( sSupport as String )  as String
 
     ToolsOptions
@@ -67,11 +63,8 @@ function CheckAsianLanguageSupport( sSupport as String )  as String
     
 end function
 
+'******************************************************************************'
 
-
-'***************************************************************
-' Start up Navigator , and set focus to the correct position
-'**************************************************************
 function fStartupNavigator(navigatorItem as String , subItemNum as Integer)
     Dim j as Integer
     
@@ -117,28 +110,8 @@ function fStartupNavigator(navigatorItem as String , subItemNum as Integer)
     sleep 1
 end function
 
+'******************************************************************************'
 
-'******************
-'Close Navigator
-'******************
-function fCloseNavigator
-    '/// This function  will close Navigator dialogure
-    
-    Kontext
-    Kontext "Navigator"
-    if ( Navigator.exists() ) then
-        Navigator.Close()
-        printlog( "Closed navigator" )
-    else
-        printlog( "Navigator not open." )
-    endif
-    
-end function
-
-
-'****************************************************************************
-' This routine will return the Country name based on CountryID
-'*****************************************************************************
 function fGetCountryName( CountryID as Integer ) as String
     
     select case iSprache
diff --git a/testautomation/framework/tools/includes/customize_tools.inc b/testautomation/framework/tools/includes/customize_tools.inc
index 8c0cbf80f1c9..a8fd0b3dba99 100755
--- a/testautomation/framework/tools/includes/customize_tools.inc
+++ b/testautomation/framework/tools/includes/customize_tools.inc
@@ -114,9 +114,6 @@ function hToolsCustomizeSelectTab( cTab as string ) as boolean
     '///+<li>Switch to one of the four available tabpages</li>
     '///<ol>
     kontext
-    active.setPage
-
-    kontext
     
     try
 
@@ -193,8 +190,7 @@ function hToolsCustomizeClose( iMode as integer  ) as boolean
     '///<ul>
     
     const CFN = "hToolsCustomizeClose::"
-    dim brc as boolean
-        brc = true
+    dim brc as boolean : brc = true
 
     kontext 
 
@@ -213,8 +209,11 @@ function hToolsCustomizeClose( iMode as integer  ) as boolean
     end select
     '///</ol>
     
+    
+    
     '///+<li>Verify that the dialog has indeed been closed</li>
     kontext "TabCustomizeEvents"
+    TabCustomizeEvents.notExists( 3 )
     if ( TabCustomizeEvents.exists() ) then
         brc = false
     endif
diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc
index d4abf557afe8..16f57f5cce6a 100755
--- a/testautomation/framework/tools/includes/fileoperations.inc
+++ b/testautomation/framework/tools/includes/fileoperations.inc
@@ -872,6 +872,8 @@ function hFindFileObjectViaFileOpen( cName as string ) as integer
     dim iPathItems as integer
     dim asPathList( 100 ) as string
     
+    dim iWait as integer ' some increment variable
+    
     printlog( CFN & "Enter with option (File): " & cName )
 
     '///+<li>If a fully qualified path has been provided we have to split it up</li>
@@ -899,6 +901,21 @@ function hFindFileObjectViaFileOpen( cName as string ) as integer
         
     '///+<li>get the number of items in the filepicker</li>
     kontext "OeffnenDlg"
+    iWait = 0
+    while ( DateiAuswahl.getItemCount() = 0 )
+        wait( 100 )
+        iWait = iWait + 1
+        if ( iWait = 10 ) then
+            warnlog( "Filepicker is not populated within reasonable timeframe, aborting" )
+            kontext "OeffnenDlg"
+            OeffnenDlg.Close()
+            hFindFileObjectViaFileOpen() = 0
+            exit function
+        else
+            printlog( "Waiting for filepicker list to populate..." )
+        endif
+    wend
+    
     iFileOpenItemCount = DateiAuswahl.getItemCount()
     
     '///+<li>Jump to the first item in the filelist and select it with SPACE</li>
diff --git a/testautomation/framework/tools/includes/help_tools.inc b/testautomation/framework/tools/includes/help_tools.inc
index 438c01d7ef7e..18e1691a1a43 100755
--- a/testautomation/framework/tools/includes/help_tools.inc
+++ b/testautomation/framework/tools/includes/help_tools.inc
@@ -199,18 +199,22 @@ function hSelectHelpTab( cTab as string ) as boolean
     select case cTabName
     case "content"       : TabControl.setPage( ContentPage )
                            if ( SearchContent.isVisible() ) then
+                               call DialogTest( ContentPage )
                                brc = true
                            endif
     case "index"         : TabControl.setPage( IndexPage )
                            if ( SearchIndex.isVisible() ) then
+                               call DialogTest( IndexPage )
                                brc = true
                            endif
     case "find"          : TabControl.setPage( FindPage )
                            if ( SearchFind.isVisible() ) then
+                               call DialogTest( FindPage )
                                brc = true
                            endif
     case "bookmarks"     : TabControl.setPage( BookmarksPage )
                            if ( Bookmarks.isVisible() ) then
+                               call DialogTest( BookmarksPage )
                                brc = true
                            endif
     case else 
diff --git a/testautomation/global/required/includes/g_printing.inc b/testautomation/global/required/includes/g_printing.inc
new file mode 100755
index 000000000000..b46a096c4364
--- /dev/null
+++ b/testautomation/global/required/includes/g_printing.inc
@@ -0,0 +1,524 @@
+'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: basic_delete_modules.inc,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:13 $
+'*
+'* 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 : joerg.skottke@sun.com
+'*
+'*  short description : Resource test for the printing dialog
+'*
+'\******************************************************************************
+
+private const MSG1 = "Incorrect default setting: "
+
+'*******************************************************************************
+
+sub g_printing()
+
+    call tPrintCommon()
+    call tPrintGeneral()
+    call tPrintApplication()
+    call tPrintLayout()
+    call tPrintOptions()
+    
+end sub
+
+'*******************************************************************************
+
+testcase tPrintCommon()
+
+    printlog( "Common print options (main dialog)" )
+
+    printlog( "Open new document" )
+    hCreateDocument()
+    
+    printlog( "Open printing dialog" )
+    FilePrint
+    
+    kontext "Printing"
+    if ( Printing.exists( 2 ) ) then
+        
+        call DialogTest( Printing )
+        
+        if ( PreviewPageNumber.isEnabled() ) then 
+            warnlog( "Page number should be disabled for empty document" )
+        endif
+        
+        if ( ScrollBackward.isEnabled() ) then
+            warnlog( "Scroll backward button should be disabled for empty document" )
+        endif
+
+        if ( ScrollForward.isEnabled() ) then
+            warnlog( "Scroll forward button should be disabled for empty document" )
+        endif
+        
+        kontext "Printing"
+        printlog( "Close print dialog")
+        Printing.cancel()
+        
+    else
+        warnlog( "Printing dialog did not open" )
+    endif
+    
+    printlog( "Close document" )
+    hDestroyDocument()        
+    
+endcase
+
+'*******************************************************************************
+
+testcase tPrintGeneral()
+
+    printlog( "General printing options - General tabpage" )
+    
+    dim iSlidesPerPage as integer
+    dim iExpected as integer
+
+    printlog( "Open new document" )
+    hCreateDocument()
+    
+    printlog( "Open printing dialog" )
+    FilePrint
+    
+    kontext "Printing"
+    if ( Printing.exists( 2 ) ) then
+    
+        PrintingTabControl.setPage( TabPrintGeneral )
+        
+        kontext "TabPrintGeneral"
+        call DialogTest( TabPrintGeneral )
+
+        printlog( "PrinterList" )    
+        if ( NOT PrinterList.isEnabled() ) then
+            warnlog( "Printer List is disabled" )
+        endif
+        
+        printlog( "Number of copies/Collate" )    
+        if ( NumberOfCopies.getText <> "1" ) then
+            warnlog( "Number of copies should be 1 by default, is " & NumberOfCopies.getText() )
+        endif
+        
+        if ( Collate.isEnabled() ) then
+            warnlog( "<Collate> should not be enabled for just one copy" )
+        endif
+
+        NumberOfCopies.setText( "2" )
+        
+        if ( Collate.isEnabled() ) then
+            cb_test( Collate, true, "" )
+        else
+            warnlog( "Collate should be enabled if number of copies <> 1" )
+        endif
+        
+        NumberOfCopies.setText( "1" )
+        
+        if ( Collate.isEnabled() ) then
+            warnlog( "<Collate> should not be enabled for just one copy" )
+        endif
+
+        printlog( "Properties/Details" )
+        Details.click() ' open
+        Details.click() ' close
+        
+        if ( gPlatGroup = "unx" and lcase( gPlatform ) <> "osx" ) then
+            Properties.click()
+            kontext "TabSPAPaper"
+            if ( TabSPAPaper.exists( 2 ) ) then
+                TabSPAPaper.close()
+            else
+                warnlog( "Printer properties did not open." )
+            endif
+        else
+            printlog( "Skipping printer properties on Windows and MacOS X (no SPAdmin)" )
+        endif
+
+        kontext "TabPrintGeneral"
+        printlog( "General settings on the Tab-Page" )
+        
+        select case( gApplication )
+        case "WRITER", "HTML", "MASTERDOCUMENT"
+
+            lb_test( PrintNotes, 4, 1, "" )
+            
+            if ( NOT AllPages.isChecked() ) then
+                warnlog( MSG1 & "<All pages> should be checked" )
+            endif            
+            
+            if ( Pages.isEnabled() ) then
+                Pages.check()
+                PageRange.setText( "1-5,7" )
+            else
+                warnlog( "Pages setting disabled" )
+            endif
+            
+            'Selection.check()
+            'AllPages.check()
+            
+        case "CALC"
+        
+            printlog( "Print ranges" )
+            if ( NOT SelectedSheets.isChecked() ) then
+                warnlog( MSG1 & "<Selected sheets> should be selected" )
+            endif
+            
+            AllSheets.check()
+            SelectedSheets.check()
+            SelectedCells.check()
+            
+            if ( NOT PrintAllPages.isChecked() ) then
+                warnlog( MSG1 & "<Thereof print all pages> should be selected" )
+            endif
+            
+            PrintPages.check()
+            PageRange.setText( "1-5,8" )
+            PrintAllPages.check()
+            
+        case "IMPRESS", "DRAW"
+        
+            printlog( "Print ranges" )
+            if ( NOT AllSlides.isChecked() ) then
+                warnlog( MSG1 & "<All slides> should be selected" )
+            endif
+            
+            Slides.check()
+            PageRange.setText( "1-6,9" )
+            
+            Selection.check()
+            
+            
+            if ( gApplication = "IMPRESS" ) then
+            
+                printlog( "General print options/layout (IMPRESS only)" )
+            
+                lb_test( PartsToPrint, 4, 1, "" )
+                
+                if ( SlidesPerPage.isEnabled() ) then
+                    warnlog( "<Slides per page> should only be enabled for Handouts" )
+                endif
+
+                if ( ArrangeSlides.isEnabled() ) then
+                    warnlog( "<Ararange slides> should only be enabled for Handouts" )
+                endif
+                
+                PartsToPrint.select( 2 ) ' Should be "Handouts" to enable further controls
+                
+                if ( NOT SlidesPerPage.isEnabled() ) then
+                    warnlog( "<Slides per Page> should be enabled for Handouts" )
+                endif
+                
+                if ( NOT ArrangeSlides.isEnabled() ) then
+                    warnlog( "<Arrange slides> should be enabled for Handouts" )
+                endif
+
+                lb_test( SlidesPerPage, 6, 0, "" )
+                lb_test( ArrangeSlides, 2, 1, "" )
+                
+            endif
+            
+                        
+        case "MATH"
+        
+            printlog( "Math does not have any special options on this tabpage" )
+            
+        case default
+            warnlog( "Invalid gApplication: " & gApplication )
+        end select
+
+        kontext "Printing"
+        printlog( "Close print dialog" )
+        Printing.cancel()
+
+    else
+        warnlog( "Printing dialog did not open" )
+    endif
+    
+    printlog( "Close document" )
+    hDestroyDocument()        
+    
+endcase
+
+'*******************************************************************************
+
+testcase tPrintApplication()
+
+    printlog( "Application specific printing options - Application tabpage" )
+
+    printlog( "Open new document" )
+    hCreateDocument()
+    
+    printlog( "Open printing dialog" )
+    FilePrint
+    
+    kontext "Printing"
+    if ( Printing.exists( 2 ) ) then
+
+        PrintingTabControl.setPage( TabApplication )
+        
+        kontext "TabApplication" 
+        call DialogTest( TabApplication )
+
+        printlog( "Check defaults, modify and reset controls" )
+        select case( gApplication )
+        case "WRITER", "HTML", "MASTERDOCUMENT"
+        
+            cb_test( PrintPageBackground, true, "" )
+            'cb_test( PrintGraphicsAndDiagrams, true, "" )
+            cb_test( PrintPicturesAndObjects, true, "" )
+            cb_test( PrintTextInBlack, false, "" )
+            cb_test( PrintBlankPages, true, "" )
+
+            if ( gApplication <> "HTML" ) then
+                cb_test( PrintHiddenText, false, "" )
+                cb_test( PrintTextPlaceholder, false, "" )
+            endif
+                
+        case "CALC"
+        
+            cb_test( IncludeEmptyPages, false, "" )
+            
+        case "IMPRESS", "DRAW"
+        
+            cb_test( SlideName, false, "" )
+            cb_test( DateAndTime, false, "" )
+            if ( gApplication = "IMPRESS" ) then 
+                cb_test( HiddenPages, false, "" )
+            endif
+            
+            printlog( "Color options" )
+            if ( NOT OriginalColors.isChecked() ) then
+                warnlog( MSG1 & "<Original colors> should be checked" )
+            endif
+            
+            GrayScale.check()
+            BlackAndWhite.check()
+            
+            printlog( "Scaling options" )
+            if ( NOT OriginalSize.isChecked() ) then
+                warnlog( MSG1 & "<Original size> should be checked" )
+            endif
+            
+            FitToPage.check()
+            MultiplePages.check()
+            TilePaper.check()
+      
+        case "MATH"
+        
+            cb_test( TitleRow, true, "" )
+            cb_test( FormulaText, true, "" )
+            cb_test( Borders, true, "" )
+            
+            if ( NOT OriginalSizeMath.isChecked() ) then
+                warnlog( MSG1 & "<Original size> should be selected" )
+            endif
+            
+            FitToPageMath.check()
+            Scaling.check()
+            ScalingFactor.setText( "1000" )
+            
+        case default
+        
+            warnlog( "Invalid gApplication: " & gApplication )
+            
+        end select
+        
+        kontext "Printing"
+        printlog( "Close print dialog" )
+        Printing.cancel()
+
+    else
+        warnlog( "Printing dialog did not open" )
+    endif
+    
+    printlog( "Close document" )
+    hDestroyDocument()
+    
+endcase
+
+'*******************************************************************************
+
+testcase tPrintLayout()
+
+    printlog( "Layout printing options - Layout tabpage" )
+    
+    printlog( "Open new document" )
+    hCreateDocument()
+    
+    printlog( "Open printing dialog" )
+    FilePrint
+    
+    kontext "Printing"
+    if ( Printing.exists( 2 ) ) then
+
+        ' Math does not have a layout page as it does not have any layout options
+        if ( gApplication <> "MATH" ) then    
+        
+            PrintingTabControl.setPage( TabLayout )
+            
+            kontext "TabLayout"
+            call DialogTest( TabLayout )
+            
+            printlog( "Controls common for (almost) all applications" )
+            if ( gApplication <> "CALC" ) then
+                if ( NOT PagesPerSheet.isChecked()) then
+                    warnlog( MSG1 & "<Pages per sheet> should be selected" )
+                endif
+
+                lb_test( NumberOfPages, 7, 1, "" )
+                NumberOfPages.select( 7 )
+               
+                if ( NumberOfColumns.getText() <> "1" ) then
+                    warnlog( MSG1 & "<Pages> has incorrect default: " & NumberOfColumns.getText() )
+                endif
+                
+                if ( NumberOfRows.getText() <> "1" ) then
+                    warnlog( MSG1 & "<by> has incorrect default: " & NumberOfRows.getText() )
+                endif
+                
+                NumberOfColumns.typeKeys( "<UP>" )
+                NumberOfRows.typeKeys( "<UP>" )
+                DistanceBetweenPages.typeKeys( "<UP>" )
+                MarginToSheetBorder.typeKeys( "<UP>" )
+            
+                lb_test( PaperOrientation, 3, 1, "" )
+            else
+                if ( PagesPerSheet.isVisible() ) then
+                    warnlog( "<Pages per Sheet> should not be visible for spreadsheet documents" )
+                endif
+            endif
+            
+            lb_test( PrintOrder, 2, 1, "" )
+            cb_test( BorderAroundPages, false, "" )
+            
+            select case( gApplication )
+            case "WRITER", "HTML", "MASTERDOCUMENT"
+
+                'if ( NOT PrintBrochureRTL.isEnabled() ) then
+                '    warnlog( "<Brochure> listbox should be enabled" )
+                'endif
+                
+                Brochure.check()
+                
+                'lb_test( PrintBrochureRTL, 2, 1, "#i105265#" )
+            
+            case "CALC"
+            
+                printlog( "Calc does not have any options in this section" )
+                
+            case "IMPRESS", "DRAW"
+
+                if ( BrochurePageSides.isEnabled() ) then
+                    warnlog( "<Page sides> listbox should be disabled" )
+                endif
+                Brochure.check()
+                lb_test( BrochurePageSides, 3, 1, "" )
+
+            case default
+            
+                warnlog( "Invalid gApplication: " & gApplication )
+                
+            end select
+            
+        else ' What we do if gApplication = MATH
+            try
+                PrintingTabControl.setPage( TabLayout )
+                warnlog( "Math should not have a layout page as no layout options exist" )
+            catch
+                printlog( "Math has no layout page. Good." )
+            endcatch
+        endif
+        
+        kontext "Printing"
+        printlog( "Close print dialog" )
+        Printing.cancel()
+
+    else
+        warnlog( "Printing dialog did not open" )
+    endif
+    
+    printlog( "Close document" )
+    hDestroyDocument()
+    
+endcase
+
+'*******************************************************************************
+
+testcase tPrintOptions()
+
+    printlog( "Extended printing options - Options tabpage" )
+    
+    printlog( "Open new document" )
+    hCreateDocument()
+    
+    printlog( "Open printing dialog" )
+    FilePrint
+    
+    kontext "Printing"
+    if ( Printing.exists( 2 ) ) then
+    
+        PrintingTabControl.setPage( TabOptions )
+        
+        kontext "TabOptions"
+        call DialogTest( TabOptions )
+        
+        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 )
+        case "WRITER", "HTML", "MASTERDOCUMENT", "IMPRESS", "DRAW"
+
+            cb_test( PaperTrayFromPrefs, false, "" )
+
+        case "CALC", "MATH"
+        
+            printlog( "Calc does not have any program specific options." )
+            
+        case default
+        
+            warnlog( "Invalid gApplication: " & gApplication )
+            
+        end select
+        
+        kontext "Printing"
+        printlog( "Close print dialog" )
+        Printing.cancel()
+
+    else
+        warnlog( "Printing dialog did not open" )
+    endif
+    
+    printlog( "Close document" )
+    hDestroyDocument()
+            
+endcase
+
diff --git a/testautomation/global/tools/includes/optional/t_control_objects.inc b/testautomation/global/tools/includes/optional/t_control_objects.inc
index 79b28ece9214..ea49aca7bd61 100755
--- a/testautomation/global/tools/includes/optional/t_control_objects.inc
+++ b/testautomation/global/tools/includes/optional/t_control_objects.inc
@@ -35,93 +35,102 @@
 '*
 '*  short description : Functions to manipulate controls by accessing them as objects
 '*
-'*******************************************************************************
-'**
-' #0 checkRadioButtons ' check a group of RBs where the sel. RB is given by number
-' #0 checkRadioButton  ' check a singe RB where the state is specified directly
-' #0 checkCheckbox     ' check a single checkbox
-' #0 setCheckBox       ' sets checkbox to status provided in reference file
-' #0 checkComboBox     ' compares an index to one provided in a reference-file
-' #0 setComboBox       ' selects an index provided by a reference file
-' #0 checkListBox      ' compares an index to one provided in a reference-file
-' #0 setListBox        ' selects an index provided by a reference file
-' #0 checkListItem     ' check that a listitem is correct
-' #1 hSetControlValue  ' Change the value of a EntryField (failsafe)
-'**
 '\******************************************************************************
 
-function checkRadioButtons( _file as string  , sKey as string  , control1 as object  , control2 as object  , optional control3 as object  , optional control4 as object ) as integer
-    
-    '///<h3>EXPERIMENTAL: Get/Set function for some control types</h3>
-    '///<i>This is a function that allows to change the state/content of a
-    '///+ control via a configuration file. This function is experimental
-    '///+ and should not be used.<br>
-    '///+ This function checks if the correct radiobutton of a group is selected.
-    '///+ at least two radiobuttons must be provided, the third and fouth are optional.
-    '///+ The value for sKey in the reference file must be of type integer</i><br>
-    
-    dim _sItem as string
-    dim _iItem as integer
-    
-    ' lowercase sKey for comparision
-    sKey = lcase( sKey )
-    
-    ' get the reference value for sKey as string
-    _sItem = hGetFileData( _file , sKey )
+private const MSG1 = "Incorrect default setting: "
+
+'*******************************************************************************
+
+function cb_test( oControl as object, def_state as string, issueid as string ) as boolean
+
+    ' Small helper that prints a warnlog if a checkbox does not have the correct
+    ' default setting (checked -> def_state = TRUE). You can supply an issue id
+    ' which will be printed to the log. no parameter is optional, issueid can
+    ' be an empty string.
+    
+    ' oControl: The checkbox itself
+    ' def_state: Default state (checked or unchecked)
+    ' issueid:  Issue id as string "#i123456#" for QUASTe
+
+    dim con_state as boolean : con_state = oControl.isChecked()
+    dim con_name  as string  : con_name  = oControl.name()
     
-    ' cast it to int
-    _iItem = val( _sItem )
+    printlog( con_name & " (Checkbox)" )
+    cb_test() = true
+
+    if ( def_state ) then
     
-    ' check which one of the up to four radiobuttons is selected.
-    select case _iItem
-        
-    case 1 :
-        if ( control1.isChecked() = true ) then
-            checkRadioButtons() = true
-            printlog( "   * Radiobutton 1 selected: ok" )
-        else
-            warnlog( "The wrong radiobutton is selected" )
+        if ( NOT con_state ) then
+            warnlog( issueid & " " & MSG1 & con_name & " should be checked" )
+            cb_test() = false
         endif
         
-    case 2 :
-        if ( control2.isChecked() = true ) then
-            checkRadioButtons() = true
-            printlog( "   * Radiobutton 2 selected: ok" )
-        else
-            warnlog( "The wrong radiobutton is selected" )
+        oControl.unCheck()
+        oControl.check()
+        
+    else
+    
+        if ( con_state ) then
+            warnlog( issueid & " " & MSG1 & con_name & " should be unchecked" )
+            cb_test() = false
         endif
         
-    case 3 :
-        if ( isMissing( control3 ) = false ) then
-            if ( control3.isChecked() = true ) then
-                checkRadioButtons() = true
-                printlog( "   * Radiobutton 3 selected: ok" )
-            else
-                warnlog( "The wrong radiobutton is selected" )
-            endif
-        else
-            warnlog( "referencing to non-existing control." )
-            checkRadioButtons() = false
+        oControl.check()
+        oControl.unCheck()
+        
+    endif
+    
+end function
+
+'*******************************************************************************
+
+function lb_test( oControl as object, items as integer, preset as integer, issueid as string ) as boolean
+
+    ' Do some basic testing on listboxes
+    ' - verify that the number of entries is correct
+    ' - verify that the default selection is correct
+    ' - select each item and restore default
+    
+    ' oControl: The Listbox as object
+    ' items:    Number of items in the list
+    ' preset:   Item which is selected by default (usually 1), skip with 0
+    ' issueid:  Issue id as string "#i123456#" for QUASTe
+
+    dim con_name as string    : con_name   = oControl.name()
+    dim con_items as integer  : con_items  = oControl.getItemCount()
+    dim con_preset as integer : con_preset = oControl.getSelIndex()
+    dim con_iterator as integer
+    
+    printlog( con_name & " (Listbox)" )
+    if ( oControl.isEnabled() ) then
+        lb_test() = true
+        
+        if ( con_items <> items ) then
+            warnlog( issueid & " Incorrect itemcount in listbox: " & con_name )
+            printlog( "Expected: " & items )
+            printlog( "Found...: " & con_items )
+            lb_test() = false
         endif
         
-    case 4 :
-        if ( isMissing( control4 ) = false ) then
-            if ( control4.isChecked() = true ) then
-                checkRadioButtons() = true
-                printlog( "   * Radiobutton 4 selected: ok" )
-            else
-                warnlog( "The wrong radiobutton is selected" )
+        if ( preset > 0 ) then
+            if ( con_preset <> preset ) then
+                warnlog( issueid & " Incorrect default setting (index): " & con_name )
+                printlog( "Expected: " & preset )
+                printlog( "Found...: " & con_preset )
+                lb_test() = false
             endif
-        else
-            warnlog( "referencing to non-existing control." )
-            checkRadioButtons() = false
         endif
         
-    case else
-        warnlog( "Maximum of four connected radiobuttons allowed." )
-        checkRadioButtons() = false
-    end select
-    
+        for con_iterator = 1 to items
+            oControl.select( con_iterator )
+        next con_iterator
+        
+        if ( preset > 0 ) then oControl.select( preset )
+    else
+        printlog( "The control is disabled" & con_name )
+        lb_test() = false
+    endif
+
 end function
 
 '*******************************************************************************
diff --git a/testautomation/global/tools/includes/optional/t_docfuncs.inc b/testautomation/global/tools/includes/optional/t_docfuncs.inc
index 704d10fea8ba..8a9c143f7179 100755
--- a/testautomation/global/tools/includes/optional/t_docfuncs.inc
+++ b/testautomation/global/tools/includes/optional/t_docfuncs.inc
@@ -95,22 +95,19 @@ end function
 function hCloseNavigator() as boolean
 
     '///<h3>Function to close the navigator</h3>
-    '///<i>Starting point: Any document</i>
-    '///<ul>
     const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCloseNavigator::"
     
     if ( VERBOSE ) then printlog( CFN & "Enter" )
     
-    '///+<li>close the navigator if found</li>
     Kontext "Navigator"
     if ( Navigator.Exists() ) then
         Navigator.Close()
+        Navigator.notExists( 2 )
         if ( VERBOSE ) then printlog( CFN & "Closed Navigator" )
     else
         if ( VERBOSE ) then printlog( CFN & "Navigator not present" )
     endif
     
-    '///+<li>verify that the navigator is indeed closed, return true on success</li>
     Kontext "Navigator"
     if ( Navigator.exists() ) then
         hCloseNavigator() = false
@@ -120,7 +117,6 @@ function hCloseNavigator() as boolean
     endif
     
     if ( VERBOSE ) then printlog( CFN & "Exit" )
-    '///</ul>
 
 end function
 
@@ -302,36 +298,16 @@ end function
 
 function hCreateDocument() as boolean
 
-    '///<h3>Create anew document, extends hNewDocument()</h3>
-    '///<i>Starting point: Any document</i><br>
-    '///<i>Note: When calling this function with gApplication "BACKGROUND" the
-    '///+ function will actually close one document to get to the backing window</i><br>
-    '///<u>Input</u>:
-    '///<ol>
-    '///+<li>Nothing, valid gApplication must be set</li>
-    '///</ol>
-    '///<u>Returns</u>:
-    '///<ol>
-    '///+<li>Errorstatus (boolean)</li>
-    '///<ul>
-    '///+<li>TRUE if a new document was created successfully</li>
-    '///+<li>FALSE if anything went wrong</li>
-    '///</ul>
-    '///</ol>
-    '///<u>Description</u>:
-    '///<ul>
-    
-
+    '///<h3>Create anew document, extends hNewDocument() by providing a returnvalue</h3>
+    ' TRUE = New document created, FALSE = Failed to create a new document '
     const CFN = "global::tools::includes::optional::t_docfuncs.inc::hCreateDocument::"
 
     dim iDocCountBefore as integer 
     dim iDocCountAfter as integer
 
-    '///+<li>Retrieve the number of open documents</li>
     iDocCountBefore = getDocumentCount
     if ( VERBOSE ) then printlog( CFN & "Number of open documents before: " & iDocCountBefore )
 
-    '///+<li>Special treatment if gApplication = BACKGROUND (virtual gApplication)</li>
     if ( ucase( gApplication ) = "BACKGROUND" ) then
     	do while( getDocumentCount > 0 )
     	    hCloseDocument()
@@ -339,13 +315,8 @@ function hCreateDocument() as boolean
         hCreateDocument() = true
     else
     
-        '///+<li>Open a new document using hNewDocument()</li>
         call hNewDocument()
-
-        '///+<li>Retrieve the number of open documents</li>
         iDocCountAfter = getDocumentCount()
-
-        '///+<li>Verify that there is exactly one more document than before</li>
         if ( iDocCountAfter = ( iDocCountBefore + 1 ) ) then
             hCreateDocument() = true
         else
@@ -484,9 +455,7 @@ function hInitSingleDoc() as boolean
     '///<u>Description:</u>
     '///<ul>
     '///+<li>Close all documents until we are on the backing window</li>
-    do while ( getDocumentCount > 0 ) 
-        call hCloseDocument()
-    loop
+    hFileCloseAll()
     
     '///+<li>Save the previous gApplication</li>
     cOldApplication = gApplication
@@ -539,9 +508,7 @@ function hInitBackingMode() as boolean
     '///<u>Description:</u>
     '///<ul>
     '///+<li>Close all documents until we are on the backing window</li>
-    do while ( getDocumentCount > 0 ) 
-        hCloseDocument()
-    loop
+    hFileCloseAll()
     
     '///+<li>verify that we do not have any open documents left (redundant check)</li>
     if ( getDocumentCount = 0 ) then
diff --git a/testautomation/global/tools/includes/required/t_tools2.inc b/testautomation/global/tools/includes/required/t_tools2.inc
index 731bea120afc..f5fa7bb01cf7 100755
--- a/testautomation/global/tools/includes/required/t_tools2.inc
+++ b/testautomation/global/tools/includes/required/t_tools2.inc
@@ -763,7 +763,7 @@ function fGetProductName as string
     'Using the bootstraprc/bootstrap.ini file in ../program dir
     'to get the value of 'ProductKey'
     
-    if gPlatform = lcase("osx") then
+    if ( lcase( gPlatform ) = "osx" ) then
     	sfile = convertPath(gNetzOfficePath + "MacOS/bootstrap")
     else
     	sfile = convertPath(gNetzOfficePath + "program/bootstrap")
@@ -826,7 +826,7 @@ function FindBuildID as String
    ' bootstrap.ini/rc part
    if (gSamePC = TRUE) then
         ' since CWS nativefixer18 the information from bootstrap file is spread across bootstrap and version
-        if gPlatform = lcase("osx") then
+        if ( lcase( gPlatform ) = "osx" ) then
             sPlatformProgramPath = "MacOS"
         else
             sPlatformProgramPath = "program"
diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win
index 2917c20d27d6..e7af03c506e6 100755
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -214,8 +214,6 @@ AusDruckereinstellung sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN
 
 *DruckerZusaetzeWriter HID_OPTPRINT_PAGE
 Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF
-Tabellen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB
-Zeichnungen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW
 Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD
 Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND
 HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT
@@ -224,7 +222,6 @@ RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL
 SchwarzDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT
 LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP
 RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP
-Umgekehrt sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE
 Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT
 Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO
 NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index 0fd52589b6b5..a95316d03619 100755..100644
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -71,6 +71,101 @@ Currency HID_DLGDEPOT_LSTMARKETS
 OKButton HID_DLGDEPOT_0_CMDGOON_HISTORY
 CancelButton 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
+   
+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        
+
+*PurchaseStarOffice HID_LICENSING_DIALOG
+TabPurchase HID_TP_PURCHASE
+getSerialNumber tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET
+TabUnlockStarOffice HID_TP_UNLOCK
+SerialNumberA tab:Edit:TP_UNLOCK:ED_UNLOCK_A
+SerialNumberB tab:Edit:TP_UNLOCK:ED_UNLOCK_B
+SerialNumberC tab:Edit:TP_UNLOCK:ED_UNLOCK_C
+TabSummary HID_TP_SUMMARY
+
 *QueryEditWindow HID_CTL_QRYSQLEDIT
 
 *QueryDesignTable HID_CTL_QRYDGNTAB
@@ -456,6 +551,7 @@ PrintButton HID_HELP_TOOLBOXITEM_PRINT
 SetBookmarks HID_HELP_TOOLBOXITEM_BOOKMARKS
 
 *SaveScheme HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
+
 SchemeName HID_OPTIONS_COLORCONFIG_NAME_SCHEME
 
 *SecurityWarning HID_XMLSECDLG_MACROWARN
diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win
index aeca03118da6..4cacc4dda5cc 100755
--- a/testautomation/global/win/sys_dial.win
+++ b/testautomation/global/win/sys_dial.win
@@ -1,21 +1,3 @@
-' **** general print-Dialog ( File/Print )
-' ****
-*DruckenDlg svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG
-Drucker svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES
-Eigenschaften svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES
-AusdruckInDatei svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT
-Alles svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL
-Seiten svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES
-SeitenText svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES
-Auswahl svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION
-Exemplare svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES
-Sortieren svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE
-Zusaetze svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS
-EditFaxNo svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO
-AllSheets svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS
-SelectedSheets svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS
-SelectedCells svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS
-
 ' **** general Printersettings-Dialog ( File/Printer settings )
 ' ****
 *DruckerEinrichten svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG
diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win
index 10e2a8b50652..af6d933aefb4 100755
--- a/testautomation/global/win/tab_a_d.win
+++ b/testautomation/global/win/tab_a_d.win
@@ -303,24 +303,20 @@ SchwarzWeiss SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BLACKWHITE
 
 *TabDruckenHTML HID_OPTPRINT_PAGE
 Grafiken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF
-Tabellen SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB
 Kontrollfelder SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD
 Hintergrund SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND
 SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT
-Umgekehrt SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE
 Prospekt SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT
 Keine SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO
 NurNotizen SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY
 Dokumentende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END
 Seitenende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND
-EinzelneDruckauftraege sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS
 AusDruckereinstellung SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP
+LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES
 Fax SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX
 
 *TabDruckenWriter HID_OPTPRINT_PAGE
 Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF
-Tabellen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB
-Zeichnungen sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW
 Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD
 Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND
 HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT
@@ -329,13 +325,11 @@ RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL
 SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT
 LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP
 RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP
-Umgekehrt sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE
 Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT
 Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO
 NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY
 Dokumentende sw:RadioButton:TP_OPTPRINT_PAGE:RB_END
 Seitenende sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND
-EinzelneDruckauftraege sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS
 AusDruckereinstellung sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP
 LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES
 Fax sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX
diff --git a/testautomation/graphics/optional/g_print.bas b/testautomation/graphics/optional/g_print.bas
deleted file mode 100755
index 73ec23a9fef6..000000000000
--- a/testautomation/graphics/optional/g_print.bas
+++ /dev/null
@@ -1,64 +0,0 @@
-'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_print.bas,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:37 $
-'*
-'* 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 : wolfram.garten@sun.com
-'*
-'* short description : Graphics Function: Print
-'*
-'\******************************************************************
-
-public glLocale (15*20) as string
-
-sub main
-    PrintLog "------------------------- g_print test -------------------------"
-    Call hStatusIn ( "Graphics","g_print.bas")
-
-    use "graphics\tools\id_tools.inc"
-    use "graphics\optional\includes\global\g_print.inc"
-
-    PrintLog "-------------------------" + gApplication + "-------------------"
-    call tFilePrint
-
-    gApplication = "DRAW"
-    PrintLog "-------------------------" + gApplication + "-------------------"
-    call tFilePrint
-
-    Call hStatusOut
-end sub
-
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    gApplication = "IMPRESS"
-    Call GetUseFiles
-end sub
diff --git a/testautomation/graphics/optional/includes/global/g_print.inc b/testautomation/graphics/optional/includes/global/g_print.inc
deleted file mode 100755
index 21bad45dc420..000000000000
--- a/testautomation/graphics/optional/includes/global/g_print.inc
+++ /dev/null
@@ -1,164 +0,0 @@
-'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_print.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 10:42:40 $
-'*
-'* 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 : wolfram.garten@sun.com
-'*
-'* short description :
-'*
-'**************************************************************************************
-' #1 tFilePrint
-'\*************************************************************************************
-
-testcase tFilePrint
-    Call hNewDocument
-
-    printlog "Inserting testtext."
-    hTextrahmenErstellen ("This is an automated print test with testtool for GRAPHICS ",90,90,80,10)
-    hTextrahmenErstellen ("Version    : "+ gVersionsnummer + " / " + gLanguage,80,90,70,10)
-    hTextrahmenErstellen ("Date / Time : "+  Date + " / " + Time,70,90,60,10)
-    hTextrahmenErstellen ("Machine / User: " + gPCName + "   " + gUser,60,90,50,10)
-
-    printlog "Opening print Dialog."
-    FilePrint
-    kontext
-    if active.exists(2) then
-        active.ok
-        qaerrorlog "There is no printer available - please install one on your system!"
-    endif
-    sleep 2
-    Kontext "DruckenDlg"
-
-
-    ' Not yet active since this feature is not build into the master: i85355
-    '   printlog "Checking options for impress..."
-    '    if (gApplication = "IMPRESS") then
-    '        if PrintContent.GetSelIndex <> 1 then
-    '            warnlog "Not first entry selected!"
-    '       else
-    '            printlog " First entry selected."
-    '        endif
-    '
-    '        if PrintContent.GetItemCount <> 4 then
-    '            warnlog "Entry-number of PrintContent listbox is wrong!"
-    '        else
-    '            printlog "Entry-number of PrintContent listbox is 4."
-    '        endif
-    '
-    '        PrintContent.Select 2
-    '        if SlidesPerPage.IsEnabled then
-    '            printlog "SlidesPerPage active."
-    '        else
-    '            warnlog "SlidesPerPage did not get active!"
-    '        endif
-    '
-    '        VerticalOrder.Check
-    '        printlog "Vertical checked."
-    '        HorizontalOrder.Check
-    '        printlog "Horizontal checked again."
-    '
-    '    else
-    '        printlog "This is not impress, so no further print content testing."
-    '    endif
-
-    printlog "Opening Options dialog."
-    Zusaetze.Click
-    sleep 1
-    Kontext "DruckerZusaetzeDraw"
-
-    printlog "Checking brochure printing."
-    if Prospekt.IsChecked then
-        warnlog "Somebody forgot to uncheck the prospect printing!"
-        Standard.Check
-    else
-        printlog "Brochure printing is checked."
-    endif
-
-
-    Seitenname.Check
-    Datum.Check
-    Zeit.Check
-    AusgeblendeteSeiten.Check
-    SeitengroesseAnpassen.Check
-    AusDruckereinstellung.Check
-
-    DruckerZusaetzeDraw.OK
-    Kontext "DruckenDlg"
-    Zusaetze.Click
-    sleep 2
-    Kontext "DruckerZusaetzeDraw"
-    if NOT Seitenname.IsChecked Then
-        warnlog "  - Page name not checked"
-    else
-        printlog "Page name checked."
-    endif
-
-    if NOT Datum.IsChecked Then
-        warnlog "  - Date not checked"
-    else
-        printlog "Date is checked."
-    endif
-
-    if NOT Zeit.IsChecked Then
-        warnlog "  - Time not checked"
-    else
-        printlog "Time is checked."
-    endif
-
-    if NOT AusgeblendeteSeiten.IsChecked Then
-        warnlog "  - Hidden pages not checked"
-    else
-        printlog "Hidden pages checked."
-    endif
-
-    if NOT SeitengroesseAnpassen.IsChecked Then
-        warnlog "  - Fit to page not checked"
-    else
-        printlog "Fit to page checked."
-    endif
-
-    if NOT AusDruckereinstellung.IsChecked Then
-        warnlog "  - Paper tray from printer settings not checked"
-    else
-        printlog "Paper tray checked."
-    endif
-
-    AusDruckereinstellung.UnCheck
-    Standard.Check
-    DruckerZusaetzeDraw.OK
-    Kontext "DruckenDlg"
-    DruckenDlg.Cancel
-    Sleep 5
-
-    Call hCloseDocument
-endcase
-
diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc
index a92daf05c2e2..fabc078af92b 100755
--- a/testautomation/graphics/optional/includes/global/id_001.inc
+++ b/testautomation/graphics/optional/includes/global/id_001.inc
@@ -41,7 +41,6 @@
 ' #1 tiFileVersion (sFileIn as string)
 ' #1 tiFilePassword
 ' #1 tiFileTemplates
-' #1 tiFilePrint
 ' #1 tmFileNewFromTemplate
 ' #1 tmFileOpen
 ' #1 tmFileClose
@@ -471,30 +470,6 @@ testcase tiFileTemplates
     Call hCloseDocument
 endcase
 
-testcase tiFilePrint
-    Call hNewDocument
-    FilePrint
-    WaitSlot (1000)
-    kontext
-    if active.exists(5) then
-        active.ok
-        qaerrorlog "There is no printer available - please install one on your system!"
-    end if
-    WaitSlot (2000)
-    Kontext "DruckenDlg"
-    Call DialogTest (DruckenDlg)
-    WaitSlot (2000)
-    Zusaetze.Click
-
-    Kontext "DruckerZusaetzeDraw"
-    Call DialogTest (DruckerZusaetzeDraw)
-    DruckerZusaetzeDraw.Cancel
-    Kontext "DruckenDlg"
-    DruckenDlg.Cancel
-    WaitSlot (2000)
-    Call hCloseDocument
-endcase
-
 
 '-----------------------------------------------------------
 '*******************  M A T H dito *************************
diff --git a/testautomation/graphics/optional/includes/global/id_009.inc b/testautomation/graphics/optional/includes/global/id_009.inc
index bfbaf6861c36..bb005deb996c 100755
--- a/testautomation/graphics/optional/includes/global/id_009.inc
+++ b/testautomation/graphics/optional/includes/global/id_009.inc
@@ -165,9 +165,9 @@ testcase tmHelpContents
             Active.Ok
         end if
 
-        kontext "DruckenDLG"
-        if DruckenDLG.Exists then
-            DruckenDLG.cancel
+        kontext "Printing"
+        if Printing.Exists( 2 ) then
+            Printing.cancel
         else
             warnlog "the Print-Dialogue didnt appear."
         end if
diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas
index 66ca92a6b190..3511bf199989 100755
--- a/testautomation/graphics/required/d_updt.bas
+++ b/testautomation/graphics/required/d_updt.bas
@@ -75,6 +75,7 @@ sub main
     call id_008
     call id_009
     call id_001
+    Call g_printing
     Call tFileExportAsPDF
     Call tExportAsPDFButton
 
@@ -88,6 +89,9 @@ sub LoadIncludeFiles
     use "global\required\includes\g_option.inc"
     use "global\required\includes\g_customize.inc"
     use "global\required\includes\g_001.inc"
+    use "global\required\includes\g_printing.inc"
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
    Call GetUseFiles
    gApplication   = "DRAW"
 end sub
diff --git a/testautomation/graphics/required/i_updt_2.bas b/testautomation/graphics/required/i_updt_2.bas
index c0da23879d21..83dfc5047db0 100755
--- a/testautomation/graphics/required/i_updt_2.bas
+++ b/testautomation/graphics/required/i_updt_2.bas
@@ -65,6 +65,7 @@ sub main
    call id_009
    call id_007
    call id_011
+   call g_printing
 
   Call hStatusOut
 end sub
@@ -75,6 +76,10 @@ sub LoadIncludeFiles
    use "global\system\includes\gvariabl.inc"
    use "global\required\includes\g_001.inc"
    use "global\required\includes\g_009.inc"
+   use "global\required\includes\g_printing.inc"
+   use "global\tools\includes\optional\t_docfuncs.inc"
+   use "global\tools\includes\optional\t_control_objects.inc"
+
    gApplication   = "IMPRESS"
     Call GetUseFiles()
 end sub
diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc
index 995de9f2b1e1..e84afee0de56 100755
--- a/testautomation/graphics/required/includes/global/id_001.inc
+++ b/testautomation/graphics/required/includes/global/id_001.inc
@@ -41,7 +41,6 @@
 ' #1 tiFileVersion (sFileIn as string)
 ' #1 tiFilePassword
 ' #1 tiFileTemplates
-' #1 tiFilePrint
 ' #1 tmFileNewFromTemplate
 ' #1 tmFileOpen
 ' #1 tmFileClose
@@ -537,38 +536,6 @@ endcase 'tiFileTemplates
 
 '-------------------------------------------------------------------------------
 
-testcase tiFilePrint
-   Call hNewDocument
-printlog " open application"
-printlog " File->Print"
-   FilePrint
-   WaitSlot (1000)
-   kontext
-   if active.exists(5) then
-       active.ok
-       qaerrorlog "There is no printer available - please install one on your system!"
-   end if
-   WaitSlot (2000)
-   Kontext "DruckenDlg"
-       Call DialogTest (DruckenDlg)
-        printlog " click 'options'"
-       WaitSlot (2000)
-       Zusaetze.Click
-
-       Kontext "DruckerZusaetzeDraw"
-       Call DialogTest (DruckerZusaetzeDraw)
-       DruckerZusaetzeDraw.Cancel
-        printlog " close options dialog with 'cancel'"
-       Kontext "DruckenDlg"
-       printlog " close print dialog with 'cancel'"
-       DruckenDlg.Cancel
-       WaitSlot (2000)
-printlog " close application"
-   Call hCloseDocument
-endcase 'tiFilePrint
-
-'-------------------------------------------------------------------------------
-
 testcase tmFileNewFromTemplate
    Call hNewDocument
    FileNewFromTemplate
diff --git a/testautomation/graphics/required/includes/global/id_009.inc b/testautomation/graphics/required/includes/global/id_009.inc
index 959b6d5ebfd9..24e7e712363f 100755
--- a/testautomation/graphics/required/includes/global/id_009.inc
+++ b/testautomation/graphics/required/includes/global/id_009.inc
@@ -194,10 +194,10 @@ testcase tmHelpContents
 			   	  Active.Ok
 			   end if
 			   
-               kontext "DruckenDLG"
-               if DruckenDLG.Exists then
+               kontext "Printing"
+               if Printing.Exists( 2 ) then
                   '/// In the dialog 'Print' press the button 'Cancel' ///'
-                  DruckenDLG.cancel
+                  Printing.cancel
                else
                   warnlog "the Print-Dialogue didnt appear."
                end if
diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc
index d0335997d2f4..78a71da95775 100755
--- a/testautomation/graphics/tools/id_tools_2.inc
+++ b/testautomation/graphics/tools/id_tools_2.inc
@@ -730,7 +730,6 @@ sub id_001
    call tiFileVersion
    printlog " File->Send not possible to test, because extrnal prg get's called!"
    call tiFileTemplates
-   call tiFilePrint
 '   Call tiFileNew instead i call:
    call tmFileNewFromTemplate
    call tmFileOpen
diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc
index 98b72b99b734..4139e688f1f5 100755
--- a/testautomation/math/optional/includes/m_101_.inc
+++ b/testautomation/math/optional/includes/m_101_.inc
@@ -550,20 +550,25 @@ testcase tFilePrint
     '/// print file ///'
     try
         Fileprint
-        sleep 2
         kontext
         if active.exists(2) then
             active.ok
             qaerrorlog "There is no printer available - please install one on your system!"
-            sleep 2
-            Kontext "DruckenDlg"
-            DruckenDlg.cancel
+            Kontext "Printing"
+            if ( Printing.exists( 2 ) ) then
+                Printing.cancel
+            else
+                warnlog( "Printing dialog did not open" )
+            endif
         else
-            sleep 2
-            Kontext "DruckenDlg"
-            DruckenDlg.Ok
+            Kontext "Printing"
+            if ( Printing.exists( 2 ) ) then
+                Printing.ok
+            else
+                warnlog( "Printing dialog did not open" )
+            endif
         endif
-        sleep 2
+
         kontext
         if active.exists(2) then
             active.ok
diff --git a/testautomation/math/required/includes/m_001_.inc b/testautomation/math/required/includes/m_001_.inc
index fd7905ef382a..452a3bfd0106 100755
--- a/testautomation/math/required/includes/m_001_.inc
+++ b/testautomation/math/required/includes/m_001_.inc
@@ -61,7 +61,6 @@ sub M_001_
    Call tmFileVersions
    Call tmExportAsPDF
    Call tmFileProperties
-   Call tmFilePrint
   Call tmFilePrinterSetting
    Call tmFilePassword
 end sub
@@ -380,27 +379,6 @@ testcase tmFileVersions
    if app.Dir (Datei) <> "" then app.kill Datei
 endcase
 
-testcase tmFilePrint
-'/// open application ///'
-   Call hNewDocument
-   sleep 3
-   '/// File->Print ///'
-   FilePrint
-   kontext
-   if active.exists(2) then
-       active.ok
-       qaerrorlog "There is no printer available - please install one on your system!"
-   endif
-   sleep 2
-   Kontext "DruckenDlg"
-   Call DialogTest (DruckenDlg)
-   '/// cancel dialog 'Print' ///'
-   DruckenDlg.Cancel
-   sleep 2
-'/// close application ///'
-   Call hCloseDocument
-endcase
-
 '-----------------------------------------------------------
 '*******************   I D  dito   *************************
 '-----------------------------------------------------------
diff --git a/testautomation/math/required/includes/m_007_.inc b/testautomation/math/required/includes/m_007_.inc
index 64b5fda9fb3e..606ab22cd8f4 100755
--- a/testautomation/math/required/includes/m_007_.inc
+++ b/testautomation/math/required/includes/m_007_.inc
@@ -204,9 +204,9 @@ testcase tmHelpContents
                       qaerrorlog "There is no printer available - please install one on your system!"
                   endif
                   sleep 2
-               kontext "DruckenDLG"
+               kontext "Printing"
                '/// On the dialog 'Print' press the button 'Cancel' ///'
-               DruckenDLG.cancel
+               Printing.cancel
             Kontext "TB_Help"
             '///+ click on button 'Add to Bookmarks ...' ///'
             SetBookmarks.Click
diff --git a/testautomation/math/required/m_updt.bas b/testautomation/math/required/m_updt.bas
index 61b517b1ba65..85d7e730518a 100755
--- a/testautomation/math/required/m_updt.bas
+++ b/testautomation/math/required/m_updt.bas
@@ -64,6 +64,7 @@ sub main
    Call m_020_       ' toolbars
    Call M_010_       ' Operators
    Call M_001_       ' File Menu
+   Call g_printing()
    Call tFileExportAsPDF
 
    Call hStatusOut
@@ -76,7 +77,11 @@ sub LoadIncludeFiles
    use "global\required\includes\g_option.inc"
    use "global\required\includes\g_customize.inc"
    use "global\required\includes\g_001.inc"
+   use "global\required\includes\g_009.inc"
+   use "global\required\includes\g_printing.inc"
    use "global\tools\includes\optional\t_ui_filters.inc" ' for gMathFilter in m_001_.inc
+   use "global\tools\includes\optional\t_docfuncs.inc"
+   use "global\tools\includes\optional\t_control_objects.inc"
    gApplication = "MATH"
    Call GetUseFiles
 end sub
diff --git a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc
index 3d4ceb3138aa..fa13497cea4a 100755
--- a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc
+++ b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc
@@ -266,14 +266,16 @@ testcase tAddPrintRange
      Active.ok
     end if
     
-    Kontext "DruckenDlg"
-   	Seiten.check
-    if SeitenText.GetText = "1-3" then
+    Kontext "Printing"
+    Kontext "TabPrintGeneral"
+    PrintPages.check
+    if PageRange.GetText = "1-3" then
    	   printlog "+ Pages to print as expected"
     else
-   	   warnlog "Expected pages to print are <1-3>, but we got: " & SeitenText.GetText
+   	   warnlog "Expected pages to print are <1-3>, but we got: " & PageRange.GetText
     end if
-   	DruckenDlg.Cancel
+    	Kontext "Printing"
+   	Printing.Cancel
     sleep(2)
     call hCloseDocument
 endcase
@@ -864,15 +866,15 @@ testcase tEmptyRangeMessagebox
             endcatch
         end if
     else
-        warnlog "There is no messagebox"
+        warnlog "There is no messagebox (#i106423#)"
         kontext "DocumentCalc"
         call hCloseDocument
         goto endsub
     end if
     
-    Kontext "DruckenDlg"
-    if DruckenDlg.Exists( 2 ) then
-    	DruckenDlg.Cancel
+    Kontext "Printing"
+    if Printing.Exists( 2 ) then
+    	Printing.Cancel
     end if
     sleep 2
 
@@ -916,9 +918,9 @@ testcase tEmptyRangeMessagebox
         goto endsub
     end if
 
-	kontext "DruckenDlg"
-	if DruckenDlg.Exists( 2 ) then
-		DruckenDlg.Cancel
+    kontext "Printing"
+    if Printing.Exists( 2 ) then
+    	Printing.Cancel
     end if    
     printlog "Close document"
     call hCloseDocument
diff --git a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc
index aed510138d38..08d424470de5 100755
--- a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc
+++ b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc
@@ -232,17 +232,19 @@ dim sPagesToPrint as STRING
             end if
         end if
         printlog "Check if print dialog exists"
-        Kontext "DruckenDlg"
-        if DruckenDlg.Exists(2) then
-            Seiten.check
-            printlog "Check for string '1-12' in pages textbox"
-            sPagesToPrint = SeitenText.getText
-            if sPagesToPrint = "1-12" then
+        Kontext "Printing"
+        if Printing.Exists(2) then
+            Kontext "TabPrintGeneral"
+            PrintPages.check
+            printlog "Check for string '1-4' in pages textbox"
+            sPagesToPrint = PageRange.getText
+            if sPagesToPrint = "1-4" then
                 printlog "    OK, expected number of pages for output"
             else
                 warnlog "Unexpected number of pages for print output: " & sPagesToPrint & " -> Check this out!"
             end if
-            DruckenDlg.Cancel
+            Kontext "Printing"
+            Printing.Cancel
         else
             qaErrorlog "OOPS, are you sure that a printer is configured at all?"
         end if
diff --git a/testautomation/spreadsheet/required/c_updt1.bas b/testautomation/spreadsheet/required/c_updt1.bas
index af3ea7596374..076b247a82ad 100755
--- a/testautomation/spreadsheet/required/c_updt1.bas
+++ b/testautomation/spreadsheet/required/c_updt1.bas
@@ -69,6 +69,10 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\optional\t_locale_tools.inc"
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
+    use "global\required\includes\g_printing.inc"
+    
     gApplication   = "CALC"
     GetUseFiles ()
 end sub
diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
index a05f22ed9360..4e6dbe0f8d70 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
@@ -48,7 +48,6 @@
 ' #0 tFileSaveAsDBF
 ' #1 tFileVersions
 ' #1 tFilePagePreview
-' #1 tFilePrint
 '*
 '\***********************************************************************
 
@@ -67,7 +66,7 @@ sub c_upd_filemenu
     Call tFileSaveAsDBF
     Call tFileVersions
     Call tFilePagePreview
-    Call tFilePrint
+    Call g_printing()
 
 end sub
 
@@ -596,71 +595,3 @@ testcase tFilePagePreview
 
 endcase
 
-'-----------------------------------------------------------
-
-testcase tFilePrint
-
-    '/// Open new Spreadsheet document
-    Printlog " Open new Spreadsheet document"
-    Call hNewDocument
-    '/// Enter some text
-    Printlog " Enter some text"
-    Kontext "DocumentCalc"
-    DocumentCalc.Typekeys "Test <RETURN>"
-    '/// Open File-Print
-    Printlog " Open File-Print"
-    FilePrint
-    '/// Look for warning regarding missing printer
-    '/// -> If configuration is missing only this MsgBox is tested
-    Kontext
-    if Active.Exists(2) then
-        if Active.GetRT = 304 then
-            Printlog Active.GetText
-            QAErrorLog "No printer is configured for this system"
-        else
-            Printlog Active.GetText
-            warnlog "There is an unexpected warning!"
-        end if
-        '/// Close messagebox with OK
-        Printlog " Close messagebox with OK"
-        Active.OK
-        '/// Cancel Print dialog
-        Printlog " Cancel Print dialog"
-        Kontext "DruckenDLG"
-        DruckenDLG.Cancel
-        '/// Close document
-        Printlog " Close document"
-        Call hCloseDocument
-        goto endsub
-    end if
-    Kontext "DruckenDLG"
-    '/// Check existence of print dilaog
-    Call DialogTest ( DruckenDLG )
-    '/// Invoke the print options dialog
-    Printlog " Invoke the print options dialog"
-    Kontext "DruckenDLG"
-    Zusaetze.Click
-    Kontext "TabPrintCalcOptions"
-    '/// Check existence of print options dilaog
-    Call DialogTest ( TabPrintCalcOptions )
-    '/// Cancel print options dialog
-    Printlog " Cancel print options dialog"
-    TabPrintCalcOptions.Cancel
-    '/// Check option 'Print to file'
-    Printlog " Check option 'Print to file'"         
-    Kontext "DruckenDLG"
-    AusdruckInDatei.check
-    '/// Commit print dialog
-    Printlog " Commit print dialog"
-    DruckenDLG.OK
-    '/// (Save file dialog should be visible now)
-    Kontext "SpeichernDLG"
-    '/// Check existence of save dilaog
-    Call DialogTest ( SpeichernDLG )
-    '/// Cancel save dialog
-    Printlog " Cancel save dialog"
-    SpeichernDLG.Cancel
-    '/// Close document
-    Printlog " Close document"
-    Call hCloseDocument
-endcase
diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc
index f0444a21271b..0331c701032d 100755
--- a/testautomation/writer/optional/includes/fields/w_fields4.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields4.inc
@@ -782,15 +782,15 @@ testcase tDocInformationPrinted
 	   	if Active.GetRT = 304 then
 			Active.Ok
 			QAErrorLog "No Default-Printer! The testcase isn't tested !"
-			Kontext "DruckenDlg"
+			Kontext "Printing"
 			Sleep 1
-			DruckenDlg.Cancel
+			Printing.Cancel
 			goto NoTest
 	   end if
 	else
-	   Kontext "DruckenDlg"
+	   Kontext "Printing"
 	   Sleep 1
-	   DruckenDlg.OK
+	   Printing.OK
 		kontext "active"
 		if active.exists(5) then
 			QaErrorLog "Error Printing..."
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc
index 034bbd7c1793..ff010c0cda14 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc
@@ -455,39 +455,34 @@ endcase
 
 testcase tInsertGraphic_8
 
-  Dim iFileType      as Integer
-  Dim iFileNumber as Integer
-
-    iFileType = 1  'filter (Format <All>)
-
-    if gPlatGroup = "unx" then
-        iFileNumber = 4  '4 graphic files. (directory hidden on Unix)
-    else
-        iFileNumber = 5  '4 graphic files and 1 directory.
-    end if
-
-  PrintLog "- Test preselect Filter (Format <All>)"
- '/// Test preselect Filter (Format <All>)
-
-  Call hNewDocument
-
-  '/// Insert a Graphic , Insert/Graphics/From file
-   InsertGraphicsFromFile
-
-  '/// Select filter (Format <All>)
-   Kontext "GrafikEinfuegenDlg"
-    Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") )
-    Sleep 1
-    Oeffnen.Click
-
-    Dateityp.Select iFileType
-    Sleep 1
-
-  '/// Check if Filter (Format <All>) works well
-    if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter (Format <All>) does NOT work well"
-   GrafikEinfuegenDlg.Cancel
-
-  Call hCloseDocument
+	Dim iFileType      as Integer
+	Dim iFileNumber as Integer
+	
+	iFileType = 1  'filter (Format <All>)	
+	iFileNumber = 4
+	
+	PrintLog "- Test preselect Filter (Format <All>)"
+	'/// Test preselect Filter (Format <All>)
+	
+	Call hNewDocument
+	
+	'/// Insert a Graphic , Insert/Graphics/From file
+	InsertGraphicsFromFile
+	
+	'/// Select filter (Format <All>)
+	Kontext "GrafikEinfuegenDlg"
+	Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") )
+	Sleep 1
+	Oeffnen.Click
+	
+	Dateityp.Select iFileType
+	Sleep 1
+	
+	'/// Check if Filter (Format <All>) works well
+	if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter (Format <All>) does NOT work well"
+	GrafikEinfuegenDlg.Cancel
+	
+	Call hCloseDocument
 
 endcase
 
@@ -495,39 +490,34 @@ endcase
 
 testcase tInsertGraphic_9
 
-  Dim iFileType      as Integer
-  Dim iFileNumber as Integer
-
-    iFileType   = 2  'another filter except for (Format <All>) -- bmp
-
-    if gPlatGroup = "unx" then
-      iFileNumber = 1
-    else
-      iFileNumber = 2  'the first is the .svn-directory
-    end if
-
-  PrintLog "- Test preselect Filter excepte for (Format <All>)"
- '/// Test preselect Filter excepte for (Format <All>)
-
-  Call hNewDocument
-
-  '/// Insert a Graphic , Insert/Graphics/From file
-   InsertGraphicsFromFile
-
-  '/// Select filter 'BMP'
-   Kontext "GrafikEinfuegenDlg"
-    Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") )
-    Sleep 1
-    Oeffnen.Click
-
-    Dateityp.Select iFileType
-    Sleep 1
-
-  '/// Check if Filter BMP works well
-    if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter BMP does NOT work well"
-   GrafikEinfuegenDlg.Cancel
-
-  Call hCloseDocument
+	Dim iFileType      as Integer
+	Dim iFileNumber as Integer
+	
+	iFileType   = 2  'another filter except for (Format <All>) -- bmp	
+	iFileNumber = 1
+	
+	PrintLog "- Test preselect Filter excepte for (Format <All>)"
+	'/// Test preselect Filter excepte for (Format <All>)
+	
+	Call hNewDocument
+	
+	'/// Insert a Graphic , Insert/Graphics/From file
+	InsertGraphicsFromFile
+	
+	'/// Select filter 'BMP'
+	Kontext "GrafikEinfuegenDlg"
+	Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") )
+	Sleep 1
+	Oeffnen.Click
+	
+	Dateityp.Select iFileType
+	Sleep 1
+	
+	'/// Check if Filter BMP works well
+	if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter BMP does NOT work well"
+	GrafikEinfuegenDlg.Cancel
+	
+	Call hCloseDocument
 
 endcase
 
diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc
index 0a1790c1cbcb..83c59edb4a68 100755
--- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc
+++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc
@@ -812,14 +812,14 @@ testcase tInsertGraphic_40
         if Active.GetRT = 304 then
             Active.Ok
             QAErrorLog "No Default-Printer!"
-            Kontext "DruckenDlg"
+            Kontext "Printing"
             Sleep 1
-            DruckenDlg.Cancel
+            Printing.Cancel
         end if
     else
-        Kontext "DruckenDlg"
+        Kontext "Printing"
         Sleep 1
-        DruckenDlg.OK
+        Printing.OK
         Sleep 5
     end if
     
diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc
index 508030bdc4d7..73e129c47910 100755
--- a/testautomation/writer/optional/includes/option/wh_o_1.inc
+++ b/testautomation/writer/optional/includes/option/wh_o_1.inc
@@ -50,7 +50,7 @@ end sub
 '------------------------------------------------------------------------------
 testcase tToolsOptionsHTMLContent
 
-    Dim irgendwas(17) as boolean
+    Dim bCheckboxStatus(17) as boolean
 
     printlog "tToolsOptionsHTMLContent datei erstellen zum laden"
     '/// uses "input\\writer\\optional\\options\\options1.sxw"  ///
@@ -63,23 +63,21 @@ testcase tToolsOptionsHTMLContent
     ToolsOptions
     Call hToolsOptions ("HTML","View")
 
-    irgendwas(1) = GrafikenUndObjekte.IsChecked
-    irgendwas(2) = Tabellen.IsChecked
-    irgendwas(3) = Zeichnungen.IsChecked
-    irgendwas(4) = Feldnamen.IsChecked
-    irgendwas(5) = Notizen.IsChecked
+    bCheckboxStatus(1) = GrafikenUndObjekte.IsChecked
+    bCheckboxStatus(3) = Zeichnungen.IsChecked
+    bCheckboxStatus(4) = Feldnamen.IsChecked
+    bCheckboxStatus(5) = Notizen.IsChecked
 
-    'irgendwas(9) = Felder.IsChecked
+    'bCheckboxStatus(9) = Felder.IsChecked
 
     printlog ("'/// - all states inverting ///")
 
-    if irgendwas(1) Then GrafikenUndObjekte.UnCheck Else GrafikenUndObjekte.Check
-    if irgendwas(2) Then Tabellen.UnCheck Else Tabellen.Check
-    if irgendwas(3) Then Zeichnungen.UnCheck Else Zeichnungen.Check
-    if irgendwas(4) Then Feldnamen.UnCheck Else Feldnamen.Check
-    if irgendwas(5) Then Notizen.UnCheck Else Notizen.Check
+    if bCheckboxStatus(1) Then GrafikenUndObjekte.UnCheck Else GrafikenUndObjekte.Check
+    if bCheckboxStatus(3) Then Zeichnungen.UnCheck Else Zeichnungen.Check
+    if bCheckboxStatus(4) Then Feldnamen.UnCheck Else Feldnamen.Check
+    if bCheckboxStatus(5) Then Notizen.UnCheck Else Notizen.Check
     
-    'if irgendwas(9) Then Felder.UnCheck Else Felder.Check
+    'if bCheckboxStatus(9) Then Felder.UnCheck Else Felder.Check
     
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -92,16 +90,14 @@ testcase tToolsOptionsHTMLContent
     ToolsOptions
     Call hToolsOptions ( "HTML","View" )
     
-    if ( irgendwas(1) = GrafikenUndObjekte.IsChecked ) Then WarnLog "GrafikenUndObjekte state changed"
-    if ( irgendwas(2) = Tabellen.IsChecked  ) Then WarnLog "Tabellen state changed"
-    if ( irgendwas(3) = Zeichnungen.IsChecked  ) Then WarnLog "Zeichnungen state changed"
-    if ( irgendwas(4) = Feldnamen.IsChecked  ) Then  WarnLog "Feldnamen state changed"
-    if ( irgendwas(5) = Notizen.IsChecked  ) Then  WarnLog "Notizen state changed"
+    if ( bCheckboxStatus(1) = GrafikenUndObjekte.IsChecked ) Then WarnLog "Grafiken state changed"
+    if ( bCheckboxStatus(3) = Zeichnungen.IsChecked  ) Then WarnLog "Zeichnungen state changed"
+    if ( bCheckboxStatus(4) = Feldnamen.IsChecked  ) Then  WarnLog "Feldnamen state changed"
+    if ( bCheckboxStatus(5) = Notizen.IsChecked  ) Then  WarnLog "Notizen state changed"
     
     printlog ("'/// - all UnCheck -> o ///")
     
     GrafikenUndObjekte.UnCheck
-    Tabellen.UnCheck
     Zeichnungen.UnCheck
     Feldnamen.UnCheck
     Notizen.UnCheck
@@ -115,15 +111,13 @@ testcase tToolsOptionsHTMLContent
     ToolsOptions
     hToolsOptions ( "HTML","View" )
     
-    if GrafikenUndObjekte.IsChecked Then WarnLog "GrafikenUndObjekte x"
-    if Tabellen.IsChecked Then WarnLog "Tabellen x"
+    if GrafikenUndObjekte.IsChecked Then WarnLog "Grafiken x"
     if Zeichnungen.IsChecked Then WarnLog "Zeichnungen x"
     if Feldnamen.IsChecked Then  WarnLog "Feldnamen x"
     if Notizen.IsChecked Then  WarnLog "Notizen x"
     
     Printlog ("'/// - all Check -> x ///")
     GrafikenUndObjekte.Check
-    Tabellen.Check
     Zeichnungen.Check
     Feldnamen.Check
     Notizen.Check
@@ -135,18 +129,16 @@ testcase tToolsOptionsHTMLContent
     ToolsOptions
     Call hToolsOptions ( "HTML","View" )
     
-    if true <> GrafikenUndObjekte.IsChecked Then WarnLog "GrafikenUndObjekte o"
-    if True <> Tabellen.IsChecked Then WarnLog "Tabellen o"
+    if true <> GrafikenUndObjekte.IsChecked Then WarnLog "Grafiken o"
     if True <> Zeichnungen.IsChecked Then WarnLog "Zeichnungen o"
     if True <> Feldnamen.IsChecked Then  WarnLog "Feldnamen o"
     if True <> Notizen.IsChecked Then  WarnLog "Notizen o"
     
     printlog ("'/// - restore states ///")    
-    if ( irgendwas(1) = TRUE ) Then  GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck
-    if ( irgendwas(2) = TRUE ) Then  Tabellen.Check Else Tabellen.UnCheck
-    if ( irgendwas(3) = TRUE ) Then  Zeichnungen.Check Else Zeichnungen.UnCheck
-    if ( irgendwas(4) = TRUE ) Then  Feldnamen.Check Else Feldnamen.UnCheck
-    if ( irgendwas(5) = TRUE ) Then  Notizen.Check Else Notizen.UnCheck
+    if ( bCheckboxStatus(1) = TRUE ) Then  GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck
+    if ( bCheckboxStatus(3) = TRUE ) Then  Zeichnungen.Check Else Zeichnungen.UnCheck
+    if ( bCheckboxStatus(4) = TRUE ) Then  Feldnamen.Check Else Feldnamen.UnCheck
+    if ( bCheckboxStatus(5) = TRUE ) Then  Notizen.Check Else Notizen.UnCheck
     
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -158,7 +150,7 @@ endcase
 
 '------------------------------------------------------------------------------
 testcase tToolsOptionsHTMLLayout
-    Dim irgendwas(11) as boolean
+    Dim bCheckboxStatus(11) as boolean
     Dim iMasseinheit(3) as integer
     Dim iTemp(3) as integer
     '///Open "writer\\optional\\input\\options\\options1.sxw ///
@@ -169,15 +161,15 @@ testcase tToolsOptionsHTMLLayout
     ToolsOptions
     Call hToolsOptions ( "HTML" , "VIEW" ) '*TabLayoutHTML/ (1)
     
-    irgendwas(1) = Hilfslinien.IsChecked
-    irgendwas(2) = FarbigeHandles.IsChecked
-    irgendwas(3) = GrosseHandles.IsChecked
-    irgendwas(4) = HorizontaleBildlaufleiste.IsChecked
-    irgendwas(5) = VertikaleBildlaufleiste.IsChecked
-    irgendwas(10) = Lineal.IsChecked
-    irgendwas(6) = HorizontalesLineal.IsChecked
-    irgendwas(7) = VertikalesLineal.IsChecked
-    irgendwas(8) = WeichesScrollen.IsChecked
+    bCheckboxStatus(1) = Hilfslinien.IsChecked
+    bCheckboxStatus(2) = FarbigeHandles.IsChecked
+    bCheckboxStatus(3) = GrosseHandles.IsChecked
+    bCheckboxStatus(4) = HorizontaleBildlaufleiste.IsChecked
+    bCheckboxStatus(5) = VertikaleBildlaufleiste.IsChecked
+    bCheckboxStatus(10) = Lineal.IsChecked
+    bCheckboxStatus(6) = HorizontalesLineal.IsChecked
+    bCheckboxStatus(7) = VertikalesLineal.IsChecked
+    bCheckboxStatus(8) = WeichesScrollen.IsChecked
     
     iMasseinheit(2) = HorizontalesLinealMasseinheit.GetSelIndex
     iMasseinheit(3) = VertikalesLinealMasseinheit.GetSelIndex
@@ -185,17 +177,17 @@ testcase tToolsOptionsHTMLLayout
     printlog ("'/// - all states inverting ///")
     
     'this one has 2 places:  ViewTextBoundaries
-    if irgendwas(1) Then Hilfslinien.UnCheck               Else Hilfslinien.Check
-    if irgendwas(2) Then FarbigeHandles.UnCheck            Else FarbigeHandles.Check
-    if irgendwas(3) Then GrosseHandles.UnCheck             Else GrosseHandles.Check
+    if bCheckboxStatus(1) Then Hilfslinien.UnCheck               Else Hilfslinien.Check
+    if bCheckboxStatus(2) Then FarbigeHandles.UnCheck            Else FarbigeHandles.Check
+    if bCheckboxStatus(3) Then GrosseHandles.UnCheck             Else GrosseHandles.Check
     
     'this one has 2 places:   ViewRuler
-    if irgendwas(4) Then HorizontaleBildlaufleiste.UnCheck Else HorizontaleBildlaufleiste.Check
-    if irgendwas(5) Then VertikaleBildlaufleiste.UnCheck   Else VertikaleBildlaufleiste.Check
-    if irgendwas(10) then Lineal.UnCheck  Else Lineal.Check ' has to be checked to enable Horizontal and Vertical Ruler
+    if bCheckboxStatus(4) Then HorizontaleBildlaufleiste.UnCheck Else HorizontaleBildlaufleiste.Check
+    if bCheckboxStatus(5) Then VertikaleBildlaufleiste.UnCheck   Else VertikaleBildlaufleiste.Check
+    if bCheckboxStatus(10) then Lineal.UnCheck  Else Lineal.Check ' has to be checked to enable Horizontal and Vertical Ruler
     if Lineal.IsChecked then
-        if irgendwas(6) Then HorizontalesLineal.UnCheck        Else HorizontalesLineal.Check
-        if irgendwas(7) Then VertikalesLineal.UnCheck          Else VertikalesLineal.Check
+        if bCheckboxStatus(6) Then HorizontalesLineal.UnCheck        Else HorizontalesLineal.Check
+        if bCheckboxStatus(7) Then VertikalesLineal.UnCheck          Else VertikalesLineal.Check
         if ( HorizontalesLinealMasseinheit.GetItemCount <> iMasseinheit(2) ) Then HorizontalesLinealMasseinheit.Select (HorizontalesLinealMasseinheit.GetItemCount) Else HorizontalesLinealMasseinheit.Select (1)
         if ( VertikalesLinealMasseinheit.GetItemCount <> iMasseinheit(3) ) Then VertikalesLinealMasseinheit.Select (VertikalesLinealMasseinheit.GetItemCount) Else VertikalesLinealMasseinheit.Select (1)
         iTemp(2) = HorizontalesLinealMasseinheit.GetSelIndex
@@ -203,13 +195,13 @@ testcase tToolsOptionsHTMLLayout
         '/// if Asian Language enabled there has to be a checkbox 'Right-aligned' for 'Vertical-Ruler' ///
         if gAsianSup = True and VertikalesLineal.IsChecked = True then
             if RechtsAusgerichtet.IsVisible = True then
-                if irgendwas(9) Then RechtsAusgerichtet.Uncheck  Else RechtsAusgerichtet.Check
+                if bCheckboxStatus(9) Then RechtsAusgerichtet.Uncheck  Else RechtsAusgerichtet.Check
             else
                 Warnlog "- Checkbox 'Right-aligned' is not visible !"
             end if
         end if
     end if
-    if irgendwas(8) Then WeichesScrollen.UnCheck           Else WeichesScrollen.Check
+    if bCheckboxStatus(8) Then WeichesScrollen.UnCheck           Else WeichesScrollen.Check
     
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -222,22 +214,22 @@ testcase tToolsOptionsHTMLLayout
     ToolsOptions
     Call hToolsOptions ( "HTML" , "VIEW" ) '*TabLayoutHTML/ (1)
     
-    if ( irgendwas(1) = Hilfslinien.IsChecked               ) Then WarnLog "Hilfslinien state changed"
-    if ( irgendwas(2) = FarbigeHandles.IsChecked            ) Then WarnLog "FarbigeHandles state changed"
-    if ( irgendwas(3) = GrosseHandles.IsChecked             ) Then WarnLog "GrosseHandles state changed"
-    if ( irgendwas(4) = HorizontaleBildlaufleiste.IsChecked ) Then WarnLog "HorizontaleBildlaufleiste state changed"
-    if ( irgendwas(5) = VertikaleBildlaufleiste.IsChecked   ) Then WarnLog "VertikaleBildlaufleiste state changed"
-    if ( irgendwas(8) = WeichesScrollen.IsChecked          ) Then WarnLog "WeichesScrollen state changed"
-    if ( irgendwas(10) = Lineal.IsChecked ) Then
+    if ( bCheckboxStatus(1) = Hilfslinien.IsChecked               ) Then WarnLog "Hilfslinien state changed"
+    if ( bCheckboxStatus(2) = FarbigeHandles.IsChecked            ) Then WarnLog "FarbigeHandles state changed"
+    if ( bCheckboxStatus(3) = GrosseHandles.IsChecked             ) Then WarnLog "GrosseHandles state changed"
+    if ( bCheckboxStatus(4) = HorizontaleBildlaufleiste.IsChecked ) Then WarnLog "HorizontaleBildlaufleiste state changed"
+    if ( bCheckboxStatus(5) = VertikaleBildlaufleiste.IsChecked   ) Then WarnLog "VertikaleBildlaufleiste state changed"
+    if ( bCheckboxStatus(8) = WeichesScrollen.IsChecked          ) Then WarnLog "WeichesScrollen state changed"
+    if ( bCheckboxStatus(10) = Lineal.IsChecked ) Then
         WarnLog "Ruler state changed"
-        if ( irgendwas(6) = HorizontalesLineal.IsChecked        ) Then WarnLog "HorizontalesLineal state changed"
-        if ( irgendwas(7) = VertikalesLineal.IsChecked         ) Then WarnLog "VertikalesLineal state changed"
+        if ( bCheckboxStatus(6) = HorizontalesLineal.IsChecked        ) Then WarnLog "HorizontalesLineal state changed"
+        if ( bCheckboxStatus(7) = VertikalesLineal.IsChecked         ) Then WarnLog "VertikalesLineal state changed"
         if ( HorizontalesLinealMasseinheit.GetSelIndex <> iTemp(2) ) Then WarnLog "HorizontalesLinealMasseinheit state changed"
         if ( VertikalesLinealMasseinheit.GetSelIndex <> iTemp(3) ) Then WarnLog "VertikalesLinealMasseinheit   state changed"
     
         if gAsianSup = True and VertikalesLineal.IsChecked = True then
             if RechtsAusgerichtet.IsVisible = True then
-                if irgendwas(9) = RechtsAusgerichtet.IsChecked then WarnLog "Right-aligned state changed"
+                if bCheckboxStatus(9) = RechtsAusgerichtet.IsChecked then WarnLog "Right-aligned state changed"
             else
                 Warnlog "- Checkbox 'Right-aligned' is not visible !"
             end if
@@ -381,19 +373,19 @@ testcase tToolsOptionsHTMLLayout
     ToolsOptions
     Call hToolsOptions ( "HTML" , "VIEW" )
     
-    if ( irgendwas(1) =  TRUE ) Then  Hilfslinien.Check               Else Hilfslinien.UnCheck
-    if ( irgendwas(2) =  TRUE ) Then  FarbigeHandles.Check            Else FarbigeHandles.UnCheck
-    if ( irgendwas(3) =  TRUE ) Then  GrosseHandles.Check             Else GrosseHandles.UnCheck
+    if ( bCheckboxStatus(1) =  TRUE ) Then  Hilfslinien.Check               Else Hilfslinien.UnCheck
+    if ( bCheckboxStatus(2) =  TRUE ) Then  FarbigeHandles.Check            Else FarbigeHandles.UnCheck
+    if ( bCheckboxStatus(3) =  TRUE ) Then  GrosseHandles.Check             Else GrosseHandles.UnCheck
     
-    if ( irgendwas(4) =  TRUE ) Then  HorizontaleBildlaufleiste.Check Else HorizontaleBildlaufleiste.UnCheck
-    if ( irgendwas(5) =  TRUE ) Then  VertikaleBildlaufleiste.Check   Else VertikaleBildlaufleiste.UnCheck
+    if ( bCheckboxStatus(4) =  TRUE ) Then  HorizontaleBildlaufleiste.Check Else HorizontaleBildlaufleiste.UnCheck
+    if ( bCheckboxStatus(5) =  TRUE ) Then  VertikaleBildlaufleiste.Check   Else VertikaleBildlaufleiste.UnCheck
     Lineal.Check
-    if ( irgendwas(6) =  TRUE ) Then  HorizontalesLineal.Check        Else HorizontalesLineal.UnCheck
-    if ( irgendwas(7) = TRUE ) Then  VertikalesLineal.Check          Else VertikalesLineal.UnCheck
+    if ( bCheckboxStatus(6) =  TRUE ) Then  HorizontalesLineal.Check        Else HorizontalesLineal.UnCheck
+    if ( bCheckboxStatus(7) = TRUE ) Then  VertikalesLineal.Check          Else VertikalesLineal.UnCheck
     HorizontalesLinealMasseinheit.Select (iMasseinheit(2))
     VertikalesLinealMasseinheit.Select (iMasseinheit(3))
     
-    if ( irgendwas(8) = TRUE ) Then  WeichesScrollen.Check           Else WeichesScrollen.UnCheck
+    if ( bCheckboxStatus(8) = TRUE ) Then  WeichesScrollen.Check           Else WeichesScrollen.UnCheck
     
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -406,7 +398,7 @@ endcase
 '------------------------------------------------------------------------------
 testcase tToolsOptionsHTMLGrid
 
-    Dim irgendwas(3) as boolean
+    Dim bCheckboxStatus(3) as boolean
     Dim sMetricField(4) as string      ' MetricField
     Dim sTempMetricField(4) as string
         
@@ -422,9 +414,9 @@ testcase tToolsOptionsHTMLGrid
     
     printlog ("'///TabRaster all UnCheck ! ///")
     
-    irgendwas(1) = FangrasterBenutzen.IsChecked
-    irgendwas(2) = RasterSichtbar.IsChecked
-    irgendwas(3) = AchsenSynchronisieren.IsChecked
+    bCheckboxStatus(1) = FangrasterBenutzen.IsChecked
+    bCheckboxStatus(2) = RasterSichtbar.IsChecked
+    bCheckboxStatus(3) = AchsenSynchronisieren.IsChecked
     
     sMetricField(1) = RasterAufloesungXAchse.GetText
     sMetricField(2) = RasterAufloesungYAchse.GetText
@@ -433,9 +425,9 @@ testcase tToolsOptionsHTMLGrid
     
     printlog ("'/// - all states inverting ///")
     
-    if irgendwas(1) Then FangrasterBenutzen.UnCheck    Else FangrasterBenutzen.Check
-    if irgendwas(2) Then RasterSichtbar.UnCheck        Else RasterSichtbar.Check
-    '      if irgendwas(3) Then AchsenSynchronisieren.UnCheck Else AchsenSynchronisieren.Check
+    if bCheckboxStatus(1) Then FangrasterBenutzen.UnCheck    Else FangrasterBenutzen.Check
+    if bCheckboxStatus(2) Then RasterSichtbar.UnCheck        Else RasterSichtbar.Check
+    '      if bCheckboxStatus(3) Then AchsenSynchronisieren.UnCheck Else AchsenSynchronisieren.Check
     '   this CheckBox interacts with the MetricBoxes:
     AchsenSynchronisieren.UnCheck
     
@@ -467,8 +459,8 @@ testcase tToolsOptionsHTMLGrid
     ToolsOptions
     Call hToolsOptions ( "HTML","Grid" )
     
-    if (irgendwas(1) = FangrasterBenutzen.IsChecked    ) Then WarnLog "FangrasterBenutzen state changed BugID: 82944 "
-    if (irgendwas(2) = RasterSichtbar.IsChecked        ) Then WarnLog "RasterSichtbar state changed"
+    if (bCheckboxStatus(1) = FangrasterBenutzen.IsChecked    ) Then WarnLog "FangrasterBenutzen state changed BugID: 82944 "
+    if (bCheckboxStatus(2) = RasterSichtbar.IsChecked        ) Then WarnLog "RasterSichtbar state changed"
     if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "AchsenSynchronisieren state changed"
     if ( RasterAufloesungXAchse.GetText <>   sTempMetricField(1) ) Then WarnLog "RasterAufloesungXAchse state changed"
     if ( RasterAufloesungYAchse.GetText <>   sTempMetricField(2) ) Then WarnLog "RasterAufloesungYAchse state changed"
@@ -638,9 +630,9 @@ testcase tToolsOptionsHTMLGrid
     ToolsOptions
     Call hToolsOptions ( "HTML","Grid" )
     
-    if ( irgendwas(1) =  TRUE ) Then FangrasterBenutzen.Check    Else FangrasterBenutzen.UnCheck
-    if ( irgendwas(2) =  TRUE ) Then RasterSichtbar.Check        Else RasterSichtbar.UnCheck
-    if ( irgendwas(3) =  TRUE ) Then AchsenSynchronisieren.Check Else AchsenSynchronisieren.UnCheck
+    if ( bCheckboxStatus(1) =  TRUE ) Then FangrasterBenutzen.Check    Else FangrasterBenutzen.UnCheck
+    if ( bCheckboxStatus(2) =  TRUE ) Then RasterSichtbar.Check        Else RasterSichtbar.UnCheck
+    if ( bCheckboxStatus(3) =  TRUE ) Then AchsenSynchronisieren.Check Else AchsenSynchronisieren.UnCheck
     RasterAufloesungXAchse.SetText   (sMetricField(1))
     RasterAufloesungYAchse.SetText   (sMetricField(2))
     RasterUnterteilungXAchse.SetText (sMetricField(3))
diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc
index ca7c0a789349..dd25cb452c08 100755
--- a/testautomation/writer/optional/includes/option/wh_o_2.inc
+++ b/testautomation/writer/optional/includes/option/wh_o_2.inc
@@ -48,53 +48,28 @@ end sub
 '------------------------------------------------------------------------------
 testcase tToolsOptionsHTMLPrint
 
-    dim irgendwas(12) as boolean    ' Checkbox states
+    dim bCheckboxStatus(12) as boolean    ' Checkbox states
     dim iListBox(1) as integer         ' ListBox
     dim iTempListBox(1) as integer
     dim bRadioBut(4) as boolean         ' RadioButtons
     dim bTempRadioBut(4) as boolean
 
-    ' sMetricField(i) and sTempMetricField(i)
-    '(1) = Grafiken
-    '(2) = Tabellen
-    '(3) = Zeichnungen
-    '(4) = Kontrollfelder
-    '(5) = Hintergrund
-    '(6) = SchwarzDrucken
-    '
-    '(7) = LinkeSeiten
-    '(8) = RechteSeiten
-    '(9) = Umgekehrt
-    '(10)= Prospekt
-    '
-    '(11)= EinzelneDruckauftraege
-    '(12)= AusDruckereinstellung
-
-    ' bRadioBut(i) and bTempRadioBut(i) / RadioButton
-    '(1) = Keine
-    '(2) = NurNotizen
-    '(3) = Dokumentende
-    '(4) = Seitenende
-
     Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\test.html" )
     Call sMakeReadOnlyDocumentEditable
-    printlog "'///- Tools/Options/HTML: PrintHTML ///"
+    printlog "- Tools/Options/HTML: PrintHTML "
 
-    printlog ("'/// - save states ///")
+    printlog (" - save states ")
     ToolsOptions
     Call hToolsOptions ("HTML","PRINT")
 
-    irgendwas(1) = Grafiken.IsChecked
-    irgendwas(2) = Tabellen.IsChecked
-    irgendwas(4) = Kontrollfelder.IsChecked
-    irgendwas(5) = Hintergrund.IsChecked
-    irgendwas(6) = SchwarzDrucken.IsChecked
+    bCheckboxStatus(1) = Grafiken.IsChecked
+    bCheckboxStatus(2) = Kontrollfelder.IsChecked
+    bCheckboxStatus(3) = Hintergrund.IsChecked
+    bCheckboxStatus(4) = SchwarzDrucken.IsChecked
 
-    irgendwas(9) = Umgekehrt.IsChecked
-    irgendwas(10)= Prospekt.IsChecked
+    bCheckboxStatus(5)= Prospekt.IsChecked
 
-    irgendwas(11)= EinzelneDruckauftraege.IsChecked
-    irgendwas(12)= AusDruckereinstellung.IsChecked
+    bCheckboxStatus(6)= AusDruckereinstellung.IsChecked
 
     iListBox(1) = Fax.GetSelIndex
 
@@ -103,19 +78,16 @@ testcase tToolsOptionsHTMLPrint
     bRadioBut(3) = Dokumentende.IsChecked
     bRadioBut(4) = Seitenende.IsChecked
 
-    printlog ("'/// - all states inverting ///")
+    printlog (" - all states inverting ")
 
-    if irgendwas(1) Then Grafiken.UnCheck               Else Grafiken.Check
-    if irgendwas(2) Then Tabellen.UnCheck               Else Tabellen.Check
-    if irgendwas(4) Then Kontrollfelder.UnCheck         Else Kontrollfelder.Check
-    if irgendwas(5) Then Hintergrund.UnCheck            Else Hintergrund.Check
-    if irgendwas(6) Then SchwarzDrucken.UnCheck         Else SchwarzDrucken.Check
+    if bCheckboxStatus(1) Then Grafiken.UnCheck               Else Grafiken.Check
+    if bCheckboxStatus(2) Then Kontrollfelder.UnCheck         Else Kontrollfelder.Check
+    if bCheckboxStatus(3) Then Hintergrund.UnCheck            Else Hintergrund.Check
+    if bCheckboxStatus(4) Then SchwarzDrucken.UnCheck         Else SchwarzDrucken.Check
 
-    if irgendwas(9) Then Umgekehrt.UnCheck              Else Umgekehrt.Check
-    if irgendwas(10) Then Prospekt.UnCheck               Else Prospekt.Check
+    if bCheckboxStatus(5) Then Prospekt.UnCheck               Else Prospekt.Check
 
-    if irgendwas(11) Then EinzelneDruckauftraege.UnCheck Else EinzelneDruckauftraege.Check
-    if irgendwas(12) Then AusDruckereinstellung.UnCheck  Else AusDruckereinstellung.Check
+    if bCheckboxStatus(6) Then AusDruckereinstellung.UnCheck  Else AusDruckereinstellung.Check
 
     if (Keine.IsChecked = True) Then NurNotizen.Check Else Keine.Check
 
@@ -134,25 +106,22 @@ testcase tToolsOptionsHTMLPrint
     Call hFileSaveAsKill(gOfficepath + "user\work\printtest.html")
     Call hCloseDocument
 
-    printlog ("'/// - SO quit - start ///")
+    printlog (" - SO quit - start ")
 
     Call wOfficeRestart
 
-    printlog ("'/// - checking states ///")
+    printlog (" - checking states ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "PRINT" )
 
-    if ( irgendwas(1) = Grafiken.IsChecked               ) Then WarnLog "'Graphics' state changed"
-    if ( irgendwas(2) = Tabellen.IsChecked               ) Then WarnLog "'Tables' state changed"
-    if ( irgendwas(4) = Kontrollfelder.IsChecked         ) Then WarnLog "'Controls' state changed"
-    if ( irgendwas(5) = Hintergrund.IsChecked            ) Then WarnLog "'Background' state changed"
-    if ( irgendwas(6) = SchwarzDrucken.IsChecked         ) Then WarnLog "'Print black' state changed"
+    if ( bCheckboxStatus(1) = Grafiken.IsChecked               ) Then WarnLog "#i108219#'Graphics' state changed"
+    if ( bCheckboxStatus(2) = Kontrollfelder.IsChecked         ) Then WarnLog "'Controls' state changed"
+    if ( bCheckboxStatus(3) = Hintergrund.IsChecked            ) Then WarnLog "'Background' state changed"
+    if ( bCheckboxStatus(4) = SchwarzDrucken.IsChecked         ) Then WarnLog "'Print black' state changed"
 
-    if ( irgendwas(9) = Umgekehrt.IsChecked              ) Then WarnLog "'Reversed' state changed"
-    if ( irgendwas(10)= Prospekt.IsChecked               ) Then WarnLog "'Brochure' state changed"
+    if ( bCheckboxStatus(5)= Prospekt.IsChecked               ) Then WarnLog "'Brochure' state changed"
 
-    if ( irgendwas(11)= EinzelneDruckauftraege.IsChecked ) Then WarnLog "'Create single print jobs' state changed"
-    if ( irgendwas(12)= AusDruckereinstellung.IsChecked  ) Then WarnLog "'Paper tray from printer settings' state changed"
+    if ( bCheckboxStatus(6)= AusDruckereinstellung.IsChecked  ) Then WarnLog "'Paper tray from printer settings' state changed"
 
     if ( bTempRadioBut(1) <> Keine.IsChecked       ) Then WarnLog "'None' state changed (Bug#99202)"
     if ( bTempRadioBut(2) <> NurNotizen.IsChecked  ) Then WarnLog "'Notes only' state changed (Bug#99202)"
@@ -161,18 +130,15 @@ testcase tToolsOptionsHTMLPrint
 
     if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed"
 
-    printlog ("'/// - all UnCheck -> o ///")
+    printlog (" - all UnCheck -> o ")
 
     Grafiken.UnCheck
-    Tabellen.UnCheck
     Kontrollfelder.UnCheck
     Hintergrund.UnCheck
     SchwarzDrucken.UnCheck
 
-    Umgekehrt.UnCheck
     Prospekt.UnCheck
 
-    EinzelneDruckauftraege.UnCheck
     AusDruckereinstellung.UnCheck
 
     if (NurNotizen.IsChecked = True) Then Dokumentende.Check Else NurNotizen.Check
@@ -187,20 +153,17 @@ testcase tToolsOptionsHTMLPrint
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - check if all UnChecked ///")
+    printlog (" - check if all UnChecked ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "PRINT" )
 
     if Grafiken.IsChecked       Then WarnLog "'Graphics' x"
-    if Tabellen.IsChecked       Then WarnLog "'Tables' x"
     if Kontrollfelder.IsChecked Then WarnLog "'Controls' x"
     if Hintergrund.IsChecked    Then WarnLog "'Background' x"
     if SchwarzDrucken.IsChecked Then WarnLog "'Print black' x"
 
-    if Umgekehrt.IsChecked      Then WarnLog "'Reversed' x"
     if Prospekt.IsChecked       Then WarnLog "'Brochure' x"
 
-    if EinzelneDruckauftraege.IsChecked Then WarnLog "'Create single print jobs' x"
     if AusDruckereinstellung.IsChecked  Then WarnLog "'Paper tray from printer settings' x"
 
     ' Is saved with document
@@ -217,18 +180,15 @@ testcase tToolsOptionsHTMLPrint
 
     if ( Fax.GetSelIndex <> 1 ) Then WarnLog "Fax is not item 1"
 
-    Printlog ("'/// - all Check -> x ///")
+    Printlog (" - all Check -> x ")
 
     Grafiken.Check
-    Tabellen.Check
     Kontrollfelder.Check
     Hintergrund.Check
     SchwarzDrucken.Check
 
-    Umgekehrt.Check
     Prospekt.Check
 
-    EinzelneDruckauftraege.Check
     AusDruckereinstellung.Check
 
     if (Dokumentende.IsChecked = True) Then Seitenende.Check Else Dokumentende.Check
@@ -243,20 +203,17 @@ testcase tToolsOptionsHTMLPrint
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - check if all Checked ///")
+    printlog (" - check if all Checked ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "PRINT" )
 
     if not Grafiken.IsChecked                Then WarnLog "'Graphics' o"
-    if not Tabellen.IsChecked                Then WarnLog "'Tables' o"
     if not Kontrollfelder.IsChecked          Then WarnLog "'Controls' o"
     if not Hintergrund.IsChecked             Then WarnLog "'Background' o"
     if not SchwarzDrucken.IsChecked          Then WarnLog "'Print black' o"
 
-    if not Umgekehrt.IsChecked               Then WarnLog "'Reversed' o"
     if not Prospekt.IsChecked                Then WarnLog "'Brochure' o"
 
-    if not EinzelneDruckauftraege.IsChecked  Then WarnLog "'Create single print jobs' o"
     if not AusDruckereinstellung.IsChecked   Then WarnLog "'Paper tray from printer settings' o"
 
     if ( bTempRadioBut(1) <> Keine.IsChecked       ) Then WarnLog "'None' state changed"
@@ -269,21 +226,18 @@ testcase tToolsOptionsHTMLPrint
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.Cancel
 
-    printlog ("'/// - restore states ///")
+    printlog (" - restore states ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "PRINT" )
 
-    if ( irgendwas(1) =  TRUE ) Then  Grafiken.Check                Else Grafiken.UnCheck
-    if ( irgendwas(2) =  TRUE ) Then  Tabellen.Check                Else Tabellen.UnCheck
-    if ( irgendwas(4) =  TRUE ) Then  Kontrollfelder.Check          Else Kontrollfelder.UnCheck
-    if ( irgendwas(5) =  TRUE ) Then  Hintergrund.Check             Else Hintergrund.UnCheck
-    if ( irgendwas(6) =  TRUE ) Then  SchwarzDrucken.Check          Else SchwarzDrucken.UnCheck
+    if ( bCheckboxStatus(1) =  TRUE ) Then  Grafiken.Check                Else Grafiken.UnCheck
+    if ( bCheckboxStatus(2) =  TRUE ) Then  Kontrollfelder.Check          Else Kontrollfelder.UnCheck
+    if ( bCheckboxStatus(3) =  TRUE ) Then  Hintergrund.Check             Else Hintergrund.UnCheck
+    if ( bCheckboxStatus(4) =  TRUE ) Then  SchwarzDrucken.Check          Else SchwarzDrucken.UnCheck
 
-    if ( irgendwas(9) =  TRUE ) Then  Umgekehrt.Check               Else Umgekehrt.UnCheck
-    if ( irgendwas(10) = TRUE ) Then  Prospekt.Check                Else Prospekt.UnCheck
+    if ( bCheckboxStatus(5) = TRUE ) Then  Prospekt.Check                Else Prospekt.UnCheck
 
-    if ( irgendwas(11) = TRUE ) Then  EinzelneDruckauftraege.Check  Else EinzelneDruckauftraege.UnCheck
-    if ( irgendwas(12) = TRUE ) Then  AusDruckereinstellung.Check   Else AusDruckereinstellung.UnCheck
+    if ( bCheckboxStatus(7) = TRUE ) Then  AusDruckereinstellung.Check   Else AusDruckereinstellung.UnCheck
 
     try
         Fax.Select (iListBox(1))
@@ -332,9 +286,9 @@ testcase tToolsOptionsHTMLTable
     '(3) = Variabel
 
     Call hNewDocument
-    printlog ("'///- Tools/Options/HTML: Table ///")
+    printlog ("- Tools/Options/HTML: Table ")
 
-    printlog ("'/// - save states ///")
+    printlog (" - save states ")
     ToolsOptions
     Call hToolsOptions ("HTML","Table")
 
@@ -349,7 +303,7 @@ testcase tToolsOptionsHTMLTable
 
     if ((bRadioBut(1) Xor bRadioBut(2) Xor bRadioBut(3)) = False) Then Warnlog (" RadioButtons have NO init state: " + bRadioBut(1) +", BugID: 83097")
 
-    printlog ("'/// - all states inverting ///")
+    printlog (" - all states inverting ")
 
     VerschiebenZeile.ToMax
     VerschiebenSpalte.ToMax
@@ -373,11 +327,11 @@ testcase tToolsOptionsHTMLTable
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - SO quit - start ///")
+    printlog (" - SO quit - start ")
 
     Call wOfficeRestart
 
-    printlog ("'/// - checking states ///")
+    printlog (" - checking states ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "Table" )
 
@@ -393,7 +347,7 @@ testcase tToolsOptionsHTMLTable
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - all UnCheck -> o ///")
+    printlog (" - all UnCheck -> o ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "Table" )
 
@@ -405,7 +359,7 @@ testcase tToolsOptionsHTMLTable
     sTempMetricField(2) = VerschiebenSpalte.GetText
     sTempMetricField(3) = EinfuegenZeile.GetText
     sTempMetricField(4) = EinfuegenSpalte.GetText
-    printlog ("'/// More test ///'")
+    printlog (" More test ///'")
     VerschiebenZeile.More
     VerschiebenSpalte.More
     EinfuegenZeile.More
@@ -428,7 +382,7 @@ testcase tToolsOptionsHTMLTable
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - check if all UnChecked ///")
+    printlog (" - check if all UnChecked ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "Table" )
 
@@ -441,7 +395,7 @@ testcase tToolsOptionsHTMLTable
     if ( bTempRadioBut(2) <> FixProportional.IsChecked) Then WarnLog "Behaviour of rows/columns : 'Fixed, proportional' state changed"
     if ( bTempRadioBut(3) <> Variabel.IsChecked       ) Then WarnLog "Behaviour of rows/columns : 'Variable' state changed"
 
-    Printlog ("'/// - all Check -> x ///")
+    Printlog (" - all Check -> x ")
 
     VerschiebenZeile.ToMax
     VerschiebenSpalte.ToMax
@@ -451,7 +405,7 @@ testcase tToolsOptionsHTMLTable
     sTempMetricField(2) = VerschiebenSpalte.GetText
     sTempMetricField(3) = EinfuegenZeile.GetText
     sTempMetricField(4) = EinfuegenSpalte.GetText
-    printlog ("'/// Less test ///'")
+    printlog (" Less test ///'")
     VerschiebenZeile.Less
     VerschiebenSpalte.Less
     EinfuegenZeile.Less
@@ -474,7 +428,7 @@ testcase tToolsOptionsHTMLTable
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - check if all Checked ///")
+    printlog (" - check if all Checked ")
     ToolsOptions
     Call hToolsOptions ( "HTML" , "Table" )
 
@@ -487,7 +441,7 @@ testcase tToolsOptionsHTMLTable
     if ( bTempRadioBut(2) <> FixProportional.IsChecked) Then WarnLog "Behaviour of rows/columns : 'Fixed, proportional' state changed"
     if ( bTempRadioBut(3) <> Variabel.IsChecked       ) Then WarnLog "Behaviour of rows/columns : 'Variable' state changed"
 
-    printlog ("'/// - restore states ///")
+    printlog (" - restore states ")
 
     VerschiebenZeile.SetText  (sMetricField(1))
     VerschiebenSpalte.SetText (sMetricField(2))
@@ -510,7 +464,7 @@ testcase tToolsOptionsHTMLTable1
     '/// This testcase check for this bug ///
 
     Call hNewDocument
-    printlog ("'///- Tools/Options/Text document: Table ///")
+    printlog ("- Tools/Options/Text document: Table ")
 
     ToolsOptions
     Call hToolsOptions ("WRITER","Table")
diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc
index e55ebbd73280..e20d47236dc5 100755
--- a/testautomation/writer/optional/includes/option/wr_o_1.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_1.inc
@@ -441,18 +441,16 @@ testcase tToolsOptionsWriterView5
     Call hToolsOptions ("WRITER","VIEW")
 
     option_value(1) = GrafikenUndObjekte.IsChecked
-    option_value(2) = Tabellen.IsChecked
-    option_value(3) = Zeichnungen.IsChecked
-    option_value(4) = Feldname.IsChecked
-    option_value(5) = Notizen.IsChecked
+    option_value(2) = Zeichnungen.IsChecked
+    option_value(3) = Feldname.IsChecked
+    option_value(4) = Notizen.IsChecked
 
     printlog ("'/// - all states inverting ///")
 
     if option_value(1) then GrafikenUndObjekte.UnCheck else GrafikenUndObjekte.Check
-    if option_value(2) then Tabellen.UnCheck else Tabellen.Check
-    if option_value(3) then Zeichnungen.UnCheck else Zeichnungen.Check
-    if option_value(4) then Feldname.UnCheck else Feldname.Check
-    if option_value(5) then Notizen.UnCheck else Notizen.Check
+    if option_value(2) then Zeichnungen.UnCheck else Zeichnungen.Check
+    if option_value(3) then Feldname.UnCheck else Feldname.Check
+    if option_value(4) then Notizen.UnCheck else Notizen.Check
 
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -465,11 +463,10 @@ testcase tToolsOptionsWriterView5
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "VIEW" )
 
-    if ( option_value(1) = GrafikenUndObjekte.IsChecked ) then WarnLog "GrafikenUndObjekte state changed"
-    if ( option_value(2) = Tabellen.IsChecked  ) then WarnLog "Tabellen state changed"
-    if ( option_value(3) = Zeichnungen.IsChecked  ) then WarnLog "Zeichnungen state changed"
-    if ( option_value(4) = Feldname.IsChecked  ) then  WarnLog "Feldname state changed"
-    if ( option_value(5) = Notizen.IsChecked  ) then  WarnLog "Notizen state changed"
+    if ( option_value(1) = GrafikenUndObjekte.IsChecked ) then WarnLog "Graphics and objects state changed"
+    if ( option_value(2) = Zeichnungen.IsChecked  ) then WarnLog "Zeichnungen state changed"
+    if ( option_value(3) = Feldname.IsChecked  ) then  WarnLog "Feldname state changed"
+    if ( option_value(4) = Notizen.IsChecked  ) then  WarnLog "Notizen state changed"
 
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -499,15 +496,13 @@ testcase tToolsOptionsWriterView6
     Call hToolsOptions ("WRITER","VIEW")
 
     option_value(1) = GrafikenUndObjekte.IsChecked
-    option_value(2) = Tabellen.IsChecked
-    option_value(3) = Zeichnungen.IsChecked
-    option_value(4) = Feldname.IsChecked
-    option_value(5) = Notizen.IsChecked
+    option_value(2) = Zeichnungen.IsChecked
+    option_value(3) = Feldname.IsChecked
+    option_value(4) = Notizen.IsChecked
 
     printlog ("'/// - all states unchecked ///")
 
     GrafikenUndObjekte.UnCheck
-    Tabellen.UnCheck
     Zeichnungen.UnCheck
     Feldname.UnCheck
     Notizen.UnCheck
@@ -523,18 +518,16 @@ testcase tToolsOptionsWriterView6
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "VIEW" )
 
-    if GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte x"
-    if Tabellen.IsChecked then WarnLog "Tabellen x"
+    if GrafikenUndObjekte.IsChecked then WarnLog "Graphics and objects x"
     if Zeichnungen.IsChecked then WarnLog "Zeichnungen x"
     if Feldname.IsChecked then  WarnLog "Feldname x"
     if Notizen.IsChecked then  WarnLog "Notizen x"
     
     printlog ("'/// - restore states ///")
     if ( option_value(1) = TRUE ) Then  GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck
-    if ( option_value(2) = TRUE ) Then  Tabellen.Check Else Tabellen.UnCheck
-    if ( option_value(3) = TRUE ) Then  Zeichnungen.Check Else Zeichnungen.UnCheck
-    if ( option_value(4) = TRUE ) Then  Feldname.Check Else Feldname.UnCheck
-    if ( option_value(5) = TRUE ) Then  Notizen.Check Else Notizen.UnCheck
+    if ( option_value(2) = TRUE ) Then  Zeichnungen.Check Else Zeichnungen.UnCheck
+    if ( option_value(3) = TRUE ) Then  Feldname.Check Else Feldname.UnCheck
+    if ( option_value(4) = TRUE ) Then  Notizen.Check Else Notizen.UnCheck
 
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -564,15 +557,13 @@ testcase tToolsOptionsWriterView7
     Call hToolsOptions ("WRITER","VIEW")
 
     option_value(1) = GrafikenUndObjekte.IsChecked
-    option_value(2) = Tabellen.IsChecked
-    option_value(3) = Zeichnungen.IsChecked
-    option_value(4) = Feldname.IsChecked
-    option_value(5) = Notizen.IsChecked
+    option_value(2) = Zeichnungen.IsChecked
+    option_value(3) = Feldname.IsChecked
+    option_value(4) = Notizen.IsChecked
 
     printlog ("'/// - all Check -> x ///")
 
     GrafikenUndObjekte.Check
-    Tabellen.Check
     Zeichnungen.Check
     Feldname.Check
     Notizen.Check
@@ -588,8 +579,7 @@ testcase tToolsOptionsWriterView7
     ToolsOptions
     hToolsOptions ( "WRITER" , "VIEW" )
 
-    if true <> GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte o"
-    if true <> Tabellen.IsChecked then WarnLog "Tabellen."
+    if true <> GrafikenUndObjekte.IsChecked then WarnLog "Graphics and objects o"
     if true <> Zeichnungen.IsChecked then WarnLog "Zeichnungen o"
     if true <> Feldname.IsChecked then  WarnLog "Feldname o"
     if true <> Notizen.IsChecked then  WarnLog "Notizen o"
diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc
index 78bff9f411ff..f677a5c39ed5 100755
--- a/testautomation/writer/optional/includes/option/wr_o_2.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_2.inc
@@ -451,14 +451,12 @@ testcase tToolsOptionsWriterPrint1
     ' sMetricField(i) and sTempMetricField(i)
     '(1) = Grafiken
     '(2) = Tabellen
-    '(3) = Zeichnungen
     '(4) = Kontrollfelder
     '(5) = Hintergrund
     '(6) = SchwarzDrucken
     '
     '(7) = LinkeSeiten
     '(8) = RechteSeiten
-    '(9) = Umgekehrt
     '(10)= Prospekt
     '
     '(11)= EinzelneDruckauftraege
@@ -480,20 +478,18 @@ testcase tToolsOptionsWriterPrint1
     Call hToolsOptions ("WRITER","PRINT")
 
     bCheckboxes(1) = Grafiken.IsChecked
-    bCheckboxes(2) = Tabellen.IsChecked
-    bCheckboxes(3) = Zeichnungen.IsChecked
-    bCheckboxes(4) = Kontrollfelder.IsChecked
-    bCheckboxes(5) = Hintergrund.IsChecked
-    bCheckboxes(6) = SchwarzDrucken.IsChecked
+    bCheckboxes(2) = Kontrollfelder.IsChecked
+    bCheckboxes(3) = Hintergrund.IsChecked
+    bCheckboxes(4) = SchwarzDrucken.IsChecked
+    bCheckboxes(5) = HiddenText.IsChecked
+    bCheckboxes(6) = TextPlaceholder.IsChecked
 
     bCheckboxes(7) = LinkeSeiten.IsChecked
     bCheckboxes(8) = RechteSeiten.IsChecked
-    bCheckboxes(9) = Umgekehrt.IsChecked
-    bCheckboxes(10)= Prospekt.IsChecked
+    bCheckboxes(9)= Prospekt.IsChecked
 
-    bCheckboxes(11)= EinzelneDruckauftraege.IsChecked
-    bCheckboxes(12)= AusDruckereinstellung.IsChecked
-    bCheckboxes(13)= LeereSeitenDrucken.IsChecked
+    bCheckboxes(10)= LeereSeitenDrucken.IsChecked
+    bCheckboxes(11)= AusDruckereinstellung.IsChecked
 
     iListBox(1) = Fax.GetSelText
 
@@ -504,21 +500,19 @@ testcase tToolsOptionsWriterPrint1
 
     printlog ("'/// - all states inverting ///")
 
-    if bCheckboxes(1) then Grafiken.UnCheck               else Grafiken.Check
-    if bCheckboxes(2) then Tabellen.UnCheck               else Tabellen.Check
-    if bCheckboxes(3) then Zeichnungen.UnCheck            else Zeichnungen.Check
-    if bCheckboxes(4) then Kontrollfelder.UnCheck         else Kontrollfelder.Check
-    if bCheckboxes(5) then Hintergrund.UnCheck            else Hintergrund.Check
-    if bCheckboxes(6) then SchwarzDrucken.UnCheck         else SchwarzDrucken.Check
+    if bCheckboxes(1) then Grafiken.UnCheck             else Grafiken.Check
+    if bCheckboxes(2) then Kontrollfelder.UnCheck       else Kontrollfelder.Check
+    if bCheckboxes(3) then Hintergrund.UnCheck          else Hintergrund.Check
+    if bCheckboxes(4) then SchwarzDrucken.UnCheck       else SchwarzDrucken.Check
+    if bCheckboxes(5) then HiddenText.UnCheck           else HiddenText.Check
+    if bCheckboxes(6) then TextPlaceholder.UnCheck      else TextPlaceholder.Check
 
-    if bCheckboxes(7) then LinkeSeiten.UnCheck            else LinkeSeiten.Check
-    if bCheckboxes(8) then RechteSeiten.UnCheck           else RechteSeiten.Check
-    if bCheckboxes(9) then Umgekehrt.UnCheck              else Umgekehrt.Check
-    if bCheckboxes(10) then Prospekt.UnCheck               else Prospekt.Check
+    if bCheckboxes(7) then LinkeSeiten.UnCheck          else LinkeSeiten.Check
+    if bCheckboxes(8) then RechteSeiten.UnCheck         else RechteSeiten.Check
+    if bCheckboxes(9) then Prospekt.UnCheck            else Prospekt.Check
 
-    if bCheckboxes(11) then EinzelneDruckauftraege.UnCheck else EinzelneDruckauftraege.Check
-    if bCheckboxes(12) then AusDruckereinstellung.UnCheck  else AusDruckereinstellung.Check
-    if bCheckboxes(13) then LeereSeitenDrucken.UnCheck  else LeereSeitenDrucken.Check
+    if bCheckboxes(10) then LeereSeitenDrucken.UnCheck else LeereSeitenDrucken.Check
+    if bCheckboxes(11) then AusDruckereinstellung.UnCheck  else AusDruckereinstellung.Check
 
     if (Keine.IsChecked = True) then NurNotizen.Check else Keine.Check
 
@@ -574,21 +568,19 @@ testcase tToolsOptionsWriterPrint1
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "PRINT" )
 
-    if ( bCheckboxes(1) = Grafiken.IsChecked               ) then WarnLog "Grafiken state changed"
-    if ( bCheckboxes(2) = Tabellen.IsChecked               ) then WarnLog "Tabellen state changed"
-    if ( bCheckboxes(3) = Zeichnungen.IsChecked            ) then WarnLog "Zeichnungen state changed"
-    if ( bCheckboxes(4) = Kontrollfelder.IsChecked         ) then WarnLog "Kontrollfelder state changed"
-    if ( bCheckboxes(5) = Hintergrund.IsChecked            ) then WarnLog "Hintergrund state changed"
-    if ( bCheckboxes(6) = SchwarzDrucken.IsChecked         ) then WarnLog "SchwarzDrucken state changed"
+    if ( bCheckboxes(1) = Grafiken.IsChecked        ) then WarnLog "Grafiken state changed"
+    if ( bCheckboxes(2) = Kontrollfelder.IsChecked  ) then WarnLog "Kontrollfelder state changed"
+    if ( bCheckboxes(3) = Hintergrund.IsChecked     ) then WarnLog "Hintergrund state changed"
+    if ( bCheckboxes(4) = SchwarzDrucken.IsChecked  ) then WarnLog "SchwarzDrucken state changed"
+    if ( bCheckboxes(5) = HiddenText.IsChecked      ) then WarnLog "HiddenText state changed"
+    if ( bCheckboxes(6) = TextPlaceholder.IsChecked ) then WarnLog "TextPlaceholder state changed"
 
     if ( bCheckboxes(7) = LinkeSeiten.IsChecked            ) then WarnLog "LinkeSeiten state changed"
     if ( bCheckboxes(8) = RechteSeiten.IsChecked           ) then WarnLog "RechteSeiten state changed"
-    if ( bCheckboxes(9) = Umgekehrt.IsChecked              ) then WarnLog "Umgekehrt state changed"
-    if ( bCheckboxes(10)= Prospekt.IsChecked               ) then WarnLog "Prospekt state changed"
+    if ( bCheckboxes(9)= Prospekt.IsChecked               ) then WarnLog "Prospekt state changed"
 
-    if ( bCheckboxes(11)= EinzelneDruckauftraege.IsChecked ) then WarnLog "EinzelneDruckauftraege state changed"
-    if ( bCheckboxes(12)= AusDruckereinstellung.IsChecked  ) then WarnLog "AusDruckereinstellung state changed"
-    if ( bCheckboxes(13)= LeereSeitenDrucken.IsChecked  ) then WarnLog "'Print automatically inserted blank pages' state changed"
+    if ( bCheckboxes(10)= LeereSeitenDrucken.IsChecked  ) then WarnLog "'Print automatically inserted blank pages' state changed"
+    if ( bCheckboxes(11)= AusDruckereinstellung.IsChecked  ) then WarnLog "AusDruckereinstellung state changed"
 
     if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed"
 
@@ -613,18 +605,17 @@ testcase tToolsOptionsWriterPrint1
     printlog ("'/// - all UnCheck -> o ///")
 
     Grafiken.UnCheck
-    Tabellen.UnCheck
-    Zeichnungen.UnCheck
     Kontrollfelder.UnCheck
     Hintergrund.UnCheck
     SchwarzDrucken.UnCheck
+    HiddenText.UnCheck
+    TextPlaceholder.UnCheck
 
     LinkeSeiten.UnCheck
     RechteSeiten.UnCheck
-    Umgekehrt.UnCheck
     Prospekt.UnCheck
 
-    EinzelneDruckauftraege.UnCheck
+    LeereSeitenDrucken.UnCheck
     AusDruckereinstellung.UnCheck
 
     if (NurNotizen.IsChecked = True) then Dokumentende.Check else NurNotizen.Check
@@ -644,20 +635,19 @@ testcase tToolsOptionsWriterPrint1
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "PRINT" )
 
-    if Grafiken.IsChecked       then WarnLog "Grafiken x"
-    if Tabellen.IsChecked       then WarnLog "Tabellen x"
-    if Zeichnungen.IsChecked    then WarnLog "Zeichnungen x"
-    if Kontrollfelder.IsChecked then WarnLog "Kontrollfelder x"
-    if Hintergrund.IsChecked    then WarnLog "Hintergrund x"
-    if SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken x"
+    if Grafiken.IsChecked           then WarnLog "Grafiken is checked"
+    if Kontrollfelder.IsChecked     then WarnLog "Kontrollfelder is checked"
+    if Hintergrund.IsChecked        then WarnLog "Hintergrund is checked"
+    if SchwarzDrucken.IsChecked     then WarnLog "SchwarzDrucken is checked"
+    if HiddenText.IsChecked         then WarnLog "HiddenText is checked"
+    if TextPlaceholder.IsChecked    then WarnLog "TextPlaceholder is checked"
 
-    if LinkeSeiten.IsChecked    then WarnLog "LinkeSeiten x"
-    if RechteSeiten.IsChecked   then WarnLog "RechteSeiten x"
-    if Umgekehrt.IsChecked      then WarnLog "Umgekehrt x"
-    if Prospekt.IsChecked       then WarnLog "Prospekt x"
+    if LinkeSeiten.IsChecked    then WarnLog "LinkeSeiten is checked"
+    if RechteSeiten.IsChecked   then WarnLog "RechteSeiten is checked"
+    if Prospekt.IsChecked       then WarnLog "Prospekt is checked"
 
-    if EinzelneDruckauftraege.IsChecked then WarnLog "EinzelneDruckauftraege x"
-    if AusDruckereinstellung.IsChecked  then WarnLog "AusDruckereinstellung x"
+    if LeereSeitenDrucken.IsChecked then WarnLog "LeereSeitenDrucken is checked"
+    if AusDruckereinstellung.IsChecked  then WarnLog "AusDruckereinstellung is checked"
 
     if ( bTempRadioBut(1) <> Keine.IsChecked       ) then WarnLog "Keine state changed"
     if ( bTempRadioBut(2) <> NurNotizen.IsChecked  ) then WarnLog "NurNotizen state changed"
@@ -669,18 +659,17 @@ testcase tToolsOptionsWriterPrint1
     Printlog ("'/// - all Check -> x ///")
 
     Grafiken.Check
-    Tabellen.Check
-    Zeichnungen.Check
     Kontrollfelder.Check
     Hintergrund.Check
     SchwarzDrucken.Check
+    HiddenText.Check
+    TextPlaceholder.Check
 
     LinkeSeiten.Check
     RechteSeiten.Check
-    Umgekehrt.Check
     Prospekt.Check
 
-    EinzelneDruckauftraege.Check
+    LeereSeitenDrucken.Check
     AusDruckereinstellung.Check
 
     if (Dokumentende.IsChecked = True) then Seitenende.Check else Dokumentende.Check
@@ -700,20 +689,19 @@ testcase tToolsOptionsWriterPrint1
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "PRINT" )
 
-    if not Grafiken.IsChecked                then WarnLog "Grafiken o"
-    if not Tabellen.IsChecked                then WarnLog "Tabellen o"
-    if not Zeichnungen.IsChecked             then WarnLog "Zeichnungen o"
-    if not Kontrollfelder.IsChecked          then WarnLog "Kontrollfelder o"
-    if not Hintergrund.IsChecked             then WarnLog "Hintergrund o"
-    if not SchwarzDrucken.IsChecked          then WarnLog "SchwarzDrucken o"
+    if not Grafiken.IsChecked           then WarnLog "Grafiken is unchecked"
+    if not Kontrollfelder.IsChecked     then WarnLog "Kontrollfelder is unchecked"
+    if not Hintergrund.IsChecked        then WarnLog "Hintergrund is unchecked"
+    if not SchwarzDrucken.IsChecked     then WarnLog "SchwarzDrucken is unchecked"
+    if not HiddenText.IsChecked         then WarnLog "HiddenText is unchecked "
+    if not TextPlaceholder.IsChecked    then WarnLog "TextPlaceholder is unchecked"
 
-    if not LinkeSeiten.IsChecked             then WarnLog "LinkeSeiten o"
-    if not RechteSeiten.IsChecked            then WarnLog "RechteSeiten o"
-    if not Umgekehrt.IsChecked               then WarnLog "Umgekehrt o"
-    if not Prospekt.IsChecked                then WarnLog "Prospekt o"
+    if not LinkeSeiten.IsChecked             then WarnLog "LinkeSeiten is unchecked"
+    if not RechteSeiten.IsChecked            then WarnLog "RechteSeiten is unchecked"
+    if not Prospekt.IsChecked                then WarnLog "Prospekt is unchecked"
 
-    if not EinzelneDruckauftraege.IsChecked  then WarnLog "EinzelneDruckauftraege o"
-    if not AusDruckereinstellung.IsChecked   then WarnLog "AusDruckereinstellung o"
+    if not LeereSeitenDrucken.IsChecked  then WarnLog "LeereSeitenDrucken is unchecked"
+    if not AusDruckereinstellung.IsChecked   then WarnLog "AusDruckereinstellung is unchecked"
 
     ' This state will be saved with the document
     if ( bTempRadioBut(1) <> Keine.IsChecked       ) then WarnLog "Keine state changed"
@@ -730,21 +718,19 @@ testcase tToolsOptionsWriterPrint1
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "PRINT" )
 
-    if ( bCheckboxes(1) =  TRUE ) then  Grafiken.Check                else Grafiken.UnCheck
-    if ( bCheckboxes(2) =  TRUE ) then  Tabellen.Check                else Tabellen.UnCheck
-    if ( bCheckboxes(3) =  TRUE ) then  Zeichnungen.Check             else Zeichnungen.UnCheck
-    if ( bCheckboxes(4) =  TRUE ) then  Kontrollfelder.Check          else Kontrollfelder.UnCheck
-    if ( bCheckboxes(5) =  TRUE ) then  Hintergrund.Check             else Hintergrund.UnCheck
-    if ( bCheckboxes(6) =  TRUE ) then  SchwarzDrucken.Check          else SchwarzDrucken.UnCheck
-
-    if ( bCheckboxes(7) =  TRUE ) then  LinkeSeiten.Check             else LinkeSeiten.UnCheck
-    if ( bCheckboxes(8) =  TRUE ) then  RechteSeiten.Check            else RechteSeiten.UnCheck
-    if ( bCheckboxes(9) =  TRUE ) then  Umgekehrt.Check               else Umgekehrt.UnCheck
-    if ( bCheckboxes(10) = TRUE ) then  Prospekt.Check                else Prospekt.UnCheck
-
-    if ( bCheckboxes(11) = TRUE ) then  EinzelneDruckauftraege.Check  else EinzelneDruckauftraege.UnCheck
-    if ( bCheckboxes(12) = TRUE ) then  AusDruckereinstellung.Check   else AusDruckereinstellung.UnCheck
-    if ( bCheckboxes(13) = TRUE ) then  LeereSeitenDrucken.Check   else LeereSeitenDrucken.UnCheck
+    if ( bCheckboxes(1) = TRUE ) then Grafiken.Check else Grafiken.Uncheck
+    if ( bCheckboxes(2) = TRUE ) then Kontrollfelder.Check else Kontrollfelder.UnCheck
+    if ( bCheckboxes(3) = TRUE ) then Hintergrund.Check else Hintergrund.Uncheck
+    if ( bCheckboxes(4) = TRUE ) then SchwarzDrucken.Check else  SchwarzDrucken.UnCheck
+    if ( bCheckboxes(5) = TRUE ) then HiddenText.check else HiddenText.Uncheck
+    if ( bCheckboxes(6) = TRUE ) then TextPlaceholder.check else TextPlaceholder.Uncheck
+
+    if ( bCheckboxes(7) = TRUE ) then LinkeSeiten.Check else LinkeSeiten.Uncheck
+    if ( bCheckboxes(8) = TRUE ) then RechteSeiten.Check else RechteSeiten.Uncheck
+    if ( bCheckboxes(9) = TRUE ) then Prospekt.Check else Prospekt.Uncheck
+
+    if ( bCheckboxes(10) = TRUE ) then LeereSeitenDrucken.Check else LeereSeitenDrucken.UnCheck
+    if ( bCheckboxes(11) = TRUE ) then AusDruckereinstellung.Check else AusDruckereinstellung.UnCheck
 
     try
         Fax.Select (iListBox(1))
diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc
index deb98f579ce1..6a3ca9dd50f3 100755
--- a/testautomation/writer/optional/includes/option/wr_o_4.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_4.inc
@@ -78,9 +78,9 @@ testcase tToolsOptionsWriterOther
     '- !!! -Current Document only- ist bei office beenden zu beachten!!!
 
     Call hNewDocument
-    printlog ("'///- Tools/Options/Writer: General ///")
+    printlog ("- Tools/Options/Writer: General ")
 
-    printlog ("'/// - save states ///")
+    printlog (" - save states ")
     ToolsOptions
     Call hToolsOptions ("WRITER","GENERAL")
 
@@ -94,7 +94,7 @@ testcase tToolsOptionsWriterOther
     iMasseinheit = Masseinheit.GetSelIndex
     sTabAbstand = Tabulatorenabstand.GetText
 
-    printlog ("'/// - all states inverting ///")
+    printlog ("- all states inverting ")
 
     if irgendwas(2) Then Feldbefehle.UnCheck Else Feldbefehle.Check
     if Feldbefehle.IsChecked  Then if irgendwas(3) Then Diagramme.UnCheck Else Diagramme.Check
@@ -124,11 +124,11 @@ testcase tToolsOptionsWriterOther
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - SO quit - start ///")
+    printlog ("- SO quit - start ")
 
     Call wOfficeRestart
 
-    printlog ("'/// - checking states ///")
+    printlog ("- checking states ")
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "GENERAL" )
 
@@ -144,7 +144,7 @@ testcase tToolsOptionsWriterOther
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - all UnCheck -> o ///")
+    printlog ("- all UnCheck -> o ")
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "GENERAL" )
 
@@ -159,7 +159,7 @@ testcase tToolsOptionsWriterOther
     Masseinheit.Select (1)
     Tabulatorenabstand.ToMin
     sTemp = Tabulatorenabstand.GetText
-    printlog ("'/// More test ///'")
+    printlog ("More test ///'")
     Tabulatorenabstand.More
     if ( sTemp = Tabulatorenabstand.GetText ) Then WarnLog "Tabulatorenabstand More-Button not working; stemp1: "+sTemp + " =? (2) " +Tabulatorenabstand.GetText
     sTemp = Tabulatorenabstand.GetText
@@ -167,7 +167,7 @@ testcase tToolsOptionsWriterOther
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - check if all UnChecked ///")
+    printlog ("- check if all UnChecked ")
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "GENERAL" )
 
@@ -186,7 +186,7 @@ testcase tToolsOptionsWriterOther
 
 '---------------------------------------------------------------------------------
 
-    printlog ("'///  check if tab stops get saved in document ///")
+    printlog ("- check if tab stops get saved in document ")
     Call hNewDocument
 
     ' set Default Tab Stop to 2,5cm
@@ -240,7 +240,7 @@ testcase tToolsOptionsWriterOther
     Call hCloseDocument
 
 '---------------------------------------------------------------------------------
-    Printlog ("'/// - all Check -> x ///")
+    Printlog ("- all Check -> x ")
 
     ToolsOptions
     Call hToolsOptions ("WRITER","GENERAL")
@@ -264,7 +264,7 @@ testcase tToolsOptionsWriterOther
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - check if all Checked ///")
+    printlog ("- check if all Checked ")
     ToolsOptions
     Call hToolsOptions ( "WRITER" , "GENERAL" )
 
@@ -280,7 +280,7 @@ testcase tToolsOptionsWriterOther
     if ( Masseinheit.GetSelIndex <> iTemp ) Then WarnLog "Masseinheit is not item " + iTemp + " it's: " + Masseinheit.GetSelIndex
     if (LiberalMeasurement (sTemp,Tabulatorenabstand.GetText) <> TRUE ) Then WarnLog "Tabulatorenabstand is not " + sTemp + " it's: " + Tabulatorenabstand.GetText
 
-    printlog ("'/// - restore states ///")
+    printlog ("- restore states ")
 
 '   if ( irgendwas(1) =  TRUE ) Then NurFuerAktuellesDokument.Check            Else NurFuerAktuellesDokument.UnCheck
     if ( irgendwas(2) =  TRUE ) Then Feldbefehle.Check                         Else Feldbefehle.UnCheck
@@ -327,7 +327,7 @@ sub hGetAllOptionsWriterGeneralCaption
     fHoleTabPage2 = ConvertPath(gOfficePath + "user\work\opt2_" + iSprache + "." + gPlatGroup)
 
     '------------------------
-    Printlog "'///(1/3) Get all items before selecting smth. ///"
+    Printlog "(1/3) Get all items before selecting smth. "
     ' put them in lsHoleTabPage and write them to 'user\work\opt__...'
 
     Call hNewDocument
@@ -355,7 +355,7 @@ sub hGetAllOptionsWriterGeneralCaption
 
 '   ------------------------
 
-    Printlog "'///(2/3) Select every ListItem & exit with OK ///"
+    Printlog "(2/3) Select every ListItem & exit with OK "
     ToolsOptions
     Call hToolsOptions ("WRITER","AutoCaption")
     Kontext "TabAutoCaption"
@@ -381,7 +381,7 @@ sub hGetAllOptionsWriterGeneralCaption
     ExtrasOptionenDlg.OK
 
     '------------------------
-    Printlog "'///(3/3) Get all items after selecting all ///"
+    Printlog "(3/3) Get all items after selecting all "
     ' put them in lsHoleTabPage2 and write them to 'user\work\opt2_...'
 
     ToolsOptions
@@ -429,9 +429,9 @@ testcase tToolsOptionsWriterAutoCaption
 
     '/// !no more Listentries than 9, you have to update the allocation for the var's! ///'
     Call hNewDocument
-    printlog "'///- Tools/Options/Writer: AutoCaption ///"
+    printlog "- Tools/Options/Writer: AutoCaption "
 
-    printlog ("'/// - save states ///")
+    printlog ("- save states ")
     ToolsOptions
     Call hToolsOptions ("WRITER","AutoCaption")
     Kontext "TabAutoCaption"
@@ -463,7 +463,7 @@ testcase tToolsOptionsWriterAutoCaption
     next i
 
     '-- just checking the checkboxes of 'ObjectList'
-    printlog ("'/// - uncheck all object - checkboxes ///")
+    printlog ("- uncheck all object - checkboxes ")
     for i=1 to NumberOfObjects
         ObjectList.Select (i)
         ObjectList.UnCheck
@@ -471,7 +471,7 @@ testcase tToolsOptionsWriterAutoCaption
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
     
-    printlog ("'/// - verify if all unchecked and check all ///")
+    printlog ("- verify if all unchecked and check all ")
     ToolsOptions
     Call hToolsOptions ("WRITER","AutoCaption")
     Kontext "TabAutoCaption"
@@ -486,7 +486,7 @@ testcase tToolsOptionsWriterAutoCaption
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - verify all checkboxes are checked ///")
+    printlog ("- verify all checkboxes are checked ")
     ToolsOptions
     Call hToolsOptions ("WRITER","AutoCaption")
     Kontext "TabAutoCaption"
@@ -498,10 +498,11 @@ testcase tToolsOptionsWriterAutoCaption
         end if
     next i
 
-    printlog ("'/// - change states ///")
+    printlog ("- change states ")
     '/// look if properties get saved for each list item
     for i=1 to NumberOfObjects
         ObjectList.Select (i)
+        printlog " - " & ObjectList.GetText
         if ObjectList.IsChecked Then
             if i <= 7 then Numbering.Select i
             CaptionSeparator.Settext "Caption Separator " & cstr(i)
@@ -520,16 +521,12 @@ testcase tToolsOptionsWriterAutoCaption
                     ApplyBorderAndShadow.Check
                 case 4:
                     Category.Select 5
-                    Position.Select 2
                 case 5:
                     Category.Select 2
-                    Position.Select 1
                 case 6:
                     Category.Select 3
-                    Position.Select 2
                 case 7:
                     Category.Select 4
-                    Position.Select 1
                 case 8:
                     Category.Select 5
                     if Numbering.GetItemCount > 7 then
@@ -537,7 +534,6 @@ testcase tToolsOptionsWriterAutoCaption
                     else
                         Numbering.Select 4
                     end if
-                    Position.Select 2
                 case 9:
                     Category.Select 2
                     if Numbering.GetItemCount > 7 then
@@ -545,7 +541,6 @@ testcase tToolsOptionsWriterAutoCaption
                     else
                         Numbering.Select 5
                     end if
-                    Position.Select 1
 
                 end select
                 vCategoryTmp(i) = Category.GetSelText
@@ -556,17 +551,17 @@ testcase tToolsOptionsWriterAutoCaption
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - SO quit - start ///")
+    printlog ("- SO quit - start")
 
     Call wOfficeRestart
 
-    printlog ("'/// - checking states ///")
+    printlog ("- checking states ")
     ToolsOptions
     Call hToolsOptions ("WRITER","AutoCaption")
     Kontext "TabAutoCaption"
     for i=1 to NumberOfObjects
-        printlog "-   checking: " & ObjectList.Gettext
         ObjectList.Select (i)
+        printlog " - " & ObjectList.GetText
 		wait 500
         if ObjectList.IsChecked Then
             if i <= 7 then
@@ -632,31 +627,31 @@ testcase tToolsOptionsWriterAutoCaption
                     end if
 
                 case 4:
-                    if Position.GetSelIndex <> 2 then
-                        Warnlog "-    'Position' changed after restart"
+                    if Position.IsEnabled = true then
+                        Warnlog "-    'Position' should be disabled"
                     else
-                        printlog "-    'Position' => ok"
+                        printlog "-    'Position' disabled => ok"
                     end if
 
                 case 5:
-                    if Position.GetSelIndex <> 1 then
-                        Warnlog "-    'Position' changed after restart"
+                    if Position.IsEnabled = true then
+                        Warnlog "-    'Position' should be disabled"
                     else
-                        printlog "-    'Position' => ok"
+                        printlog "-    'Position' disabled => ok"
                     end if
 
                 case 6:
-                    if Position.GetSelIndex <> 2 then
-                        Warnlog "-    'Position' changed after restart"
+                    if Position.IsEnabled = true then
+                        Warnlog "-    'Position' should be disabled"
                     else
-                        printlog "-    'Position' => ok"
+                        printlog "-    'Position' disabled => ok"
                     end if
 
                 case 7:
-                    if Position.GetSelIndex <> 1 then
-                        Warnlog "-    'Position' changed after restart"
+                    if Position.IsEnabled = true then
+                        Warnlog "-    'Position' should be disabled"
                     else
-                        printlog "-    'Position' => ok"
+                        printlog "-    'Position' disabled => ok"
                     end if
 
                 case 8:
@@ -674,10 +669,10 @@ testcase tToolsOptionsWriterAutoCaption
                         end if
                     end if
 
-                    if Position.GetSelIndex <> 2 then
-                        Warnlog "-    'Position' changed after restart"
+                    if Position.IsEnabled = true then
+                        Warnlog "-    'Position' should be disabled"
                     else
-                        printlog "-    'Position' => ok"
+                        printlog "-    'Position' disabled => ok"
                     end if
 
                 case 9:
@@ -695,10 +690,10 @@ testcase tToolsOptionsWriterAutoCaption
                         end if
                     end if
 
-                    if Position.GetSelIndex <> 1 then
-                        Warnlog "-    'Position' changed after restart"
+                    if Position.IsEnabled = true then
+                        Warnlog "-    'Position' should be disabled"
                     else
-                        printlog "-    'Position' => ok"
+                        printlog "-    'Position' disabled => ok"
                     end if
 
             end select
@@ -710,7 +705,7 @@ testcase tToolsOptionsWriterAutoCaption
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
 
-    printlog ("'/// - restore states ///")
+    printlog ("- restore states ")
 
     ToolsOptions
     Call hToolsOptions ("WRITER","AutoCaption")
@@ -765,10 +760,10 @@ testcase tToolsOptionsWriterGeneral
 
     ' State is saved with document. Thats why I use 3 docs
     Call hNewDocument
-    printlog "'///- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren ///"
+    printlog "- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren "
     ToolsOptions
     Call hToolsOptions("WRITER","GENERAL")
-    printlog "'///- Update links when loading -> always ///"
+    printlog "- Update links when loading -> always "
     Immer.Check
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -796,7 +791,7 @@ testcase tToolsOptionsWriterGeneral
     ToolsOptions
     Call hToolsOptions("WRITER","GENERAL")
     if not Immer.IsChecked then Warnlog "Option 'always' has not been changed"
-    printlog "'///- Update links when loading -> On request ///"
+    printlog "- Update links when loading -> On request "
     AufNachfrage.Check
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -820,7 +815,7 @@ testcase tToolsOptionsWriterGeneral
     ToolsOptions
     Call hToolsOptions("WRITER","GENERAL")
     if not AufNachfrage.IsChecked then Warnlog "Option 'On request' has been changed"
-    printlog "'///- Update links when loading -> Never ///"
+    printlog "- Update links when loading -> Never "
     Nie.Check
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
@@ -873,7 +868,7 @@ endcase
 testcase tToolsOptionsWriterMailMerge
 
     Call hNewDocument
-    printlog ("'///- Tools/Options/Writer: Mail Merge ///")
+    printlog ("- Tools/Options/Writer: Mail Merge ")
     Kontext "Navigator"
     if Navigator.Exists then ViewNavigator
     ToolsOptions
diff --git a/testautomation/writer/optional/includes/option/wr_o_a.inc b/testautomation/writer/optional/includes/option/wr_o_a.inc
index 2f917d4961c1..ce8eea6178c3 100755
--- a/testautomation/writer/optional/includes/option/wr_o_a.inc
+++ b/testautomation/writer/optional/includes/option/wr_o_a.inc
@@ -59,15 +59,11 @@ testcase tToolsOptionsWriterPrint
     Call hToolsOptions("WRITER","PRINT")
 
     Grafiken.Check
-    Tabellen.Check
-    Zeichnungen.Check
     Kontrollfelder.Check
     Hintergrund.Check
     SchwarzDrucken.Check
     LinkeSeiten.Check
     RechteSeiten.Check
-    Umgekehrt.Check
-
     Prospekt.UnCheck
 
     Seitenende.Check
@@ -97,14 +93,11 @@ testcase tToolsOptionsWriterPrint
     Printlog "  - uncheck everything"
 
     Grafiken.UnCheck
-    Tabellen.UnCheck
-    Zeichnungen.UnCheck
     Kontrollfelder.UnCheck
     Hintergrund.UnCheck
     SchwarzDrucken.UnCheck
     LinkeSeiten.Check               ' that's so, otherwise there will be no printing
     RechteSeiten.Check              ' that's so, otherwise there will be no printing
-    Umgekehrt.UnCheck
     Prospekt.UnCheck
     Keine.Check
     AusDruckereinstellung.UnCheck
diff --git a/testautomation/writer/optional/w_fields.bas b/testautomation/writer/optional/w_fields.bas
index 9d2240321158..3eb650c5ad0e 100644
--- a/testautomation/writer/optional/w_fields.bas
+++ b/testautomation/writer/optional/w_fields.bas
@@ -93,7 +93,8 @@ end sub
 
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
-   use "global\system\includes\gvariabl.inc"
+   use "global\system\includes\gvariabl.inc"  
+
    Call GetUseFiles
    gApplication = "WRITER"
 end Sub
diff --git a/testautomation/writer/optional/w_insertgraphic.bas b/testautomation/writer/optional/w_insertgraphic.bas
index 84402564098a..ba2014952921 100644
--- a/testautomation/writer/optional/w_insertgraphic.bas
+++ b/testautomation/writer/optional/w_insertgraphic.bas
@@ -131,6 +131,7 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
+    
     Call GetUseFiles
     gApplication = "WRITER"
 end sub
diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc
index cbfd5de23047..1b33d5360606 100644
--- a/testautomation/writer/required/includes/w_001a_.inc
+++ b/testautomation/writer/required/includes/w_001a_.inc
@@ -1,582 +1,480 @@
-'**************************************************************************
-'* 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: w_001a_.inc,v $
-'*
-'* $Revision: 1.2 $
-'*
-'* last change: $Author: vg $ $Date: 2008-08-18 12:40:41 $
-'*
-'* 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 : helge.delfs@sun.com
-'*
-'* short description:  Testcases for the Writer Required-test.
-'*
-'\***********************************************************************
-
-sub w_001a_
-
-    printLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------"
-    gApplication = "WRITER"
-
-    Call tFileProperties
-
-    Call tFileTemplatesOrganize
-    Call tFileTemplatesAddressbookSource
-    Call tFileTemplatesSave
-    Call tFileTemplatesEdit
-
-    Call tFilePagePreview
-    Call tFilePrint
-    Call tFilePrinterSetup
-
-    'Writer Master Document
-    gApplication = "MASTERDOCUMENT"
-    Call tMasterDocFilePagePreview
-    gApplication = "WRITER"
-
-end sub
-
-'-----------------------------------------------------------
-
-testcase tFileProperties
-    PrintLog "- File / Properties"
-
-    printlog " Open new document"
-    Call hNewDocument
-
-    printlog " File / Properties"
-    FileProperties
-
-    WaitSlot(5000)
-    Kontext
-    try
-        active.SetPage TabDokument
-    catch
-        Warnlog "Dialog 'FileProperties' not up! (Bug#99828)"
-        goto endsub
-    endcatch
-
-    printlog " Switch to Tabpage 'General'"
-    Kontext "TabDokument"
-    Call DialogTest (TabDokument)
-
-    printlog " Switch to Tabpage 'Description'"
-    Kontext
-    active.SetPage TabDokumentinfo
-    Kontext "TabDokumentinfo"
-    Call DialogTest (TabDokumentinfo)
-
-
-    QAErrorlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed."
-    '    printlog " Switch to Tabpage 'User defined'"
-    '    Kontext
-    '    active.SetPage TabBenutzer
-    '    Kontext "TabBenutzer"
-    '    Call DialogTest ( TabBenutzer )
-
-    '    Wait 500
-
-    '    Infofelder.Click
-    '    printlog " Click 'Infofields'"
-    '    Kontext "InfonamenBearbeiten"
-    '    printlog " Close upcoming dialog with 'Cancel'"
-    '    Call DialogTest (InfonamenBearbeiten)
-    '    InfonamenBearbeiten.Cancel
-
-    printlog " Switch to Tabpage 'Internet'"
-    Kontext
-    active.SetPage TabInternet
-    Kontext "TabInternet"
-    Call DialogTest (TabInternet)
-
-    printlog " Switch to Tabpage 'Statistics' and close dialog"
-    Kontext
-    active.SetPage TabStatistik
-    Kontext "TabStatistik"
-    Call DialogTest (TabStatistik)
-    TabStatistik.Close
-
-    Sleep 1
-    printlog " Close active document"
-    Call hCloseDocument
-endcase
-
-'-----------------------------------------------------------
-
-testcase tFileTemplatesOrganize
-    Dim i as integer
-
-    PrintLog " Open new document."
-    Call hNewDocument
-    PrintLog " File / Templates / Organize"
-    FileTemplatesOrganize
-    Kontext "DVVerwalten"
-    For i = 1 to 50
-        if DVVerwalten.Exists then
-            i = 51
-        else
-            Sleep 5
-        end if
-    next i
-    if Not DVVerwalten.Exists then
-        Warnlog "Dialog 'Template Management' not up !"
-        Call hCloseDocument
-        goto endsub
-    end if
-    wait 500
-    PrintLog " Select first entry in left list of dialog 'Template Management' (should be 'My Templates')"
-    ListeLinks.Select 1
-    ListeLinks.TypeKeys "<Home>"
-    Sleep 1
-    Befehle.Click
-    wait 500
-    PrintLog " Select 'Commands -> Import Template'"
-    Call hMenuSelectNr(3)
-    Wait 500
-    PrintLog " Close Filedialog."
-    if gUseSysDlg = False then
-        Kontext "OeffnenDlg"
-        if OeffnenDlg.Exists then
-            OeffnenDlg.Cancel
-        else
-            Warnlog "FileOpen dialog not up!"
-        end if
-    end if
-
-    PrintLog " Select 'Commands -> Printer Settings"
-    Kontext "DVVerwalten"
-    Sleep 1
-    Befehle.Click
-    wait 500
-    Call hMenuSelectNr(4)
-
-    PrintLog " Cancel 'Printer-Setup' dialog"
-    Kontext "DruckerEinrichten"
-    if DruckerEinrichten.Exists then
-        DruckerEinrichten.Cancel
-    else
-        Warnlog "Printersettings dialog is not up!"
-    end if
-
-    PrintLog " Select first entry in right list"
-    Kontext "DVVerwalten"
-    ListeRechts.Select 1
-
-    PrintLog " Select pushbutton 'File..'"
-    if WelcheDatei.IsEnabled then
-        WelcheDatei.Click
-        if gUseSysDlg = False then
-            PrintLog " Cancel Filedialog"
-            Kontext "OeffnenDlg"
-            OeffnenDlg.Cancel
-        end if
-    end if
-
-    PrintLog " Select pushbutton 'Address Book'"
-    Kontext "DVVerwalten"
-    AddressBook.Click
-    Kontext "AddressbookSource"
-    PrintLog " Cancel Dialog 'Address Book-Assignment'"
-    if AddressbookSource.Exists then
-        AddressbookSource.Cancel
-    else
-        Warnlog "the Dialog ' Address Book Source' wasnt up!"
-    end if
-
-    PrintLog " Close dialog"
-    Kontext "DVVerwalten"
-    DVVerwalten.Close
-
-    PrintLog " Close active document."
-    Call hCloseDocument
-endcase
-
-'-----------------------------------------------------------
-
-testcase tFileTemplatesAddressbookSource
-
-    PrintLog " Open new document"
-    Call hNewDocument
-
-    PrintLog " File / Templates /Address Book Source..."
-    UseBindings
-    FileTemplatesAddressbookSource
-
-    WaitSlot(2000)
-    PrintLog " In 'Address Book Assignement' dialog click pushbutton 'Administrate'"
-    Kontext "AddressbookSource"
-    if AddressbookSource.Exists then
-        Call DialogTest (AddressbookSource)
-        Administrate.Click
-        Sleep 2
-        PrintLog " Close 'Data Source Administration' with 'Cancel'"
-        Kontext "DatabaseProperties"
-        if Not DatabaseProperties.Exists then
-            Kontext "AddressSourceAutopilot"
-            if AddressSourceAutopilot.Exists then
-                AddressSourceAutopilot.Cancel
-            end if
-            Kontext "AddressbookSource"
-            AddressbookSource.Cancel
-        else
-            PrintLog " DatabaseProperties.SetPage TabConnection"
-            Kontext "TabConnection"
-            Call DialogTest ( TabConnection )
-            Kontext "DatabaseProperties"
-            DatabaseProperties.Close
-            Kontext "AddressbookSource"
-            PrintLog " Close dialog"
-            AddressbookSource.Cancel
-        end if
-    end if
-
-    printlog " Close active document"
-    Call hCloseDocument
-endcase
-
-'-----------------------------------------------------------
-
-testcase tFileTemplatesSave
-    if gApplication = "MASTERDOCUMENT" then
-        qaErrorLog "    tFileTemplatesSave has been disabled in Masterdocument."
-        goto endsub
-    end if
-    printlog "- File / Templates / Save"
-    Call hNewDocument
-    printlog " Open new document"
-    FileTemplatesSave
-    printlog " File / Templates / Save"
-
-    Kontext "DokumentVorlagen"
-    Call DialogTest ( DokumentVorlagen )
-    printlog " On 'Templates' dialog click 'Organizer'"
-
-    Verwalten.Click
-    Kontext "DVVerwalten"
-    DVVerwalten.Close
-    printlog " Close dialog 'Template Management'"
-
-    Kontext "DokumentVorlagen"
-    DokumentVorlagen.Cancel
-    printlog " Close 'Templates' dialog"
-
-    printlog " Close active document"
-    Call hCloseDocument
-    gApplication = "WRITER"
-endcase
-
-'-----------------------------------------------------------
-
-testcase tFileTemplatesEdit
-    printlog "- File / Templates / Edit"
-
-    printlog " Open new document"
-    Call hNewDocument
-    printlog " File / Templates / Edit"
-    FileTemplatesEdit
-
-    if gUseSysDlg = False then
-        printlog " Cancel Filedialog"
-        Kontext "OeffnenDlg"
-        OeffnenDlg.Cancel
-    end if
-
-    printlog " Close active document"
-    Call hCloseDocument
-endcase
-
-'-----------------------------------------------------------
-
-testcase tFilePagePreview
-    PrintLog "- File / Page Preview"
-    Dim gehtnicht as boolean
-    gehtnicht = FALSE
-    printlog " Open new document"
-    Select Case gApplication
-    Case "WRITER"
-        Call hNewDocument
-
-    Case "MASTERDOCUMENT"
-        Call hNewDocument
-
-    Case "HTML"
-        printlog "Not in Writer/Web!"
-        goto endsub
-    end select
-
-    printlog " Enter some text in document"
-    Call wTypeKeys("Just a small change!")
-    printlog " File / Page Preview"
-    FilePageView
-    WaitSlot (1000)
-    Kontext "DocPageViewWriter"
-    if DocPageViewWriter.NotExists then
-        Warnlog "Page Preview is not coming up!"
-        Kontext "Active"
-        if Active.Exists then
-            if Active.GetRT = 304 then
-                Active.No
-            end if
-        end if
-    else
-        if gehtnicht=FALSE then
-            Kontext "PreviewObjectbar"
-            if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)
-            printlog " Select 'Zoom 100%' in toolbar"
-            try
-                Massstab.Select 4
-            catch
-                Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"
-            endcatch
-
-            printlog " Click 'Print Page Preview' in toolbar"
-            Kontext "PreviewObjectbar"
-            DruckenSeitenansicht.Click
-            Kontext "Active"
-            if Active.Exists then
-                QAErrorlog "No default printer!"
-                Active.ok
-                Sleep 1
-                Kontext "DruckenDlg"
-                if DruckenDlg.Exists then DruckenDlg.Cancel
-            else
-                printlog " Close 'Print' dialog with cancel"
-                Kontext "DruckenDlg"
-                DruckenDlg.Cancel
-            end if
-
-            printlog " Click 'Print options page preview' in toolbar"
-            Kontext "PreviewObjectbar"
-            Skalierung.Click
-            printlog " Close 'Print Options' dialog with cancel"
-            Kontext "DruckOptionen"
-            Call DialogTest ( DruckOptionen )
-            DruckOptionen.Cancel
-
-            printlog " Close Page Preview with button 'Close Preview' in toolbar"
-            Kontext "PreviewObjectbar"
-            SeitenansichtSchliessen.Click
-        else
-            Warnlog "Objectbar not addressable!"
-        end if
-    end if
-    printlog " Close active document"
-    Call hCloseDocument
-endcase
-
-'-----------------------------------------------------------
-
-testcase tFilePrint
-    PrintLog " Open new document"
-    Call hNewDocument
-
-    PrintLog " File / Print"
-    FilePrint
-
-    Kontext "Active"
-    WaitSlot(1000)
-    if Active.Exists then
-        if Active.GetRT = 304 then
-            QAErrorlog "No Default Printer!"
-            Active.Ok
-            Kontext "DruckenDlg"
-            if DruckenDlg.Exists then DruckenDlg.Cancel
-            Call hCloseDocument
-            goto endsub
-        end if
-    end if
-    Kontext "DruckenDlg"
-    if DruckenDlg.Exists then
-        PrintLog " In printer dialog click 'Options'"
-        Zusaetze.Click
-        Sleep 1
-
-        Kontext "DruckerZusaetzeWriter"
-        PrintLog " Close 'Print options' with 'Cancel'"
-        DruckerZusaetzeWriter.Cancel
-        Kontext "DruckenDlg"
-
-        if gPlatGroup = "unx" then
-            if NOT Eigenschaften.IsEnabled AND gPlatform = "osx" then
-                QAErrorlog "#i81545#-macport File -> Print|Printer Settings: Properties button disabled"
-                Kontext "DruckenDlg"
-                DruckenDlg.Cancel
-                Call hCloseDocument
-                goto endsub
-            end if
-            PrintLog " On Unix-Platforms select 'Properties"
-            Eigenschaften.Click
-            sleep (3)
-            Kontext "TabSPAPaper"
-            if NOT TabSPAPaper.Exists then
-                Kontext "TabSPADevice"
-                if NOT TabSPADevice.Exists then
-                    Warnlog "#i88799# - Non functional options-button in Print-dialog."
-                else
-                    Kontext
-                    Active.Setpage TabSPAPaper
-                    Kontext "TabSPAPaper"
-                    Call DialogTest ( TabSPAPaper )
-
-                    printlog( "ALLES WIRD GUT!" )
-                    Kontext
-                    Active.Setpage TabSPADevice
-                    Kontext "TabSPADevice"
-                    Call DialogTest ( TabSPADevice )
-
-                    PrintLog " Cancel Printer Properties' (only unix)"
-                    TabSPADevice.Cancel
-                end if
-            else
-                Kontext
-                Active.Setpage TabSPAPaper
-                Kontext "TabSPAPaper"
-                Call DialogTest ( TabSPAPaper )
-
-                printlog( "ALLES WIRD GUT!" )
-                Kontext
-                Active.Setpage TabSPADevice
-                Kontext "TabSPADevice"
-                Call DialogTest ( TabSPADevice )
-
-                PrintLog " Cancel Printer Properties' (only unix)"
-                TabSPADevice.Cancel
-            end if
-        end if
-        Kontext "DruckenDlg"
-        Call DialogTest ( DruckenDlg )
-        PrintLog " Close 'Print' dialog"
-        DruckenDlg.Cancel
-    else
-        Warnlog "Print dialog is not up !"
-    end if
-
-    PrintLog " Close active document"
-    Call hCloseDocument
-endcase
-
-'-----------------------------------------------------------
-
-testcase tFilePrinterSetup
-    PrintLog " Open new document"
-    Call hNewDocument
-
-    PrintLog " File / Printer Settings"
-    FilePrintersettings
-    Kontext "Active"
-    WaitSlot(1000)
-    if Active.Exists then
-        if Active.GetRT = 304 then
-            QAErrorLog "No Default Printer!"
-            Active.Ok
-            Sleep 2
-            Kontext "DruckerEinrichten"
-            if DruckerEinrichten.Exists then
-                Call DialogTest ( DruckerEinrichten )
-                DruckerEinrichten.Cancel
-            end if
-        end if
-    else
-        Kontext "DruckerEinrichten"
-        Call DialogTest ( DruckerEinrichten )
-        DruckerEinrichten.Cancel
-        PrintLog " Cancel 'Printer Setup' dialog"
-    end if
-    PrintLog " Close active document"
-    Call hCloseDocument
-endcase
-
-'-----------------------------------------------------------
-
-testcase tMasterDocFilePagePreview
-    PrintLog "- File / Page Preview"
-    Dim gehtnicht as boolean
-    gehtnicht = FALSE
-    gApplication   = "MASTERDOCUMENT"
-    printlog " Open new document"
-    Call hNewDocument
-
-    printlog " Enter some text in document"
-    Call wTypeKeys("Just a small change!")
-    printlog " File / Page Preview"
-    FilePageView
-    WaitSlot (1000)
-    Kontext "DocPageViewWriter"
-    if DocPageViewWriter.NotExists then
-        Warnlog "Page Preview is not coming up!"
-        Kontext "Active"
-        if Active.Exists then
-            if Active.GetRT = 304 then
-                Active.No
-            end if
-        end if
-    else
-        if gehtnicht=FALSE then
-            Kontext "PreviewObjectbar"
-            if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)
-            printlog " Select 'Zoom 100%' in toolbar"
-            try
-                Massstab.Select 4
-            catch
-                Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"
-            endcatch
-
-            printlog " Click 'Print Page Preview' in toolbar"
-            Kontext "PreviewObjectbar"
-            DruckenSeitenansicht.Click
-            Kontext "Active"
-            if Active.Exists then
-                QAErrorlog "No default printer!"
-                Active.ok
-                Sleep 1
-                Kontext "DruckenDlg"
-                if DruckenDlg.Exists then DruckenDlg.Cancel
-            else
-                printlog " Close 'Print' dialog with cancel"
-                Kontext "DruckenDlg"
-                DruckenDlg.Cancel
-            end if
-
-            printlog " Click 'Print options page preview' in toolbar"
-            Kontext "PreviewObjectbar"
-            Skalierung.Click
-            printlog " Close 'Print Options' dialog with cancel"
-            Kontext "DruckOptionen"
-            Call DialogTest ( DruckOptionen )
-            DruckOptionen.Cancel
-
-            printlog " Close Page Preview with button 'Close Preview' in toolbar"
-            Kontext "PreviewObjectbar"
-            SeitenansichtSchliessen.Click
-        else
-            Warnlog "Objectbar not addressable!"
-        end if
-    end if
-
-    printlog " Close active document"
-    Call hCloseDocument
-    gApplication = "WRITER"
-endcase
+'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: w_001a_.inc,v $

+'*

+'* $Revision: 1.2 $

+'*

+'* last change: $Author: vg $ $Date: 2008-08-18 12:40:41 $

+'*

+'* 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 : helge.delfs@sun.com

+'*

+'* short description:  Testcases for the Writer Required-test.

+'*

+'\***********************************************************************

+

+sub w_001a_

+

+    printLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------"

+    gApplication = "WRITER"

+

+    Call tFileProperties

+

+    Call tFileTemplatesOrganize

+    Call tFileTemplatesAddressbookSource

+    Call tFileTemplatesSave

+    Call tFileTemplatesEdit

+

+    Call tFilePagePreview

+    Call tPrintCommon()

+    Call tPrintGeneral()

+    Call tPrintApplication()

+    Call tPrintLayout()

+    Call tPrintOptions()

+    Call tFilePrinterSetup

+

+    'Writer Master Document

+    gApplication = "MASTERDOCUMENT"

+    Call tMasterDocFilePagePreview

+    gApplication = "WRITER"

+

+end sub

+

+'-----------------------------------------------------------

+

+testcase tFileProperties

+    PrintLog "- File / Properties"

+

+    printlog " Open new document"

+    Call hNewDocument

+

+    printlog " File / Properties"

+    FileProperties

+

+    WaitSlot(5000)

+    Kontext

+    try

+        active.SetPage TabDokument

+    catch

+        Warnlog "Dialog 'FileProperties' not up! (Bug#99828)"

+        goto endsub

+    endcatch

+

+    printlog " Switch to Tabpage 'General'"

+    Kontext "TabDokument"

+    Call DialogTest (TabDokument)

+

+    printlog " Switch to Tabpage 'Description'"

+    Kontext

+    active.SetPage TabDokumentinfo

+    Kontext "TabDokumentinfo"

+    Call DialogTest (TabDokumentinfo)

+

+

+    QAErrorlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed."

+    '    printlog " Switch to Tabpage 'User defined'"

+    '    Kontext

+    '    active.SetPage TabBenutzer

+    '    Kontext "TabBenutzer"

+    '    Call DialogTest ( TabBenutzer )

+

+    '    Wait 500

+

+    '    Infofelder.Click

+    '    printlog " Click 'Infofields'"

+    '    Kontext "InfonamenBearbeiten"

+    '    printlog " Close upcoming dialog with 'Cancel'"

+    '    Call DialogTest (InfonamenBearbeiten)

+    '    InfonamenBearbeiten.Cancel

+

+    printlog " Switch to Tabpage 'Internet'"

+    Kontext

+    active.SetPage TabInternet

+    Kontext "TabInternet"

+    Call DialogTest (TabInternet)

+

+    printlog " Switch to Tabpage 'Statistics' and close dialog"

+    Kontext

+    active.SetPage TabStatistik

+    Kontext "TabStatistik"

+    Call DialogTest (TabStatistik)

+    TabStatistik.Close

+

+    Sleep 1

+    printlog " Close active document"

+    Call hCloseDocument

+endcase

+

+'-----------------------------------------------------------

+

+testcase tFileTemplatesOrganize

+    Dim i as integer

+

+    PrintLog " Open new document."

+    Call hNewDocument

+    PrintLog " File / Templates / Organize"

+    FileTemplatesOrganize

+    Kontext "DVVerwalten"

+    For i = 1 to 50

+        if DVVerwalten.Exists then

+            i = 51

+        else

+            Sleep 5

+        end if

+    next i

+    if Not DVVerwalten.Exists then

+        Warnlog "Dialog 'Template Management' not up !"

+        Call hCloseDocument

+        goto endsub

+    end if

+    wait 500

+    PrintLog " Select first entry in left list of dialog 'Template Management' (should be 'My Templates')"

+    ListeLinks.Select 1

+    ListeLinks.TypeKeys "<Home>"

+    Sleep 1

+    Befehle.Click

+    wait 500

+    PrintLog " Select 'Commands -> Import Template'"

+    Call hMenuSelectNr(3)

+    Wait 500

+    PrintLog " Close Filedialog."

+    if gUseSysDlg = False then

+        Kontext "OeffnenDlg"

+        if OeffnenDlg.Exists then

+            OeffnenDlg.Cancel

+        else

+            Warnlog "FileOpen dialog not up!"

+        end if

+    end if

+

+    PrintLog " Select 'Commands -> Printer Settings"

+    Kontext "DVVerwalten"

+    Sleep 1

+    Befehle.Click

+    wait 500

+    Call hMenuSelectNr(4)

+

+    PrintLog " Cancel 'Printer-Setup' dialog"

+    Kontext "DruckerEinrichten"

+    if DruckerEinrichten.Exists then

+        DruckerEinrichten.Cancel

+    else

+        Warnlog "Printersettings dialog is not up!"

+    end if

+

+    PrintLog " Select first entry in right list"

+    Kontext "DVVerwalten"

+    ListeRechts.Select 1

+

+    PrintLog " Select pushbutton 'File..'"

+    if WelcheDatei.IsEnabled then

+        WelcheDatei.Click

+        if gUseSysDlg = False then

+            PrintLog " Cancel Filedialog"

+            Kontext "OeffnenDlg"

+            OeffnenDlg.Cancel

+        end if

+    end if

+

+    PrintLog " Select pushbutton 'Address Book'"

+    Kontext "DVVerwalten"

+    AddressBook.Click

+    Kontext "AddressbookSource"

+    PrintLog " Cancel Dialog 'Address Book-Assignment'"

+    if AddressbookSource.Exists then

+        AddressbookSource.Cancel

+    else

+        Warnlog "the Dialog ' Address Book Source' wasnt up!"

+    end if

+

+    PrintLog " Close dialog"

+    Kontext "DVVerwalten"

+    DVVerwalten.Close

+

+    PrintLog " Close active document."

+    Call hCloseDocument

+endcase

+

+'-----------------------------------------------------------

+

+testcase tFileTemplatesAddressbookSource

+

+    PrintLog " Open new document"

+    Call hNewDocument

+

+    PrintLog " File / Templates /Address Book Source..."

+    UseBindings

+    FileTemplatesAddressbookSource

+

+    WaitSlot(2000)

+    PrintLog " In 'Address Book Assignement' dialog click pushbutton 'Administrate'"

+    Kontext "AddressbookSource"

+    if AddressbookSource.Exists then

+        Call DialogTest (AddressbookSource)

+        Administrate.Click

+        Sleep 2

+        PrintLog " Close 'Data Source Administration' with 'Cancel'"

+        Kontext "DatabaseProperties"

+        if Not DatabaseProperties.Exists then

+            Kontext "AddressSourceAutopilot"

+            if AddressSourceAutopilot.Exists then

+                AddressSourceAutopilot.Cancel

+            end if

+            Kontext "AddressbookSource"

+            AddressbookSource.Cancel

+        else

+            PrintLog " DatabaseProperties.SetPage TabConnection"

+            Kontext "TabConnection"

+            Call DialogTest ( TabConnection )

+            Kontext "DatabaseProperties"

+            DatabaseProperties.Close

+            Kontext "AddressbookSource"

+            PrintLog " Close dialog"

+            AddressbookSource.Cancel

+        end if

+    end if

+

+    printlog " Close active document"

+    Call hCloseDocument

+endcase

+

+'-----------------------------------------------------------

+

+testcase tFileTemplatesSave

+    if gApplication = "MASTERDOCUMENT" then

+        qaErrorLog "    tFileTemplatesSave has been disabled in Masterdocument."

+        goto endsub

+    end if

+    printlog "- File / Templates / Save"

+    Call hNewDocument

+    printlog " Open new document"

+    FileTemplatesSave

+    printlog " File / Templates / Save"

+

+    Kontext "DokumentVorlagen"

+    Call DialogTest ( DokumentVorlagen )

+    printlog " On 'Templates' dialog click 'Organizer'"

+

+    Verwalten.Click

+    Kontext "DVVerwalten"

+    DVVerwalten.Close

+    printlog " Close dialog 'Template Management'"

+

+    Kontext "DokumentVorlagen"

+    DokumentVorlagen.Cancel

+    printlog " Close 'Templates' dialog"

+

+    printlog " Close active document"

+    Call hCloseDocument

+    gApplication = "WRITER"

+endcase

+

+'-----------------------------------------------------------

+

+testcase tFileTemplatesEdit

+    printlog "- File / Templates / Edit"

+

+    printlog " Open new document"

+    Call hNewDocument

+    printlog " File / Templates / Edit"

+    FileTemplatesEdit

+

+    if gUseSysDlg = False then

+        printlog " Cancel Filedialog"

+        Kontext "OeffnenDlg"

+        OeffnenDlg.Cancel

+    end if

+

+    printlog " Close active document"

+    Call hCloseDocument

+endcase

+

+'-----------------------------------------------------------

+

+testcase tFilePagePreview

+    PrintLog "- File / Page Preview"

+    Dim gehtnicht as boolean

+    gehtnicht = FALSE

+    printlog " Open new document"

+    Select Case gApplication

+    Case "WRITER"

+        Call hNewDocument

+

+    Case "MASTERDOCUMENT"

+        Call hNewDocument

+

+    Case "HTML"

+        printlog "Not in Writer/Web!"

+        goto endsub

+    end select

+

+    printlog " Enter some text in document"

+    Call wTypeKeys("Just a small change!")

+    printlog " File / Page Preview"

+    FilePageView

+    WaitSlot (1000)

+    Kontext "DocPageViewWriter"

+    if DocPageViewWriter.NotExists then

+        Warnlog "Page Preview is not coming up!"

+        Kontext "Active"

+        if Active.Exists then

+            if Active.GetRT = 304 then

+                Active.No

+            end if

+        end if

+    else

+        if gehtnicht=FALSE then

+            Kontext "PreviewObjectbar"

+            if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)

+            printlog " Select 'Zoom 100%' in toolbar"

+            try

+                Massstab.Select 4

+            catch

+                Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"

+            endcatch

+

+            printlog " Click 'Print Page Preview' in toolbar"

+            Kontext "PreviewObjectbar"

+            DruckenSeitenansicht.Click

+            Kontext "Active"

+            if Active.Exists then

+                QAErrorlog "No default printer!"

+                Active.ok

+                Sleep 1

+                Kontext "Printing"

+                if Printing.Exists then Printing.Cancel

+            else

+                printlog " Close 'Print' dialog with cancel"

+                Kontext "Printing"

+                Printing.Cancel

+            end if

+

+            printlog " Close Page Preview with button 'Close Preview' in toolbar"

+            Kontext "PreviewObjectbar"

+            SeitenansichtSchliessen.Click

+        else

+            Warnlog "Objectbar not addressable!"

+        end if

+    end if

+    printlog " Close active document"

+    Call hCloseDocument

+endcase

+

+'-----------------------------------------------------------

+

+testcase tFilePrinterSetup

+    PrintLog " Open new document"

+    Call hNewDocument

+

+    PrintLog " File / Printer Settings"

+    FilePrintersettings

+    Kontext "Active"

+    WaitSlot(1000)

+    if Active.Exists then

+        if Active.GetRT = 304 then

+            QAErrorLog "No Default Printer!"

+            Active.Ok

+            Sleep 2

+            Kontext "DruckerEinrichten"

+            if DruckerEinrichten.Exists then

+                Call DialogTest ( DruckerEinrichten )

+                DruckerEinrichten.Cancel

+            end if

+        end if

+    else

+        Kontext "DruckerEinrichten"

+        Call DialogTest ( DruckerEinrichten )

+        DruckerEinrichten.Cancel

+        PrintLog " Cancel 'Printer Setup' dialog"

+    end if

+    PrintLog " Close active document"

+    Call hCloseDocument

+endcase

+

+'-----------------------------------------------------------

+

+testcase tMasterDocFilePagePreview

+    PrintLog "- File / Page Preview"

+    Dim gehtnicht as boolean

+    gehtnicht = FALSE

+    gApplication   = "MASTERDOCUMENT"

+    printlog " Open new document"

+    Call hNewDocument

+

+    printlog " Enter some text in document"

+    Call wTypeKeys("Just a small change!")

+    printlog " File / Page Preview"

+    FilePageView

+    WaitSlot (1000)

+    Kontext "DocPageViewWriter"

+    if DocPageViewWriter.NotExists then

+        Warnlog "Page Preview is not coming up!"

+        Kontext "Active"

+        if Active.Exists then

+            if Active.GetRT = 304 then

+                Active.No

+            end if

+        end if

+    else

+        if gehtnicht=FALSE then

+            Kontext "PreviewObjectbar"

+            if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)

+            printlog " Select 'Zoom 100%' in toolbar"

+            try

+                Massstab.Select 4

+            catch

+                Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"

+            endcatch

+

+            printlog " Click 'Print Page Preview' in toolbar"

+            Kontext "PreviewObjectbar"

+            DruckenSeitenansicht.Click

+            Kontext "Active"

+            if Active.Exists then

+                QAErrorlog "No default printer!"

+                Active.ok

+                Sleep 1

+                Kontext "Printing"

+                if Printing.Exists then Printing.Cancel

+            else

+                printlog " Close 'Print' dialog with cancel"

+                Kontext "Printing"

+                Printing.Cancel

+            end if

+

+            printlog " Close Page Preview with button 'Close Preview' in toolbar"

+            Kontext "PreviewObjectbar"

+            SeitenansichtSchliessen.Click

+        else

+            Warnlog "Objectbar not addressable!"

+        end if

+    end if

+

+    printlog " Close active document"

+    Call hCloseDocument

+    gApplication = "WRITER"

+endcase

diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas
index 992a4cc9f194..a52335d47e37 100755
--- a/testautomation/writer/required/w_updt.bas
+++ b/testautomation/writer/required/w_updt.bas
@@ -58,7 +58,7 @@ sub main
     use "writer\required\includes\w_010_1.inc"
     use "writer\required\includes\w_011_.inc"
     use "writer\required\includes\w_020_.inc"
-
+    
     Printlog "******* Ressource-Test Writer Document *******"
 
     Call wChangeDefaultView()
@@ -89,7 +89,10 @@ sub LoadIncludeFiles
     use "global\system\includes\gvariabl.inc"
     use "global\required\includes\g_001.inc"
     use "global\required\includes\g_option.inc"                	' global subroutines for Tools / Options
+    use "global\required\includes\g_printing.inc"
     use "global\tools\includes\optional\t_xml_filter1.inc"       ' global routines for XML-functionality
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
 
     gApplication   = "WRITER"
     GetUseFiles ()
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc
index 63e7e3a8ef7d..41d6b98eaeac 100755
--- a/testautomation/writer/tools/includes/w_tools.inc
+++ b/testautomation/writer/tools/includes/w_tools.inc
@@ -917,7 +917,6 @@ sub wOptionsUndo ( sOption$ )
         WeichesScrollen.Uncheck
         ' Display
         GrafikenUndObjekte.Check
-        Tabellen.Check
         Zeichnungen.Check
         Feldname.Uncheck
         Notizen.Check
@@ -981,20 +980,17 @@ sub wOptionsUndo ( sOption$ )
         Call hToolsOptions("WRITER","Print")
         ' Contents
         Grafiken.Check
-        Tabellen.Check
-        Zeichnungen.Check
         Kontrollfelder.Check
         Hintergrund.Check
         SchwarzDrucken.Uncheck
         ' Pages
         LinkeSeiten.Check
         RechteSeiten.Check
-        Umgekehrt.Uncheck
         Prospekt.Uncheck
         ' Notes
         Keine.Check
         ' Other
-        EinzelneDruckauftraege.Uncheck
+        LeereSeitenDrucken.Check
         AusDruckereinstellung.Uncheck
         Fax.SetNoSelection
     end if