Drop statement that VBA macros don't get converted, they sort of do thesedays

5 files changed, 14 insertions, 24 deletions

diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index d323ba7ed711..df1accfe6533 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -82,7 +82,6 @@ Dim i as Integer
 		.cmdBack.Label = sBackButton
 		.cmdGoOn.Label = sNextButton
 		.WelcomeTextLabel.Label = sWelcomeTextLabel1
-		.WelcomeTextLabel2.Label = sWelcomeTextLabel2
 		.WelcomeTextLabel3.Label = sWelcomeTextLabel3
 
 		.optMSDocuments.Label = sContainerName(0)
@@ -654,4 +653,4 @@ Sub FinalizeDialogButtons()
 	ImportDialog.cmdGoOn.Label = sCloseButton
 	ImportDialog.cmdGoOn.Enabled = True
 End Sub	
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl
index f28bc1192807..de94e3ed841b 100644
--- a/wizards/source/importwizard/ImportDialog.xdl
+++ b/wizards/source/importwizard/ImportDialog.xdl
@@ -78,19 +78,18 @@
   <dlg:checkbox dlg:id="chkMSApplication3" dlg:tab-index="35" dlg:disabled="true" dlg:left="12" dlg:top="139" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT" dlg:value="chkMSApplication3" dlg:checked="false">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleNextButton?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:checkbox>
-  <dlg:text dlg:id="WelcomeTextLabel2" dlg:tab-index="36" dlg:disabled="true" dlg:left="6" dlg:top="152" dlg:width="258" dlg:height="18" dlg:page="1" dlg:value="WelcomeTextLabel2" dlg:multiline="true"/>
-  <dlg:checkbox dlg:id="chkTemplatePath" dlg:tab-index="37" dlg:left="12" dlg:top="48" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Template" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE" dlg:value="chkTemplatePath" dlg:checked="true">
+  <dlg:checkbox dlg:id="chkTemplatePath" dlg:tab-index="36" dlg:left="12" dlg:top="48" dlg:width="240" dlg:height="10" dlg:page="2" dlg:tag="Template" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE" dlg:value="chkTemplatePath" dlg:checked="true">
    <script:event script:event-name="on-itemstatechange" script:macro-name="vnd.sun.star.script:ImportWizard.DialogModul.ToggleInputPaths?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:checkbox>
-  <dlg:checkbox dlg:id="chkTemplateSearchSubDir" dlg:tab-index="38" dlg:left="12" dlg:top="61" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE" dlg:value="chkTemplateSearchSubDir" dlg:checked="false"/>
-  <dlg:text dlg:id="lblTemplateImport" dlg:tab-index="39" dlg:left="12" dlg:top="78" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblTemplateImport"/>
-  <dlg:checkbox dlg:id="chkLogfile" dlg:tab-index="40" dlg:left="6" dlg:top="171" dlg:width="136" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE" dlg:value="chkLogfile" dlg:checked="true"/>
-  <dlg:fixedline dlg:id="hlnTemplates" dlg:tab-index="41" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnTemplates"/>
-  <dlg:fixedline dlg:id="hlnDocuments" dlg:tab-index="42" dlg:left="6" dlg:top="110" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnDocuments"/>
-  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="43" dlg:left="6" dlg:top="181" dlg:width="258" dlg:height="6"/>
-  <dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="44" dlg:left="6" dlg:top="55" dlg:width="258" dlg:height="8" dlg:page="4" dlg:value="hlnProgress"/>
-  <dlg:button dlg:id="cmdShowLogFile" dlg:tab-index="45" dlg:disabled="true" dlg:left="75" dlg:top="142" dlg:width="120" dlg:height="14" dlg:page="4" dlg:value="cmdShowLogFile">
+  <dlg:checkbox dlg:id="chkTemplateSearchSubDir" dlg:tab-index="37" dlg:left="12" dlg:top="61" dlg:width="240" dlg:height="10" dlg:page="2" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE" dlg:value="chkTemplateSearchSubDir" dlg:checked="false"/>
+  <dlg:text dlg:id="lblTemplateImport" dlg:tab-index="38" dlg:left="12" dlg:top="78" dlg:width="60" dlg:height="8" dlg:page="2" dlg:value="lblTemplateImport"/>
+  <dlg:checkbox dlg:id="chkLogfile" dlg:tab-index="39" dlg:left="6" dlg:top="153" dlg:width="136" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE" dlg:value="chkLogfile" dlg:checked="true"/>
+  <dlg:fixedline dlg:id="hlnTemplates" dlg:tab-index="40" dlg:left="6" dlg:top="37" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnTemplates"/>
+  <dlg:fixedline dlg:id="hlnDocuments" dlg:tab-index="41" dlg:left="6" dlg:top="110" dlg:width="258" dlg:height="8" dlg:page="2" dlg:value="hlnDocuments"/>
+  <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="42" dlg:left="6" dlg:top="181" dlg:width="258" dlg:height="6"/>
+  <dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="43" dlg:left="6" dlg:top="55" dlg:width="258" dlg:height="8" dlg:page="4" dlg:value="hlnProgress"/>
+  <dlg:button dlg:id="cmdShowLogFile" dlg:tab-index="44" dlg:disabled="true" dlg:left="75" dlg:top="142" dlg:width="120" dlg:height="14" dlg:page="4" dlg:value="cmdShowLogFile">
    <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.FilesModul.OpenLogDocument?language=Basic&amp;location=application" script:language="Script"/>
   </dlg:button>
  </dlg:bulletinboard>
