You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/02/05 15:16:06 UTC

[openoffice] branch AOO41X updated (92c27b5751 -> bd4036b4fc)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from 92c27b5751 Updated English dictionary
     new b5fe907b7f Fixed typo (existant -> existent)
     new cf5c25e878 Cleaning up Euro Converter wizard, moving graphics from bmp to png
     new bd4036b4fc Cleaned up resource file for Euro converter

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../source/templates/wizard/bitmap/euro_1.bmp      | Bin 23344 -> 0 bytes
 .../source/templates/wizard/bitmap/euro_1.png      | Bin 0 -> 33365 bytes
 .../source/templates/wizard/bitmap/euro_2.bmp      | Bin 66480 -> 0 bytes
 .../source/templates/wizard/bitmap/euro_2.png      | Bin 0 -> 52327 bytes
 .../source/templates/wizard/bitmap/euro_3.bmp      | Bin 66480 -> 0 bytes
 .../source/templates/wizard/bitmap/euro_3.png      | Bin 0 -> 39467 bytes
 main/forms/source/xforms/NameContainer.hxx         |   2 +-
 main/wizards/source/euro/AutoPilotRun.xba          |  40 ++--
 main/wizards/source/euro/DlgConvert.xdl            |   2 +-
 main/wizards/source/euro/Init.xba                  |  48 +++--
 main/wizards/source/euro/euro.src                  | 210 +++++++++------------
 11 files changed, 138 insertions(+), 164 deletions(-)
 delete mode 100644 main/extras/source/templates/wizard/bitmap/euro_1.bmp
 create mode 100644 main/extras/source/templates/wizard/bitmap/euro_1.png
 delete mode 100644 main/extras/source/templates/wizard/bitmap/euro_2.bmp
 create mode 100644 main/extras/source/templates/wizard/bitmap/euro_2.png
 delete mode 100644 main/extras/source/templates/wizard/bitmap/euro_3.bmp
 create mode 100644 main/extras/source/templates/wizard/bitmap/euro_3.png


[openoffice] 01/03: Fixed typo (existant -> existent)

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit b5fe907b7f3099a78ede64b9c24e25c22e8dd61d
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Mon Oct 2 09:46:22 2017 +0000

    Fixed typo (existant -> existent)
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1810324 13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit a1090ed2d1adb3400aefd623934bc30652ff5340)
---
 main/forms/source/xforms/NameContainer.hxx | 2 +-
 main/wizards/source/euro/euro.src          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/forms/source/xforms/NameContainer.hxx b/main/forms/source/xforms/NameContainer.hxx
index bfd8988b1f..71cf5adcaa 100644
--- a/main/forms/source/xforms/NameContainer.hxx
+++ b/main/forms/source/xforms/NameContainer.hxx
@@ -65,7 +65,7 @@ protected:
 
     T getItem( const rtl::OUString& rName ) 
     {
-        OSL_ENSURE( hasItem( rName ), "can't get non-existant item" );
+        OSL_ENSURE( hasItem( rName ), "can't get non-existent item" );
         return maItems[ rName ];
     }
 
diff --git a/main/wizards/source/euro/euro.src b/main/wizards/source/euro/euro.src
index 4109ee2c52..5bffa6e91e 100644
--- a/main/wizards/source/euro/euro.src
+++ b/main/wizards/source/euro/euro.src
@@ -233,7 +233,7 @@ Text [ en-US ] = "Select target directory";
 
 String MESSAGES + 4
 {
-Text [ en-US ] = "non-existant";
+Text [ en-US ] = "non-existent";
 };
 
 


[openoffice] 02/03: Cleaning up Euro Converter wizard, moving graphics from bmp to png

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit cf5c25e8784ee6baa6b0af33d32f958aaa7e6340
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Thu Nov 8 15:06:51 2018 +0000

    Cleaning up Euro Converter wizard, moving graphics from bmp to png
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1846157 13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit 79ff0626c08e88865fa857521f2748ffc033c5f7)
---
 .../source/templates/wizard/bitmap/euro_1.bmp      | Bin 23344 -> 0 bytes
 .../source/templates/wizard/bitmap/euro_1.png      | Bin 0 -> 33365 bytes
 .../source/templates/wizard/bitmap/euro_2.bmp      | Bin 66480 -> 0 bytes
 .../source/templates/wizard/bitmap/euro_2.png      | Bin 0 -> 52327 bytes
 .../source/templates/wizard/bitmap/euro_3.bmp      | Bin 66480 -> 0 bytes
 .../source/templates/wizard/bitmap/euro_3.png      | Bin 0 -> 39467 bytes
 main/wizards/source/euro/AutoPilotRun.xba          |  40 ++++++++---------
 main/wizards/source/euro/DlgConvert.xdl            |   2 +-
 main/wizards/source/euro/Init.xba                  |  48 ++++++++++-----------
 9 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/main/extras/source/templates/wizard/bitmap/euro_1.bmp b/main/extras/source/templates/wizard/bitmap/euro_1.bmp
