diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-14 19:58:02 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-14 20:06:24 +0100 |
| commit | 8bab53a19828b888ca689dafaf98aa3ba82228a8 (patch) | |
| tree | 7e1a6bdeff4dab9aa3d973c8fbcb43f8fa846317 /wizards | |
| parent | 907b63a0f3f754d4a975717ffec9cbc03214f0f3 (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')
| -rw-r--r-- | wizards/source/importwizard/API.xba | 11 | ||||
| -rw-r--r-- | wizards/source/importwizard/DialogModul.xba | 157 | ||||
| -rw-r--r-- | wizards/source/importwizard/FilesModul.xba | 10 | ||||
| -rw-r--r-- | wizards/source/importwizard/ImportDialog.xdl | 15 | ||||
| -rw-r--r-- | wizards/source/importwizard/Language.xba | 19 | ||||
| -rw-r--r-- | wizards/source/importwizard/Main.xba | 45 | ||||
| -rw-r--r-- | wizards/source/importwizard/importwi.src | 123 |
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 - ' Helper Application with no templates - GetTemplateDefaultPath = SOWorkPath - Else - GetTemplateDefaultPath = SOTemplatePath - End If End Select NOVALIDSYSTEMPATH: If Err <> 0 Then @@ -222,4 +213,4 @@ Dim vValue As String ' 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 = "MS" -Public Const SBXMLMODE = "SO" ' 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 'Number of different formats - -' e.g.: -' XMLFilterName(x,0) = "sdw" ' in documents we take the extensions; in SO-templates the appropriate Filtername -' XMLFilterName(x,1) = "swriter: StarWriter 5.0" ' the filtername of the target-format -' XMLFilterName(x,2) = "sxw" ' 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() + '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 & " - " & sSODocumentCheckBox(Index) - Else + If WizardMode = SBMICROSOFTMODE Then ImportDialogArea.Title = sTitle & " - " & sMSDocumentCheckBox(Index) End If - If WizardMode = SBXMLMODE AND Index = 3 Then - ' 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,"Template") ToggleInputPaths(oNullObject,"Document") @@ -183,8 +160,6 @@ Dim BoolValue as Boolean For i = 1 To ApplCount If ImportDialog.optMSDocuments.State = 1 Then BoolValue = ImportDialogArea.GetControl("chkMSApplication" & i).Model.State = 1 - Else - BoolValue = ImportDialogArea.GetControl("chkSOApplication" & i).Model.State = 1 End If Applications(a,SBAPPLCONVERT) = BoolValue Applications(a,SBDOCCONVERT) = BoolValue @@ -272,8 +247,6 @@ Dim sAddText as String sAddText = "" If WizardMode = SBMICROSOFTMODE Then sAddText = sSumMSTemplates(Index) & sCRLF - Else - sAddText = sSumSOTemplates(Index) & sCRLF End If sTmpText = sTmpText & sAddText & ConvertFromUrl(Applications(i,SBTEMPLSOURCE)) & sCRLF If Applications(i,SBTEMPLRECURSIVE) Then @@ -289,8 +262,6 @@ Dim sAddText as String ' Documents are to be converted If WizardMode = SBMICROSOFTMODE Then sAddText = sSumMSDocuments(Index) & sCRLF - Else - sAddText = sSumSODocuments(Index) & sCRLF End If sTmpText = sTmpText & sAddText & ConvertFromUrl(Applications(i,SBDOCSOURCE)) & sCRLF @@ -399,118 +370,6 @@ Sub SetupMSConfiguration() End Sub - -' This is an extract from "http://util.openoffice.org/source/browse/util/sot/source/base/exchange.cxx?rev=1.25&content-type=text/x-cvsweb-markup" -' about the listed defined mimetypes that are required to define binary StarOffice templates that have for all applications the same extension ".vor" - -' 26 SOT_FORMATSTR_ID_STARWRITER_30*/ { "application/x-openoffice-starwriter-30;windows_formatname=\"StarWriter 3.0\"", "StarWriter 3.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 27 SOT_FORMATSTR_ID_STARWRITER_40*/ { "application/x-openoffice-starwriter-40;windows_formatname=\"StarWriter 4.0\"", "StarWriter 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 28 SOT_FORMATSTR_ID_STARWRITER_50*/ { "application/x-openoffice-starwriter-50;windows_formatname=\"StarWriter 5.0\"", "StarWriter 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - -' 29 SOT_FORMATSTR_ID_STARWRITERWEB_40*/ { "application/x-openoffice-starwriterweb-40;windows_formatname=\"StarWriter/Web 4.0\"", "StarWriter/Web 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 30 SOT_FORMATSTR_ID_STARWRITERWEB_50*/ { "application/x-openoffice-starwriterweb-50;windows_formatname=\"StarWriter/Web 5.0\"", "StarWriter/Web 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - -' 31 SOT_FORMATSTR_ID_STARWRITERGLOB_40*/ { "application/x-openoffice-starwriterglob-40;windows_formatname=\"StarWriter/Global 4.0\"", "StarWriter/Global 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 32 SOT_FORMATSTR_ID_STARWRITERGLOB_50*/ { "application/x-openoffice-starwriterglob-50;windows_formatname=\"StarWriter/Global 5.0\"", "StarWriter/Global 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - -' 33 SOT_FORMATSTR_ID_STARDRAW*/ { "application/x-openoffice-stardraw;windows_formatname=\"StarDrawDocument\"", "StarDrawDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 34 SOT_FORMATSTR_ID_STARDRAW_40*/ { "application/x-openoffice-stardraw-40;windows_formatname=\"StarDrawDocument 4.0\"", "StarDrawDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 36 SOT_FORMATSTR_ID_STARDRAW_50*/ { "application/x-openoffice-stardraw-50;windows_formatname=\"StarDraw 5.0\"", "StarDraw 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - -' 35 SOT_FORMATSTR_ID_STARIMPRESS_50*/ { "application/x-openoffice-starimpress-50;windows_formatname=\"StarImpress 5.0\"", "StarImpress 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - -' 37 SOT_FORMATSTR_ID_STARCALC*/ { "application/x-openoffice-starcalc;windows_formatname=\"StarCalcDocument\"", "StarCalcDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 38 SOT_FORMATSTR_ID_STARCALC_40*/ { "application/x-openoffice-starcalc-40;windows_formatname=\"StarCalc 4.0\"", "StarCalc 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 39 SOT_FORMATSTR_ID_STARCALC_50*/ { "application/x-openoffice-starcalc-50;windows_formatname=\"StarCalc 5.0\"", "StarCalc 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - -' 40 SOT_FORMATSTR_ID_STARCHART*/ { "application/x-openoffice-starchart;windows_formatname=\"StarChartDocument\"", "StarChartDocument", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 41 SOT_FORMATSTR_ID_STARCHART_40*/ { "application/x-openoffice-starchart-40;windows_formatname=\"StarChartDocument 4.0\"", "StarChartDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 42 SOT_FORMATSTR_ID_STARCHART_50*/ { "application/x-openoffice-starchart-50;windows_formatname=\"StarChart 5.0\"", "StarChart 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - -' 46 SOT_FORMATSTR_ID_STARMATH*/ { "application/x-openoffice-starmath;windows_formatname=\"StarMath\"", "StarMath", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 47 SOT_FORMATSTR_ID_STARMATH_40*/ { "application/x-openoffice-starmath-40;windows_formatname=\"StarMathDocument 4.0\"", "StarMathDocument 4.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -' 48 SOT_FORMATSTR_ID_STARMATH_50*/ { "application/x-openoffice-starmath-50;windows_formatname=\"StarMath 5.0\"", "StarMath 5.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, - - -Sub SetupXMLConfiguration() - iApplSection = 1000 - Wizardmode = SBXMLMODE - ApplCount = 4 - MaxApplCount = 4 - XMLTemplateList = Array("vor", "sti", "stw" , "stc" , "std") - ' chkTemplatePath-Captions - GetApplResourceArray(1009 + iApplSection, ApplCount, sTemplateCheckBox()) - ' DocumentCheckbox- Captions - GetApplResourceArray(1009 + iApplSection + ApplCount, ApplCount, sDocumentCheckBox()) - - XMLFilterName(0,0) = "sdw|sxw" - XMLFilterName(0,1) = "writer8|writer8" - XMLFilterName(0,2) = "odt|odt" - XMLFilterName(0,3) = sDocumentCheckBox(0) - - XMLFilterName(1,0) = "sdc|sxc" - XMLFilterName(1,1) = "calc8|calc8" - XMLFilterName(1,2) = "ods|ods" - XMLFilterName(1,3) = sDocumentCheckBox(1) - - If oFactoryKey.HasByName("com.sun.star.drawing.DrawingDocument") and oFactoryKey.HasByName("com.sun.star.presentation.PresentationDocument") Then - XMLFilterName(2,0) = "sdd|sda|sxi|sxd" - XMLFilterName(2,1) = "impress8|draw8|impress8|draw8" - XMLFilterName(2,2) = "odp|odg|odp|odg" - Elseif oFactoryKey.HasByName("com.sun.star.drawing.DrawingDocument") Then - XMLFilterName(2,0) = "sda|sxd" - XMLFilterName(2,1) = "draw8|draw8" - XMLFilterName(2,2) = "odg|odg" - Elseif oFactoryKey.HasByName("com.sun.star.presentation.PresentationDocument") Then - XMLFilterName(2,0) = "sdd|sxi" - XMLFilterName(2,1) = "impress8|impress8" - XMLFilterName(2,2) = "odp|odp" - End If - XMLFilterName(2,3) = sDocumentCheckBox(2) - - - XMLFilterName(3,0) = "smf|sxm" - XMLFilterName(3,1) = "math8|math8" - XMLFilterName(3,2) = "odf|odf" - XMLFilterName(3,3) = sDocumentCheckBox(3) - - XMLFilterName(4,0) = "application/x-openoffice-starwriter|application/vnd.stardivision.writer/web|application/vnd.sun.xml.writer|application/vnd.sun.xml.writerweb" - XMLFilterName(4,1) = "writer8_template|writerweb8_writer_template|writer8_template|writerweb8_writer_template" - XMLFilterName(4,2) = "ott|oth|ott|oth" - XMLFilterName(4,3) = sTemplateCheckBox(0) - - - XMLFilterName(5,0) = "application/x-openoffice-starcalc|application/vnd.sun.xml.calc" - XMLFilterName(5,1) = "calc8_template|calc8_template" - XMLFilterName(5,2) = "ots|ots" - XMLFilterName(5,3) = sTemplateCheckBox(1) - - ' due to bug #108942# impress templates of the version 4.0 have to be handled in a special way because their mimetype - ' falsely points to the draw application. - If oFactoryKey.HasByName("com.sun.star.drawing.DrawingDocument") and oFactoryKey.HasByName("com.sun.star.presentation.PresentationDocument") Then - XMLFilterName(6,0) = "application/x-openoffice-starimpress|application/x-openoffice-stardraw-40|application/x-openoffice-stardraw|application/vnd.sun.xml.impress|application/vnd.sun.xml.draw" - XMLFilterName(6,1) = "impress8_template|impress8_template|draw8_template|impress8_template|draw8_template" - XMLFilterName(6,2) = "otp|otp|otg|otp|otg" - Elseif oFactoryKey.HasByName("com.sun.star.drawing.DrawingDocument") Then - XMLFilterName(6,0) = "application/x-openoffice-stardraw|application/vnd.sun.xml.draw" - XMLFilterName(6,1) = "draw8_template|draw8_template" - XMLFilterName(6,2) = "otg|otg" - Elseif oFactoryKey.HasByName("com.sun.star.presentation.PresentationDocument") Then - XMLFilterName(6,0) = "application/x-openoffice-starimpress|application/x-openoffice-stardraw-40|application/vnd.sun.xml.impress" - XMLFilterName(6,1) = "impress8_template|impress8_template|impress8_template" - XMLFilterName(6,2) = "otp|otp|otp" - End If - XMLFilterName(6,3) = sTemplateCheckBox(2) - - If oFactoryKey.HasByName("com.sun.star.text.GlobalDocument") Then - XMLFilterName(7,0) = "sgl|sxg" - XMLFilterName(7,1) = "writerglobal8|writerglobal8" - XMLFilterName(7,2) = "odm|odm" - 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 = "" 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 & "/" & sTemplateGroupName - Case SBXMLMODE - If Index = 3 Then - ' 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&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&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&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&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&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&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&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&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&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() ' DocumentCheckbox- Captions GetApplResourceArray(1012, 3, sMSDocumentCheckBox()) - ' DocumentCheckbox- Captions - GetApplResourceArray(2013, 5, sSODocumentCheckBox()) - 'StarOffice Applicationnames - sSOHelperDocuments(0,0) = GetResText(2017) - sSOHelperDocuments(0,1) = "com.sun.star.text.GlobalDocument" - sSOHelperDocuments(1,0) = GetResText(2018) - sSOHelperDocuments(1,1) = "com.sun.star.formula.FormulaProperties" - - GetApplResourceArray(2017,2, sSOHelperDocuments()) - sContainerName(0) = GetResText(1030) - ' Note: for the version 5.2 there was no Productname "StarSuite" - sContainerName(1) = "StarOffice" sSummaryHeader = GetResText(1031) @@ -132,9 +116,6 @@ Sub LoadLanguage() sLogSummary = GetResText(2034) sSumInclusiveSubDir = GetResText(3000) sSumSaveDocuments = GetResText(3001) - '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 ' If the ProgressPage ist already on Top The Dialog will be immediately closed when this flag is ' set to False @@ -54,14 +53,13 @@ Sub Main() ImportDialogArea = LoadDialog("ImportWizard","ImportDialog") 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("optMSDocuments").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("com.sun.star.comp.office.BF_MigrateFilter") - 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 + 'Not supposed to happen - is there an assert in BASIC... End If With ImportDialogArea - If (isNull(oBinFilterComp)) Then - .GetControl("optSODocuments").Visible = False - .GetControl("chkSOApplication1").Visible = False - .GetControl("chkSOApplication2").Visible = False - .GetControl("chkSOApplication3").Visible = False - .GetControl("chkSOApplication4").Visible = False - Else - .GetControl("chkSOApplication1").Model.Enabled = Not bMSEnable - .GetControl("chkSOApplication2").Model.Enabled = Not bMSEnable - .GetControl("chkSOApplication3").Model.Enabled = Not bMSEnable - .GetControl("chkSOApplication4").Model.Enabled = Not bMSEnable - End if .GetControl("chkMSApplication1").Model.Enabled = bMSEnable .GetControl("chkMSApplication2").Model.Enabled = bMSEnable .GetControl("chkMSApplication3").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) = "" 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:"; |