-</dlg:window>
\ No newline at end of file
+</dlg:window>
diff --git a/wizards/source/importwizard/Language.xba b/wizards/source/importwizard/Language.xba
index 32efcc242e8a..08c7ec7e5784 100644
--- a/wizards/source/importwizard/Language.xba
+++ b/wizards/source/importwizard/Language.xba
@@ -19,7 +19,7 @@ Public SOApplicationName(5) As String
 Public sHelpButton As String, sCancelButton As String, sBackButton As String, sNextButton As String
 Public sSumInclusiveSubDir As String, sSumSaveDocuments As String
 Public sSummaryHeader As String
-Public sWelcometextLabel1 As String, sWelcometextLabel2 As String,  sWelcometextLabel3 As String
+Public sWelcometextLabel1 As String, sWelcometextLabel3 As String
 Public sBeginButton As String, sMsgDirNotThere As String
 Public sQueryForNewCreation As String, sPathError3 As String
 Public sNoDirCreation As String
@@ -58,7 +58,6 @@ Sub LoadLanguage()
 		sCloseButton = GetResText(1005)
 		
 		sWelcometextLabel1 = ReplaceString(GetResText(1006), GetProductName(),&quot;%PRODUCTNAME&quot;)
-		sWelcometextLabel2 = GetResText(1007)
 		sWelcometextLabel3 = GetResText(1008)
 
 		&apos; Microsoft Documents
@@ -154,4 +153,4 @@ Dim a as Integer
 		a = a + 1
 	Next			
 End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index 3415d0ee8dd8..6b6c3d701355 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -228,7 +228,6 @@ Sub ToggleCheckboxesWithBoolean(bMSEnable as Boolean)
 		.GetControl(&quot;chkMSApplication3&quot;).Model.Enabled = bMSEnable
 	End With
 	CheckModuleInstallation()
-	ImportDialog.WelcomeTextLabel2.Enabled = bMSEnable
 	bDoKeepApplValues = False
 	ToggleNextButton()
 End Sub
@@ -287,4 +286,4 @@ Function GetImportWizardPaths() as Boolean
 	End  If
 	GetImportWizardPaths() = False
 End Function
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src
index 1a3ec68b1d04..59bc5e8ec3f9 100644
--- a/wizards/source/importwizard/importwi.src
+++ b/wizards/source/importwizard/importwi.src
@@ -30,7 +30,6 @@
 #define sBeginButton	1004
 #define sCloseButton    1005
 #define sWelcometextLabel1  1006
-#define sWelcometextLabel2  1007
 #define sWelcometextLabel3  1008
 #define sMSTemplateCheckbox_1_    1009
 #define sMSTemplateCheckbox_2_    1010
@@ -155,11 +154,6 @@ String sWelcometextLabel1
     Text [ en-US ] = "This wizard convert legacy format documents to Open Document Format for Office Applications.";
 };
 
-String sWelcometextLabel2
-{
-    Text [ en-US ] = "Please note that when converting Microsoft documents any attached VBA macros lose their functionality.";
-};
-
 String sWelcometextLabel3
 {
     Text [ en-US ] = "Select the document type for conversion:";