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 e937939 Cleaned up resource files
e937939 is described below
commit e937939831b50fbccbf1a1996a633ec227eb31ba
Author: mseidel <msei...@apache.org>
AuthorDate: Mon Dec 2 23:21:56 2019 +0100
Cleaned up resource files
(cherry picked from commit 22daf8cb557d8559991c55bdb83729bd24466a7e)
---
main/cui/source/dialogs/about.src | 29 ++++-----
main/cui/source/dialogs/colorpicker.src | 18 +++---
main/sfx2/source/doc/doctdlg.src | 103 +++++++++++---------------------
main/sfx2/source/doc/doctempl.src | 91 +++++++++-------------------
4 files changed, 87 insertions(+), 154 deletions(-)
diff --git a/main/cui/source/dialogs/about.src
b/main/cui/source/dialogs/about.src
index bea7e29..9e8b711 100644
--- a/main/cui/source/dialogs/about.src
+++ b/main/cui/source/dialogs/about.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.
- *
+ *
*************************************************************/
@@ -28,7 +28,7 @@
ModalDialog RID_DEFAULTABOUT
{
- HelpID = "cui:ModalDialog:RID_DEFAULTABOUT";
+ HelpID = "cui:ModalDialog:RID_DEFAULTABOUT" ;
OutputSize = TRUE ;
Moveable = TRUE ;
SVLook = TRUE ;
@@ -52,7 +52,7 @@ ModalDialog RID_DEFAULTABOUT
};
MultiLineEdit RID_CUI_ABOUT_FTXT_BUILDDATA
{
- //HelpID =
"cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_BUILDDATA";
+ //HelpID =
"cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_BUILDDATA" ;
Border = FALSE ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
@@ -60,7 +60,7 @@ ModalDialog RID_DEFAULTABOUT
};
MultiLineEdit RID_CUI_ABOUT_FTXT_COPYRIGHT
{
- HelpID =
"cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT";
+ HelpID =
"cui:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT" ;
Border = FALSE ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
@@ -69,7 +69,7 @@ ModalDialog RID_DEFAULTABOUT
FixedText RID_CUI_ABOUT_FTXT_WELCOME_LINK
{
Left = TRUE ;
- Text = "https://www.openoffice.org/welcome/credits.html";;
+ Text = "https://www.openoffice.org/welcome/credits.html"; ;
};
String RID_CUI_ABOUT_STR_COPYRIGHT_VENDOR
{
@@ -102,15 +102,15 @@ ModalDialog RID_CUI_README_DLG
OutputSize = TRUE ;
SvLook = TRUE ;
Moveable = TRUE ;
- Closeable = TRUE;
+ Closeable = TRUE ;
Size = MAP_APPFONT ( DLG_WIDTH, DLG_HEIGHT ) ;
Text [ en-US ] = "Readme, License and Notice" ;
TabControl RID_CUI_README_TBCTL
{
OutputSize = TRUE ;
- Pos = MAP_APPFONT( CTRL_MARGIN, CTRL_MARGIN );
- Size = MAP_APPFONT( TAB_WIDTH, TAB_HEIGHT );
+ Pos = MAP_APPFONT ( CTRL_MARGIN, CTRL_MARGIN ) ;
+ Size = MAP_APPFONT ( TAB_WIDTH, TAB_HEIGHT ) ;
PageList =
{
PageItem
@@ -137,7 +137,7 @@ ModalDialog RID_CUI_README_DLG
OKButton RID_CUI_README_OKBTN
{
DefButton = TRUE ;
- Pos = MAP_APPFONT( 0, CTRL_MARGIN + TAB_HEIGHT + CTRL_MARGIN );
+ Pos = MAP_APPFONT ( 0, CTRL_MARGIN + TAB_HEIGHT + CTRL_MARGIN )
;
Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
};
};
@@ -155,8 +155,9 @@ TabPage RID_CUI_README_TBPAGE
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
AutoVScroll = TRUE ;
- Pos = MAP_APPFONT( CTRL_MARGIN, CTRL_MARGIN );
- Size = MAP_APPFONT( TAB_WIDTH - CTRL_MARGIN - CTRL_MARGIN,
TAB_HEIGHT - CTRL_MARGIN - CTRL_MARGIN );
+ Pos = MAP_APPFONT ( CTRL_MARGIN, CTRL_MARGIN ) ;
+ Size = MAP_APPFONT ( TAB_WIDTH - CTRL_MARGIN - CTRL_MARGIN,
TAB_HEIGHT - CTRL_MARGIN - CTRL_MARGIN ) ;
};
};
+// ********************************************************************** EOF
diff --git a/main/cui/source/dialogs/colorpicker.src
b/main/cui/source/dialogs/colorpicker.src
index c06208f..b7193ad 100644
--- a/main/cui/source/dialogs/colorpicker.src
+++ b/main/cui/source/dialogs/colorpicker.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,18 +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 "colorpicker.hrc"
#define DLG_WIDTH 295
@@ -39,10 +41,10 @@
#define SLIDER_WIDTH 22
#define PREVIEW_HEIGHT 16
-#define LINE_WIDTH (3 + RADIO_WIDTH + 2 + LABEL_WIDTH + 3 + METRIC_WIDTH + 3)
+#define LINE_WIDTH (3 + RADIO_WIDTH + 2 + LABEL_WIDTH + 3 + METRIC_WIDTH + 3)
#define LINE_HEIGHT 8
-#define CONTROL_AREA_X (DLG_WIDTH - LINE_WIDTH - 6)
+#define CONTROL_AREA_X (DLG_WIDTH - LINE_WIDTH - 6)
#define CONTROL_AREA_X_RADIO (CONTROL_AREA_X + 3)
#define CONTROL_AREA_X_LABEL (CONTROL_AREA_X + 3 + RADIO_WIDTH + 2)
#define CONTROL_AREA_X_METRIC (CONTROL_AREA_X + 3 + RADIO_WIDTH + 2 +
LABEL_WIDTH + 3)
@@ -125,7 +127,6 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
Image CT_SLIDERIMG
{
ImageBitmap = Bitmap { File = "colorslider.png" ; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
};
#if 0
@@ -139,7 +140,6 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
ButtonImage = Image
{
ImageBitmap = Bitmap { File = "pipette.png" ; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
;
};
};
#endif
@@ -473,4 +473,4 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
};
};
-// eof
+// ********************************************************************** EOF
diff --git a/main/sfx2/source/doc/doctdlg.src b/main/sfx2/source/doc/doctdlg.src
index a19549b..0b5f2df 100644
--- a/main/sfx2/source/doc/doctdlg.src
+++ b/main/sfx2/source/doc/doctdlg.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,118 +31,85 @@ ModalDialog DLG_DOC_TEMPLATE
HelpId = CMD_SID_DOCTEMPLATE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 280 , 128 ) ;
+ Size = MAP_APPFONT ( 280, 128 ) ;
Text [ en-US ] = "Templates" ;
Moveable = TRUE ;
FixedLine FL_EDIT
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 212 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 212, 8 ) ;
Text [ en-US ] = "New template" ;
};
Edit ED_NAME
{
- HelpID = "sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME";
+ HelpID = "sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 200 , 12 ) ;
+ Pos = MAP_APPFONT ( 12, 14 ) ;
+ Size = MAP_APPFONT ( 200, 12 ) ;
};
FixedLine FL_STYLESHEETS
{
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 212 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 32 ) ;
+ Size = MAP_APPFONT ( 212, 8 ) ;
Text [ en-US ] = "Templates" ;
};
FixedText FT_SECTION
{
- Pos = MAP_APPFONT ( 12 , 43 ) ;
- Size = MAP_APPFONT ( 97 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 43 ) ;
+ Size = MAP_APPFONT ( 97, 10 ) ;
Text [ en-US ] = "~Categories" ;
};
ListBox LB_SECTION
{
- HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION";
+ HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 97 , 66 ) ;
+ Pos = MAP_APPFONT ( 12, 56 ) ;
+ Size = MAP_APPFONT ( 97, 66 ) ;
};
FixedText FT_STYLESHEETS
{
- Pos = MAP_APPFONT ( 115 , 43 ) ;
- Size = MAP_APPFONT ( 97 , 10 ) ;
+ Pos = MAP_APPFONT ( 115, 43 ) ;
+ Size = MAP_APPFONT ( 97, 10 ) ;
Text [ en-US ] = "~Templates" ;
};
ListBox LB_STYLESHEETS
{
- HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS";
+ HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 115 , 56 ) ;
- Size = MAP_APPFONT ( 97 , 66 ) ;
+ Pos = MAP_APPFONT ( 115, 56 ) ;
+ Size = MAP_APPFONT ( 97, 66 ) ;
};
OKButton BT_OK
{
- Pos = MAP_APPFONT ( 224 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 224, 6 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
DefButton = TRUE ;
Disable = TRUE ;
};
CancelButton BT_CANCEL
{
- Pos = MAP_APPFONT ( 224 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 224, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
HelpButton BT_HELP
{
- Pos = MAP_APPFONT ( 224 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 224, 43 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
PushButton BT_EDIT
{
- HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT";
- Pos = MAP_APPFONT ( 224 , 62 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT" ;
+ Pos = MAP_APPFONT ( 224, 62 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Edit" ;
};
PushButton BT_ORGANIZE
{
- HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE";
- Pos = MAP_APPFONT ( 224 , 79 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE" ;
+ Pos = MAP_APPFONT ( 224, 79 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
Text [ en-US ] = "~Organizer..." ;
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/sfx2/source/doc/doctempl.src
b/main/sfx2/source/doc/doctempl.src
index ed35437..e4ba703 100644
--- a/main/sfx2/source/doc/doctempl.src
+++ b/main/sfx2/source/doc/doctempl.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.
- *
+ *
*************************************************************/
@@ -29,74 +29,39 @@ StringArray TEMPLATE_SHORT_NAMES_ARY
{
ItemList =
{
- < "standard" ; > ;
- < "officorr" ; > ;
- < "offimisc" ; > ;
- < "personal" ; > ;
- < "forms" ; > ;
- < "finance" ; > ;
- < "educate" ; > ;
- < "layout" ; > ;
- < "presnt" ; > ;
- < "misc" ; > ;
+ < "standard" ; > ;
+ < "officorr" ; > ;
+ < "offimisc" ; > ;
+ < "personal" ; > ;
+ < "forms" ; > ;
+ < "finance" ; > ;
+ < "educate" ; > ;
+ < "layout" ; > ;
+ < "presnt" ; > ;
+ < "misc" ; > ;
};
};
StringArray TEMPLATE_LONG_NAMES_ARY
{
- ItemList [ en-US ] =
+ ItemList [ en-US ] =
{
- < "My Templates" ; > ;
- < "Business Correspondence" ; > ;
- < "Other Business Documents" ; > ;
- < "Personal Correspondence and Documents" ; > ;
- < "Forms and Contracts" ; > ;
- < "Finances" ; > ;
- < "Education" ; > ;
- < "Presentation Backgrounds" ; > ;
- < "Presentations" ; > ;
- < "Miscellaneous" ; > ;
- };
-
+ < "My Templates" ;
> ;
+ < "Business Correspondence" ; > ;
+ < "Other Business Documents" ; > ;
+ < "Personal Correspondence and Documents" ; > ;
+ < "Forms and Contracts" ;
> ;
+ < "Finances" ;
> ;
+ < "Education" ;
> ;
+ < "Presentation Backgrounds" ; > ;
+ < "Presentations" ;
> ;
+ < "Miscellaneous" ;
> ;
};
+};
String RID_CNT_STR_WAITING
{
- Text [ en-US ] = "The templates are being initialized for first-time
usage." ;
+ Text [ en-US ] = "The templates are being initialized for first-time
usage." ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