deleted file mode 100644
index 8186915154..0000000000
Binary files a/main/extras/source/templates/wizard/bitmap/euro_1.bmp and /dev/null differ
diff --git a/main/extras/source/templates/wizard/bitmap/euro_1.png b/main/extras/source/templates/wizard/bitmap/euro_1.png
new file mode 100644
index 0000000000..38a68c0a0c
Binary files /dev/null and b/main/extras/source/templates/wizard/bitmap/euro_1.png differ
diff --git a/main/extras/source/templates/wizard/bitmap/euro_2.bmp b/main/extras/source/templates/wizard/bitmap/euro_2.bmp
deleted file mode 100644
index 34031d9efd..0000000000
Binary files a/main/extras/source/templates/wizard/bitmap/euro_2.bmp and /dev/null differ
diff --git a/main/extras/source/templates/wizard/bitmap/euro_2.png b/main/extras/source/templates/wizard/bitmap/euro_2.png
new file mode 100644
index 0000000000..cc066dae2f
Binary files /dev/null and b/main/extras/source/templates/wizard/bitmap/euro_2.png differ
diff --git a/main/extras/source/templates/wizard/bitmap/euro_3.bmp b/main/extras/source/templates/wizard/bitmap/euro_3.bmp
deleted file mode 100644
index 70f73b141d..0000000000
Binary files a/main/extras/source/templates/wizard/bitmap/euro_3.bmp and /dev/null differ
diff --git a/main/extras/source/templates/wizard/bitmap/euro_3.png b/main/extras/source/templates/wizard/bitmap/euro_3.png
new file mode 100644
index 0000000000..bf544d2f61
Binary files /dev/null and b/main/extras/source/templates/wizard/bitmap/euro_3.png differ
diff --git a/main/wizards/source/euro/AutoPilotRun.xba b/main/wizards/source/euro/AutoPilotRun.xba
index 20b51c9a56..8e1fa4884d 100644
--- a/main/wizards/source/euro/AutoPilotRun.xba
+++ b/main/wizards/source/euro/AutoPilotRun.xba
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,16 +9,16 @@
  * 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.
- * 
+ *
  ***********************************************************-->
 <script:module xmlns:script="http://openoffice.org/2000/script" script:name="AutoPilotRun" script:language="StarBasic">Option Explicit
 
@@ -54,7 +54,7 @@ Dim oFactoryKey as Object
 		InitializeConverter(oLocale, 2)
 		ToggleGoOnButton()
 		oFactoryKey = GetRegistryKeyContent(&quot;org.openoffice.Setup/Office/Factories&quot;)
-		DialogModel.chkTextDocuments.Enabled =  oFactoryKey.hasbyName(&quot;com.sun.star.text.TextDocument&quot;)
+		DialogModel.chkTextDocuments.Enabled = oFactoryKey.hasbyName(&quot;com.sun.star.text.TextDocument&quot;)
 		DialogModel.cmdGoOn.DefaultButton = True
 		DialogModel.lstCurrencies.TabIndex = 12
 		DialogConvert.GetControl(&quot;optWholeDir&quot;).SetFocus()
@@ -147,7 +147,7 @@ Dim sExtension as String
 				bIsReadOnly = False
 				RetrieveDocumentObjects()
 				sViewPath = CutPathView(SourceFile, 60)
-				DialogModel.lblCurDocument.Label = Str(DocIndex+1) &amp; &quot;/&quot; &amp; sTotDocCount &amp; &quot;  (&quot; &amp; sViewPath &amp; &quot;)&quot;
+				DialogModel.lblCurDocument.Label = Str(DocIndex+1) &amp; &quot;/&quot; &amp; sTotDocCount &amp; &quot; (&quot; &amp; sViewPath &amp; &quot;)&quot;
 			End If
 			InitializeDocument() = Not bIsReadOnly
 		Else
@@ -246,7 +246,7 @@ Dim TextBoxText as String
 				TextBoxText = TextBoxText &amp; DeleteStr(sInclusiveSubDir,&quot;~&quot;) &amp; chr(13)
 			End If
 		Else
-			TextBoxText = sSOURCEFILE &amp; &quot; &quot; &amp; ConvertFromUrl(Source) &amp; chr(13) 
+			TextBoxText = sSOURCEFILE &amp; &quot; &quot; &amp; ConvertFromUrl(Source) &amp; chr(13)
 		End If
 		TextBoxText = TextBoxText &amp; sTARGETDIR &amp; &quot; &quot; &amp; ConvertFromUrl(TargetDir) &amp; chr(13)
 		If DialogModel.chkProtect.State = 1 Then
