diff options
| author | Matthias Seidel <mseidel@apache.org> | 2018-11-08 15:06:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-12-10 13:29:43 +0100 |
| commit | 0761fbdd146c306190e41d65b9d4eec03c39c1b8 (patch) | |
| tree | 74a190c106344c3303bd2b61e9ad9f161c301c8f /wizards | |
| parent | f1cf8cd8c34d51279f2870ef87a885bf3f2896b8 (diff) | |
Cleaning up Euro Converter wizard, moving graphics from bmp to png
(cherry picked from commit 7364f1749a8e25959aa580d7a4c2bc710a52ccbe)
Change-Id: I2821ceaf00735fde1903fce27a01fda390b3a926
Reviewed-on: https://gerrit.libreoffice.org/64864
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/euro/AutoPilotRun.xba | 26 | ||||
| -rw-r--r-- | wizards/source/euro/Init.xba | 20 |
2 files changed, 22 insertions, 24 deletions
diff --git a/wizards/source/euro/AutoPilotRun.xba b/wizards/source/euro/AutoPilotRun.xba index 5c869459ebb8..77ca182df999 100644 --- a/wizards/source/euro/AutoPilotRun.xba +++ b/wizards/source/euro/AutoPilotRun.xba @@ -51,7 +51,7 @@ Dim oFactoryKey as Object InitializeConverter(oLocale, 2) ToggleGoOnButton() oFactoryKey = GetRegistryKeyContent("org.openoffice.Setup/Office/Factories") - DialogModel.chkTextDocuments.Enabled = oFactoryKey.hasbyName("com.sun.star.text.TextDocument") + DialogModel.chkTextDocuments.Enabled = oFactoryKey.hasbyName("com.sun.star.text.TextDocument") DialogModel.cmdGoOn.DefaultButton = True DialogModel.lstCurrencies.TabIndex = 12 DialogConvert.GetControl("optWholeDir").SetFocus() @@ -136,7 +136,7 @@ Dim sExtension as String bIsReadOnly = False RetrieveDocumentObjects() sViewPath = CutPathView(SourceFile, 60) - DialogModel.lblCurDocument.Label = Str(DocIndex+1) & "/" & sTotDocCount & " (" & sViewPath & ")" + DialogModel.lblCurDocument.Label = Str(DocIndex+1) & "/" & sTotDocCount & " (" & sViewPath & ")" End If InitializeDocument() = Not bIsReadOnly Else @@ -235,7 +235,7 @@ Dim TextBoxText as String TextBoxText = TextBoxText & DeleteStr(sInclusiveSubDir,"~") & chr(13) End If Else - TextBoxText = sSOURCEFILE & " " & ConvertFromUrl(Source) & chr(13) + TextBoxText = sSOURCEFILE & " " & ConvertFromUrl(Source) & chr(13) End If TextBoxText = TextBoxText & sTARGETDIR & " " & ConvertFromUrl(TargetDir) & chr(13) If DialogModel.chkProtect.State = 1 Then @@ -243,8 +243,8 @@ Dim TextBoxText as String End If DialogModel.txtConfig.Text = TextBoxText ToggleProgressStep() - DialogModel.cmdGoOn.Enabled = False - InitializeThirdStep() = True + DialogModel.cmdGoOn.Enabled = False + InitializeThirdStep() = True Else InitializeThirdStep() = False End If @@ -265,7 +265,7 @@ Dim LocStep as Integer DialogConvert.GetControl("lstCurrencies").Visible = Not bMakeVisible DialogConvert.GetControl("cmdBack").Visible = bMakeVisible DialogConvert.GetControl("cmdGoOn").Visible = bMakeVisible - DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_" & DialogModel.Step & ".bmp" + DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_" & DialogModel.Step & ".png" End Sub @@ -319,8 +319,8 @@ Dim sNoDirMessage as String If DialogModel.chkTextDocuments.State = 1 Then If (Instr(1, sLocMimeType, "text") = 0) And (Instr(1, sLocMimeType, "calc") = 0) Then Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE) - bIsValid = False - End If + bIsValid = False + End If Else If (Instr(1, sLocMimeType, "spreadsheet") = 0) And (Instr(1, sLocMimeType, "calc")) = 0 Then Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE) @@ -339,7 +339,7 @@ Dim sNoDirMessage as String End If End if Else - Msgbox(HeaderString & " '" & ConvertFromUrl(sPath) & "' " & sMsgNOTTHERE,48, sMsgDLGTITLE) + Msgbox(HeaderString & " '" & ConvertFromUrl(sPath) & "' " & sMsgNOTTHERE,48, sMsgDLGTITLE) End If If bIsValid Then AssignFileName() = sPath @@ -350,7 +350,7 @@ End Function Sub ToggleGoOnButton() -Dim bDoEnable as Boolean +Dim bDoEnable as Boolean Dim sLocMimeType as String Dim sPath as String bDoEnable = Ubound(DialogModel.lstCurrencies.SelectedItems()) > -1 @@ -365,7 +365,7 @@ End Sub Sub CallFolderPicker() GetFolderName(DialogModel.txtTarget) - ToggleGoOnButton() + ToggleGoOnButton() End Sub @@ -374,7 +374,7 @@ Sub CallFilePicker() Dim oMasterKey as Object Dim oTypes() as Object Dim oUIKey() as Object - + oMasterKey = GetRegistryKeyContent("org.openoffice.TypeDetection.Types") oTypes() = oMasterKey.Types oUIKey = GetRegistryKeyContent("org.openoffice.Office.UI/FilterClassification/LocalFilters") @@ -409,7 +409,7 @@ End Sub Sub PreviousStep() DialogModel.Step = 2 - DialogModel.cmdGoOn.Label = sGOON + DialogModel.cmdGoOn.Label = sGOON DialogModel.cmdCancel.Label = sCANCEL End Sub </script:module> diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba index f8c2eac7e966..623a0a53be46 100644 --- a/wizards/source/euro/Init.xba +++ b/wizards/source/euro/Init.xba @@ -18,9 +18,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Init" script:language="StarBasic">Option Explicit -REM ***** BASIC ***** - - +REM ***** BASIC ***** Public Const SBRANGEUBOUND = 20 Public StyleRangeAssignmentList(SBRANGEUBOUND)as String @@ -255,7 +253,7 @@ Dim LocWorkPath as String End If .txtSource.Text = ConvertfromUrl(LocWorkPath) - + SubstDir = .txtSource.Text .txtTarget.Text = .txtSource.Text .hlnProgress.Label = GetResText("STEP_LASTPAGE_0") @@ -289,7 +287,7 @@ Sub InitializeLanguages() LangIDValue(3,0,0) = "es" LangIDValue(3,0,1) = "" LangIDValue(3,0,2) = "-40A" - + 'Spanish modern LangIDValue(3,1,0) = "es" LangIDValue(3,1,1) = "" @@ -332,7 +330,7 @@ Sub InitializeLanguages() LangIDValue(8,0,0) = "fr" LangIDValue(8,0,1) = "LU" LangIDValue(8,0,2) = "-140C" - + LangIDValue(8,1,0) = "de" LangIDValue(8,1,1) = "LU" LangIDValue(8,1,2) = "-1007" @@ -589,7 +587,7 @@ Sub InitializeControls() EnableStep2DialogControls(True) End If End If -End Sub +End Sub Sub InitializeConverter(oLocale, iDialogPage as Integer) @@ -603,7 +601,7 @@ Dim Isthere as Boolean If sDocType = "sCalc" Then bDocHasProtectedSheets = CheckSheetProtection(oSheets) End If - oStatusline = ThisComponent.GetCurrentController.GetFrame.CreateStatusIndicator() + oStatusline = ThisComponent.GetCurrentController.GetFrame.CreateStatusIndicator() End If DialogConvert = LoadDialog("Euro", "DlgConvert") DialogModel = DialogConvert.Model @@ -620,9 +618,9 @@ Dim Isthere as Boolean Stop End If FillUpCurrencyListbox() - DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_" & DialogModel.Step & ".bmp" + DialogModel.imgPreview.ImageUrl = BitmapDir & "euro_" & DialogModel.Step & ".png" DialogConvert.Title = sMsgDLGTITLE - DialogModel.cmdGoOn.DefaultButton = True + DialogModel.cmdGoOn.DefaultButton = True If iDialogPage = 1 Then ToggleWindow(True) End If @@ -637,7 +635,7 @@ Sub InitializeCurrencyValues(CurrIndex) CurrSymbolList(1) = CurrValue(CurrIndex,4) CurrSymbolList(2) = CurrValue(CurrIndex,5) End If -End Sub +End Sub Function InitializeLocales(oLocale) as Boolean |