This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new e418426 Removed old binary formats from Euro Converter, fixed file
type
e418426 is described below
commit e4184268604bfe55482475ff7fe6fe07577b7516
Author: mseidel <[email protected]>
AuthorDate: Mon Dec 30 01:21:29 2019 +0100
Removed old binary formats from Euro Converter, fixed file type
(cherry picked from commit 909a32bc9659cdda6d3cd1e982d47047bf993231)
---
.../types/writer_StarOffice_XML_Writer.xcu | 12 ++--
main/wizards/source/euro/AutoPilotRun.xba | 74 +++++++++-------------
2 files changed, 35 insertions(+), 51 deletions(-)
diff --git
a/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
b/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
index e5029d6..72d7862 100644
--- a/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
+++ b/main/filter/source/config/fragments/types/writer_StarOffice_XML_Writer.xcu
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,19 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
- <node oor:name="writer_StarOffice_XML_Writer" oor:op="replace" >
+ <node oor:name="writer_StarOffice_XML_Writer" oor:op="replace">
<prop
oor:name="DetectService"><value>com.sun.star.text.FormatDetector</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>sxw</value></prop>
@@ -27,7 +27,7 @@
<prop oor:name="Preferred"><value>false</value></prop>
<prop oor:name="PreferredFilter"><value>StarOffice XML
(Writer)</value></prop>
<prop oor:name="UIName">
- <value>%oooxmlformatname% %oooxmlformatversion%
Textdokument</value>
+ <value>Writer 6.0 Text Document</value>
</prop>
<prop oor:name="ClipboardFormat"><value>Writer
6.0</value></prop>
</node>
diff --git a/main/wizards/source/euro/AutoPilotRun.xba
b/main/wizards/source/euro/AutoPilotRun.xba
index 8e1fa48..411759a 100644
--- a/main/wizards/source/euro/AutoPilotRun.xba
+++ b/main/wizards/source/euro/AutoPilotRun.xba
@@ -31,7 +31,7 @@ Public Source as String
Public SubstFile as String
Public SubstDir as String
Public NoArgs()
-Public TypeList(14) as String
+Public TypeList(6) as String
Public GoOn as Boolean
Public DoUnprotect as Integer
Public Password as String
@@ -77,21 +77,13 @@ Dim bDisposable as Boolean
TargetStemDir = TargetDir
TypeList(0) = "calc8"
TypeList(1) = "calc_StarOffice_XML_Calc"
- TypeList(2) = "calc_StarCalc_30"
- TypeList(3) = "calc_StarCalc_40"
- TypeList(4) = "calc_StarCalc_50"
If DialogModel.chkTextDocuments.State = 1 Then
- ReDim Preserve TypeList(13) as String
-
- TypeList(5) = "writer8"
- TypeList(6) = "writerglobal8"
- TypeList(7) =
"writer_StarOffice_XML_Writer"
- TypeList(8) =
"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
- TypeList(9) = "writer_StarWriter_30"
- TypeList(10) = "writer_StarWriter_40"
- TypeList(11) =
"writer_globaldocument_StarWriter_40GlobalDocument"
- TypeList(12) = "writer_StarWriter_50"
- TypeList(13) =
"writer_globaldocument_StarWriter_50GlobalDocument"
+ ReDim Preserve TypeList(5) as String
+
+ TypeList(2) = "writer8"
+ TypeList(3) = "writerglobal8"
+ TypeList(4) =
"writer_StarOffice_XML_Writer"
+ TypeList(5) =
"writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
End If
FilesList() = ReadDirectories(SourceDir, bRecursive,
True, False, TypeList())
TotDocCount = Ubound(FilesList(),1) + 1
@@ -139,7 +131,7 @@ Dim sExtension as String
End If
If CreateFolder(TargetDir) Then
sExtension = GetFileNameExtension(SourceFile,
"/")
- oDocument = OpenDocument(SourceFile, OpenProperties(),
bDisposable)
+ oDocument = OpenDocument(SourceFile, OpenProperties(),
bDisposable)
If (oDocument.IsReadOnly) AND (UCase(SourceFile) =
UCase(TargetFile)) Then
bIsReadOnly = True
Msgbox(sMsgDOCISREADONLY, 16, GetProductName())
@@ -181,12 +173,12 @@ Dim iOverWrite as Integer
sCurFileExists = ReplaceString(sCurFileExists, chr(13),
"<CR>")
iOverWrite = Msgbox (sCurFileExists, 32 + 3,
sMsgDLGTITLE)
Select Case iOverWrite
- Case 1 ' OK
- Case 2 ' Abort
+ Case 1 ' OK
+ Case 2 ' Abort
bCancelTask = True
StoreDocument() = False
Exit Function
- Case 7 ' No
+ Case 7 ' No
StoreDocument() = False
Exit Function
End Select
@@ -253,7 +245,7 @@ Dim TextBoxText as String
TextBoxText = TextboxText & sPrgsUNPROTECT
End If
DialogModel.txtConfig.Text = TextBoxText
- ToggleProgressStep()
+ ToggleProgressStep()
DialogModel.cmdGoOn.Enabled = False
InitializeThirdStep() = True
Else
@@ -272,10 +264,10 @@ Dim LocStep as Integer
Else
DialogModel.Step = 2
End If
- DialogConvert.GetControl("lblCurrencies").Visible = Not
bMakeVisible
- DialogConvert.GetControl("lstCurrencies").Visible = Not
bMakeVisible
+ DialogConvert.GetControl("lblCurrencies").Visible = Not
bMakeVisible
+ DialogConvert.GetControl("lstCurrencies").Visible = Not
bMakeVisible
DialogConvert.GetControl("cmdBack").Visible = bMakeVisible
- DialogConvert.GetControl("cmdGoOn").Visible = bMakeVisible
+ DialogConvert.GetControl("cmdGoOn").Visible = bMakeVisible
DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_"
& DialogModel.Step & ".png"
End Sub
@@ -390,34 +382,26 @@ Sub CallFilePicker()
oTypes() = oMasterKey.Types
oUIKey =
GetRegistryKeyContent("org.openoffice.Office.UI/FilterClassification/LocalFilters")
If DialogModel.chkTextDocuments.State = 1 Then
- Dim FilterNames(11,1) as String
+ Dim FilterNames(7,1) as String
+ FilterNames(4,0) =
oTypes.GetByName("writer8").UIName
+ FilterNames(4,1) = "*.odt"
+ FilterNames(5,0) =
oTypes.GetByName("writer8_template").UIName
+ FilterNames(5,1) = "*.ott"
FilterNames(6,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer").UIName
FilterNames(6,1) = "*.sxw"
FilterNames(7,0) =
oTypes.GetByName("writer_StarOffice_XML_Writer_Template").UIName
FilterNames(7,1) = "*.stw"
- FilterNames(8,0) =
oUIKey.Classes.GetByName("sw3to5").DisplayName
- FilterNames(8,1) = "*.sdw"
- FilterNames(9,0) =
oUIKey.Classes.GetByName("sw3to5templ").DisplayName
- Filternames(9,1) = "*.vor"
- FilterNames(10,0) =
oTypes.GetByName("writer8").UIName
- FilterNames(10,1) = "*.odt"
- FilterNames(11,0) =
oTypes.GetByName("writer8_template").UIName
- FilterNames(11,1) = "*.ott"
Else
- ReDim FilterNames(5,1) as String
+ ReDim FilterNames(3,1) as String
End If
- FilterNames(0,0) =
oTypes.GetByName("calc_StarOffice_XML_Calc").UIName
- Filternames(0,1) = "*.sxc"
- FilterNames(1,0) =
oTypes.GetByName("calc_StarOffice_XML_Calc_Template").UIName
- Filternames(1,1) = "*.stc"
- FilterNames(2,0) =
oUIKey.Classes.GetByName("sc345").DisplayName
- FilterNames(2,1) = "*.sdc"
- FilterNames(3,0) =
oUIKey.Classes.GetByName("sc345templ").DisplayName
- Filternames(3,1) = "*.vor"
- FilterNames(4,0) = oTypes.GetByName("calc8").UIName
- Filternames(4,1) = "*.ods"
- FilterNames(5,0) =
oTypes.GetByName("calc8_template").UIName
- Filternames(5,1) = "*.ots"
+ FilterNames(0,0) = oTypes.GetByName("calc8").UIName
+ Filternames(0,1) = "*.ods"
+ FilterNames(1,0) =
oTypes.GetByName("calc8_template").UIName
+ Filternames(1,1) = "*.ots"
+ FilterNames(2,0) =
oTypes.GetByName("calc_StarOffice_XML_Calc").UIName
+ Filternames(2,1) = "*.sxc"
+ FilterNames(3,0) =
oTypes.GetByName("calc_StarOffice_XML_Calc_Template").UIName
+ Filternames(3,1) = "*.stc"
GetFileName(DialogModel.txtSource, Filternames())
Else
GetFolderName(DialogModel.txtSource)