@@ -254,8 +254,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
@@ -276,7 +276,7 @@ Dim LocStep as Integer
  	DialogConvert.GetControl(&quot;lstCurrencies&quot;).Visible = Not bMakeVisible
 	DialogConvert.GetControl(&quot;cmdBack&quot;).Visible = bMakeVisible
  	DialogConvert.GetControl(&quot;cmdGoOn&quot;).Visible = bMakeVisible
-	DialogModel.imgPreview.ImageUrl = BitmapDir &amp; &quot;euro_&quot; &amp; DialogModel.Step &amp; &quot;.bmp&quot;	 	
+	DialogModel.imgPreview.ImageUrl = BitmapDir &amp; &quot;euro_&quot; &amp; DialogModel.Step &amp; &quot;.png&quot;
 End Sub
 
 
@@ -330,8 +330,8 @@ Dim sNoDirMessage as String
 				If DialogModel.chkTextDocuments.State = 1 Then
 					If (Instr(1, sLocMimeType, &quot;text&quot;) = 0) And (Instr(1, sLocMimeType, &quot;calc&quot;) = 0) Then
 						Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE)
-						bIsValid = False						
-					End If				
+						bIsValid = False
+					End If
 				Else
 					If (Instr(1, sLocMimeType, &quot;spreadsheet&quot;) = 0) And (Instr(1, sLocMimeType, &quot;calc&quot;)) = 0 Then
 						Msgbox(sMsgFileInvalid, 48, sMsgDLGTITLE)
@@ -350,7 +350,7 @@ Dim sNoDirMessage as String
 			End If
 		End if
 	Else
-		Msgbox(HeaderString &amp; &quot; &apos;&quot; &amp; ConvertFromUrl(sPath) &amp; &quot;&apos; &quot; &amp;  sMsgNOTTHERE,48, sMsgDLGTITLE)
+		Msgbox(HeaderString &amp; &quot; &apos;&quot; &amp; ConvertFromUrl(sPath) &amp; &quot;&apos; &quot; &amp; sMsgNOTTHERE,48, sMsgDLGTITLE)
 	End If
 	If bIsValid Then
 		AssignFileName() = sPath
@@ -361,7 +361,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()) &gt; -1
@@ -376,7 +376,7 @@ End Sub
 
 Sub CallFolderPicker()
 	GetFolderName(DialogModel.txtTarget)
-	ToggleGoOnButton()	
+	ToggleGoOnButton()
 End Sub
 
 
@@ -385,7 +385,7 @@ Sub CallFilePicker()
 		Dim oMasterKey as Object
 		Dim oTypes() as Object
 		Dim oUIKey() as Object
-		
+
 		oMasterKey = GetRegistryKeyContent(&quot;org.openoffice.TypeDetection.Types&quot;)
 		oTypes() = oMasterKey.Types
 		oUIKey = GetRegistryKeyContent(&quot;org.openoffice.Office.UI/FilterClassification/LocalFilters&quot;)
@@ -406,7 +406,7 @@ Sub CallFilePicker()
 		Else
 			ReDim FilterNames(5,1) as String
 		End If
-		FilterNames(0,0) = oTypes.GetByName(&quot;calc_StarOffice_XML_Calc&quot;).UIName	
+		FilterNames(0,0) = oTypes.GetByName(&quot;calc_StarOffice_XML_Calc&quot;).UIName
 		Filternames(0,1) = &quot;*.sxc&quot;
 		FilterNames(1,0) = oTypes.GetByName(&quot;calc_StarOffice_XML_Calc_Template&quot;).UIName
 		Filternames(1,1) = &quot;*.stc&quot;
@@ -414,9 +414,9 @@ Sub CallFilePicker()
 		FilterNames(2,1) = &quot;*.sdc&quot;
 		FilterNames(3,0) = oUIKey.Classes.GetByName(&quot;sc345templ&quot;).DisplayName
 		Filternames(3,1) = &quot;*.vor&quot;
-		FilterNames(4,0) = oTypes.GetByName(&quot;calc8&quot;).UIName	
+		FilterNames(4,0) = oTypes.GetByName(&quot;calc8&quot;).UIName
 		Filternames(4,1) = &quot;*.ods&quot;
-		FilterNames(5,0) = oTypes.GetByName(&quot;calc8_template&quot;).UIName	
+		FilterNames(5,0) = oTypes.GetByName(&quot;calc8_template&quot;).UIName
 		Filternames(5,1) = &quot;*.ots&quot;
 		GetFileName(DialogModel.txtSource, Filternames())
 	Else
