1 files changed, 13 insertions, 7 deletions

diff --git a/smoketestdoc/data/Global.xml b/smoketestdoc/data/Global.xml
index f285ef51c458..6f9c066fc3b6 100644
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestdoc/data/Global.xml
@@ -35,7 +35,7 @@ const cParagraphBreak = 0
 
 global const cExtensionFileName = "TestExtension.oxt"
 
-global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4
+global const cDocNew = 0, cDocSaveOpen8 = 1, cDocSaveOpenXML = 2, cDocOpen50 = 3, cDocClose = 4, cDocMacros = 5
 global const cDBService = 0, cDBOpen = 1, cDBInsert = 2, cDBDelete = 3, cDBSeek = 4, cDBClose = 5
 global const cEXTService = 0, cEXTInstall = 1, cEXTUninstall = 2
 global const cTestClosureSetupDoc = 0, cTestClosureWriteStatus = 1
@@ -91,7 +91,7 @@ Global const cUserFieldTestHTML = "HTML", cUserFieldTestJava = "J
 Global const cUserFieldTestExtension = "Extension"
 Global const cUserFieldTestOpenSaveXML = "SaveOpenXML"
 Global const cUserFieldTestOpen50 = "Open50"
-Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8"
+Global const cUserFieldTestTerminateAfterTest = "Terminate", cUserFieldTestOpenSave8 = "SaveOpen8", cUserFieldTestMacros = "Macros"
 
 Global const cOptionsDialogName = "OptionsDlg", cTest10Modul = "Standard"
 
@@ -110,7 +110,7 @@ Global bMakeHTMLTest as boolean, bMakeJavaTest as boolean, bMakeDBTest as boolea
 Global bMakeExtensionTest as boolean
 Global bMakeSaveOpenXMLTest as boolean, bMakeOpen50Test as boolean
 Global bMakeTerminateAfterTest as boolean, bShowTable as boolean
-Global bMakeSaveOpen8Test as boolean
+Global bMakeSaveOpen8Test as boolean, bMakeMacrosTest as boolean
 
 global sExtensionURL as string
 
@@ -235,12 +235,13 @@ Sub CreateStatusTable
     tableHeaders(cStHTML) = "HTML"
     tableHeaders(cStJava) = "Java"
 
-    dim tableRows(4) as string
+    dim tableRows(5) as string
     tableRows(cDocNew) = "new"
     tableRows(cDocSaveOpen8) = "V8.0"
     tableRows(cDocSaveOpenXML) = "XML"
     tableRows(cDocOpen50) = "V5.0"
     tableRows(cDocClose) = "close"
+    tableRows(cDocMacros) = "macros"
 
     aDoc = gOutputDoc
 
@@ -255,7 +256,7 @@ Sub CreateStatusTable
     xCursor.GoRight (1, False)
 
     table = aDoc.createInstance("com.sun.star.text.TextTable")
-    table.initialize(6,9)
+    table.initialize(7,9)
     table.Name = "StTab1"
   table.BackColor = cCoGrey
     xText.insertTextContent(xCursor, table, FALSE)
@@ -341,7 +342,7 @@ Sub CreateDocState
     table = aDoc.TextTables.GetByIndex (1)
 
     for j% = 0 to 7
-        for i% = 0 to 4
+        for i% = 0 to 5
             sRangeName = GetRangeName(j%, i%+1)
 
             tableCursor = table.createCursorByCellName(sRangeName)
@@ -580,6 +581,7 @@ Sub SetOptions
     SetUserFieldState (cUserFieldTestOpenSaveXML, -(gOptionsDialog.getControl("cbSaveOpenXMLTest").getState), gOutputDoc)
     SetUserFieldState (cUserFieldTestOpen50, -(gOptionsDialog.getControl("cbOpen50Test").getState), gOutPutDoc)
     SetUserFieldState (cUserFieldTestOpenSave8, -(gOptionsDialog.getControl("cbSaveOpen8Test").getState), gOutputDoc)
+    SetUserFieldState (cUserFieldTestMacros, -(gOptionsDialog.getControl("cbMacrosTest").getState), gOutputDoc)
     SetUserFieldState (cUserFieldTestTerminateAfterTest, -(gOptionsDialog.getControl("cbTerminateAfterTest").getState), gOutputDoc)
 end Sub
 
@@ -602,6 +604,7 @@ Sub GetOptions
         gOptionsDialog.getControl("cbOpen50Test").setState(0)
     end If
     gOptionsDialog.getControl("cbSaveOpen8Test").setState( -( GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)))
+    gOptionsDialog.getControl("cbMacrosTest").setState( -( GetUserFieldState (cUserFieldTestMacros, gOutputDoc)))
     gOptionsDialog.getControl("cbTerminateAfterTest").setState( -( GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)))
 End Sub
 
@@ -624,6 +627,7 @@ Sub ReadOptions
         bMakeOpen50Test = false
     End If
     bMakeSaveOpen8Test = GetUserFieldState (cUserFieldTestOpenSave8, gOutputDoc)
+    bMakeMacrosTest = GetUserFieldState (cUserFieldTestMacros, gOutputDoc)
     bMakeTerminateAfterTest = GetUserFieldState (cUserFieldTestTerminateAfterTest, gOutputDoc)
 end Sub
 
@@ -652,6 +656,7 @@ Sub SetDefaultOptions
         bMakeOpen50Test = false
     End If
     bMakeSaveOpen8Test = true
+    bMakeMacrosTest = true
     bMakeTerminateAfterTest = false
 end Sub
 
@@ -685,12 +690,13 @@ Function StartTestWithDefaultOptions
     component(cStJava) = "Java"
     component(cStDataBase) = "Base"
     component(cStExtension) = "Extensions"
-    dim action(4) as string
+    dim action(5) as string
     action(cDocNew) = "new"
     action(cDocSaveOpen8) = "V8.0"
     action(cDocSaveOpenXML) = "XML"
     action(cDocOpen50) = "V5.0"
     action(cDocClose) = "close"
+    action(cDocMacros) = "macros"
     dim baseAction(5) as string
     baseAction(cDBService) = "services"
     baseAction(cDBOpen) = "open"