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 4cb5fda Cleaned up resource files
4cb5fda is described below
commit 4cb5fda472876c9a32cffecefa1a31237c0f10e8
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Mar 1 00:00:40 2020 +0100
Cleaned up resource files
(cherry picked from commit e1503350ff951c479a2b1d278bcce7f045928560)
---
main/basctl/source/basicide/basicprint.src | 22 +++--
main/basctl/source/basicide/macrodlg.src | 152 ++++++++++++-----------------
main/sfx2/source/bastyp/bastyp.src | 43 ++------
3 files changed, 78 insertions(+), 139 deletions(-)
diff --git a/main/basctl/source/basicide/basicprint.src
b/main/basctl/source/basicide/basicprint.src
index a0f4c77..8753ba5 100644
--- a/main/basctl/source/basicide/basicprint.src
+++ b/main/basctl/source/basicide/basicprint.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.
- *
+ *
*************************************************************/
@@ -25,10 +25,12 @@
StringArray RID_PRINTDLG_STRLIST
{
- ItemList [en-US] =
- {
- < "Print range"; >;
- < "All ~Pages"; >;
- < "Pa~ges"; >;
- };
+ ItemList [en-US] =
+ {
+ < "Print range" ; > ;
+ < "All ~Pages" ; > ;
+ < "Pa~ges" ; > ;
+ };
};
+
+// ********************************************************************** EOF
diff --git a/main/basctl/source/basicide/macrodlg.src
b/main/basctl/source/basicide/macrodlg.src
index 67bc159..9ec10f8 100644
--- a/main/basctl/source/basicide/macrodlg.src
+++ b/main/basctl/source/basicide/macrodlg.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.
- *
+ *
*************************************************************/
@@ -30,144 +30,142 @@ ModalDialog RID_MACROCHOOSER
HelpId = "basctl:ModalDialog:RID_MACROCHOOSER" ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 287 , 165 ) ;
+ Size = MAP_APPFONT ( 287, 165 ) ;
Text [ en-US ] = "%PRODUCTNAME Basic Macros" ;
Moveable = TRUE ;
- // Closeable = TRUE;
+ //Closeable = TRUE ;
FixedText RID_TXT_MACROSIN
{
- Pos = MAP_APPFONT ( 122 , 30 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- Text [ en-US ] = "Existing macros ~in:";
+ Pos = MAP_APPFONT ( 122, 30 ) ;
+ Size = MAP_APPFONT ( 100, 10 ) ;
+ Text [ en-US ] = "Existing macros ~in:" ;
};
Control RID_CTRL_MACRO
{
HelpID = HID_BASICIDE_MACROS ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 122 , 41 ) ;
- Size = MAP_APPFONT ( 100 , 117 ) ;
- // Size = MAP_APPFONT ( 100 , 117 ) ;
+ Pos = MAP_APPFONT ( 122, 41 ) ;
+ Size = MAP_APPFONT ( 100, 117 ) ;
+ // Size = MAP_APPFONT ( 100, 117 ) ;
TabStop = TRUE ;
};
Control RID_CTRL_LIB
{
HelpID = HID_BASICIDE_LIBS ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 41 ) ;
- Size = MAP_APPFONT ( 110 , 117 ) ;
+ Pos = MAP_APPFONT ( 6, 41 ) ;
+ Size = MAP_APPFONT ( 110, 117 ) ;
TabStop = TRUE ;
};
FixedText RID_TXT_MACRONAME
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 100, 10 ) ;
Text [ en-US ] = "~Macro name" ;
};
Edit RID_ED_MACRONAME
{
- HelpID = "basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME";
+ HelpID = "basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME" ;
Border = TRUE ;
SVLook = TRUE ;
- Pos = MAP_APPFONT ( 6 , 14 ) ;
- Size = MAP_APPFONT ( 110 , 12 ) ;
+ Pos = MAP_APPFONT ( 6, 14 ) ;
+ Size = MAP_APPFONT ( 110, 12 ) ;
TabStop = TRUE ;
};
FixedText RID_TXT_MACROFROM
{
- Pos = MAP_APPFONT ( 6 , 30 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 30 ) ;
+ Size = MAP_APPFONT ( 100, 10 ) ;
Text [ en-US ] = "Macro ~from" ;
};
FixedText RID_TXT_SAVEMACRO
{
- Pos = MAP_APPFONT ( 6 , 30 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
- Text [ en-US ] = "Save m~acro in";
+ Pos = MAP_APPFONT ( 6, 30 ) ;
+ Size = MAP_APPFONT ( 100, 10 ) ;
+ Text [ en-US ] = "Save m~acro in" ;
};
FixedText RID_TXT_DESCRIPTION
{
- Pos = MAP_APPFONT ( 6 , 117 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 117 ) ;
+ Size = MAP_APPFONT ( 100, 10 ) ;
Text [ en-US ] = "De~scription" ;
};
PushButton RID_PB_RUN
{
- HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN";
- Pos = MAP_APPFONT ( 231 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE;
- /* ### ACHTUNG: Neuer Text in Resource? Aus~f�hren : Aus~f�hren
*/
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN" ;
+ Pos = MAP_APPFONT ( 231, 6 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ DefButton = TRUE ;
Text [ en-US ] = "R~un" ;
TabStop = TRUE ;
};
CancelButton RID_PB_CLOSE
{
- Pos = MAP_APPFONT ( 231 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 231, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
- Text [ en-US ] = "Close";
+ Text [ en-US ] = "Close" ;
};
PushButton RID_PB_ASSIGN
{
- HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN";
- Pos = MAP_APPFONT ( 231 , 60 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN" ;
+ Pos = MAP_APPFONT ( 231, 60 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Assign..." ;
TabStop = TRUE ;
};
PushButton RID_PB_EDIT
{
- HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT";
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Pos = MAP_APPFONT ( 231 , 77 ) ;
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT" ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Pos = MAP_APPFONT ( 231, 77 ) ;
Text [ en-US ] = "~Edit" ;
TabStop = TRUE ;
};
PushButton RID_PB_NEWLIB
{
- HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB";
- Pos = MAP_APPFONT ( 231 , 60 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "New ~Library";
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB" ;
+ Pos = MAP_APPFONT ( 231, 60 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Text [ en-US ] = "New ~Library" ;
};
PushButton RID_PB_NEWMOD
{
- HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD";
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Pos = MAP_APPFONT ( 231 , 77 ) ;
- Text [ en-US ] = "New M~odule";
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD" ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ Pos = MAP_APPFONT ( 231, 77 ) ;
+ Text [ en-US ] = "New M~odule" ;
};
PushButton RID_PB_DEL
{
- HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL";
- Pos = MAP_APPFONT ( 231 , 94 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~L�schen... :
~L�schen... */
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL" ;
+ Pos = MAP_APPFONT ( 231, 94 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Delete" ;
TabStop = TRUE ;
};
PushButton RID_PB_ORG
{
- HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG";
- Pos = MAP_APPFONT ( 231 , 114 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID = "basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG" ;
+ Pos = MAP_APPFONT ( 231, 114 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Organizer..." ;
};
HelpButton RID_PB_HELP
{
- Pos = MAP_APPFONT ( 231 , 131 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 231, 131 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
MultiLineEdit RID_ML_DESCRIPTION
{
- HelpID = "basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION";
+ HelpID =
"basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 131 ) ;
- Size = MAP_APPFONT ( 216 , 28 ) ;
+ Pos = MAP_APPFONT ( 6, 131 ) ;
+ Size = MAP_APPFONT ( 216, 28 ) ;
TabStop = TRUE ;
VScroll = TRUE ;
IgnoreTab = TRUE ;
@@ -179,7 +177,6 @@ String RID_STR_STDMACRONAME
};
String RID_STR_BTNDEL
{
- /* ### ACHTUNG: Neuer Text in Resource? ~L�schen... : ~L�schen... */
Text [ en-US ] = "~Delete" ;
};
String RID_STR_BTNNEW
@@ -188,49 +185,20 @@ String RID_STR_BTNNEW
};
String RID_STR_CLOSE
{
- /* ### ACHTUNG: Neuer Text in Resource? Schlie�en : Schlie�en */
Text [ en-US ] = "Close" ;
};
String RID_STR_CHOOSE
{
- /* ### ACHTUNG: Neuer Text in Resource? Ausw�hlen : Ausw�hlen */
Text [ en-US ] = "Choose" ;
};
String RID_STR_RUN
{
- /* ### ACHTUNG: Neuer Text in Resource? Ausf�hren : Ausf�hren */
Text [ en-US ] = "Run" ;
};
String RID_STR_RECORD
{
- Text [ en-US ] = "~Save" ;
+ Text [ en-US ] = "~Save" ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/sfx2/source/bastyp/bastyp.src
b/main/sfx2/source/bastyp/bastyp.src
index 84f1523..8b80b2a 100644
--- a/main/sfx2/source/bastyp/bastyp.src
+++ b/main/sfx2/source/bastyp/bastyp.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,19 +7,20 @@
* 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.
- *
+ *
*************************************************************/
+
#include "bastyp.hrc"
String STR_HTML_GENERATOR
@@ -27,36 +28,4 @@ String STR_HTML_GENERATOR
Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION (%1)" ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