@@ -428,7 +428,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/main/wizards/source/euro/DlgConvert.xdl b/main/wizards/source/euro/DlgConvert.xdl
index cfb733bbab..2593102515 100644
--- a/main/wizards/source/euro/DlgConvert.xdl
+++ b/main/wizards/source/euro/DlgConvert.xdl
@@ -77,7 +77,7 @@
   <dlg:text dlg:id="lblRetrieval" dlg:tab-index="24" dlg:left="9" dlg:top="119" dlg:width="216" dlg:height="8" dlg:page="3" dlg:value="lblRetrieval"/>
   <dlg:text dlg:id="lblConfig" dlg:tab-index="25" dlg:left="6" dlg:top="39" dlg:width="94" dlg:height="8" dlg:page="3" dlg:value="lblConfig"/>
   <dlg:text dlg:id="lblCurDocument" dlg:tab-index="26" dlg:left="16" dlg:top="141" dlg:width="208" dlg:height="8" dlg:page="3"/>
-  <dlg:img dlg:id="imgPreview" dlg:tab-index="27" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26" dlg:src="file:///D:/office630np/share/template/german/wizard/bitmap/euro_2.bmp"/>
+  <dlg:img dlg:id="imgPreview" dlg:tab-index="27" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26" dlg:src="file:///D:/office630np/share/template/german/wizard/bitmap/euro_2.png"/>
   <dlg:fixedline dlg:id="hlnSelection" dlg:tab-index="28" dlg:left="7" dlg:top="72" dlg:width="258" dlg:height="8" dlg:page="1" dlg:value="hlnSelection"/>
   <dlg:fixedline dlg:id="hlnExtent" dlg:tab-index="29" dlg:left="6" dlg:top="39" dlg:width="156" dlg:height="8" dlg:page="2" dlg:value="hlnExtent"/>
   <dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="30" dlg:left="6" dlg:top="108" dlg:width="258" dlg:height="8" dlg:page="3" dlg:value="hlnProgress"/>
diff --git a/main/wizards/source/euro/Init.xba b/main/wizards/source/euro/Init.xba
index 1e0884c1fa..0a3e428e66 100644
--- a/main/wizards/source/euro/Init.xba
+++ b/main/wizards/source/euro/Init.xba
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
 <!--***********************************************************
- * 
+ *
  * 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
@@ -9,21 +9,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.
- * 
+ *
  ***********************************************************-->
 <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
@@ -217,13 +215,13 @@ Dim LocWorkPath as String
 		sCurrSLOVAK = GetResText(1515)
 		sCurrUNKNOWN = GetResText(1516)
 		sCurrSYSUNKNOWN = GetResText(1517)
-		.cmdCancel.Label =  sCANCEL
-		.cmdHelp.Label =  sHELP
-		.cmdBack.Label =  GetResText(1002)
-		.cmdGoOn.Label =  sGOON
-		.lblHint.Label =  GetResText(1004)
+		.cmdCancel.Label = sCANCEL
+		.cmdHelp.Label = sHELP
+		.cmdBack.Label = GetResText(1002)
+		.cmdGoOn.Label = sGOON
+		.lblHint.Label = GetResText(1004)
 		.lblCurrencies.Label = GetResText(1006)
-		.cmdBack.Enabled = False		
+		.cmdBack.Enabled = False
 		If .Step = 1 Then
 			.chkComplete.Label = GetResText(1100)
 			.hlnSelection.Label = GetResText(1101)
@@ -236,10 +234,10 @@ Dim LocWorkPath as String
 		Else
 			.lblProgress.Label = sStsPROGRESS
 		 	.hlnExtent.Label = GetResText(1200)
-			.optSingleFile.Label = GetResText(1201) 
+			.optSingleFile.Label = GetResText(1201)
  			.optWholeDir.Label = GetResText(1202)
  			.chkProtect.Label = GetResText(1207)
- 			.chkTextDocuments.Label = GetResText(1210) 
+ 			.chkTextDocuments.Label = GetResText(1210)
 
 			sSOURCEFILE = GetResText(1203)
 			sSOURCEDIR = GetResText(1204)
@@ -247,8 +245,8 @@ Dim LocWorkPath as String
  			sInclusiveSubDir = GetResText(1205)
  			.chkRecursive.Label = sInclusiveSubDir
 			sTARGETDIR = GetResText(1206)
- 			.lblTarget.Label = STARGETDIR 
-			
+ 			.lblTarget.Label = STARGETDIR
+
 			LocWorkPath = GetPathSettings(&quot;Work&quot;)
 			If Not oUcb.Exists(LocWorkPath) Then
 				ShowNoOfficePathError()
