summaryrefslogtreecommitdiff
path: root/wizards/source/importwizard
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-14 19:58:02 +0100
committerMichael Stahl <mstahl@redhat.com>2013-01-14 20:06:24 +0100
commit8bab53a19828b888ca689dafaf98aa3ba82228a8 (patch)
tree7e1a6bdeff4dab9aa3d973c8fbcb43f8fa846317 /wizards/source/importwizard
parent907b63a0f3f754d4a975717ffec9cbc03214f0f3 (diff)
wizards: Document Conversion: remove StarOffice mode:
With the removal of binfilter, legacy StarOffice format documents cannot be converted any more, so remove the associated code. Change-Id: I49da6b56eb893acebce0de43846128abaede6a71
Diffstat (limited to 'wizards/source/importwizard')
-rw-r--r--wizards/source/importwizard/API.xba11
-rw-r--r--wizards/source/importwizard/DialogModul.xba157
-rw-r--r--wizards/source/importwizard/FilesModul.xba10
-rw-r--r--wizards/source/importwizard/ImportDialog.xdl15
-rw-r--r--wizards/source/importwizard/Language.xba19
-rw-r--r--wizards/source/importwizard/Main.xba45
-rw-r--r--wizards/source/importwizard/importwi.src123
7 files changed, 14 insertions, 366 deletions
diff --git a/wizards/source/importwizard/API.xba b/wizards/source/importwizard/API.xba
index 192dc2cd64b9..c62e88700201 100644
--- a/wizards/source/importwizard/API.xba
+++ b/wizards/source/importwizard/API.xba
@@ -102,8 +102,6 @@ Dim Index as Integer
sPath = SOWorkPath
End If
GetDefaultPath = sPath
- Case SBXMLMODE
- GetDefaultPath = SOWorkPath
End Select
End Function
@@ -158,13 +156,6 @@ Dim sTemplateValueName as String
Else
GetTemplateDefaultPath = SOWorkPath
End If
- Case SBXMLMODE
- If Index = 3 Then
- &apos; Helper Application with no templates
- GetTemplateDefaultPath = SOWorkPath
- Else
- GetTemplateDefaultPath = SOTemplatePath
- End If
End Select
NOVALIDSYSTEMPATH:
If Err &lt;&gt; 0 Then
@@ -222,4 +213,4 @@ Dim vValue As String &apos; Key value
RegCloseKeyA (hKey)
QueryValue = vValue
End Function
-</script:module> \ No newline at end of file
+</script:module>
diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba
index 70f9a6b3df64..a9ea8f9a36f1 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -27,10 +27,9 @@ Public Const SBTHIRDAPPLCHECKED = 2
Public Const SBFOURTHAPPLCHECKED = 3
Public WizardMode as String
Public Const SBMICROSOFTMODE = &quot;MS&quot;
-Public Const SBXMLMODE = &quot;SO&quot;
&apos; The absolute maximal Number of possible Applications
-Public Const Twip = 425
Public Const SBMAXAPPLCOUNT = 4
+Public Const Twip = 425
Public MaxApplCount as Integer
Public CurOffice As Integer
Public SOBitmapPath As String
@@ -47,12 +46,6 @@ Public sKeyName(SBMAXAPPLCOUNT-1) as String
Public sValueName(SBMAXAPPLCOUNT-1) as String
Public sCRLF as String
Public MSFilterName(5,4) as String
-Public XMLFilterName(7,3) as String &apos;Number of different formats
-
-&apos; e.g.:
-&apos; XMLFilterName(x,0) = &quot;sdw&quot; &apos; in documents we take the extensions; in SO-templates the appropriate Filtername
-&apos; XMLFilterName(x,1) = &quot;swriter: StarWriter 5.0&quot; &apos; the filtername of the target-format
-&apos; XMLFilterName(x,2) = &quot;sxw&quot; &apos; the target extension
Public Applications(SBMAXAPPLCOUNT-1,9)
@@ -101,11 +94,6 @@ Dim i as Integer
.chkMSApplication2.Label = sMsDocumentCheckbox(1)
.chkMSApplication3.Label = sMsDocumentCheckbox(2)
- .optSODocuments.Label = sContainerName(1)
- .chkSOApplication1.Label = sSODocumentCheckbox(0)
- .chkSOApplication2.Label = sSODocumentCheckbox(1)
- .chkSOApplication3.Label = sSODocumentCheckbox(2)
- .chkSOApplication4.Label = sSODocumentCheckbox(3)
.cmdBack.Enabled = False
.Step = 1
@@ -126,7 +114,7 @@ Dim oNullObject as Object
If ImportDialog.optMSDocuments.State = 1 Then
SetupMSConfiguration()
Else
- SetupXMLConfiguration()
+ &apos;Not supposed to happen - is there an assert in BASIC...
End If
FillUpApplicationList()
End If
@@ -140,25 +128,14 @@ Dim oNullObject as Object
.txtDocumentImportPath.Text = ConvertFromUrl(Applications(CurOffice,SBDOCSOURCE))
.txtDocumentExportPath.Text = ConvertFromUrl(Applications(CurOffice,SBDOCTARGET))
.hlnDocuments.Label = sProgressMoreDocs
- If WizardMode = SBXMLMODE Then
- ImportDialogArea.Title = sTitle &amp; &quot; - &quot; &amp; sSODocumentCheckBox(Index)
- Else
+ If WizardMode = SBMICROSOFTMODE Then
ImportDialogArea.Title = sTitle &amp; &quot; - &quot; &amp; sMSDocumentCheckBox(Index)
End If
- If WizardMode = SBXMLMODE AND Index = 3 Then
- &apos; Note: SO-Helper Applications are partly treated like templates although they only have documents
- .hlnTemplates.Label = sProgressMoreDocs
- .chkTemplatePath.Label = sSOHelperDocuments(0,0)
- .chkTemplatePath.Enabled = oFactoryKey.HasByName(sSOHelperDocuments(0,1))
- .chkDocumentPath.Label = sSOHelperDocuments(1,0)
- .chkDocumentPath.Enabled = oFactoryKey.HasByName(sSOHelperDocuments(1,1))
- Else
- .chkTemplatePath.Enabled = True
- .chkDocumentPath.Enabled = True
- .chkTemplatePath.Label = sTemplateCheckbox(Index)
- .chkDocumentPath.Label = sDocumentCheckbox(Index)
- .hlnTemplates.Label = sProgressMoreTemplates
- End If
+ .chkTemplatePath.Enabled = True
+ .chkDocumentPath.Enabled = True
+ .chkTemplatePath.Label = sTemplateCheckbox(Index)
+ .chkDocumentPath.Label = sDocumentCheckbox(Index)
+ .hlnTemplates.Label = sProgressMoreTemplates
.chkTemplatePath.State = Abs(Applications(CurOffice,SBTEMPLCONVERT))
ToggleInputPaths(oNullObject,&quot;Template&quot;)
ToggleInputPaths(oNullObject,&quot;Document&quot;)
@@ -183,8 +160,6 @@ Dim BoolValue as Boolean
For i = 1 To ApplCount
If ImportDialog.optMSDocuments.State = 1 Then
BoolValue = ImportDialogArea.GetControl(&quot;chkMSApplication&quot; &amp; i).Model.State = 1
- Else
- BoolValue = ImportDialogArea.GetControl(&quot;chkSOApplication&quot; &amp; i).Model.State = 1
End If
Applications(a,SBAPPLCONVERT) = BoolValue
Applications(a,SBDOCCONVERT) = BoolValue
@@ -272,8 +247,6 @@ Dim sAddText as String
sAddText = &quot;&quot;
If WizardMode = SBMICROSOFTMODE Then
sAddText = sSumMSTemplates(Index) &amp; sCRLF
- Else
- sAddText = sSumSOTemplates(Index) &amp; sCRLF
End If
sTmpText = sTmpText &amp; sAddText &amp; ConvertFromUrl(Applications(i,SBTEMPLSOURCE)) &amp; sCRLF
If Applications(i,SBTEMPLRECURSIVE) Then
@@ -289,8 +262,6 @@ Dim sAddText as String
&apos; Documents are to be converted
If WizardMode = SBMICROSOFTMODE Then
sAddText = sSumMSDocuments(Index) &amp; sCRLF
- Else
- sAddText = sSumSODocuments(Index) &amp; sCRLF
End If
sTmpText = sTmpText &amp; sAddText &amp; ConvertFromUrl(Applications(i,SBDOCSOURCE)) &amp; sCRLF
@@ -399,118 +370,6 @@ Sub SetupMSConfiguration()
End Sub
-
-&apos; This is an extract from &quot;http://util.openoffice.org/source/browse/util/sot/source/base/exchange.cxx?rev=1.25&amp;content-type=text/x-cvsweb-markup&quot;
-&apos; about the listed defined mimetypes that are required to define binary StarOffice templates that have for all applications the same extension &quot;.vor&quot;
-
-&apos; 26 SOT_FORMATSTR_ID_STARWRITER_30*/ { &quot;application/x-openoffice-starwriter-30;windows_formatname=\&quot;StarWriter 3.0\&quot;&quot;, &quot;StarWriter 3.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 27 SOT_FORMATSTR_ID_STARWRITER_40*/ { &quot;application/x-openoffice-starwriter-40;windows_formatname=\&quot;StarWriter 4.0\&quot;&quot;, &quot;StarWriter 4.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 28 SOT_FORMATSTR_ID_STARWRITER_50*/ { &quot;application/x-openoffice-starwriter-50;windows_formatname=\&quot;StarWriter 5.0\&quot;&quot;, &quot;StarWriter 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-&apos; 29 SOT_FORMATSTR_ID_STARWRITERWEB_40*/ { &quot;application/x-openoffice-starwriterweb-40;windows_formatname=\&quot;StarWriter/Web 4.0\&quot;&quot;, &quot;StarWriter/Web 4.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 30 SOT_FORMATSTR_ID_STARWRITERWEB_50*/ { &quot;application/x-openoffice-starwriterweb-50;windows_formatname=\&quot;StarWriter/Web 5.0\&quot;&quot;, &quot;StarWriter/Web 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-&apos; 31 SOT_FORMATSTR_ID_STARWRITERGLOB_40*/ { &quot;application/x-openoffice-starwriterglob-40;windows_formatname=\&quot;StarWriter/Global 4.0\&quot;&quot;, &quot;StarWriter/Global 4.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 32 SOT_FORMATSTR_ID_STARWRITERGLOB_50*/ { &quot;application/x-openoffice-starwriterglob-50;windows_formatname=\&quot;StarWriter/Global 5.0\&quot;&quot;, &quot;StarWriter/Global 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-&apos; 33 SOT_FORMATSTR_ID_STARDRAW*/ { &quot;application/x-openoffice-stardraw;windows_formatname=\&quot;StarDrawDocument\&quot;&quot;, &quot;StarDrawDocument&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 34 SOT_FORMATSTR_ID_STARDRAW_40*/ { &quot;application/x-openoffice-stardraw-40;windows_formatname=\&quot;StarDrawDocument 4.0\&quot;&quot;, &quot;StarDrawDocument 4.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 36 SOT_FORMATSTR_ID_STARDRAW_50*/ { &quot;application/x-openoffice-stardraw-50;windows_formatname=\&quot;StarDraw 5.0\&quot;&quot;, &quot;StarDraw 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-&apos; 35 SOT_FORMATSTR_ID_STARIMPRESS_50*/ { &quot;application/x-openoffice-starimpress-50;windows_formatname=\&quot;StarImpress 5.0\&quot;&quot;, &quot;StarImpress 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-&apos; 37 SOT_FORMATSTR_ID_STARCALC*/ { &quot;application/x-openoffice-starcalc;windows_formatname=\&quot;StarCalcDocument\&quot;&quot;, &quot;StarCalcDocument&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 38 SOT_FORMATSTR_ID_STARCALC_40*/ { &quot;application/x-openoffice-starcalc-40;windows_formatname=\&quot;StarCalc 4.0\&quot;&quot;, &quot;StarCalc 4.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 39 SOT_FORMATSTR_ID_STARCALC_50*/ { &quot;application/x-openoffice-starcalc-50;windows_formatname=\&quot;StarCalc 5.0\&quot;&quot;, &quot;StarCalc 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-&apos; 40 SOT_FORMATSTR_ID_STARCHART*/ { &quot;application/x-openoffice-starchart;windows_formatname=\&quot;StarChartDocument\&quot;&quot;, &quot;StarChartDocument&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 41 SOT_FORMATSTR_ID_STARCHART_40*/ { &quot;application/x-openoffice-starchart-40;windows_formatname=\&quot;StarChartDocument 4.0\&quot;&quot;, &quot;StarChartDocument 4.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 42 SOT_FORMATSTR_ID_STARCHART_50*/ { &quot;application/x-openoffice-starchart-50;windows_formatname=\&quot;StarChart 5.0\&quot;&quot;, &quot;StarChart 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-&apos; 46 SOT_FORMATSTR_ID_STARMATH*/ { &quot;application/x-openoffice-starmath;windows_formatname=\&quot;StarMath\&quot;&quot;, &quot;StarMath&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 47 SOT_FORMATSTR_ID_STARMATH_40*/ { &quot;application/x-openoffice-starmath-40;windows_formatname=\&quot;StarMathDocument 4.0\&quot;&quot;, &quot;StarMathDocument 4.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-&apos; 48 SOT_FORMATSTR_ID_STARMATH_50*/ { &quot;application/x-openoffice-starmath-50;windows_formatname=\&quot;StarMath 5.0\&quot;&quot;, &quot;StarMath 5.0&quot;, &amp;::getCppuType( (const Sequence&lt; sal_Int8 &gt;*) 0 ) },
-
-
-Sub SetupXMLConfiguration()
- iApplSection = 1000
- Wizardmode = SBXMLMODE
- ApplCount = 4
- MaxApplCount = 4
- XMLTemplateList = Array(&quot;vor&quot;, &quot;sti&quot;, &quot;stw&quot; , &quot;stc&quot; , &quot;std&quot;)
- &apos; chkTemplatePath-Captions
- GetApplResourceArray(1009 + iApplSection, ApplCount, sTemplateCheckBox())
- &apos; DocumentCheckbox- Captions
- GetApplResourceArray(1009 + iApplSection + ApplCount, ApplCount, sDocumentCheckBox())
-
- XMLFilterName(0,0) = &quot;sdw|sxw&quot;
- XMLFilterName(0,1) = &quot;writer8|writer8&quot;
- XMLFilterName(0,2) = &quot;odt|odt&quot;
- XMLFilterName(0,3) = sDocumentCheckBox(0)
-
- XMLFilterName(1,0) = &quot;sdc|sxc&quot;
- XMLFilterName(1,1) = &quot;calc8|calc8&quot;
- XMLFilterName(1,2) = &quot;ods|ods&quot;
- XMLFilterName(1,3) = sDocumentCheckBox(1)
-
- If oFactoryKey.HasByName(&quot;com.sun.star.drawing.DrawingDocument&quot;) and oFactoryKey.HasByName(&quot;com.sun.star.presentation.PresentationDocument&quot;) Then
- XMLFilterName(2,0) = &quot;sdd|sda|sxi|sxd&quot;
- XMLFilterName(2,1) = &quot;impress8|draw8|impress8|draw8&quot;
- XMLFilterName(2,2) = &quot;odp|odg|odp|odg&quot;
- Elseif oFactoryKey.HasByName(&quot;com.sun.star.drawing.DrawingDocument&quot;) Then
- XMLFilterName(2,0) = &quot;sda|sxd&quot;
- XMLFilterName(2,1) = &quot;draw8|draw8&quot;
- XMLFilterName(2,2) = &quot;odg|odg&quot;
- Elseif oFactoryKey.HasByName(&quot;com.sun.star.presentation.PresentationDocument&quot;) Then
- XMLFilterName(2,0) = &quot;sdd|sxi&quot;
- XMLFilterName(2,1) = &quot;impress8|impress8&quot;
- XMLFilterName(2,2) = &quot;odp|odp&quot;
- End If
- XMLFilterName(2,3) = sDocumentCheckBox(2)
-
-
- XMLFilterName(3,0) = &quot;smf|sxm&quot;
- XMLFilterName(3,1) = &quot;math8|math8&quot;
- XMLFilterName(3,2) = &quot;odf|odf&quot;
- XMLFilterName(3,3) = sDocumentCheckBox(3)
-
- XMLFilterName(4,0) = &quot;application/x-openoffice-starwriter|application/vnd.stardivision.writer/web|application/vnd.sun.xml.writer|application/vnd.sun.xml.writerweb&quot;
- XMLFilterName(4,1) = &quot;writer8_template|writerweb8_writer_template|writer8_template|writerweb8_writer_template&quot;
- XMLFilterName(4,2) = &quot;ott|oth|ott|oth&quot;
- XMLFilterName(4,3) = sTemplateCheckBox(0)
-
-
- XMLFilterName(5,0) = &quot;application/x-openoffice-starcalc|application/vnd.sun.xml.calc&quot;
- XMLFilterName(5,1) = &quot;calc8_template|calc8_template&quot;
- XMLFilterName(5,2) = &quot;ots|ots&quot;
- XMLFilterName(5,3) = sTemplateCheckBox(1)
-
- &apos; due to bug #108942# impress templates of the version 4.0 have to be handled in a special way because their mimetype
- &apos; falsely points to the draw application.
- If oFactoryKey.HasByName(&quot;com.sun.star.drawing.DrawingDocument&quot;) and oFactoryKey.HasByName(&quot;com.sun.star.presentation.PresentationDocument&quot;) Then
- XMLFilterName(6,0) = &quot;application/x-openoffice-starimpress|application/x-openoffice-stardraw-40|application/x-openoffice-stardraw|application/vnd.sun.xml.impress|application/vnd.sun.xml.draw&quot;
- XMLFilterName(6,1) = &quot;impress8_template|impress8_template|draw8_template|impress8_template|draw8_template&quot;
- XMLFilterName(6,2) = &quot;otp|otp|otg|otp|otg&quot;
- Elseif oFactoryKey.HasByName(&quot;com.sun.star.drawing.DrawingDocument&quot;) Then
- XMLFilterName(6,0) = &quot;application/x-openoffice-stardraw|application/vnd.sun.xml.draw&quot;
- XMLFilterName(6,1) = &quot;draw8_template|draw8_template&quot;
- XMLFilterName(6,2) = &quot;otg|otg&quot;
- Elseif oFactoryKey.HasByName(&quot;com.sun.star.presentation.PresentationDocument&quot;) Then
- XMLFilterName(6,0) = &quot;application/x-openoffice-starimpress|application/x-openoffice-stardraw-40|application/vnd.sun.xml.impress&quot;
- XMLFilterName(6,1) = &quot;impress8_template|impress8_template|impress8_template&quot;
- XMLFilterName(6,2) = &quot;otp|otp|otp&quot;
- End If
- XMLFilterName(6,3) = sTemplateCheckBox(2)
-
- If oFactoryKey.HasByName(&quot;com.sun.star.text.GlobalDocument&quot;) Then
- XMLFilterName(7,0) = &quot;sgl|sxg&quot;
- XMLFilterName(7,1) = &quot;writerglobal8|writerglobal8&quot;
- XMLFilterName(7,2) = &quot;odm|odm&quot;
- XMLFilterName(7,3) = sTemplateCheckBox(3)
- End If
-End Sub
-
-
Function CheckControlPath(oCheckbox as Object, oTextBox as Object, ByVal bDoEnable as Boolean)
Dim sPath as String
If Not bDoEnable Then
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index 710f46ba56bf..b33404b1d537 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -238,9 +238,6 @@ Dim XMLTemplateContentString as String
XMLTemplateCount = 0
XMLTemplateContentString = &quot;&quot;
For i = 0 To ApplCount-1
- If WizardMode = SBXMLMODE Then
- XMLTemplateCount = XMLTemplateCount + 1
- End If
CheckIfToAddPathToCollection(i, SBTEMPLCONVERT, SBTEMPLSOURCE, SBTEMPLRECURSIVE, sFilterName(), MaxApplCount)
Next i
End Sub
@@ -470,13 +467,6 @@ Function GetTargetTemplatePath(Index as Integer)
Select Case WizardMode
Case SBMICROSOFTMODE
GetTargetTemplatePath() = SOTemplatePath &amp; &quot;/&quot; &amp; sTemplateGroupName
- Case SBXMLMODE
- If Index = 3 Then
- &apos; Helper Application
- GetTargetTemplatePath = SOWorkPath
- Else
- GetTargetTemplatePath = SOTemplatePath
- End If
End Select
End Function
diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl
index de0c92759822..2f9a3a9b1a8d 100644
--- a/wizards/source/importwizard/ImportDialog.xdl
+++ b/wizards/source/importwizard/ImportDialog.xdl
@@ -70,9 +70,6 @@
<dlg:radio dlg:id="optMSDocuments" dlg:tab-index="27" dlg:left="6" dlg:top="72" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="MS" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS" dlg:value="optMSDocuments" dlg:checked="true">
<script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleCheckboxes?language=Basic&amp;location=application" script:language="Script"/>
</dlg:radio>
- <dlg:radio dlg:id="optSODocuments" dlg:tab-index="28" dlg:left="6" dlg:top="113" dlg:width="258" dlg:height="9" dlg:page="1" dlg:tag="SO" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS" dlg:value="optSODocuments">
- <script:event script:event-name="on-performaction" script:macro-name="vnd.sun.star.script:ImportWizard.Main.ToggleCheckboxes?language=Basic&amp;location=application" script:language="Script"/>
- </dlg:radio>
</dlg:radiogroup>
<dlg:checkbox dlg:id="chkMSApplication1" dlg:tab-index="29" dlg:disabled="true" dlg:left="12" dlg:top="85" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_2_CHKWORD" dlg:value="chkMSApplication1" 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"/>
@@ -83,18 +80,6 @@
<dlg:checkbox dlg:id="chkMSApplication3" dlg:tab-index="31" dlg:disabled="true" dlg:left="12" dlg:top="98" 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:checkbox dlg:id="chkSOApplication1" dlg:tab-index="32" dlg:left="12" dlg:top="126" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKWRITER" dlg:value="chkSOApplication1" 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:checkbox dlg:id="chkSOApplication2" dlg:tab-index="33" dlg:left="155" dlg:top="126" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKCALC" dlg:value="chkSOApplication2" 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:checkbox dlg:id="chkSOApplication3" dlg:tab-index="34" dlg:left="12" dlg:top="139" dlg:width="141" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS" dlg:value="chkSOApplication3" 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:checkbox dlg:id="chkSOApplication4" dlg:tab-index="35" dlg:left="155" dlg:top="139" dlg:width="109" dlg:height="9" dlg:page="1" dlg:help-url="HID:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL" dlg:value="chkSOApplication4" 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: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>
diff --git a/wizards/source/importwizard/Language.xba b/wizards/source/importwizard/Language.xba
index 387e80c8c2a6..00590580f41d 100644
--- a/wizards/source/importwizard/Language.xba
+++ b/wizards/source/importwizard/Language.xba
@@ -21,8 +21,6 @@
Public sMSTemplateCheckbox(2) As String
Public sMSDocumentCheckbox(2) As String
-Public sSODocumentCheckbox(4) As String
-Public sSOHelperdocuments(1,1) As String
Public sTemplateCheckbox(SBMAXAPPLCOUNT-1) As String
Public sDocumentCheckbox(SBMAXAPPLCOUNT-1) As String
Public sTemplateGroupName As String
@@ -51,8 +49,6 @@ Public sReady as String, sTitle as String
Public sCloseButton as String
Public sSourceDocuments as String
Public sTargetDocuments as String
-Public sSumSODocuments(4) as String
-Public sSumSOTemplates(4) as String
Public sSumMSDocuments(3) as String
Public sSumMSTemplates(3) as String
Public ModuleList(3) as String
@@ -83,21 +79,9 @@ Sub LoadLanguage()
&apos; DocumentCheckbox- Captions
GetApplResourceArray(1012, 3, sMSDocumentCheckBox())
- &apos; DocumentCheckbox- Captions
- GetApplResourceArray(2013, 5, sSODocumentCheckBox())
-
&apos;StarOffice Applicationnames
- sSOHelperDocuments(0,0) = GetResText(2017)
- sSOHelperDocuments(0,1) = &quot;com.sun.star.text.GlobalDocument&quot;
- sSOHelperDocuments(1,0) = GetResText(2018)
- sSOHelperDocuments(1,1) = &quot;com.sun.star.formula.FormulaProperties&quot;
-
- GetApplResourceArray(2017,2, sSOHelperDocuments())
-
sContainerName(0) = GetResText(1030)
- &apos; Note: for the version 5.2 there was no Productname &quot;StarSuite&quot;
- sContainerName(1) = &quot;StarOffice&quot;
sSummaryHeader = GetResText(1031)
@@ -132,9 +116,6 @@ Sub LoadLanguage()
sLogSummary = GetResText(2034)
sSumInclusiveSubDir = GetResText(3000)
sSumSaveDocuments = GetResText(3001)
- &apos;StarOffice Applicationnames
- GetApplResourceArray(3100, 4, sSumSODocuments())
- GetApplResourceArray(3110, 4, sSumSOTemplates())
GetApplResourceArray(3200, 3, sSumMSDocuments())
GetApplResourceArray(3210, 3, sSumMSTemplates())
With ImportDialog
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index 875fd36b62d0..37475a05045e 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -25,7 +25,6 @@ Public ImportDialog as Object
Public ImportDialogArea as Object
Public oFactoryKey as Object
Public bShowLogFile as Boolean
-Public oBinFilterComp as Object
&apos; If the ProgressPage ist already on Top The Dialog will be immediately closed when this flag is
&apos; set to False
@@ -54,14 +53,13 @@ Sub Main()
ImportDialogArea = LoadDialog(&quot;ImportWizard&quot;,&quot;ImportDialog&quot;)
ImportDialog = ImportDialogArea.Model
LoadLanguage()
- WizardMode = SBXMLMODE
- MaxApplCount = 4
+ WizardMode = SBMICROSOFTMODE
+ MaxApplCount = 3
FillStep_Welcome()
RepaintHeaderPreview()
ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126)
ImportDialog.cmdGoOn.DefaultButton = True
ImportDialogArea.GetControl(&quot;optMSDocuments&quot;).SetFocus()
- oBinFilterComp = createBF_MigrateFilterIfPossible()
ToggleCheckboxesWithBoolean(True)
RetValue = ImportDialogArea.Execute()
@@ -106,8 +104,6 @@ Dim iCurStep as Integer
Select Case WizardMode
Case SBMICROSOFTMODE
Call ConvertAllDocuments(MSFilterName())
- CASE SBXMLMODE
- Call ConvertAllDocuments(XMLFilterName())
End Select
Case 4
CancelTask(True)
@@ -203,17 +199,6 @@ Dim i as Integer
End Sub
-Function createBF_MigrateFilterIfPossible()
-Dim oService
- On Error Goto RTError
- oService = createUnoService(&quot;com.sun.star.comp.office.BF_MigrateFilter&quot;)
- getBinFilterCompIfItExists = oService
- Exit Function
-RTError:
- createBF_MigrateFilterIfPossible = Nothing
-End Function
-
-
Function CheckInstalledModule(Index as Integer) as Boolean
Dim ModuleName as String
Dim NameList() as String
@@ -247,22 +232,9 @@ Sub ToggleCheckboxesWithBoolean(bMSEnable as Boolean)
WizardMode = SBMICROSOFTMODE
MaxApplCount = 3
Else
- WizardMode = SBXMLMODE
- MaxApplCount = 4
+ &apos;Not supposed to happen - is there an assert in BASIC...
End If
With ImportDialogArea
- If (isNull(oBinFilterComp)) Then
- .GetControl(&quot;optSODocuments&quot;).Visible = False
- .GetControl(&quot;chkSOApplication1&quot;).Visible = False
- .GetControl(&quot;chkSOApplication2&quot;).Visible = False
- .GetControl(&quot;chkSOApplication3&quot;).Visible = False
- .GetControl(&quot;chkSOApplication4&quot;).Visible = False
- Else
- .GetControl(&quot;chkSOApplication1&quot;).Model.Enabled = Not bMSEnable
- .GetControl(&quot;chkSOApplication2&quot;).Model.Enabled = Not bMSEnable
- .GetControl(&quot;chkSOApplication3&quot;).Model.Enabled = Not bMSEnable
- .GetControl(&quot;chkSOApplication4&quot;).Model.Enabled = Not bMSEnable
- End if
.GetControl(&quot;chkMSApplication1&quot;).Model.Enabled = bMSEnable
.GetControl(&quot;chkMSApplication2&quot;).Model.Enabled = bMSEnable
.GetControl(&quot;chkMSApplication3&quot;).Model.Enabled = bMSEnable
@@ -283,8 +255,6 @@ Dim i as Integer
With ImportDialog
If .optMSDocuments.State = 1 Then
bDoEnable = .chkMSApplication1.State = 1 Or .chkMSApplication2.State = 1 Or .chkMSApplication3.State = 1
- Else
- bDoEnable = .chkSOApplication1.State = 1 Or .chkSOApplication2.State = 1 Or .chkSOApplication3.State = 1 Or .chkSOApplication4.State = 1
End If
End With
bDoKeepApplValues = False
@@ -301,13 +271,8 @@ Sub TakeOverPathSettings()
If Applications(CurOffice,SBDOCSOURCE) = &quot;&quot; Then
Applications(CurOffice,SBDOCSOURCE) = Applications(0,SBDOCSOURCE)
Applications(CurOffice,SBDOCTARGET) = Applications(0,SBDOCTARGET)
- If WizardMode = SBXMLMODE AND Applications(CurOffice,SBAPPLKEY) = 3 Then
- Applications(CurOffice,SBTEMPLSOURCE) = Applications(CurOffice,SBDOCSOURCE)
- Applications(CurOffice,SBTEMPLTARGET) = Applications(CurOffice,SBDOCTARGET)
- Else
- Applications(CurOffice,SBTEMPLSOURCE) = Applications(0,SBTEMPLSOURCE)
- Applications(CurOffice,SBTEMPLTARGET) = Applications(0,SBTEMPLTARGET)
- End If
+ Applications(CurOffice,SBTEMPLSOURCE) = Applications(0,SBTEMPLSOURCE)
+ Applications(CurOffice,SBTEMPLTARGET) = Applications(0,SBTEMPLTARGET)
End If
End Sub
diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src
index ff0b0ebe701a..65cf093eb7f5 100644
--- a/wizards/source/importwizard/importwi.src
+++ b/wizards/source/importwizard/importwi.src
@@ -56,9 +56,6 @@
#define sPathErrorDocument_1_ 1062
#define sPathErrorDocument_2_ 1063
#define sPathErrorDocument_3_ 1064
-#define sPathErrorStarDoc_1_ 1065
-#define sPathErrorStarDoc_2_ 1066
-#define sPathErrorStarDoc_3_ 1067
#define sOverwriteallFiles 1070
#define sreeditMacro 1071
#define scouldNotsaveDocument 1072
@@ -71,16 +68,6 @@
#define sProgressFound 1093
#define sProgressPage5 1094
#define sReady 1100
-#define sXMLTemplateCheckbox_1_ 2009
-#define sXMLTemplateCheckbox_2_ 2010
-#define sXMLTemplateCheckbox_3_ 2011
-#define sXMLTemplateCheckbox_4_ 2012
-#define sXMLDocumentCheckbox_1_ 2013
-#define sXMLDocumentCheckbox_2_ 2014
-#define sXMLDocumentCheckbox_3_ 2015
-#define sXMLDocumentCheckbox_4_ 2016
-#define sXMLHelperApplications_1 2017
-#define sXMLHelperApplications_2 2018
#define sSourceDocuments 2030
#define sTargetDocuments 2031
@@ -92,16 +79,6 @@
#define sSumInclusiveSubDir 3000
#define sSumSaveDokumente 3001
-#define sSumSOTextDocuments 3100
-#define sSumSOTableDocuments 3101
-#define sSumSODrawDocuments 3102
-#define sSumSOMathDocuments 3103
-
-#define sSumSOTextTemplates 3110
-#define sSumSOTableTemplates 3111
-#define sSumSODrawTemplates 3112
-#define sSumSOGlobalDocuments 3113
-
#define sSumMSTextDocuments 3200
#define sSumMSTableDocuments 3201
#define sSumMSDrawDocuments 3202
@@ -361,59 +338,6 @@ String sReady
};
-String sXMLTemplateCheckbox_1_
-{
- Text [ en-US ] = "Text templates";
-};
-
-String sXMLTemplateCheckbox_2_
-{
- Text [ en-US ] = "Spreadsheet templates";
-};
-
-String sXMLTemplateCheckbox_3_
-{
- Text [ en-US ] = "Drawing/presentation templates";
-};
-
-String sXMLTemplateCheckbox_4_
-{
- Text [ en-US ] = "Master documents";
-};
-
-
-String sXMLDocumentCheckbox_1_
-{
- Text [ en-US ] = "Text documents";
-};
-
-String sXMLDocumentCheckbox_2_
-{
- Text [ en-US ] = "Spreadsheets";
-};
-
-String sXMLDocumentCheckbox_3_
-{
- Text [ en-US ] = "Drawing/presentation documents";
-};
-
-
-String sXMLDocumentCheckbox_4_
-{
- Text [ en-US ] = "Master documents/formulas";
-};
-
-String sXMLHelperApplications_1
-{
- Text [ en-US ] = "Master documents";
-};
-
-String sXMLHelperApplications_2
-{
- Text [ en-US ] = "Formulas";
-};
-
-
String sSourceDocuments
{
Text [ en-US ] = "Source documents";
@@ -461,53 +385,6 @@ String sSumSaveDokumente
};
-String sSumSOTextDocuments
-{
- Text [ en-US ] = "All StarOffice text documents contained in the following directory will be imported:";
-};
-
-
-String sSumSOTableDocuments
-{
- Text [ en-US ] = "All StarOffice spreadsheets contained in the following directory will be imported:";
-};
-
-
-String sSumSODrawDocuments
-{
- Text [ en-US ] = "All StarOffice drawing and presentation documents contained in the following directory will be imported:";
-};
-
-
-String sSumSOMathDocuments
-{
- Text [ en-US ] = "All StarOffice formula documents contained in the following directory will be imported:";
-};
-
-
-String sSumSOTextTemplates
-{
- Text [ en-US ] = "All StarOffice text templates contained in the following directory will be imported:";
-};
-
-
-String sSumSOTableTemplates
-{
- Text [ en-US ] = "All StarOffice table templates contained in the following directory will be imported:";
-};
-
-
-String sSumSODrawTemplates
-{
- Text [ en-US ] = "All StarOffice drawing and presentation templates contained in the following directory will be imported:";
-};
-
-String sSumSOGlobalDocuments
-{
- Text [ en-US ] = "All StarOffice master documents contained in the following directory will be imported:";
-};
-
-
String sSumMSTextDocuments
{
Text [ en-US ] = "All Word documents contained in the following directory will be imported:";