@@ -256,7 +254,7 @@ Dim LocWorkPath as String
 			End If
 
 			.txtSource.Text = ConvertfromUrl(LocWorkPath)
-			
+
 			SubstDir = .txtSource.Text
 			.txtTarget.Text = .txtSource.Text
 			.hlnProgress.Label = GetResText(1600)
@@ -290,7 +288,7 @@ Sub InitializeLanguages()
 	LangIDValue(3,0,0) = &quot;es&quot;
 	LangIDValue(3,0,1) = &quot;&quot;
 	LangIDValue(3,0,2) = &quot;-40A&quot;
-	
+
 	&apos;Spanish modern
 	LangIDValue(3,1,0) = &quot;es&quot;
 	LangIDValue(3,1,1) = &quot;&quot;
@@ -333,7 +331,7 @@ Sub InitializeLanguages()
 	LangIDValue(8,0,0) = &quot;fr&quot;
 	LangIDValue(8,0,1) = &quot;LU&quot;
 	LangIDValue(8,0,2) = &quot;-140C&quot;
-	
+
 	LangIDValue(8,1,0) = &quot;de&quot;
 	LangIDValue(8,1,1) = &quot;LU&quot;
 	LangIDValue(8,1,2) = &quot;-1007&quot;
@@ -544,7 +542,7 @@ Sub InitializeControls()
 			EnableStep2DialogControls(True)
 		End If
 	End If
-End Sub	
+End Sub
 
 
 Sub InitializeConverter(oLocale, iDialogPage as Integer)
@@ -558,7 +556,7 @@ Dim Isthere as Boolean
 		If sDocType = &quot;sCalc&quot; Then
 			bDocHasProtectedSheets = CheckSheetProtection(oSheets)
 		End If
-	    oStatusline = ThisComponent.GetCurrentController.GetFrame.CreateStatusIndicator()
+		oStatusline = ThisComponent.GetCurrentController.GetFrame.CreateStatusIndicator()
 	End If
 	DialogConvert = LoadDialog(&quot;Euro&quot;, &quot;DlgConvert&quot;)
 	DialogModel = DialogConvert.Model
@@ -575,9 +573,9 @@ Dim Isthere as Boolean
 		Stop
 	End If
 	FillUpCurrencyListbox()
-	DialogModel.imgPreview.ImageUrl = BitmapDir &amp; &quot;euro_&quot; &amp; DialogModel.Step &amp; &quot;.bmp&quot;	
+	DialogModel.imgPreview.ImageUrl = BitmapDir &amp; &quot;euro_&quot; &amp; DialogModel.Step &amp; &quot;.png&quot;
 	DialogConvert.Title = sMsgDLGTITLE
-	DialogModel.cmdGoOn.DefaultButton = True	
+	DialogModel.cmdGoOn.DefaultButton = True
 	If iDialogPage = 1 Then
 		ToggleWindow(True)
 	End If
@@ -592,7 +590,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


[openoffice] 03/03: Cleaned up resource file for Euro converter

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit bd4036b4fcd79a2a6c2d6a32a3de1bbe441cd1aa
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Thu Nov 22 16:43:22 2018 +0000

    Cleaned up resource file for Euro converter
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1847189 13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit a2aef65cef30af2a2b86cd1060f20aebbc3f7e58)
---
 main/wizards/source/euro/euro.src | 210 +++++++++++++++++---------------------
 1 file changed, 93 insertions(+), 117 deletions(-)

diff --git a/main/wizards/source/euro/euro.src b/main/wizards/source/euro/euro.src
index 5bffa6e91e..3ec2ccee97 100644
--- a/main/wizards/source/euro/euro.src
+++ b/main/wizards/source/euro/euro.src
@@ -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,16 +7,16 @@
  * 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.
- * 
+ *
  *************************************************************/
 
 
@@ -31,442 +31,418 @@
 // --------------------------------------------------------------------
 String STEP_ZERO
 {
-Text [ en-US ] = "~Cancel";
+Text [ en-US ] = "~Cancel" ;
 };
 
 String STEP_ZERO + 1
 {
-Text [ en-US ] = "~Help";
+Text [ en-US ] = "~Help" ;
 };
 
 String STEP_ZERO + 2
 {
-Text [ en-US ] = "<<~Back";
+Text [ en-US ] = "<<~Back" ;
 };
 
 String STEP_ZERO + 3
 {
-Text [ en-US ] = "~Convert";
+Text [ en-US ] = "~Convert" ;
 };
 
 String STEP_ZERO + 4
 {
-Text [ en-US ] = "Note: Currency amounts from external links and currency conversion factors in formulas cannot be converted.";
+Text [ en-US ] = "Note: Currency amounts from external links and currency conversion factors in formulas cannot be converted." ;
 };
 
 String STEP_ZERO + 5
 {
-Text [ en-US ] = "First, unprotect all sheets.";
+Text [ en-US ] = "First, unprotect all sheets." ;
 };
 
 String STEP_ZERO + 6
 {
-Text [ en-US ] = "Currencies:";
+Text [ en-US ] = "Currencies:" ;
 };
 
-
 String STEP_ZERO + 7
 {
-Text [ en-US ] = "C~ontinue>>";
+Text [ en-US ] = "C~ontinue>>" ;
 };
 
-
 String STEP_ZERO + 8
 {
-Text [ en-US ] = "C~lose";
+Text [ en-US ] = "C~lose" ;
 };
 
+
 String STEP_CONVERTER
 {
-Text [ en-US ] = "~Entire document";
+Text [ en-US ] = "~Entire document" ;
 };
 
 String STEP_CONVERTER + 1
 {
-Text [ en-US ] = "Selection";
+Text [ en-US ] = "Selection" ;
 };
 
 String STEP_CONVERTER + 2
 {
-Text [ en-US ] = "Cell S~tyles";
+Text [ en-US ] = "Cell S~tyles" ;
 };
 
 String STEP_CONVERTER + 3
 {
-Text [ en-US ] = "Currency cells in the current ~sheet";
+Text [ en-US ] = "Currency cells in the current ~sheet" ;
 };
 
 String STEP_CONVERTER + 4
 {
-Text [ en-US ] = "Currency cells in the entire ~document";
+Text [ en-US ] = "Currency cells in the entire ~document" ;
 };
 
 String STEP_CONVERTER + 5
 {
-Text [ en-US ] = "~Selected range";
+Text [ en-US ] = "~Selected range" ;
 };
 
 String STEP_CONVERTER + 6
 {
-Text [ en-US ] = "Select Cell Styles";
+Text [ en-US ] = "Select Cell Styles" ;
 };
 
 String STEP_CONVERTER + 7
 {
-Text [ en-US ] = "Select currency cells";
+Text [ en-US ] = "Select currency cells" ;
 };
 
 String STEP_CONVERTER + 8
 {
-Text [ en-US ] = "Currency ranges:";
+Text [ en-US ] = "Currency ranges:" ;
 };
 
 String STEP_CONVERTER + 9
 {
-Text [ en-US ] = "Templates:";
+Text [ en-US ] = "Templates:" ;
 };
 
 
 String STEP_AUTOPILOT
 {
-Text [ en-US ] = "Extent";
+Text [ en-US ] = "Extent" ;
 };
 
 String STEP_AUTOPILOT + 1
 {
-Text [ en-US ] = "~Single %PRODUCTNAME Calc document";
+Text [ en-US ] = "~Single %PRODUCTNAME Calc document" ;
 };
 
 String STEP_AUTOPILOT + 2
 {
-Text [ en-US ] = "Complete ~directory";
+Text [ en-US ] = "Complete ~directory" ;
 };
 
 String STEP_AUTOPILOT + 3
 {
-Text [ en-US ] = "Source Document:";
+Text [ en-US ] = "Source Document:" ;
 };
 
 String STEP_AUTOPILOT + 4
 {
-Text [ en-US ] = "Source directory:";
+Text [ en-US ] = "Source directory:" ;
 };
 
 String STEP_AUTOPILOT + 5
 {
-Text [ en-US ] = "~Including subfolders";
+Text [ en-US ] = "~Including subfolders" ;
 };
 
 String STEP_AUTOPILOT + 6
 {
-Text [ en-US ] = "Target directory:";
+Text [ en-US ] = "Target directory:" ;
 };
 
-
 String STEP_AUTOPILOT + 7
 {
-Text [ en-US ] = "Temporarily unprotect sheet without query";
+Text [ en-US ] = "Temporarily unprotect sheet without query" ;
 };
 
-
 String STEP_AUTOPILOT + 10
 {
-Text [ en-US ] = "Also convert fields and tables in text documents";
+Text [ en-US ] = "Also convert fields and tables in text documents" ;
 };
 
 
 String STATUSLINE
 {
-Text [ en-US ] = "Conversion status: ";
+Text [ en-US ] = "Conversion status: " ;
 };
 
 String STATUSLINE + 1
 {
-Text [ en-US ] = "Conversion status of the cell templates:";
+Text [ en-US ] = "Conversion status of the cell templates:" ;
 };
 
 String STATUSLINE + 2
 {
-Text [ en-US ] = "Registration of the relevant ranges: Sheet %1Number%1 of %2TotPageCount%2";
+Text [ en-US ] = "Registration of the relevant ranges: Sheet %1Number%1 of %2TotPageCount%2" ;
 };
 
-
 String STATUSLINE + 3
 {
-Text [ en-US ] = "Entry of the ranges to be converted...";
+Text [ en-US ] = "Entry of the ranges to be converted..." ;
 };
 
-
-
 String STATUSLINE + 4
 {
-Text [ en-US ] = "Sheet protection for each sheet will be restored...";
+Text [ en-US ] = "Sheet protection for each sheet will be restored..." ;
 };
 
-
 String STATUSLINE + 5
 {
-Text [ en-US ] = "Conversion of the currency units in the cell templates...";
+Text [ en-US ] = "Conversion of the currency units in the cell templates..." ;
 };
 
 
-
 String MESSAGES
 {
-Text [ en-US ] = "~Finish";
+Text [ en-US ] = "~Finish" ;
 };
 
 String MESSAGES + 1
 {
-Text [ en-US ] = "Select directory";
+Text [ en-US ] = "Select directory" ;
 };
 
 String MESSAGES + 2
 {
-Text [ en-US ] = "Select file";
+Text [ en-US ] = "Select file" ;
 };
 
 String MESSAGES + 3
 {
-Text [ en-US ] = "Select target directory";
+Text [ en-US ] = "Select target directory" ;
 };
 
 String MESSAGES + 4
 {
-Text [ en-US ] = "non-existent";
+Text [ en-US ] = "non-existent" ;
 };
 
-
 String MESSAGES + 5
 {
-Text [ en-US ] = "Euro Converter";
+Text [ en-US ] = "Euro Converter" ;
 };
 
-
-
 String MESSAGES + 6
 {
-Text [ en-US ] = "Should protected spreadsheets be temporarily unprotected?";
+Text [ en-US ] = "Should protected spreadsheets be temporarily unprotected?" ;
 };
 
-
 String MESSAGES + 7
 {
-Text [ en-US ] = "Enter the password to unprotect the table %1TableName%1";
+Text [ en-US ] = "Enter the password to unprotect the table %1TableName%1" ;
 };
 
-
 String MESSAGES + 8
 {
-Text [ en-US ] = "Wrong Password!";
+Text [ en-US ] = "Wrong Password!" ;
 };
 
-
 String MESSAGES + 9
 {
-Text [ en-US ] = "Protected Sheet";
+Text [ en-US ] = "Protected Sheet" ;
 };
 
-
 String MESSAGES + 10
 {
-Text [ en-US ] = "Warning!";
+Text [ en-US ] = "Warning!" ;
 };
 
-
 String MESSAGES + 11
 {
-Text [ en-US ] = "Protection for the sheets will not be removed.";
+Text [ en-US ] = "Protection for the sheets will not be removed." ;
 };
 
-
 String MESSAGES + 12
 {
-Text [ en-US ] = "Sheet cannot be unprotected";
+Text [ en-US ] = "Sheet cannot be unprotected" ;
 };
 
-
 String MESSAGES + 13
 {
-Text [ en-US ] = "The Wizard cannot edit this document as cell formats cannot be modified in documents containing protected spreadsheets.";
+Text [ en-US ] = "The Wizard cannot edit this document as cell formats cannot be modified in documents containing protected spreadsheets." ;
 };
 
-
-
 String MESSAGES + 14
 {
-Text [ en-US ] = "Please note that the Euro Converter will, otherwise, not be able to edit this document!";
+Text [ en-US ] = "Please note that the Euro Converter will, otherwise, not be able to edit this document!" ;
 };
 
-
-
 String MESSAGES + 15
 {
-Text [ en-US ] = "Please choose a currency to be converted first!";
+Text [ en-US ] = "Please choose a currency to be converted first!" ;
 };
 
 String MESSAGES + 16
 {
-Text [ en-US ] = "Password:";
+Text [ en-US ] = "Password:" ;
 };
 
 String MESSAGES + 17
 {
-Text [ en-US ] = "OK";
+Text [ en-US ] = "OK" ;
 };
 
 String MESSAGES + 18
 {
-Text [ en-US ] = "Cancel";
+Text [ en-US ] = "Cancel" ;
 };
 
-
- String MESSAGES + 19
+String MESSAGES + 19
 {
-Text [ en-US ] = "Please select a %PRODUCTNAME Calc document for editing!";
+Text [ en-US ] = "Please select a %PRODUCTNAME Calc document for editing!" ;
 };
 
-
 String MESSAGES + 20
 {
-Text [ en-US ] = "'<1>' is not a directory!";
+Text [ en-US ] = "'<1>' is not a directory!" ;
 };
 
-
 String MESSAGES + 21
 {
-Text [ en-US ] = "Document is read-only!";
+Text [ en-US ] = "Document is read-only!" ;
 };
 
-
 String MESSAGES + 22
 {
-    Text [ en-US ] = "The '<1>' file already exists.<CR>Do you want to overwrite it?";
+Text [ en-US ] = "The '<1>' file already exists.<CR>Do you want to overwrite it?" ;
 };
 
-
 String MESSAGES + 23
 {
-	Text [ en-US ] = "Do you really want to terminate conversion at this point?";
+Text [ en-US ] = "Do you really want to terminate conversion at this point?" ;
 };
 
 String MESSAGES + 24
 {
-	Text [ en-US ] = "Cancel Wizard";
+Text [ en-US ] = "Cancel Wizard" ;
 };
 
- String CURRENCIES
+
+String CURRENCIES
 {
-Text [ en-US ] = "Portuguese Escudo";
+Text [ en-US ] = "Portuguese Escudo" ;
 };
 
 String CURRENCIES + 1
 {
-Text [ en-US ] = "Dutch Guilder";
+Text [ en-US ] = "Dutch Guilder" ;
 };
 
 String CURRENCIES + 2
 {
-Text [ en-US ] = "French Franc";
+Text [ en-US ] = "French Franc" ;
 };
 
 String CURRENCIES + 3
 {
-Text [ en-US ] = "Spanish Peseta";
+Text [ en-US ] = "Spanish Peseta" ;
 };
 
 String CURRENCIES + 4
 {
-Text [ en-US ] = "Italian Lira";
+Text [ en-US ] = "Italian Lira" ;
 };
 
 String CURRENCIES + 5
 {
-Text [ en-US ] = "German Mark";
+Text [ en-US ] = "German Mark" ;
 };
 
 String CURRENCIES + 6
 {
-Text [ en-US ] = "Belgian Franc";
+Text [ en-US ] = "Belgian Franc" ;
 };
 
 String CURRENCIES + 7
 {
-Text [ en-US ] = "Irish Punt";
+Text [ en-US ] = "Irish Punt" ;
 };
 
 String CURRENCIES + 8
 {
-Text [ en-US ] = "Luxembourg Franc";
+Text [ en-US ] = "Luxembourg Franc" ;
 };
 
 String CURRENCIES + 9
 {
-Text [ en-US ] = "Austrian Schilling";
+Text [ en-US ] = "Austrian Schilling" ;
 };
 
 String CURRENCIES + 10
 {
-Text [ en-US ] = "Finnish Mark";
+Text [ en-US ] = "Finnish Mark" ;
 };
 
 String CURRENCIES + 11
 {
-Text [ en-US ] = "Greek Drachma";
+Text [ en-US ] = "Greek Drachma" ;
 };
 
 String CURRENCIES + 12
 {
-Text [ en-US ] = "Slovenian Tolar";
+Text [ en-US ] = "Slovenian Tolar" ;
 };
 
 String CURRENCIES + 13
 {
-Text [ en-US ] = "Cypriot Pound";
+Text [ en-US ] = "Cypriot Pound" ;
 };
 
 String CURRENCIES + 14
 {
-Text [ en-US ] = "Maltese Lira";
+Text [ en-US ] = "Maltese Lira" ;
 };
 
 String CURRENCIES + 15
 {
-Text [ en-US ] = "Slovak Koruna";
+Text [ en-US ] = "Slovak Koruna" ;
 };
 
 String CURRENCIES + 16
 {
-Text [ en-US ] = "The currency set for the document is not a European currency!";
+Text [ en-US ] = "The currency set for the document is not a European currency!" ;
 };
 
 String CURRENCIES + 17
 {
-Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union.";
+Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union." ;
 };
 
+
 String STEP_LASTPAGE
 {
-Text [ en-US ] = "Progress";
+Text [ en-US ] = "Progress" ;
 };
 
-
 String STEP_LASTPAGE + 1
 {
-Text [ en-US ] = "Retrieving the relevant documents...";
+Text [ en-US ] = "Retrieving the relevant documents..." ;
 };
 
 String STEP_LASTPAGE + 2
 {
-Text [ en-US ] = "Converting the documents...";
+Text [ en-US ] = "Converting the documents..." ;
 };
 
 String STEP_LASTPAGE + 3
 {
-Text [ en-US ] = "Settings:";
+Text [ en-US ] = "Settings:" ;
 };
 
 String STEP_LASTPAGE + 4
 {
-Text [ en-US ] = "Sheet is always unprotected";
+Text [ en-US ] = "Sheet is always unprotected" ;
 };
+
+// ********************************************************************** EOF