[openoffice] branch AOO42X updated: Cleaned up resource file

2023-02-12 Thread mseidel
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 ebc72bd729 Cleaned up resource file
ebc72bd729 is described below

commit ebc72bd729f5af5834ffc73ba14176d63ef61410
Author: mseidel 
AuthorDate: Sun Feb 12 21:58:06 2023 +0100

Cleaned up resource file

(cherry picked from commit 8e0f63ef5cd4f3fd5d559c5a2b406b071dcf1866)
---
 main/sd/source/ui/annotations/annotations.src | 164 +-
 1 file changed, 83 insertions(+), 81 deletions(-)

diff --git a/main/sd/source/ui/annotations/annotations.src 
b/main/sd/source/ui/annotations/annotations.src
index 8ea30eaf23..a30d0f1ba5 100644
--- a/main/sd/source/ui/annotations/annotations.src
+++ b/main/sd/source/ui/annotations/annotations.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.
- * 
+ *
  */
 
 
@@ -32,76 +32,76 @@ Menu RID_ANNOTATION_CONTEXTMENU
{
MenuItem
{
-   Identifier = SID_REPLYTO_POSTIT;
-   HelpId = CMD_SID_REPLYTO_POSTIT ;
-   Text [ en-US ] = "~Reply";
+   Identifier = SID_REPLYTO_POSTIT ;
+   HelpId = CMD_SID_REPLYTO_POSTIT ;
+   Text [ en-US ] = "~Reply" ;
};
MenuItem
{
-   Separator = TRUE;
+   Separator = TRUE ;
};
MenuItem
{
-   Identifier = SID_ATTR_CHAR_WEIGHT;
-   HelpId = CMD_SID_ATTR_CHAR_WEIGHT ;
-   Text [ en-US ] = "~Bold";
+   Identifier = SID_ATTR_CHAR_WEIGHT ;
+   HelpId = CMD_SID_ATTR_CHAR_WEIGHT ;
+   Text [ en-US ] = "~Bold" ;
};
MenuItem
{
-   Identifier = SID_ATTR_CHAR_POSTURE;
-   HelpId = CMD_SID_ATTR_CHAR_POSTURE;
-   Text [ en-US ] = "~Italic";
+   Identifier = SID_ATTR_CHAR_POSTURE ;
+   HelpId = CMD_SID_ATTR_CHAR_POSTURE ;
+   Text [ en-US ] = "~Italic" ;
};
MenuItem
{
-   Identifier = SID_ATTR_CHAR_UNDERLINE;
-   HelpId = CMD_SID_ATTR_CHAR_UNDERLINE;
-   Text [ en-US ] = "~Underline";
+   Identifier = SID_ATTR_CHAR_UNDERLINE ;
+   HelpId = CMD_SID_ATTR_CHAR_UNDERLINE ;
+   Text [ en-US ] = "~Underline" ;
};
MenuItem
{
-   Identifier = SID_ATTR_CHAR_STRIKEOUT;
-   HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT;
-   Text [ en-US ] = "~Strikethrough";
+   Identifier = SID_ATTR_CHAR_STRIKEOUT ;
+   HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT ;
+   Text [ en-US ] = "~Strikethrough" ;
};
MenuItem
{
-   Separator = TRUE;
-   };  
+   Separator = TRUE ;
+   };
MenuItem
{
-   Identifier = SID_COPY ;
-   HelpId = CMD_SID_COPY ;
-   Text [ en-US ] = "~Copy" ;
+   Identifier = SID_COPY ;
+   HelpId = CMD_SID_COPY ;
+   Text [ en-US ] = "~Copy" ;
};
MenuItem
{
-   Identifier = SID_PASTE ;
-   HelpId = CMD_SID_PASTE ;
-   Text [ en-US ] = "~Paste" ;
+   Identifier = SID_PASTE ;
+   HelpId = CMD_SID_PASTE ;
+   Text [ en-US ] = "~Paste" ;
};
MenuItem
{
-  

[openoffice] branch AOO42X updated: Cleaned up resource file

2023-01-23 Thread mseidel
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 112d27fba8 Cleaned up resource file
112d27fba8 is described below

commit 112d27fba8aa17a2f79bb9aa6524536f1cbc1c31
Author: mseidel 
AuthorDate: Mon Jan 23 17:38:56 2023 +0100

Cleaned up resource file

(cherry picked from commit 31e9cb6669564c40e223fe09816d948e4515cc5a)
---
 main/padmin/source/padialog.src | 1250 +++
 1 file changed, 625 insertions(+), 625 deletions(-)

diff --git a/main/padmin/source/padialog.src b/main/padmin/source/padialog.src
index ba93bbea99..664fe27100 100644
--- a/main/padmin/source/padialog.src
+++ b/main/padmin/source/padialog.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,1194 +25,1194 @@
 
 ModalDialog RID_FONTIMPORT_DIALOG
 {
-HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG";
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 230 , 185 );
-Moveable = TRUE ;
-Closeable = TRUE ;
-
-ListBox RID_FIMP_BOX_NEWFONTS
-{
-HelpID = "padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS";
-Border = TRUE;
-Sort=TRUE;
-   AutoHScroll = TRUE;
-Pos = MAP_APPFONT( 5, 5 );
-Size = MAP_APPFONT( 155, 75 );
-};
-FixedText RID_FIMP_TXT_HELP
-{
-Pos = MAP_APPFONT( 5, 155 );
-Size = MAP_APPFONT( 220, 24 );
-WordBreak=TRUE;
-   Text [ en-US ] = "Please select the folder from which you want to 
import fonts. Add the selected fonts by clicking the OK button.";
+   HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG" ;
+   OutputSize = TRUE ;
+   SVLook = TRUE ;
+   Size = MAP_APPFONT ( 230, 185 ) ;
+   Moveable = TRUE ;
+   Closeable = TRUE ;
+
+   ListBox RID_FIMP_BOX_NEWFONTS
+   {
+   HelpID = 
"padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS" ;
+   Border = TRUE ;
+   Sort=TRUE ;
+   AutoHScroll = TRUE ;
+   Pos = MAP_APPFONT ( 5, 5 ) ;
+   Size = MAP_APPFONT ( 155, 75 ) ;
+   };
+   FixedText RID_FIMP_TXT_HELP
+   {
+   Pos = MAP_APPFONT ( 5, 155 ) ;
+   Size = MAP_APPFONT ( 220, 24 ) ;
+   WordBreak=TRUE ;
+   Text [ en-US ] = "Please select the folder from which you want 
to import fonts. Add the selected fonts by clicking the OK button." ;
};
FixedLine RID_FIMP_FL_FROM
{
-   Pos = MAP_APPFONT( 5, 85 );
-   Size = MAP_APPFONT( 160, 8 );
-   Text [ en-US ] = "Source directory";
+   Pos = MAP_APPFONT ( 5, 85 ) ;
+   Size = MAP_APPFONT ( 160, 8 ) ;
+   Text [ en-US ] = "Source directory" ;
};
Edit RID_FIMP_EDT_FROM
{
-   HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM";
-   Border = TRUE;
-   Pos = MAP_APPFONT( 10, 97 );
-   Size = MAP_APPFONT( 130, 12 );
+   HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM" ;
+   Border = TRUE ;
+   Pos = MAP_APPFONT ( 10, 97 ) ;
+   Size = MAP_APPFONT ( 130, 12 ) ;
};
PushButton RID_FIMP_BTN_FROM
{
-   HelpID = 
"padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM";
-   Pos = MAP_APPFONT( 145, 97 );
-   Size = MAP_APPFONT( 15, 12 );
-   Text = "...";
-   };
-CheckBox RID_FIMP_BOX_SUBDIRS
-{
-HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_SUBDIRS";
-Pos = MAP_APPFONT( 10, 115 );
-Size = MAP_APPFONT( 145, 10 );
-Text [ en-US ] = "Sea~rch Subdirectories";
-};
-FixedLine RID_FIMP_FL_TARGETOPTS
-{
-Pos = MAP_APPFONT( 5, 130 );
-Size = MAP_APPFONT( 160, 8 );
-Text [ 

[openoffice] branch AOO42X updated: Cleaned up resource file

2023-01-17 Thread mseidel
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 7bbad9506b Cleaned up resource file
7bbad9506b is described below

commit 7bbad9506b9efd056af19d6360abc7a5828eac44
Author: mseidel 
AuthorDate: Tue Jan 17 15:03:30 2023 +0100

Cleaned up resource file

(cherry picked from commit 7eef9b795aa500b1565a2367eef7ad1581659a86)
---
 main/dbaccess/source/ui/misc/WizardPages.src | 577 +++
 1 file changed, 240 insertions(+), 337 deletions(-)

diff --git a/main/dbaccess/source/ui/misc/WizardPages.src 
b/main/dbaccess/source/ui/misc/WizardPages.src
index 2de8cbb0a4..e0de9e0ed9 100644
--- a/main/dbaccess/source/ui/misc/WizardPages.src
+++ b/main/dbaccess/source/ui/misc/WizardPages.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,81 +31,80 @@
 #include "dbaccess_helpid.hrc"
 #endif
 
-#include "dbaccess_slotid.hrc"  
+#include "dbaccess_slotid.hrc"
 
-#define WINDOW_SIZE_X   276
+#define WINDOW_SIZE_X  276
 #define WINDOW_SIZE_Y  185
 
-#define WINDOW_BORDER_X 12
-#define WINDOW_BORDER_Y 14
+#define WINDOW_BORDER_X12
+#define WINDOW_BORDER_Y14
 
-#define BUTTON_SIZE_X   50
-#define BUTTON_SIZE_Y   14
+#define BUTTON_SIZE_X  50
+#define BUTTON_SIZE_Y  14
 
 String STR_WIZ_COLUMN_SELECT_TITEL
 {
-   Text [ en-US ] = "Apply columns";
+   Text [ en-US ] = "Apply columns" ;
 };
 
 String STR_WIZ_TYPE_SELECT_TITEL
 {
-   Text [ en-US ] = "Type formatting";
+   Text [ en-US ] = "Type formatting" ;
 };
 
 String STR_WIZ_PKEY_ALREADY_DEFINED
 {
-   Text [ en-US ] = "The following fields have already been set as primary 
keys:\n";
+   Text [ en-US ] = "The following fields have already been set as primary 
keys:\n" ;
 };
 
 String STR_WIZ_NAME_MATCHING_TITEL
 {
-   Text [ en-US ]  = "Assign columns" ;
+   Text [ en-US ] = "Assign columns" ;
 };
 
 ModalDialog WIZ_RTFCOPYTABLE
 {
-HelpID = "dbaccess:ModalDialog:WIZ_RTFCOPYTABLE";
+   HelpID = "dbaccess:ModalDialog:WIZ_RTFCOPYTABLE" ;
 
Text [ en-US ] = "Copy RTF Table" ;
 
+   OutputSize = TRUE ;
+   SVLook = TRUE ;
+   Moveable = TRUE ;
+   Closeable = TRUE ;
+   Hide = TRUE ;
 
-   OutputSize  = TRUE ;
-   SVLook  = TRUE ;
-   Moveable= TRUE ;
-   Closeable   = TRUE ;
-   Hide= TRUE;
-
-HelpButton PB_HELP
+   HelpButton PB_HELP
{
-   TabStop = TRUE ;
-   Size= MAP_APPFONT ( BUTTON_SIZE_X , 
BUTTON_SIZE_Y ) ;
-   Text [ en-US ] = "~Help";
+   TabStop = TRUE ;
+   Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+   Text [ en-US ] = "~Help" ;
};
CancelButton PB_CANCEL
{
-   TabStop = TRUE ;
-   Size= MAP_APPFONT ( BUTTON_SIZE_X , 
BUTTON_SIZE_Y ) ;
-   Text [ en-US ] = "~Cancel";
+   TabStop = TRUE ;
+   Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+   Text [ en-US ] = "~Cancel" ;
};
PushButton PB_PREV
{
-   HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV";
-   TabStop = TRUE ;
-   Size= MAP_APPFONT ( BUTTON_SIZE_X , 
BUTTON_SIZE_Y ) ;
-   Text [ en-US ] = "< ~Back";
+   HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV" ;
+   TabStop = TRUE ;
+   Size = MAP_APPFONT ( BUTTON_SIZE_X, BUTTON_SIZE_Y ) ;
+   Text [ en-US ] = "< ~Back" ;
};
PushButton PB_NEXT
{
-   HelpID = "dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_NEXT";
-   TabStop

[openoffice] branch AOO42X updated: Cleaned up resource file

2022-09-17 Thread mseidel
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 a455b7f44a Cleaned up resource file
a455b7f44a is described below

commit a455b7f44a40a4a71c04c4cddab283286df97506
Author: mseidel 
AuthorDate: Sat Sep 17 17:38:23 2022 +0200

Cleaned up resource file

(cherry picked from commit a5eec534055ac9435019123c230f0b97484dd922)
---
 .../source/ext/macromigration/macromigration.src   | 560 +++--
 1 file changed, 281 insertions(+), 279 deletions(-)

diff --git a/main/dbaccess/source/ext/macromigration/macromigration.src 
b/main/dbaccess/source/ext/macromigration/macromigration.src
index e3167fc933..cabb279858 100644
--- a/main/dbaccess/source/ext/macromigration/macromigration.src
+++ b/main/dbaccess/source/ext/macromigration/macromigration.src
@@ -1,22 +1,22 @@
 /**
- * 
+ *
  * 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
  * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
+ * "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.
- * 
+ *
  */
 
 
@@ -27,33 +27,33 @@
 // 
-
 ModalDialog DLG_MACRO_MIGRATION
 {
-HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION";
+   HelpID = "dbaccess:ModalDialog:DLG_MACRO_MIGRATION" ;
OutputSize = TRUE ;
-   Moveable = TRUE;
+   Moveable = TRUE ;
Closeable = TRUE ;
-   Hide = TRUE;
+   Hide = TRUE ;
 
-Text[ en-US ]  = "Database Document Macro Migration" ;
+   Text [ en-US ] = "Database Document Macro Migration" ;
 
-String STR_STATE_CLOSE_SUB_DOCS
-{
-Text [ en-US ] = "Prepare";
-};
+   String STR_STATE_CLOSE_SUB_DOCS
+   {
+   Text [ en-US ] = "Prepare" ;
+   };
 
-String STR_STATE_BACKUP_DBDOC
-{
-Text [ en-US ] = "Backup Document";
-};
+   String STR_STATE_BACKUP_DBDOC
+   {
+   Text [ en-US ] = "Backup Document" ;
+   };
 
-String STR_STATE_MIGRATE
-{
-Text [ en-US ] = "Migrate";
-};
+   String STR_STATE_MIGRATE
+   {
+   Text [ en-US ] = "Migrate" ;
+   };
 
-String STR_STATE_SUMMARY
-{
-Text [ en-US ] = "Summary";
-};
+   String STR_STATE_SUMMARY
+   {
+   Text [ en-US ] = "Summary" ;
+   };
 };
 
 //
@@ -62,39 +62,39 @@ ModalDialog DLG_MACRO_MIGRATION
 
 TabPage TP_PREPARE
 {
-HelpID = "dbaccess:TabPage:TP_PREPARE";
-Pos = MAP_APPFONT( 40, 130 );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
-Hide = TRUE;
-
-FixedText FT_HEADER
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, 
FIXED_TEXT_HEIGHT );
-
-Text [ en-US ] = "Welcome to the Database Macro Migration Wizard";
-};
-
-FixedText FT_INTRODUCTION
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - CONTENT_POS_X - 
TAB_PAGE_CONTENT_MARGIN - ( 2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-WordBreak = TRUE;
-
-Text [ en-US ] = "This wizard will guide you through the task of 
migrating your macros.\n\nAfter you finished it, all macros which were formerly 
embedded into the forms and reports of the current database document will have 
been moved to the document itself. In this course, libraries will be renamed as 
needed.\n\nIf your forms and reports contain references to those macros, they 
will be adjusted, where possible.\n\nBefore the migration can start, all forms, 
reports, queries and t [...]
-};
-
-FixedText FT_CLOSE_DOC_ERROR
-{
-Pos = MAP_APPFONT ( TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - TAB_PAGE_CONTENT_MARGIN - ( 

[openoffice] branch AOO42X updated: Cleaned up resource file

2022-09-06 Thread mseidel
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 c1236e1e1f Cleaned up resource file
c1236e1e1f is described below

commit c1236e1e1f746bf617ef68da166f4ed2eef4cfa3
Author: mseidel 
AuthorDate: Tue Sep 6 13:25:58 2022 +0200

Cleaned up resource file

(cherry picked from commit deffb4aca2480e89b12a6e4d4de5e548ba60a8a2)
---
 main/reportdesign/source/ui/report/report.src | 312 +-
 1 file changed, 155 insertions(+), 157 deletions(-)

diff --git a/main/reportdesign/source/ui/report/report.src 
b/main/reportdesign/source/ui/report/report.src
index 5949ae463d..7c4b3dcfda 100644
--- a/main/reportdesign/source/ui/report/report.src
+++ b/main/reportdesign/source/ui/report/report.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 "RptResId.hrc"
 #include "rptui_slotid.hrc"
 #ifndef _GLOBLMN_HRC
@@ -54,15 +55,15 @@ String RID_STR_CLASS_FORMATTEDFIELD
 
 String RID_STR_BRWTITLE_PROPERTIES
 {
-   Text [ en-US ] = "Properties: ";
+   Text [ en-US ] = "Properties: " ;
 };
 String RID_STR_BRWTITLE_NO_PROPERTIES
 {
-   Text [ en-US ] = "No Control marked";
+   Text [ en-US ] = "No Control marked" ;
 };
 String RID_STR_BRWTITLE_MULTISELECT
 {
-   Text [ en-US ] = "Multiselection";
+   Text [ en-US ] = "Multiselection" ;
 };
 
 String RID_STR_PROPTITLE_IMAGECONTROL
@@ -79,139 +80,135 @@ String RID_STR_PROPTITLE_FIXEDLINE
 };
 String RID_STR_PROPTITLE_FORMATTED
 {
-   Text [ en-US ] = "Formatted Field";
+   Text [ en-US ] = "Formatted Field" ;
 };
 String RID_STR_PROPTITLE_SHAPE
 {
-   Text [ en-US ] = "Shape";
+   Text [ en-US ] = "Shape" ;
 };
 String RID_STR_PROPTITLE_REPORT
 {
-   Text [ en-US ] = "Report";
+   Text [ en-US ] = "Report" ;
 };
 String RID_STR_PROPTITLE_SECTION
 {
-   Text [ en-US ] = "Section";
+   Text [ en-US ] = "Section" ;
 };
 String RID_STR_PROPTITLE_FUNCTION
 {
-   Text [ en-US ] = "Function";
+   Text [ en-US ] = "Function" ;
 };
 String RID_STR_PROPTITLE_GROUP
 {
-   Text [ en-US ] = "Group";
+   Text [ en-US ] = "Group" ;
 };
 // ---
 
 Image RID_IMG_TREENODE_COLLAPSED
 {
-   ImageBitmap = Bitmap { File = "plus.png"; } ;
-MaskColor = Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; };
+   ImageBitmap = Bitmap { File = "plus.png" ; } ;
 };
 
 Image RID_IMG_TREENODE_EXPANDED
 {
-   ImageBitmap = Bitmap { File = "minus.png"; } ;
-MaskColor = Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; };
+   ImageBitmap = Bitmap { File = "minus.png" ; } ;
 };
 
 Image RID_IMG_TREENODE_COLLAPSED_HC
 {
-   ImageBitmap = Bitmap { File = "plus_sch.png"; } ;
-MaskColor = Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; };
+   ImageBitmap = Bitmap { File = "plus_sch.png" ; } ;
 };
 
 Image RID_IMG_TREENODE_EXPANDED_HC
 {
-   ImageBitmap = Bitmap { File = "minus_sch.png"; } ;
-MaskColor = Color { Red = 0xFF00; Green = 0x; Blue = 0xFF00; };
+   ImageBitmap = Bitmap { File = "minus_sch.png" ; } ;
 };
 
 String STR_SHOW_RULER
 {
-   Text [ en-US ] = "Show ruler";
+   Text [ en-US ] = "Show ruler" ;
 };
 
 String STR_SHOW_GRID
 {
-   Text [ en-US ] = "Show grid";
+   Text [ en-US ] = "Show grid" ;
 };
 
 String RID_STR_UNDO_CHANGEPOSITION
 {
-   Text [ en-US ] = "Change Object";
+   Text [ en-US ] = "Change Object" ;
 };
 String RID_STR_UNDO_MOVE_GROUP
 {
-   Text [ en-US ] = "Move Group(s)";
+   Text [ en-US ] = "Move Group(s)" ;
 };
 String RID_STR_UNDO_CONDITIONAL_FORMATTING
 {
-   Text [ en-US ] = "Conditional Formatting";
+   Text [ en-US ] = "Conditional Formatting" ;
 };
 String RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER
 {
-   Text [ en-US ] = "Remove report header / report footer";
+   Text [ en-US ] = "Remove report header / report 

[openoffice] branch AOO42X updated: Cleaned up resource file, removed whitespace

2022-06-10 Thread mseidel
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 fa5c067cde Cleaned up resource file, removed whitespace
fa5c067cde is described below

commit fa5c067cdef6d03dba9252e0b0ebdacd03dbde0a
Author: mseidel 
AuthorDate: Sat Jun 11 00:45:22 2022 +0200

Cleaned up resource file, removed whitespace

(cherry picked from commit d42a595daaa6d99342c3923b65ea5204784cb7d0)
---
 main/framework/source/services/fwk_services.src | 371 
 1 file changed, 186 insertions(+), 185 deletions(-)

diff --git a/main/framework/source/services/fwk_services.src 
b/main/framework/source/services/fwk_services.src
index 5a1d17f8f7..09960e0682 100644
--- a/main/framework/source/services/fwk_services.src
+++ b/main/framework/source/services/fwk_services.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,199 +25,200 @@
 
 Window DLG_BACKING
 {
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Border = FALSE;
+   OutputSize = TRUE ;
+   SVLook = TRUE ;
+   Border = FALSE ;
 
-String STR_BACKING_WELCOME
-{
-Text [ en-US ] = "Welcome to";
-};
-String STR_BACKING_WELCOMEPRODUCT
-{
-Text [ en-US ] = "%PRODUCTNAME";
-};
-String STR_BACKING_CREATE
-{
-Text [ en-US ] = "Create a new document";
-};
-String STR_BACKING_TEMPLATE
-{
-Text [ en-US ] = "~Templates...";
-};
-String STR_BACKING_FILE
-{
-Text [ en-US ] = "~Open...";
-};
-String STR_BACKING_EXTHELP
-{
-Text [ en-US ] = "Add new features to %PRODUCTNAME";
-};
-String STR_BACKING_REGHELP
-{
-Text [ en-US ] = "Register your %PRODUCTNAME";
-};
-String STR_BACKING_INFOHELP
-{
-Text [ en-US ] = "Get more information about %PRODUCTNAME";
-};
-String STR_BACKING_TPLREP
-{
-Text [ en-US ] = "Get more templates for %PRODUCTNAME";
-};
+   String STR_BACKING_WELCOME
+   {
+   Text [ en-US ] = "Welcome to" ;
+   };
+   String STR_BACKING_WELCOMEPRODUCT
+   {
+   Text [ en-US ] = "%PRODUCTNAME" ;
+   };
+   String STR_BACKING_CREATE
+   {
+   Text [ en-US ] = "Create a new document" ;
+   };
+   String STR_BACKING_TEMPLATE
+   {
+   Text [ en-US ] = "~Templates..." ;
+   };
+   String STR_BACKING_FILE
+   {
+   Text [ en-US ] = "~Open..." ;
+   };
+   String STR_BACKING_EXTHELP
+   {
+   Text [ en-US ] = "Add new features to %PRODUCTNAME" ;
+   };
+   String STR_BACKING_REGHELP
+   {
+   Text [ en-US ] = "Register your %PRODUCTNAME" ;
+   };
+   String STR_BACKING_INFOHELP
+   {
+   Text [ en-US ] = "Get more information about %PRODUCTNAME" ;
+   };
+   String STR_BACKING_TPLREP
+   {
+   Text [ en-US ] = "Get more templates for %PRODUCTNAME" ;
+   };
 };
 
 Resource RES_BACKING_IMAGES
 {
-Bitmap BMP_BACKING_BACKGROUND_LEFT
-{
-File = "backing.png";
-};
-Bitmap BMP_BACKING_BACKGROUND_MIDDLE
-{
-File = "backing_space.png";
-};
-Bitmap BMP_BACKING_BACKGROUND_RIGHT
-{
-File = "backing_right.png";
-};
-Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
-{
-File = "backing_rtl_left.png";
-};
-Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
-{
-File = "backing_rtl_right.png";
-};
-Bitmap BMP_BACKING_EXT
-{
-File = "extension.png";
-};
-Bitmap BMP_BACKING_REG
-{
-File = "register_32.png";
-};
-Bitmap BMP_BACKING_INFO
-{
-File = "info_26.png";
-};
-Bitmap BMP_BACKING_TPLREP
-{
-File = "addtemplate_32.png";
-};
-Bitmap BMP_BACKING_WRITER
-{
-File = "odt_32.png";
-};
-Bitmap BMP_BACKING_CALC
-{
-   

[openoffice] branch AOO42X updated: Cleaned up resource file

2020-07-21 Thread mseidel
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 ad5621c  Cleaned up resource file
ad5621c is described below

commit ad5621ca55f982f7361485105ad1ec0f3e1af87f
Author: mseidel 
AuthorDate: Tue Jul 21 13:57:33 2020 +0200

Cleaned up resource file

(cherry picked from commit 42387d93837003be305db4101fd717620c62d1d6)
---
 main/cui/source/tabpages/autocdlg.src | 588 +++---
 1 file changed, 252 insertions(+), 336 deletions(-)

diff --git a/main/cui/source/tabpages/autocdlg.src 
b/main/cui/source/tabpages/autocdlg.src
index 1482041..a401f90 100644
--- a/main/cui/source/tabpages/autocdlg.src
+++ b/main/cui/source/tabpages/autocdlg.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,30 +7,29 @@
  * 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 --
+
+// include --
 #include "autocdlg.hrc"
 #include 
 #include "helpid.hrc"
 #include  // SID_AUTOFORMAT
 
- // pragma ---
+// pragma ---
 /**/
-/**/
-/*  TabDialog RID_OFA_AUTOCORR_DLG*/
-/**/
+/* TabDialog RID_OFA_AUTOCORR_DLG */
 /**/
 TabDialog RID_OFA_AUTOCORR_DLG
 {
@@ -71,27 +70,27 @@ TabDialog RID_OFA_AUTOCORR_DLG
PageItem
{
Identifier = RID_OFAPAGE_AUTOCOMPLETE_OPTIONS ;
-   Text [ en-US ] = "Word Completion";
+   Text [ en-US ] = "Word Completion" ;
};
PageItem
{
Identifier = RID_OFAPAGE_SMARTTAG_OPTIONS ;
-   Text [ en-US ] = "Smart Tags";
+   Text [ en-US ] = "Smart Tags" ;
};
};
};
FixedText FT_LANG
{
-   Pos = MAP_APPFONT ( 6 , 3 ) ;
-   Size = MAP_APPFONT ( 140 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 3 ) ;
+   Size = MAP_APPFONT ( 140, 8 ) ;
 
Left = TRUE ;
-   Text [ en-US ] = "Replacements and exceptions for language:";
+   Text [ en-US ] = "Replacements and exceptions for language:" ;
};
ListBox LB_LANG
{
-   Pos = MAP_APPFONT ( 150 , 3 ) ;
-Size = MAP_APPFONT ( 60 , 100 ) ;
+   Pos = MAP_APPFONT ( 150, 3 ) ;
+   Size = MAP_APPFONT ( 60, 100 ) ;
DropDown = TRUE;
TabStop = TRUE ;
Border = TRUE ;
@@ -122,28 +121,26 @@ TabDialog RID_OFA_AUTOCORR_DLG
 { \
 Text [ en-US ] = "URL Recognition" ; \
}; \
-String ST_DASH \
-{ \
-Text [ en-US ] = "Replace dashes" ; \
-};
+   String ST_DASH \
+   { \
+   Text [ en-US ] = "Replace dashes" ; \
+   };
 
 /**/
-/**/
-/*  Beschreibung: Autokorrektur-Optionen  */
-/**/
+/* Beschreibung: Autokorrektur-Optionen   */
 /**/
 TabPage RID_OFAPAGE_AUTOCORR_OPTIONS
 {
HelpId 

[openoffice] branch AOO42X updated: Cleaned up resource file

2020-06-01 Thread mseidel
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 f823b1d  Cleaned up resource file
f823b1d is described below

commit f823b1dd0157aaa96db24355aa3990b32e5b82c3
Author: mseidel 
AuthorDate: Mon Jun 1 20:59:13 2020 +0200

Cleaned up resource file

(cherry picked from commit be37a4cb721df939292efeb157d4dc702545558e)
---
 main/sfx2/source/dialog/dinfdlg.src | 1075 +--
 1 file changed, 536 insertions(+), 539 deletions(-)

diff --git a/main/sfx2/source/dialog/dinfdlg.src 
b/main/sfx2/source/dialog/dinfdlg.src
index 7c22449..a181d45 100644
--- a/main/sfx2/source/dialog/dinfdlg.src
+++ b/main/sfx2/source/dialog/dinfdlg.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,21 +7,21 @@
  * 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 ---
+// include ---
 
 #include "sfx2/sfx.hrc"
 #include "helpid.hrc"
@@ -29,7 +29,7 @@
 #include "dinfdlg.hrc"
 #include "dialog.hrc"
 
- // TP_DOCINFODESC 
+// TP_DOCINFODESC 
 String STR_SFX_NEWOFFICEDOC
 {
Text [ en-US ] = "%PRODUCTNAME document" ;
@@ -39,188 +39,188 @@ TabPage TP_DOCINFODESC
 {
HelpId = HID_DOCINFODESC ;
Hide = TRUE ;
-   Size = MAP_APPFONT ( 260 , 185 ) ;
+   Size = MAP_APPFONT ( 260, 185 ) ;
FixedText FT_TITLE
{
-   Pos = MAP_APPFONT ( 6 , 7 ) ;
-Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+   Pos = MAP_APPFONT ( 6, 7 ) ;
+   Size = MAP_APPFONT ( 60, RSC_CD_FIXEDTEXT_HEIGHT ) ;
Left = TRUE ;
Text [ en-US ] = "~Title" ;
};
Edit ED_TITLE
{
-   HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_TITLE";
+   HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_TITLE" ;
Border = TRUE ;
-   Pos = MAP_APPFONT ( 70 , 6 ) ;
-Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
+   Pos = MAP_APPFONT ( 70, 6 ) ;
+   Size = MAP_APPFONT ( 184, RSC_CD_TEXTBOX_HEIGHT ) ;
TabStop = TRUE ;
Left = TRUE ;
};
FixedText FT_THEMA
{
-   Pos = MAP_APPFONT ( 6 , 22 ) ;
-Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+   Pos = MAP_APPFONT ( 6, 22 ) ;
+   Size = MAP_APPFONT ( 60, RSC_CD_FIXEDTEXT_HEIGHT ) ;
Left = TRUE ;
Text [ en-US ] = "~Subject" ;
};
Edit ED_THEMA
{
-   HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_THEMA";
+   HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_THEMA" ;
Border = TRUE ;
-   Pos = MAP_APPFONT ( 70 , 21 ) ;
-Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
+   Pos = MAP_APPFONT ( 70, 21 ) ;
+   Size = MAP_APPFONT ( 184, RSC_CD_TEXTBOX_HEIGHT ) ;
TabStop = TRUE ;
Left = TRUE ;
};
FixedText FT_KEYWORDS
{
-   Pos = MAP_APPFONT ( 6 , 37 ) ;
-Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+   Pos = MAP_APPFONT ( 6, 37 ) ;
+   Size = MAP_APPFONT ( 60, RSC_CD_FIXEDTEXT_HEIGHT ) ;
Left = TRUE ;
Text [ en-US ] = "~Keywords" ;
};
Edit ED_KEYWORDS
{
-   HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS";
+   HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS" ;
Border = TRUE ;
-   Pos = MAP_APPFONT ( 70 , 36 ) ;
-Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ;
+   Pos = MAP_APPFONT ( 70, 36 ) ;
+   Size = MAP_APPFONT ( 184, RSC_CD_TEXTBOX_HEIGHT ) ;
TabStop = TRUE ;
 

[openoffice] branch AOO42X updated: Cleaned up resource file

2020-05-29 Thread mseidel
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 8b991d7  Cleaned up resource file
8b991d7 is described below

commit 8b991d742a8fc7a321c67532d8012f2f20bfc21d
Author: mseidel 
AuthorDate: Fri May 29 19:26:46 2020 +0200

Cleaned up resource file

(cherry picked from commit 257a218158c7b0af626a3cef6c19c6ec72f13d5b)
---
 main/extensions/source/dbpilots/gridpages.src | 86 +--
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/main/extensions/source/dbpilots/gridpages.src 
b/main/extensions/source/dbpilots/gridpages.src
index 9dcb762..68ee99a 100644
--- a/main/extensions/source/dbpilots/gridpages.src
+++ b/main/extensions/source/dbpilots/gridpages.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.
- * 
+ *
  */
 
 
@@ -27,91 +27,91 @@
 
 TabPage RID_PAGE_GW_FIELDSELECTION
 {
-HelpID = "extensions:TabPage:RID_PAGE_GW_FIELDSELECTION";
+   HelpID = "extensions:TabPage:RID_PAGE_GW_FIELDSELECTION" ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+   Size = MAP_APPFONT ( WINDOW_SIZE_X, WINDOW_SIZE_Y ) ;
 
-   Text [ en-US ] = "Field Selection";
+   Text [ en-US ] = "Field Selection" ;
 
FixedLine FL_FRAME
{
-   Pos = MAP_APPFONT ( 4 , 40  ) ;
-   Size = MAP_APPFONT ( WINDOW_SIZE_X - 8 , 8 ) ;
-   Text [ en-US ] = "Table element";
+   Pos = MAP_APPFONT ( 4, 40 ) ;
+   Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8 ) ;
+   Text [ en-US ] = "Table element" ;
};
 
FixedText FT_EXISTING_FIELDS
{
-   Pos = MAP_APPFONT ( 7, 52 );
-   Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 
2 - 13, 8 );
-   Text [ en-US ] = "Existing fields";
+   Pos = MAP_APPFONT ( 7, 52 ) ;
+   Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 
2 - 13, 8 ) ;
+   Text [ en-US ] = "Existing fields" ;
};
ListBox LB_EXISTING_FIELDS
{
-   HelpID = 
"extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS";
-   Pos = MAP_APPFONT ( 7 , 63  ) ;
+   HelpID = 
"extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS" ;
+   Pos = MAP_APPFONT ( 7, 63 ) ;
Size = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 
2 - 13, WINDOW_SIZE_Y - 63 - 6 ) ;
SVLook = TRUE ;
Border = TRUE ;
AutoHScroll = TRUE ;
-   Sort = FALSE;
-   DropDown = FALSE;
+   Sort = FALSE ;
+   DropDown = FALSE ;
};
PushButton PB_FIELDRIGHT
{
-   HelpID = 
"extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT";
-   Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 
2, 63 );
-   Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
-   Text = "->";
+   HelpID = 
"extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT" ;
+   Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 
2, 63 ) ;
+   Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y ) ;
+   Text = ">" ;
};
PushButton PB_ALLFIELDSRIGHT
{
-   HelpID = 
"extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT";
-   Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 
2, 63 + ITEM_BUTTON_SIZE_Y + 3 );
-   Size = MAP_APPFONT ( ITEM_BUTTON_SIZE_X, ITEM_BUTTON_SIZE_Y );
-   Text = "=>>";
+   HelpID = 
"extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT" ;
+   Pos = MAP_APPFONT ( WINDOW_HALF_SIZE_X - ITEM_BUTTON_SIZE_X / 
2, 63 + ITEM_BUTTON_SIZE_Y + 3 ) ;
+  

[openoffice] branch AOO42X updated: Cleaned up resource file, fixes strings

2020-05-29 Thread mseidel
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 0afd15c  Cleaned up resource file, fixes strings
0afd15c is described below

commit 0afd15c5abe8eb5df9e4c7f964c5803e0fb81db2
Author: mseidel 
AuthorDate: Fri May 29 10:48:08 2020 +0200

Cleaned up resource file, fixes strings

(cherry picked from commit 4c3db3b63df8cae205890d1284d28fef5de807a3)
---
 main/wizards/source/formwizard/dbwizres.src | 1398 +--
 1 file changed, 688 insertions(+), 710 deletions(-)

diff --git a/main/wizards/source/formwizard/dbwizres.src 
b/main/wizards/source/formwizard/dbwizres.src
index 312d6ab..eeae193 100644
--- a/main/wizards/source/formwizard/dbwizres.src
+++ b/main/wizards/source/formwizard/dbwizres.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,52 +7,54 @@
  * 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.
- * 
+ *
  */
 
+
+
 // common
 
 #define RID_COMMON_START   500
-#define RID_DB_COMMON_START1000
+#define RID_DB_COMMON_START1000
 
 // db wizards
 
 #define RID_DB_FORM_WIZARD_START   2200
 #define RID_DB_QUERY_WIZARD_START  2300
-#define RID_DB_REPORT_WIZARD_START 2400
-#define RID_DB_TABLE_WIZARD_START  2500
+#define RID_DB_REPORT_WIZARD_START 2400
+#define RID_DB_TABLE_WIZARD_START  2500
 
 
 #define RID_LETTERWIZARDDIALOG_START   3000
-#define RID_LETTERWIZARDGREETING_START 3080
+#define RID_LETTERWIZARDGREETING_START 3080
 #define RID_LETTERWIZARDSALUTATION_START   3090
-#define RID_LETTERWIZARDROADMAP_START  3100
-#define RID_LETTERWIZARDLANGUAGE_START 3110
+#define RID_LETTERWIZARDROADMAP_START  3100
+#define RID_LETTERWIZARDLANGUAGE_START 3110
 
 
 #define RID_FAXWIZARDDIALOG_START  3200
 #define RID_FAXWIZARDCOMMUNICATION_START   3270
-#define RID_FAXWIZARDGREETING_START3280
+#define RID_FAXWIZARDGREETING_START3280
 #define RID_FAXWIZARDSALUTATION_START  3290
-#define RID_FAXWIZARDROADMAP_START 3300
+#define RID_FAXWIZARDROADMAP_START 3300
 
 // web wizard
 
 #define RID_WEBWIZARDDIALOG_START  4000
-#define RID_WEBWIZARDDIALOG_FTP4200
+#define RID_WEBWIZARDDIALOG_FTP4200
 
 // agenda wizard
 
-#define RID_AGENDAWIZARDDIALOG_START  5000
+#define RID_AGENDAWIZARDDIALOG_START   5000
 
 
 
@@ -60,112 +62,112 @@
 
 String RID_COMMON_START + 0
 {
-   Text [ en-US ] = "The directory '%1' could not be created.There may 
not be enough space left on your hard disk.";
+   Text [ en-US ] = "The directory '%1' could not be created.There may 
not be enough space left on your hard disk." ;
 };
 
 String RID_COMMON_START + 1
 {
-   Text [ en-US] = "The text document could not be created.Please 
check if the module 'PRODUCTNAME Writer' is installed.";
+   Text [ en-US] = "The text document could not be created.Please 
check if the module 'PRODUCTNAME Writer' is installed." ;
 };
 
 String RID_COMMON_START + 2
 {
-   Text [ en-US] = "The spreadsheet could not be created.Please check 
if the module 'PRODUCTNAME Calc' is installed.";
+   Text [ en-US] = "The spreadsheet could not be created.Please check 
if the module 'PRODUCTNAME Calc' is installed." ;
 };
 
 String RID_COMMON_START + 3
 {
-   Text [ en-US] = "The presentation could not be created.Please check 
if the module 'PRODUCTNAME Impress' is installed.";
+   Text [ en-US] = "The presentation could not be created.Please check 
if the module 'PRODUCTNAME Impress' is installed." ;
 };
 
 String RID_COMMON_START + 4
 {
-   Text [ en-US] = "The drawing could not be created.Please check if 
the module 'PRODUCTNAME Draw' is installed.";
+   Text [ en-US] = "The 

[openoffice] branch AOO42X updated: Cleaned up resource file, decreased height

2020-05-25 Thread mseidel
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 01b93fc  Cleaned up resource file, decreased height
01b93fc is described below

commit 01b93fc100e23ecd4dda236e109b63f8e62f
Author: mseidel 
AuthorDate: Tue May 26 00:11:02 2020 +0200

Cleaned up resource file, decreased height

(cherry picked from commit ea9e98079ebedeb2f43d610fd451b496aa13689e)
---
 main/sw/source/ui/frmdlg/column.src | 86 +++--
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/main/sw/source/ui/frmdlg/column.src 
b/main/sw/source/ui/frmdlg/column.src
index 7591c36..bcfdbdd 100644
--- a/main/sw/source/ui/frmdlg/column.src
+++ b/main/sw/source/ui/frmdlg/column.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.
- * 
+ *
  */
 
 
@@ -32,19 +32,19 @@
 TabPage TP_COLUMN
 {
HelpID = HID_COLUMN ;
-   Hide = TRUE;
-   Size = MAP_APPFONT ( 260, 188 ) ;
+   Hide = TRUE ;
+   Size = MAP_APPFONT ( 260, 185 ) ;
Text [ en-US ] = "Columns" ;
FixedText FT_NUMBER
{
Pos = MAP_APPFONT ( 12, 19 ) ;
Size = MAP_APPFONT ( 28, 8 ) ;
Left = TRUE ;
-   Text [ en-US ] = "Columns";
+   Text [ en-US ] = "Columns" ;
};
NumericField ED_NUMBER
{
-   HelpID = "sw:NumericField:TP_COLUMN:ED_NUMBER";
+   HelpID = "sw:NumericField:TP_COLUMN:ED_NUMBER" ;
Border = TRUE ;
Pos = MAP_APPFONT ( 12, 30 ) ;
Size = MAP_APPFONT ( 24, 12 ) ;
@@ -67,24 +67,24 @@ TabPage TP_COLUMN
};
CheckBox CB_BALANCECOLS
{
-   HelpID = "sw:CheckBox:TP_COLUMN:CB_BALANCECOLS";
+   HelpID = "sw:CheckBox:TP_COLUMN:CB_BALANCECOLS" ;
Pos = MAP_APPFONT ( 7, 46 ) ;
Size = MAP_APPFONT ( 163, 10 ) ;
-   Hide = TRUE;
-   Text [ en-US ] = "Evenly distribute contents ~to all columns";
+   Hide = TRUE ;
+   Text [ en-US ] = "Evenly distribute contents ~to all columns" ;
};
FixedLine FL_COLUMNS
{
Pos = MAP_APPFONT ( 6, 3 ) ;
Size = MAP_APPFONT ( 164, 8 ) ;
-   Text [ en-US ] = "Settings";
+   Text [ en-US ] = "Settings" ;
};
FixedText FT_COLUMN
{
Pos = MAP_APPFONT ( 12, 70 ) ;
Size = MAP_APPFONT ( 50, 8 ) ;
Left = TRUE ;
-   Text [ en-US ] = "Column";
+   Text [ en-US ] = "Column" ;
};
Window WN_BSP
{
@@ -93,7 +93,7 @@ TabPage TP_COLUMN
};
ImageButton BTN_DOWN
{
-   HelpID = "sw:ImageButton:TP_COLUMN:BTN_DOWN";
+   HelpID = "sw:ImageButton:TP_COLUMN:BTN_DOWN" ;
Disable = TRUE ;
Pos = MAP_APPFONT ( 62, 69 ) ;
Size = MAP_APPFONT ( 10, 10 ) ;
@@ -123,7 +123,7 @@ TabPage TP_COLUMN
};
ImageButton BTN_UP
{
-   HelpID = "sw:ImageButton:TP_COLUMN:BTN_UP";
+   HelpID = "sw:ImageButton:TP_COLUMN:BTN_UP" ;
Disable = TRUE ;
Pos = MAP_APPFONT ( 238, 69 ) ;
Size = MAP_APPFONT ( 10, 10 ) ;
@@ -139,7 +139,7 @@ TabPage TP_COLUMN
};
MetricField ED_1
{
-   HelpID = "sw:MetricField:TP_COLUMN:ED_1";
+   HelpID = "sw:MetricField:TP_COLUMN:ED_1" ;
Disable = TRUE ;
Border = TRUE ;
Pos = MAP_APPFONT ( 87, 83 ) ;
@@ -158,7 +158,7 @@ TabPage TP_COLUMN
};
MetricField ED_2
{
-   HelpID = "sw:MetricField:TP_COLUMN:ED_2";
+   HelpID = "sw:MetricField:TP_COLUMN:ED_2" ;
Disable = TRUE ;
Border = TRUE ;
Pos 

[openoffice] branch AOO42X updated: Cleaned up resource file, minor changes in Help

2020-05-21 Thread mseidel
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 1f73b90  Cleaned up resource file, minor changes in Help
1f73b90 is described below

commit 1f73b90b3981a148eeb1297d9bc585bddd929647
Author: mseidel 
AuthorDate: Thu May 21 10:42:36 2020 +0200

Cleaned up resource file, minor changes in Help

(cherry picked from commit 66e89fe63daa1fe684f6cf0da1894e69c60355ed)
---
 main/dbaccess/source/ui/browser/sbabrw.src | 108 ++---
 .../helpcontent2/source/text/scalc/01/1201.xhp |   2 +-
 .../helpcontent2/source/text/scalc/01/12010100.xhp |   2 +-
 .../helpcontent2/source/text/scalc/01/1207.xhp |   2 +-
 .../helpcontent2/source/text/scalc/01/12070100.xhp |   2 +-
 .../source/text/swriter/01/05150101.xhp|   2 +-
 6 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/main/dbaccess/source/ui/browser/sbabrw.src 
b/main/dbaccess/source/ui/browser/sbabrw.src
index cce005e..188dcc5 100644
--- a/main/dbaccess/source/ui/browser/sbabrw.src
+++ b/main/dbaccess/source/ui/browser/sbabrw.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.
- * 
+ *
  */
 
 
+
 #ifndef _DBA_DBACCESS_HELPID_HRC_
 #include "dbaccess_helpid.hrc"
 #endif
@@ -29,7 +30,7 @@
 #ifndef DBACCESS_UI_BROWSER_ID_HXX
 #include "browserids.hxx"
 #endif
-// #include 
+// #include 
 #ifndef _GLOBLMN_HRC
 #include 
 #endif
@@ -39,14 +40,12 @@ QueryBox QUERY_BRW_SAVEMODIFIED
 {
Buttons = WB_YES_NO_CANCEL ;
DefButton = WB_DEF_YES ;
-   /* ### ACHTUNG: Neuer Text in Resource? Soll der ge�nderte Datensatz 
gespeichert werden? : Soll der ge�nderte Datensatz gespeichert werden? */
Message [ en-US ] = "The current record has been changed.\nDo you want 
to save the changes?" ;
 };
 
 QueryBox QUERY_BRW_DELETE_ROWS
 {
Buttons = WB_YES_NO ;
-   /* ### ACHTUNG: Neuer Text in Resource? Sollen die selektierten Daten 
gel�scht werden? : Sollen die selektierten Daten gel�scht werden? */
Message [ en-US ] = "Do you want to delete the selected data?" ;
 };
 
@@ -57,68 +56,68 @@ String RID_STR_DATABROWSER_FILTERED
 
 String SBA_BROWSER_SETTING_ORDER
 {
-   Text [ en-US ] = "Error setting the sort criteria";
+   Text [ en-US ] = "Error setting the sort criteria" ;
 };
 String SBA_BROWSER_SETTING_FILTER
 {
-   Text [ en-US ] = "Error setting the filter criteria";
+   Text [ en-US ] = "Error setting the filter criteria" ;
 };
 
 String RID_STR_CONNECTION_LOST
 {
-   Text [ en-US ] = "Connection lost";
+   Text [ en-US ] = "Connection lost" ;
 };
 
 String RID_STR_QUERIES_CONTAINER
 {
-   Text [ en-US ] = "Queries";
+   Text [ en-US ] = "Queries" ;
 };
 
 String RID_STR_TABLES_CONTAINER
 {
-   Text [ en-US ] = "Tables";
+   Text [ en-US ] = "Tables" ;
 };
 
-#define MID_EDIT_DATABASE  \
-   Identifier = ID_TREE_EDIT_DATABASE ;\
-   HelpId = HID_BROWSER_EDIT_DATABASE; \
+#define MID_EDIT_DATABASE \
+   Identifier = ID_TREE_EDIT_DATABASE ; \
+   HelpId = HID_BROWSER_EDIT_DATABASE ; \
Text [ en-US ] = "Edit ~Database File..." ;\
 
-#define MID_ADMINISTRATE   \
-   Identifier = ID_TREE_ADMINISTRATE ; \
-   HelpId = HID_BROWSER_ADMINISTRATE;  \
-   Text [ en-US ] = "Registered databases ..." ;\
+#define MID_ADMINISTRATE \
+   Identifier = ID_TREE_ADMINISTRATE ; \
+   HelpId = HID_BROWSER_ADMINISTRATE ; \
+   Text [ en-US ] = "Registered databases..." ;\
 
-#define MID_CLOSECONN  \
-   Identifier = ID_TREE_CLOSE_CONN ;   \
-   HelpId = HID_BROWSER_CLOSECONN ;\
-   Text [ en-US ] = "Disco~nnect" ;\
+#define MID_CLOSECONN \
+   Identifier = ID_TREE_CLOSE_CONN ; \
+   HelpId = HID_BROWSER_CLOSECONN ; \
+   Text [ en-US ] = "Disco~nnect" ; \
 
 Menu MENU_BROWSER_DEFAULTCONTEXT
 {
ItemList =
{
-   MenuItem\
-   {   \
-  

[openoffice] branch AOO42X updated: Cleaned up resource file

2020-05-15 Thread mseidel
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 4ec186a  Cleaned up resource file
4ec186a is described below

commit 4ec186a031a78fc3425551faa3c8d03002a92c7f
Author: mseidel 
AuthorDate: Fri May 15 22:14:04 2020 +0200

Cleaned up resource file

(cherry picked from commit ff29ddc6d056e90e04af6c467652073a012e3593)
---
 main/sw/source/ui/dbui/dbui.src | 129 
 1 file changed, 66 insertions(+), 63 deletions(-)

diff --git a/main/sw/source/ui/dbui/dbui.src b/main/sw/source/ui/dbui/dbui.src
index 990d1f3..b457052 100644
--- a/main/sw/source/ui/dbui/dbui.src
+++ b/main/sw/source/ui/dbui/dbui.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,66 +7,67 @@
  * 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.
- * 
+ *
  */
 
 
- // #pragma **
 
- // #include *
+// #pragma **
+
+// #include *
 #include "dbui.hrc"
 #include "helpid.h"
 ModalDialog DLG_DBSELECTION
 {
-HelpID = "sw:ModalDialog:DLG_DBSELECTION";
+   HelpID = "sw:ModalDialog:DLG_DBSELECTION" ;
OutputSize = TRUE ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( 168 , 132 ) ;
+   Size = MAP_APPFONT ( 168, 132 ) ;
Moveable = TRUE ;
Control TLB_DBLIST
{
Border = TRUE ;
-   Pos = MAP_APPFONT ( 6 , 6 ) ;
-   Size = MAP_APPFONT ( 100 , 120 ) ;
+   Pos = MAP_APPFONT ( 6, 6 ) ;
+   Size = MAP_APPFONT ( 100, 120 ) ;
};
OKButton BTN_OK
{
-   Pos = MAP_APPFONT ( 112 , 6 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 112, 6 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
Disable = TRUE ;
};
CancelButton BTN_CANCEL
{
-   Pos = MAP_APPFONT ( 112 , 23 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 112, 23 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
-   Pos = MAP_APPFONT ( 112 , 43 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 112, 43 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
Text [ en-US ] = "Database Selection" ;
 };
- // DLG_PRINTMONITOR --
+// DLG_PRINTMONITOR --
 ModelessDialog DLG_PRINTMONITOR
 {
-   HelpID = HID_MERGE_PRINTMONITOR  ;
+   HelpID = HID_MERGE_PRINTMONITOR ;
SVLOOK = TRUE ;
HIDE = TRUE ;
OUTPUTSIZE = TRUE ;
-Size = MAP_APPFONT ( 118, 72 ) ;
+   Size = MAP_APPFONT ( 118, 72 ) ;
MOVEABLE = TRUE ;
APP = FALSE ;
FixedText FT_DOCNAME
@@ -78,49 +79,49 @@ ModelessDialog DLG_PRINTMONITOR
FixedText FT_PRINTING
{
Pos = MAP_APPFONT ( 6, 17 ) ;
-   Size = MAP_APPFONT (  100, 8 ) ;
+   Size = MAP_APPFONT ( 100, 8 ) ;
CENTER = TRUE ;
Text [ en-US ] = "is being prepared for printing on" ;
};
FixedText FT_SENDING
{
Pos = MAP_APPFONT ( 6, 17 ) ;
-   Size = MAP_APPFONT (  100, 8 ) ;
+   Size = MAP_APPFONT ( 100, 8 ) ;
CENTER = TRUE ;
-   Text [ en-US ] = "is being sent to";
+   Text [ en-US ] = "is being sent to" ;
};
FixedText FT_SAVING
{
Pos = MAP_APPFONT ( 6, 17 ) ;
-   Size = MAP_APPFONT (  100, 8 ) ;
+   Size = 

[openoffice] branch AOO42X updated: Cleaned up resource file

2020-04-24 Thread mseidel
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 bca3771  Cleaned up resource file
bca3771 is described below

commit bca37714095e53d8dfb938c69393619c6237a009
Author: mseidel 
AuthorDate: Fri Apr 24 17:38:39 2020 +0200

Cleaned up resource file

(cherry picked from commit 55a081adf43424f86844e90499e7c562512a14a8)
---
 main/sc/source/ui/styleui/styledlg.src | 61 --
 1 file changed, 13 insertions(+), 48 deletions(-)

diff --git a/main/sc/source/ui/styleui/styledlg.src 
b/main/sc/source/ui/styleui/styledlg.src
index 4cc04f2..e4a8453 100644
--- a/main/sc/source/ui/styleui/styledlg.src
+++ b/main/sc/source/ui/styleui/styledlg.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.
- * 
+ *
  */
 
 
@@ -27,15 +27,15 @@ TabDialog RID_SCDLG_STYLES_PAR
 {
OutputSize = TRUE ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( 289 , 176 ) ;
+   Size = MAP_APPFONT ( 289, 176 ) ;
Text [ en-US ] = "Cell Style" ;
Moveable = TRUE ;
Closeable = FALSE ;
TabControl 1
{
OutputSize = TRUE ;
-   Pos = MAP_APPFONT ( 3 , 3 ) ;
-   Size = MAP_APPFONT ( 260 , 135 ) ;
+   Pos = MAP_APPFONT ( 3, 3 ) ;
+   Size = MAP_APPFONT ( 260, 135 ) ;
PageList =
{
PageItem
@@ -46,13 +46,12 @@ TabDialog RID_SCDLG_STYLES_PAR
PageItem
{
Identifier = TP_FONT ;
-   /* ### ACHTUNG: Neuer Text in Resource? Schrift 
: Zeichen */
Text [ en-US ] = "Font" ;
};
PageItem
{
Identifier = TP_FONTEFF ;
-   Text [ en-US ] = "Font Effects";
+   Text [ en-US ] = "Font Effects" ;
};
PageItem
{
@@ -62,7 +61,7 @@ TabDialog RID_SCDLG_STYLES_PAR
PageItem
{
Identifier = TP_ASIAN ;
-   Text [ en-US ] = "Asian Typography";
+   Text [ en-US ] = "Asian Typography" ;
};
PageItem
{
@@ -86,15 +85,15 @@ TabDialog RID_SCDLG_STYLES_PAGE
 {
OutputSize = TRUE ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( 280 , 165 ) ;
+   Size = MAP_APPFONT ( 280, 165 ) ;
Text [ en-US ] = "Page Style" ;
Moveable = TRUE ;
Closeable = FALSE ;
TabControl 1
{
OutputSize = TRUE ;
-   Pos = MAP_APPFONT ( 3 , 6 ) ;
-   Size = MAP_APPFONT ( 260 , 135 ) ;
+   Pos = MAP_APPFONT ( 3, 6 ) ;
+   Size = MAP_APPFONT ( 260, 135 ) ;
PageList =
{
PageItem
@@ -131,38 +130,4 @@ TabDialog RID_SCDLG_STYLES_PAGE
};
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ** EOF



[openoffice] branch AOO42X updated: Cleaned up resource file

2020-04-12 Thread mseidel
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 bf99887  Cleaned up resource file
bf99887 is described below

commit bf998877739b6097a41c48abbf1455b6143269b7
Author: mseidel 
AuthorDate: Sun Apr 12 17:37:30 2020 +0200

Cleaned up resource file

(cherry picked from commit 908555e7caa42b818d17d267f2e6c74f6e084f5b)
---
 main/cui/source/dialogs/newtabledlg.src | 108 +++-
 1 file changed, 38 insertions(+), 70 deletions(-)

diff --git a/main/cui/source/dialogs/newtabledlg.src 
b/main/cui/source/dialogs/newtabledlg.src
index bce0a0f..ba0cba5 100644
--- a/main/cui/source/dialogs/newtabledlg.src
+++ b/main/cui/source/dialogs/newtabledlg.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.
- * 
+ *
  */
 
 
@@ -26,109 +26,77 @@
 
 ModalDialog RID_SVX_NEWTABLE_DLG
 {
-HelpID = "cui:ModalDialog:RID_SVX_NEWTABLE_DLG";
-   OutputSize = TRUE;
+   HelpID = "cui:ModalDialog:RID_SVX_NEWTABLE_DLG" ;
+   OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
-   Size = MAP_APPFONT ( 181 , 6+15+15+15+14+6 ) ;
+   Size = MAP_APPFONT ( 181, 6 + 15 + 15 + 15 + 14 + 6 ) ;
Text [ en-US ] = "Insert Table" ;
-   
+
FixedText FT_COLUMNS
{
-Pos = MAP_APPFONT ( 6 , 8 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 8 ) ;
+   Size = MAP_APPFONT ( 60, 8 ) ;
Text [ en-US ] = "Number of columns:" ;
};
-NumericField NF_COLUMNS
+   NumericField NF_COLUMNS
{
-HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS";
+   HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 80 , 6 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
+   Pos = MAP_APPFONT ( 80, 6 ) ;
+   Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
-Minimum = 1 ;
-Maximum = 75 ;
-SpinSize = 1 ;
-StrictFormat = TRUE ;
+   Minimum = 1 ;
+   Maximum = 75 ;
+   SpinSize = 1 ;
+   StrictFormat = TRUE ;
};
FixedText FT_ROWS
{
-Pos = MAP_APPFONT ( 6 , 8+15 ) ;
-   Size = MAP_APPFONT ( 60 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 8 + 15 ) ;
+   Size = MAP_APPFONT ( 60, 8 ) ;
Text [ en-US ] = "Number of rows:" ;
};
-NumericField NF_ROWS
+   NumericField NF_ROWS
{
-HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS";
+   HelpID = "cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 80 , 6+15 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
+   Pos = MAP_APPFONT ( 80, 6 + 15 ) ;
+   Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
-Minimum = 1 ;
-Maximum = 75 ;
-SpinSize = 1 ;
-StrictFormat = TRUE ;
+   Minimum = 1 ;
+   Maximum = 75 ;
+   SpinSize = 1 ;
+   StrictFormat = TRUE ;
};
FixedLine FL_SEP
{
-   Pos = MAP_APPFONT ( 0 , 6+15+15 ) ;
-Size = MAP_APPFONT ( 181 , 12 ) ;
+   Pos = MAP_APPFONT ( 0, 6 + 15 + 15 ) ;
+   Size = MAP_APPFONT ( 181, 12 ) ;
};
HelpButton BTN_HELP
{
-   Pos = MAP_APPFONT ( 6 , 6+15+15+15 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 6, 6 + 15 + 15 + 15 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
-   };  
+   };
OKButton BTN_OK
{
-   Pos = 

[openoffice] branch AOO42X updated: Cleaned up resource file - This fixes truncated text in Pootle

2020-02-21 Thread mseidel
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 b8539b3  Cleaned up resource file - This fixes truncated text in Pootle
b8539b3 is described below

commit b8539b34a534c8407a3061845c188494f3e6bd8b
Author: mseidel 
AuthorDate: Fri Feb 21 16:59:09 2020 +0100

Cleaned up resource file - This fixes truncated text in Pootle

(cherry picked from commit 0a252a6c22a81186f9c06389f71ca29d32e40bde)
---
 main/cui/source/dialogs/passwdomdlg.src | 388 
 1 file changed, 192 insertions(+), 196 deletions(-)

diff --git a/main/cui/source/dialogs/passwdomdlg.src 
b/main/cui/source/dialogs/passwdomdlg.src
index 2b7dc82..44b13f0 100644
--- a/main/cui/source/dialogs/passwdomdlg.src
+++ b/main/cui/source/dialogs/passwdomdlg.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,20 +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.
- * 
+ *
  */
 
 
- 
 
 #include 
 #include "passwdomdlg.hrc"
@@ -29,202 +28,199 @@
 
 ModalDialog RID_DLG_PASSWORD_TO_OPEN_MODIFY
 {
-Size = MAP_APPFONT( 171, 150 );
-Text [ en-US ] = "Set Password";
-HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY;
-Border = TRUE ;
-Moveable = TRUE ;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-
-FixedLine FL_FILE_ENCRYPTION
-{
-Pos = MAP_APPFONT( 3, 3 );
-Size = MAP_APPFONT( 165, 8 );
-Text [ en-US ] = "File encryption password";
-};
-  
-FixedText FT_PASSWD_TO_OPEN
-{
-Pos = MAP_APPFONT( 6, 17 );
-Size = MAP_APPFONT( 159, 8 );
-Text [ en-US ] = "~Enter password to open";
-WordBreak = TRUE;
-};
-
-Edit ED_PASSWD_TO_OPEN
-{
-HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN;
-Pos = MAP_APPFONT( 6, 28 );
-Size = MAP_APPFONT( 159, 12 );
-Border = TRUE ;
-PassWord = TRUE ;
-};
-
-FixedText FT_REENTER_PASSWD_TO_OPEN
-{
-Pos = MAP_APPFONT( 6, 45 );
-Size = MAP_APPFONT( 159, 8 );
-Text [ en-US ] = "Confirm password";
-WordBreak = TRUE;
-};
-
-Edit ED_REENTER_PASSWD_TO_OPEN
-{
-HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN;
-Pos = MAP_APPFONT( 6, 56 );
-Size = MAP_APPFONT( 159, 12 );
-Border = TRUE ;
-PassWord = TRUE ;
-};
+   Size = MAP_APPFONT ( 171, 150 ) ;
+   Text [ en-US ] = "Set Password" ;
+   HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY ;
+   Border = TRUE ;
+   Moveable = TRUE ;
+   OutputSize = TRUE ;
+   SVLook = TRUE ;
+
+   FixedLine FL_FILE_ENCRYPTION
+   {
+   Pos = MAP_APPFONT ( 3, 3 ) ;
+   Size = MAP_APPFONT ( 165, 8 ) ;
+   Text [ en-US ] = "File encryption password" ;
+   };
+
+   FixedText FT_PASSWD_TO_OPEN
+   {
+   Pos = MAP_APPFONT ( 6, 17 ) ;
+   Size = MAP_APPFONT ( 159, 8 ) ;
+   Text [ en-US ] = "~Enter password to open" ;
+   WordBreak = TRUE ;
+   };
+
+   Edit ED_PASSWD_TO_OPEN
+   {
+   HelpId = HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN ;
+   Pos = MAP_APPFONT ( 6, 28 ) ;
+   Size = MAP_APPFONT ( 159, 12 ) ;
+   Border = TRUE ;
+   PassWord = TRUE ;
+   };
+
+   FixedText FT_REENTER_PASSWD_TO_OPEN
+   {
+   Pos = MAP_APPFONT ( 6, 45 ) ;
+   Size = MAP_APPFONT ( 159, 8 ) ;
+   Text [ en-US ] = "Confirm password" ;
+   WordBreak = TRUE ;
+   };
+
+   Edit ED_REENTER_PASSWD_TO_OPEN
+   {
+   HelpId = 
HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN ;
+   Pos = MAP_APPFONT ( 6, 56 ) ;
+   Size = MAP_APPFONT ( 159, 12 ) ;
+   Border = TRUE ;
+   PassWord = TRUE ;
+   };
 /*
-FixedImage FI_PASSWD_TO_OPEN_MATCH
-{
-Pos = MAP_APPFONT ( 150, 42 ) ;
-Size = 

[openoffice] branch AOO42X updated: Cleaned up resource file

2020-02-20 Thread mseidel
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 5b74bf8  Cleaned up resource file
5b74bf8 is described below

commit 5b74bf8396a828b080930d955c00cea1ff530595
Author: mseidel 
AuthorDate: Thu Feb 20 11:56:55 2020 +0100

Cleaned up resource file

(cherry picked from commit 546573de7d213e861263a754754c15008efd0169)
---
 main/svx/source/dialog/srchdlg.src | 627 ++---
 1 file changed, 312 insertions(+), 315 deletions(-)

diff --git a/main/svx/source/dialog/srchdlg.src 
b/main/svx/source/dialog/srchdlg.src
index 7d4fef5..fde8b51 100644
--- a/main/svx/source/dialog/srchdlg.src
+++ b/main/svx/source/dialog/srchdlg.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,29 +7,27 @@
  * 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 ---
+// include ---
 
 #include 
 #include "srchdlg.hrc"
 #include 
 
-#define MASKCOLOR   MaskColor = Color { Red = 0x; Green = 0x; Blue = 
0x; } ;
-
- // Strings ---
+// Strings ---
 
 String RID_SVXSTR_SEARCH_STYLES
 {
@@ -44,7 +42,7 @@ String RID_SVXSTR_REPLACE
Text [ en-US ] = "(Replace)" ;
 };
 
- // RID_SVXDLG_SEARCH -
+// RID_SVXDLG_SEARCH -
 
 ModelessDialog RID_SVXDLG_SEARCH
 {
@@ -52,29 +50,29 @@ ModelessDialog RID_SVXDLG_SEARCH
OutputSize = TRUE ;
Hide = TRUE ;
SvLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 155 ) ;
+   Size = MAP_APPFONT ( 200, 155 ) ;
Text [ en-US ] = "Find & Replace" ;
Moveable = TRUE ;
FixedText FT_SEARCH
{
-   Pos = MAP_APPFONT ( 6 , 7 ) ;
-Size = MAP_APPFONT ( 132 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 7 ) ;
+   Size = MAP_APPFONT ( 132, 8 ) ;
Text [ en-US ] = "~Search for" ;
};
ComboBox ED_SEARCH
{
-   HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH";
-Pos = MAP_APPFONT ( 6 , 18 ) ;
-Size = MAP_APPFONT ( 132 , 98 ) ;
+   HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH" ;
+   Pos = MAP_APPFONT ( 6, 18 ) ;
+   Size = MAP_APPFONT ( 132, 98 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
ListBox LB_SEARCH
{
-   HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH";
+   HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 18 ) ;
-Size = MAP_APPFONT ( 132 , 98 ) ;
+   Pos = MAP_APPFONT ( 6, 18 ) ;
+   Size = MAP_APPFONT ( 132, 98 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
Hide = TRUE ;
@@ -82,38 +80,38 @@ ModelessDialog RID_SVXDLG_SEARCH
};
FixedText FT_SEARCH_ATTR
{
-Pos = MAP_APPFONT ( 9 , 35 ) ;
-Size = MAP_APPFONT ( 129 , 16 ) ;
+   Pos = MAP_APPFONT ( 9, 35 ) ;
+   Size = MAP_APPFONT ( 129, 16 ) ;
WordBreak = TRUE ;
Hide = TRUE ;
};
-FixedText FT_SEARCH_FORMATS
+   FixedText FT_SEARCH_FORMATS
{
-Pos = MAP_APPFONT ( 9 , 35 ) ;
-Size = MAP_APPFONT ( 129 , 16 ) ;
-WordBreak = TRUE ;
+   Pos = MAP_APPFONT ( 9, 35 ) ;
+   Size = MAP_APPFONT ( 129, 16 ) ;
+   WordBreak = TRUE ;
Hide = TRUE ;
};
FixedText FT_REPLACE
{
-Pos = MAP_APPFONT ( 6 , 54 ) ;
-Size = MAP_APPFONT ( 132 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 54 ) ;
+   Size = MAP_APPFONT ( 132, 8 ) ;
  

[openoffice] branch AOO42X updated: Cleaned up resource file

2020-02-04 Thread mseidel
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 6c52bfa  Cleaned up resource file
6c52bfa is described below

commit 6c52bfa0a1d4e916df8906b07a51a66b93d91ecb
Author: mseidel 
AuthorDate: Tue Feb 4 14:22:30 2020 +0100

Cleaned up resource file

(cherry picked from commit b5bbfcc6f5296e0002b558ba2fcd039cf875ffb9)
---
 main/sfx2/source/menu/menu.src | 41 +
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/main/sfx2/source/menu/menu.src b/main/sfx2/source/menu/menu.src
index 1a9b6a8..959be5b 100644
--- a/main/sfx2/source/menu/menu.src
+++ b/main/sfx2/source/menu/menu.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.
- * 
+ *
  */
 
 
@@ -40,28 +40,28 @@ Menu MN_CLIPBOARDFUNCS
{
MenuItem
{
-   Identifier = SID_CUT ;
-   HelpID = CMD_SID_CUT ;
-   Text [ en-US ] = "Cu~t" ;
+   Identifier = SID_CUT ;
+   HelpID = CMD_SID_CUT ;
+   Text [ en-US ] = "Cu~t" ;
};
MenuItem
{
-   Identifier = SID_COPY ;
-   HelpID = CMD_SID_COPY ;
-   Text [ en-US ] = "~Copy" ;
+   Identifier = SID_COPY ;
+   HelpID = CMD_SID_COPY ;
+   Text [ en-US ] = "~Copy" ;
};
MenuItem
{
-   Identifier = SID_PASTE ;
-   HelpID = CMD_SID_PASTE ;
-   Text [ en-US ] = "~Paste" ;
+   Identifier = SID_PASTE ;
+   HelpID = CMD_SID_PASTE ;
+   Text [ en-US ] = "~Paste" ;
};
};
 };
 
 String SID_WIN_FULLSCREEN
 {
-   Text [ en-US ] = "Leave Full-Screen Mode";
+   Text [ en-US ] = "Leave Full-Screen Mode" ;
 };
 
 String STR_MENU_ADDONHELP
@@ -71,24 +71,17 @@ String STR_MENU_ADDONHELP
 
 String STR_MENU_SYNONYMS
 {
-Text [ en-US ] = "Synonyms" ;
+   Text [ en-US ] = "Synonyms" ;
 };
 
 String STR_MENU_NO_SYNONYM_FOUND
 {
-Text [ en-US ] = "(none)" ;
+   Text [ en-US ] = "(none)" ;
 };
 
 String STR_MENU_THESAURUS
 {
-Text [ en-US ] = "~Thesaurus..." ;
+   Text [ en-US ] = "~Thesaurus..." ;
 };
 
 // *** EOF
-
-
-
-
-
-
-



[openoffice] branch AOO42X updated: Cleaned up resource file

2020-01-17 Thread mseidel
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 c85fff6  Cleaned up resource file
c85fff6 is described below

commit c85fff693e6ab2aa9c5037c637b26379afcab279
Author: mseidel 
AuthorDate: Fri Jan 17 17:45:52 2020 +0100

Cleaned up resource file

(cherry picked from commit 8683d3bcbd0e04f3b4472f87584897d7ee45e735)
---
 .../source/ui/animations/CustomAnimationDialog.src | 612 ++---
 1 file changed, 295 insertions(+), 317 deletions(-)

diff --git a/main/sd/source/ui/animations/CustomAnimationDialog.src 
b/main/sd/source/ui/animations/CustomAnimationDialog.src
index eadb3a9..c8cef9d 100644
--- a/main/sd/source/ui/animations/CustomAnimationDialog.src
+++ b/main/sd/source/ui/animations/CustomAnimationDialog.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.
- * 
+ *
  */
 
 
@@ -34,18 +34,18 @@
 
 TabDialog DLG_CUSTOMANIMATION
 {
-   Size = MAP_APPFONT ( WIDTH+6 , 200 ) ;
+   Size = MAP_APPFONT ( WIDTH + 6, 200 ) ;
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
-   Text [ en-US ] = "Effect Options";
+   Text [ en-US ] = "Effect Options" ;
 
TabControl 1
{
OutputSize = TRUE ;
-   Pos = MAP_APPFONT ( 3 , 3 ) ;
-   Size = MAP_APPFONT ( 240 , 159 ) ;
+   Pos = MAP_APPFONT ( 3, 3 ) ;
+   Size = MAP_APPFONT ( 240, 159 ) ;
PageList =
{
PageItem
@@ -57,182 +57,174 @@ TabDialog DLG_CUSTOMANIMATION
 
PageItem
{
-   PageResID = RID_TP_CUSTOMANIMATION_DURATION;
-   Identifier = RID_TP_CUSTOMANIMATION_DURATION;
-   Text [ en-US ] = "Timing";
+   PageResID = RID_TP_CUSTOMANIMATION_DURATION ;
+   Identifier = RID_TP_CUSTOMANIMATION_DURATION ;
+   Text [ en-US ] = "Timing" ;
};
 
PageItem
{
-   PageResID = RID_TP_CUSTOMANIMATION_TEXT;
-   Identifier = RID_TP_CUSTOMANIMATION_TEXT;
-   Text [ en-US ] = "Text Animation";
+   PageResID = RID_TP_CUSTOMANIMATION_TEXT ;
+   Identifier = RID_TP_CUSTOMANIMATION_TEXT ;
+   Text [ en-US ] = "Text Animation" ;
};
};
};
OKButton 1
{
-   Pos = MAP_APPFONT ( 10 , 175 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 10, 175 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
CancelButton 1
{
-   Pos = MAP_APPFONT ( 64 , 175 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 64, 175 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton 1
{
-   Pos = MAP_APPFONT ( 119 , 175 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 119, 175 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
 };
 
 TabPage RID_TP_CUSTOMANIMATION_EFFECT
 {
-HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT";
-   Hide = TRUE;
-   Size = MAP_APPFONT ( WIDTH , 159 );
-   Text [ en-US ] = "Effect";
-   
+   HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT" ;
+   Hide = TRUE ;
+   Size = MAP_APPFONT ( WIDTH, 159 ) ;
+   Text [ en-US ] = "Effect" ;
+
FixedLine FL_SETTINGS
{
-   OutputSize = TRUE;
-   Pos = 

[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-12-27 Thread mseidel
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 76f1aba  Cleaned up resource file, removed MASKCOLOR
76f1aba is described below

commit 76f1aba9b611b38cbe5b4b87448bad864b429f84
Author: mseidel 
AuthorDate: Sat Dec 28 00:27:57 2019 +0100

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit 3b8463111255f4c1df145e3a753fba91ee453b18)
---
 .../ui/sidebar/CellAppearancePropertyPanel.src | 384 ++---
 1 file changed, 190 insertions(+), 194 deletions(-)

diff --git a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src 
b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index 50ca174..b6b9f0f 100755
--- a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.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,60 +7,61 @@
  * 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 "CellAppearancePropertyPanel.hrc"
 #include 
 #include "sc.hrc"
 #include "helpids.h"
 
-#define TOOLBOX_WIDTH  50
-#define TOOLBOX_HEIGHT 15
+#define TOOLBOX_WIDTH 50
+#define TOOLBOX_HEIGHT 15
 
-#define TOOLBOX_WIDTH_234
-#define TOOLBOX_HEIGHT_2   30
+#define TOOLBOX_WIDTH_2 34
+#define TOOLBOX_HEIGHT_2 30
 
-#define TOOLBOX_BORDER_WIDTH   107
-#define PB_BORDER_MOREBTN  57
-#define POPUPPANEL_MARGIN_SMALL_PIXEL  8
+#define TOOLBOX_BORDER_WIDTH 107
+#define PB_BORDER_MOREBTN 57
+#define POPUPPANEL_MARGIN_SMALL_PIXEL 8
 
-//
 // the basic propertypanel
 
 Control RID_PROPERTYPANEL_SC_APPEAR
 {
-   OutputSize = TRUE;
-   DialogControl = TRUE;
-   Border = FALSE;
+   OutputSize = TRUE ;
+   DialogControl = TRUE ;
+   Border = FALSE ;
 
-   Size = MAP_APPFONT( PROPERTYPAGE_WIDTH,  
SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  
TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL 
* 2 +  TOOLBOX_HEIGHT_2 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT - 2);   
   
+   Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, 
SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + 
TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 
2 + TOOLBOX_HEIGHT_2 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT - 2 ) ;
HelpID = HID_PROPERTYPANEL_SC_CELL_SECTION ;
-   Text [ en-US ] = "Cell Appearance";
-   
+   Text [ en-US ] = "Cell Appearance" ;
+
FixedText FT_BK_COLOR
{
-   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, 
SECTIONPAGE_MARGIN_VERTICAL_TOP );
-   Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - 
SECTIONPAGE_MARGIN_HORIZONTAL * 2 , TEXT_HEIGHT) ;
-   Text [ en-US ] = "~Cell background:";
+   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, 
SECTIONPAGE_MARGIN_VERTICAL_TOP ) ;
+   Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - 
SECTIONPAGE_MARGIN_HORIZONTAL * 2, TEXT_HEIGHT ) ;
+   Text [ en-US ] = "~Cell background:" ;
};
ToolBox TB_BK_COLOR
{
SVLook = TRUE ;
-   Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, 
SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) ;
-   Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
+   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, 
SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL ) 
;
+   Size = MAP_APPFONT ( TOOLBOX_WIDTH, TOOLBOX_HEIGHT ) ;
TabStop = TRUE ;
HelpID = HID_PROPERTYPANEL_SC_TBX_BKCOLOR ;
-   Text [ en-US ] = "Cell Background";
+   Text [ en-US ] = "Cell Background" ;
ItemList =
{
ToolBoxItem
@@ -68,7 +69,7 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 

[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-12-26 Thread mseidel
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 98d1756  Cleaned up resource file, removed MASKCOLOR
98d1756 is described below

commit 98d17561d9bee45004bd764f98678a64a9b1ea72
Author: mseidel 
AuthorDate: Thu Dec 26 23:34:00 2019 +0100

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit f72597984e833144ddae8ad6f17d737342098155)
---
 main/dbaccess/source/ui/dlg/indexdialog.src | 138 +---
 1 file changed, 66 insertions(+), 72 deletions(-)

diff --git a/main/dbaccess/source/ui/dlg/indexdialog.src 
b/main/dbaccess/source/ui/dlg/indexdialog.src
index 1f9616f..13ad48a 100644
--- a/main/dbaccess/source/ui/dlg/indexdialog.src
+++ b/main/dbaccess/source/ui/dlg/indexdialog.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.
- * 
+ *
  */
 
 
@@ -34,93 +34,92 @@
 #include "dbaccess_helpid.hrc"
 #endif
 
-#define DIALOG_SIZE_X  220
-#define DIALOG_SIZE_Y  140
-#define BUTTON_SIZE_X  50
-#define BUTTON_SIZE_Y  14
+#define DIALOG_SIZE_X 220
+#define DIALOG_SIZE_Y 140
+#define BUTTON_SIZE_X 50
+#define BUTTON_SIZE_Y 14
 
-#define LIST_WIDTH 70
+#define LIST_WIDTH 70
 
 ModalDialog DLG_INDEXDESIGN
 {
-HelpID = "dbaccess:ModalDialog:DLG_INDEXDESIGN";
+   HelpID = "dbaccess:ModalDialog:DLG_INDEXDESIGN" ;
OutputSize = TRUE ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( DIALOG_SIZE_X , DIALOG_SIZE_Y ) ;
+   Size = MAP_APPFONT ( DIALOG_SIZE_X, DIALOG_SIZE_Y ) ;
Text [ en-US ] = "Indexes" ;
Moveable = TRUE ;
Closeable = TRUE ;
 
ToolBox TLB_ACTIONS
{
-   Pos = MAP_APPFONT ( 6 , 6 ) ;
-   //  Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ;
-   ButtonType = BUTTON_SYMBOL;
-   Align = BOXALIGN_TOP;
-   HelpId = HID_INDEX_DIALOG_ACTION_TB;
-   Customize = FALSE;
+   Pos = MAP_APPFONT ( 6, 6 ) ;
+   //  Size = MAP_APPFONT ( DIALOG_SIZE_X - 14, 14 ) ;
+   ButtonType = BUTTON_SYMBOL ;
+   Align = BOXALIGN_TOP ;
+   HelpId = HID_INDEX_DIALOG_ACTION_TB ;
+   Customize = FALSE ;
ItemImageList = IMG_INDEX_DLG_SC ;
 
ItemList =
{
ToolBoxItem
{
-   Identifier = ID_INDEX_NEW;
-   HelpId = HID_DLGIDX_NEWINDEX;
-   Command = ".index:createNew";
+   Identifier = ID_INDEX_NEW ;
+   HelpId = HID_DLGIDX_NEWINDEX ;
+   Command = ".index:createNew" ;
Text [ en-US ] = "New Index" ;
};
ToolBoxItem
{
-   Identifier = ID_INDEX_DROP;
-   HelpId = HID_DLGIDX_DROPINDEX;
-   Command = ".index:dropCurrent";
+   Identifier = ID_INDEX_DROP ;
+   HelpId = HID_DLGIDX_DROPINDEX ;
+   Command = ".index:dropCurrent" ;
Text [ en-US ] = "Delete Current Index" ;
};
ToolBoxItem
{
-   Identifier = ID_INDEX_RENAME;
-   HelpId = HID_DLGIDX_RENAMEINDEX;
-   Command = ".index:renameCurrent";
+   Identifier = ID_INDEX_RENAME ;
+   HelpId = HID_DLGIDX_RENAMEINDEX ;
+   Command = ".index:renameCurrent" ;
Text [ en-US ] = "Rename Current Index" ;

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-12-20 Thread mseidel
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 8df7e04  Cleaned up resource file
8df7e04 is described below

commit 8df7e04310b6e503631a6de77b8a982a1b18d2e5
Author: mseidel 
AuthorDate: Sat Dec 21 00:35:23 2019 +0100

Cleaned up resource file

(cherry picked from commit 7371cc306b59434ae7ef935867b38c844c43b896)
---
 main/sw/source/ui/config/mailconfigpage.src | 132 ++--
 1 file changed, 64 insertions(+), 68 deletions(-)

diff --git a/main/sw/source/ui/config/mailconfigpage.src 
b/main/sw/source/ui/config/mailconfigpage.src
index 13a3ace..377967f 100644
--- a/main/sw/source/ui/config/mailconfigpage.src
+++ b/main/sw/source/ui/config/mailconfigpage.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,36 +29,35 @@
 
 TabPage TP_MAILCONFIG
 {
-   HelpID = HID_TP_MAILCONFIG;
+   HelpID = HID_TP_MAILCONFIG ;
Size = MAP_APPFONT ( 260, 185 ) ;
Hide = TRUE ;
-
-   Text[ en-US ] = "Mail Merge e-mail" ;
+   Text [ en-US ] = "Mail Merge E-mail" ;
 
FixedLine FL_IDENTITY
{
Pos = MAP_APPFONT ( 6, 3 ) ;
Size = MAP_APPFONT ( 248, 8 ) ;
-   Text[ en-US ] = "User information" ;
+   Text [ en-US ] = "User information" ;
};
FixedText FT_DISPLAYNAME
{
Pos = MAP_APPFONT ( 12, 16 ) ;
Size = MAP_APPFONT ( 74, 8 ) ;
-   Text[ en-US ] = "~Your name" ;
+   Text [ en-US ] = "~Your name" ;
};
Edit ED_DISPLAYNAME
{
HelpID = "sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME" ;
Pos = MAP_APPFONT ( 88, 14 ) ;
Size = MAP_APPFONT ( 160, 12 ) ;
-   Border = TRUE;
+   Border = TRUE ;
};
FixedText FT_ADDRESS
{
Pos = MAP_APPFONT ( 12, 31 ) ;
Size = MAP_APPFONT ( 74, 8 ) ;
-   Text[ en-US ] = "~E-Mail address" ;
+   Text [ en-US ] = "~E-Mail address" ;
};
Edit ED_ADDRESS
{
@@ -72,13 +71,13 @@ TabPage TP_MAILCONFIG
HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO" ;
Pos = MAP_APPFONT ( 12, 45 ) ;
Size = MAP_APPFONT ( 242, 10 ) ;
-   Text[ en-US ] = "Send replies to ~different e-mail address" ;
+   Text [ en-US ] = "Send replies to ~different e-mail address" ;
};
FixedText FT_REPLYTO
{
Pos = MAP_APPFONT ( 18, 60 ) ;
Size = MAP_APPFONT ( 68, 8 ) ;
-   Text[ en-US ] = "~Reply address" ;
+   Text [ en-US ] = "~Reply address" ;
};
Edit ED_REPLYTO
{
@@ -91,13 +90,13 @@ TabPage TP_MAILCONFIG
{
Pos = MAP_APPFONT ( 6, 76 ) ;
Size = MAP_APPFONT ( 248, 8 ) ;
-   Text[ en-US ] = "Outgoing server (SMTP) Settings" ;
+   Text [ en-US ] = "Outgoing server (SMTP) Settings" ;
};
FixedText FT_SERVER
{
Pos = MAP_APPFONT ( 12, 89 ) ;
Size = MAP_APPFONT ( 74, 8 ) ;
-   Text[ en-US ] = "~Server name" ;
+   Text [ en-US ] = "~Server name" ;
};
Edit ED_SERVER
{
@@ -110,19 +109,19 @@ TabPage TP_MAILCONFIG
{
Pos = MAP_APPFONT ( 197, 89 ) ;
Size = MAP_APPFONT ( 24, 8 ) ;
-   Right = TRUE;
-   Text[ en-US ] = "~Port" ;
+   Right = TRUE ;
+   Text [ en-US ] = "~Port" ;
};
NumericField NF_PORT
{
HelpID = "sw:NumericField:TP_MAILCONFIG:NF_PORT" ;
Pos = MAP_APPFONT ( 223, 87 ) ;
Size = MAP_APPFONT ( 25, 12 ) ;
-   Border = TRUE;
+   Border = TRUE ;

[openoffice] branch AOO42X updated: Cleaned up resource file, removed whitespace

2019-12-07 Thread mseidel
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 4796aa6  Cleaned up resource file, removed whitespace
4796aa6 is described below

commit 4796aa664527b331b46d3bec8b4caa84a0f632cd
Author: mseidel 
AuthorDate: Sat Dec 7 20:22:45 2019 +0100

Cleaned up resource file, removed whitespace

(cherry picked from commit 17b4e05d817cd726ea01b9247a688b277a3d043e)
---
 main/sfx2/source/view/view.src | 72 +++---
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/main/sfx2/source/view/view.src b/main/sfx2/source/view/view.src
index 9f744ea..16f518e 100644
--- a/main/sfx2/source/view/view.src
+++ b/main/sfx2/source/view/view.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,26 +7,27 @@
  * 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 ---
+
+// include ---
 #include "view.hrc"
 #include 
 #include "helpid.hrc"
 #include "sfxlocal.hrc"
 
- // Strings ---
+// Strings ---
 String STR_NODEFPRINTER
 {
Text [ en-US ] = "No default printer found.\nPlease choose a printer 
and try again." ;
@@ -37,7 +38,7 @@ String STR_NOSTARTPRINTER
 };
 String STR_PRINTER_NOTAVAIL
 {
-   Text [ en-US ] = "This document has been formatted for the printer $1. 
The specified printer is not available. \nDo you want to use the standard 
printer $2 ?" ;
+   Text [ en-US ] = "This document has been formatted for the printer $1. 
The specified printer is not available.\nDo you want to use the standard 
printer $2 ?" ;
 };
 String STR_PRINT_OPTIONS
 {
@@ -91,15 +92,15 @@ String STR_PREVIEW_NODOCINFO
 {
Text [ en-US ] = "No document properties found." ;
 };
- // ---
+// ---
 InfoBox MSG_CANT_CLOSE
 {
-   Message [ en-US ] = "The document cannot be closed because a\n print 
job is being carried out." ;
+   Message [ en-US ] = "The document cannot be closed because a\nprint job 
is being carried out." ;
 };
- // DLG_PRINTMONITOR --
+// DLG_PRINTMONITOR --
 
 #defineDLG_PRINTMONITOR_TEXT \
-Text [ en-US ] = "Print Monitor" ; \
+   Text [ en-US ] = "Print Monitor" ; \
 
 ModelessDialog DLG_PRINTMONITOR
 {
@@ -107,46 +108,46 @@ ModelessDialog DLG_PRINTMONITOR
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
-   Moveable = TRUE;
-   Size = MAP_APPFONT ( 112 , 81 ) ;
+   Moveable = TRUE ;
+   Size = MAP_APPFONT ( 112, 81 ) ;
DLG_PRINTMONITOR_TEXT
FixedText FT_DOCNAME
{
-   Pos = MAP_APPFONT ( 6 , 6 ) ;
-   Size = MAP_APPFONT ( 100 , 10 ) ;
+   Pos = MAP_APPFONT ( 6, 6 ) ;
+   Size = MAP_APPFONT ( 100, 10 ) ;
Center = TRUE ;
};
FixedText FT_PRINTING
{
-   Pos = MAP_APPFONT ( 6 , 19 ) ;
-   Size = MAP_APPFONT ( 100 , 10 ) ;
+   Pos = MAP_APPFONT ( 6, 19 ) ;
+   Size = MAP_APPFONT ( 100, 10 ) ;
Center = TRUE ;
Text [ en-US ] = "is being printed on" ;
};
FixedText FT_PRINTER
{
-   Pos = MAP_APPFONT ( 6 , 32 ) ;
-   Size = MAP_APPFONT ( 100 , 10 ) ;
+   Pos = MAP_APPFONT ( 6, 32 ) ;
+   Size = MAP_APPFONT ( 100, 10 ) ;
Center = TRUE ;
};
FixedText FT_PRINTINFO
{
-   Pos = MAP_APPFONT ( 6 , 45 ) ;
-   Size = MAP_APPFONT ( 100 , 10 ) ;
+   Pos = MAP_APPFONT ( 6, 45 ) ;
+

[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-11-28 Thread mseidel
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 072dae6  Cleaned up resource file, removed MASKCOLOR
072dae6 is described below

commit 072dae6a9ec688e7bcdbec06394bfbfeda492772
Author: mseidel 
AuthorDate: Thu Nov 28 17:52:29 2019 +0100

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit 9cab181b75f5bc4a075af598133ed297c48a0d14)
---
 main/sw/source/ui/utlui/utlui.src | 163 +-
 1 file changed, 74 insertions(+), 89 deletions(-)

diff --git a/main/sw/source/ui/utlui/utlui.src 
b/main/sw/source/ui/utlui/utlui.src
index 5920212..acc242a 100644
--- a/main/sw/source/ui/utlui/utlui.src
+++ b/main/sw/source/ui/utlui/utlui.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.
- * 
+ *
  */
 
 
@@ -55,15 +55,15 @@ Resource RID_SHELLRES_AUTOFMTSTRS
};
String STR_AUTOFMTREDL_BULLET+1
{
-   Text [ en-US ] = "Bullets replaced";
+   Text [ en-US ] = "Bullets replaced" ;
};
String STR_AUTOFMTREDL_UNDER+1
{
-   Text [ en-US ] = "Automatic _underline_";
+   Text [ en-US ] = "Automatic _underline_" ;
};
String STR_AUTOFMTREDL_BOLD+1
{
-   Text [ en-US ] = "Automatic *bold*";
+   Text [ en-US ] = "Automatic *bold*" ;
};
String STR_AUTOFMTREDL_FRACTION+1
{
@@ -83,47 +83,47 @@ Resource RID_SHELLRES_AUTOFMTSTRS
};
String STR_AUTOFMTREDL_RIGHT_MARGIN+1
{
-   Text [ en-US ] = "Combine single line paragraphs";
+   Text [ en-US ] = "Combine single line paragraphs" ;
};
 
String STR_AUTOFMTREDL_SET_TMPL_TEXT +1
{
-   Text [ en-US ] = "Set \"Text body\" Style";
+   Text [ en-US ] = "Set \"Text body\" Style" ;
};
String STR_AUTOFMTREDL_SET_TMPL_INDENT  +1
{
-   Text [ en-US ] = "Set \"Text body indent\" Style";
+   Text [ en-US ] = "Set \"Text body indent\" Style" ;
};
String STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT  +1
{
-   Text [ en-US ] = "Set \"Hanging indent\" Style";
+   Text [ en-US ] = "Set \"Hanging indent\" Style" ;
};
String STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT +1
{
-   Text [ en-US ] = "Set \"Text body indent\" Style";
+   Text [ en-US ] = "Set \"Text body indent\" Style" ;
};
String STR_AUTOFMTREDL_SET_TMPL_HEADLINE +1
{
-   Text [ en-US ] = "Set \"Heading $(ARG1)\" Style";
+   Text [ en-US ] = "Set \"Heading $(ARG1)\" Style" ;
};
String STR_AUTOFMTREDL_SET_NUMBULET +1
{
-   Text [ en-US ] = "Set \"Bullet\" or \"Numbering\" Style";
+   Text [ en-US ] = "Set \"Bullet\" or \"Numbering\" Style" ;
};
 
String STR_AUTOFMTREDL_DEL_MORELINES +1
{
-   Text [ en-US ] = "Combine paragraphs";
+   Text [ en-US ] = "Combine paragraphs" ;
+   };
+   String STR_AUTOFMTREDL_NON_BREAK_SPACE +1
+   {
+   Text [ en-US ] = "Add non breaking space" ;
};
-String STR_AUTOFMTREDL_NON_BREAK_SPACE +1
-{
-Text [ en-US ] = "Add non breaking space";
-};
 
 };
 
 /*-
-   Diverses
+   Miscellaneous
  -*/
 String STR_EVENT_OBJECT_SELECT
 {
@@ -131,11 +131,11 @@ String STR_EVENT_OBJECT_SELECT
 };
 String STR_EVENT_START_INS_GLOSSARY
 {
-   Text [ en-US ] = "Before inserting AutoText";
+   Text [ en-US ] = "Before inserting AutoText" ;
 };
 String STR_EVENT_END_INS_GLOSSARY
 {
-   Text [ en-US ] = "After inserting AutoText";
+   Text [ en-US ] = "After inserting 

[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-11-19 Thread mseidel
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 0c36aba  Cleaned up resource file, removed MASKCOLOR
0c36aba is described below

commit 0c36aba1507a6a8c50835d4ea0e68c3201068d10
Author: mseidel 
AuthorDate: Tue Nov 19 22:07:39 2019 +0100

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit ef1400e684701a8b15d1b7557035b9a20af1a292)
---
 .../source/deployment/gui/dp_gui_backend.src   | 64 --
 1 file changed, 24 insertions(+), 40 deletions(-)

diff --git a/main/desktop/source/deployment/gui/dp_gui_backend.src 
b/main/desktop/source/deployment/gui/dp_gui_backend.src
index cf4c415..9cbcbc1 100644
--- a/main/desktop/source/deployment/gui/dp_gui_backend.src
+++ b/main/desktop/source/deployment/gui/dp_gui_backend.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.
- * 
+ *
  */
 
 
@@ -26,102 +26,86 @@
 // package bundle:
 Image RID_IMG_DEF_PACKAGE_BUNDLE
 {
-ImageBitmap = Bitmap { File = "sx03256.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "sx03256.png" ;} ;
 };
 Image RID_IMG_DEF_PACKAGE_BUNDLE_HC
 {
-ImageBitmap = Bitmap { File = "sxh03256.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "sxh03256.png" ;} ;
 };
 
 // script, dialog:
 Image RID_IMG_SCRIPTLIB
 {
-ImageBitmap = Bitmap { File = "im30820.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "im30820.png" ;} ;
 };
 Image RID_IMG_SCRIPTLIB_HC
 {
-ImageBitmap = Bitmap { File = "imh30820.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "imh30820.png" ;} ;
 };
 
 Image RID_IMG_DIALOGLIB
 {
-ImageBitmap = Bitmap { File = "dialogfolder_16.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "dialogfolder_16.png" ;} ;
 };
 Image RID_IMG_DIALOGLIB_HC
 {
-ImageBitmap = Bitmap { File = "dialogfolder_16_h.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "dialogfolder_16_h.png" ;} ;
 };
 
 // configuration:
 Image RID_IMG_CONF_XML
 {
-ImageBitmap = Bitmap { File = "xml_16.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "xml_16.png" ;} ;
 };
 Image RID_IMG_CONF_XML_HC
 {
-ImageBitmap = Bitmap { File = "xml_16_h.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "xml_16_h.png" ;} ;
 };
 
 // component, typelib:
 Image RID_IMG_COMPONENT
 {
-ImageBitmap = Bitmap { File = "component_16.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "component_16.png" ;} ;
 };
 Image RID_IMG_COMPONENT_HC
 {
-ImageBitmap = Bitmap { File = "component_16_h.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "component_16_h.png" ;} ;
 };
 
 Image RID_IMG_JAVA_COMPONENT
 {
-ImageBitmap = Bitmap { File = "javacomponent_16.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "javacomponent_16.png" ;} ;
 };
 Image RID_IMG_JAVA_COMPONENT_HC
 {
-ImageBitmap = Bitmap { File = "javacomponent_16_h.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "javacomponent_16_h.png" ;} ;
 };
 
 Image RID_IMG_TYPELIB
 {
-ImageBitmap = Bitmap { File = "library_16.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "library_16.png" ;} ;
 };
 Image RID_IMG_TYPELIB_HC
 {
-ImageBitmap = Bitmap { File = "library_16_h.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "library_16_h.png" ;} ;
 };
 
 Image RID_IMG_JAVA_TYPELIB
 {
-ImageBitmap = Bitmap { File = "javalibrary_16.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "javalibrary_16.png" ;} ;
 };
 Image RID_IMG_JAVA_TYPELIB_HC
 {
-ImageBitmap = Bitmap { File = "javalibrary_16_h.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "javalibrary_16_h.png" ;} ;
 };
 
 Image RID_IMG_HELP
 {
-ImageBitmap = Bitmap { File = "commandimagelist/sc_helperdialog.bmp"; };
-MASKCOLOR
+   ImageBitmap = Bitmap {File = "commandimagelist/sc_helperdialog.png" ;} ;
 };
 Image RID_IMG_HELP_HC
 {
-ImageBitmap = 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-11-19 Thread mseidel
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 94b9354  Cleaned up resource file
94b9354 is described below

commit 94b9354818a3566449df3be3f98c64d690d54c60
Author: mseidel 
AuthorDate: Tue Nov 19 16:28:55 2019 +0100

Cleaned up resource file

(cherry picked from commit 11f394b512da1f3c9c9788ca5899a3bc19a0d79e)
---
 main/svtools/source/filter/exportdialog.src | 427 +---
 1 file changed, 195 insertions(+), 232 deletions(-)

diff --git a/main/svtools/source/filter/exportdialog.src 
b/main/svtools/source/filter/exportdialog.src
index 99379d2..69c6d87 100644
--- a/main/svtools/source/filter/exportdialog.src
+++ b/main/svtools/source/filter/exportdialog.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,138 +30,138 @@ String DLG_EXPORT_TITLE
 
 ModalDialog DLG_EXPORT
 {
-HelpID = "svtools:ModalDialog:DLG_EXPORT";
+   HelpID = "svtools:ModalDialog:DLG_EXPORT" ;
OutputSize = TRUE ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( 178 , 135 ) ;
+   Size = MAP_APPFONT ( 178, 135 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
 
FixedLine FL_EXPORT_SIZE
{
-   Hide = TRUE;
-   Size = MAP_APPFONT ( 110 , 8 ) ;
+   Hide = TRUE ;
+   Size = MAP_APPFONT ( 110, 8 ) ;
Text [ en-US ] = "Size" ;
};
FixedText FT_SIZEX
{
-   Hide = TRUE;
-   Size = MAP_APPFONT ( 41 , 10 ) ;
+   Hide = TRUE ;
+   Size = MAP_APPFONT ( 41, 10 ) ;
Text [ en-US ] = "Width:" ;
};
MetricField MF_SIZEX
{
-   HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX";
-   Hide = TRUE;
-   Border = TRUE;
+   HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX" ;
+   Hide = TRUE ;
+   Border = TRUE ;
Size = MAP_APPFONT ( 30, 12 ) ;
-   TabStop = TRUE;
-   Repeat = TRUE;
-   Spin = FALSE;
-   StrictFormat = TRUE;
-   DecimalDigits = 2;
-   Unit = FUNIT_NONE;
-   Maximum = 9;
-   Last = 255;
+   TabStop = TRUE ;
+   Repeat = TRUE ;
+   Spin = FALSE ;
+   StrictFormat = TRUE ;
+   DecimalDigits = 2 ;
+   Unit = FUNIT_NONE ;
+   Maximum = 9 ;
+   Last = 255 ;
};
ListBox LB_SIZEX
{
-   HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX";
-   Hide = TRUE;
+   HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX" ;
+   Hide = TRUE ;
Border = TRUE ;
Size = MAP_APPFONT ( 60, 80 ) ;
DropDown = TRUE ;
Sort = FALSE ;
StringList [ en-US ] =
{
-   < "inches" ; > ;
-   < "cm" ; Default ; > ;
-   < "mm" ; > ;
-   < "points" ; > ;
-   < "pixels" ; > ;
-   };  
+   < "inches" ;> ;
+   < "cm" ; Default ;  > ;
+   < "mm" ;> ;
+   < "points" ;> ;
+   < "pixels" ;> ;
+   };
};
FixedText FT_SIZEY
{
-   Hide = TRUE;
-   Size = MAP_APPFONT ( 41 , 10 ) ;
+   Hide = TRUE ;
+   Size = MAP_APPFONT ( 41, 10 ) ;
Text [ en-US ] = "Height:" ;
};
MetricField MF_SIZEY
{
-   HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEY";
-   Hide = TRUE;
+   HelpID = 

[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-11-02 Thread mseidel
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 77f5794  Cleaned up resource file, removed MASKCOLOR
77f5794 is described below

commit 77f57947603ac003e0fa97862a297741c883f001
Author: mseidel 
AuthorDate: Sat Nov 2 11:45:48 2019 +0100

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit 6bb5a7b1eb6efa3e2be3d9aedff75220a9e7bd14)
---
 main/cui/source/dialogs/scriptdlg.src | 395 +-
 1 file changed, 193 insertions(+), 202 deletions(-)

diff --git a/main/cui/source/dialogs/scriptdlg.src 
b/main/cui/source/dialogs/scriptdlg.src
index dcbe99a..f0c36f8 100644
--- a/main/cui/source/dialogs/scriptdlg.src
+++ b/main/cui/source/dialogs/scriptdlg.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,286 +25,277 @@
 #include "scriptdlg.hrc"
 #include "helpid.hrc"
 
-#define MASKCOLOR  MaskColor = \
-Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
-
 ModalDialog RID_DLG_SCRIPTORGANIZER
 {
-OutputSize = TRUE ;
-Size = MAP_APPFONT ( 210 , 165 ) ;
-Moveable = TRUE ;
-Text [ en-US ] = "%MACROLANG Macros";
-Closeable = TRUE ;
-HelpId = HID_SCRIPTORG_DIALOG;
-FixedText SF_TXT_SCRIPTS
-{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 100 , 10 ) ;
-Text [ en-US ] = "~Macros" ;
-};
+   OutputSize = TRUE ;
+   Size = MAP_APPFONT ( 210, 165 ) ;
+   Moveable = TRUE ;
+   Text [ en-US ] = "%MACROLANG Macros" ;
+   Closeable = TRUE ;
+   HelpId = HID_SCRIPTORG_DIALOG ;
+   FixedText SF_TXT_SCRIPTS
+   {
+   Pos = MAP_APPFONT ( 6, 3 ) ;
+   Size = MAP_APPFONT ( 100, 10 ) ;
+   Text [ en-US ] = "~Macros" ;
+   };
 
-Control SF_CTRL_SCRIPTSBOX
-{
-HelpId = HID_SCRIPTSBOX ;
-Border = TRUE ;
-Pos = MAP_APPFONT ( 6 , 16 ) ;
-Size = MAP_APPFONT ( 130 , 144 ) ;
-TabStop = TRUE ;
-Image IMG_HARDDISK
-{
-ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
-MASKCOLOR
-};
-Image IMG_HARDDISK_HC
-{
-ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
-MASKCOLOR
-};
-Image IMG_LIB
-{
-ImageBitmap = Bitmap { File = "im30820.png"; };
-MASKCOLOR
-};
-Image IMG_LIB_HC
-{
-ImageBitmap = Bitmap { File = "imh30820.png"; };
-MASKCOLOR
-};
-Image IMG_MACRO
-{
-ImageBitmap = Bitmap { File = "im30821.png"; };
-MASKCOLOR
-};
-Image IMG_MACRO_HC
-{
-ImageBitmap = Bitmap { File = "imh30821.png"; };
-MASKCOLOR
-};
-Image IMG_DOCUMENT
-{
-ImageBitmap = Bitmap { File = "im30826.png"; };
-MASKCOLOR
-};
-Image IMG_DOCUMENT_HC
-{
-ImageBitmap = Bitmap { File = "imh30826.png"; };
-MASKCOLOR
-};
-String STR_MYMACROS
-{
-Text [ en-US ] = "My Macros";
-};
-String STR_PRODMACROS
-{
-Text [ en-US ] = "%PRODUCTNAME Macros";
-};
-};
+   Control SF_CTRL_SCRIPTSBOX
+   {
+   HelpId = HID_SCRIPTSBOX ;
+   Border = TRUE ;
+   Pos = MAP_APPFONT ( 6, 16 ) ;
+   Size = MAP_APPFONT ( 130, 144 ) ;
+   TabStop = TRUE ;
+   Image IMG_HARDDISK
+   {
+   ImageBitmap = Bitmap {File = "harddisk_16.png" ;} ;
+   };
+   Image IMG_HARDDISK_HC
+   {
+   ImageBitmap = Bitmap {File = "harddisk_16_h.png" ;} ;
+   };
+   Image IMG_LIB
+   {
+   ImageBitmap = Bitmap 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-10-26 Thread mseidel
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 6a0f354  Cleaned up resource file
6a0f354 is described below

commit 6a0f354cb7f400df4af9f4e62f02374438f2b436
Author: mseidel 
AuthorDate: Sat Oct 26 14:25:41 2019 +0200

Cleaned up resource file

(cherry picked from commit fe14dfa647c41d55ccb69a958a161554491355e2)
---
 main/sd/source/ui/dlg/prntopts.src | 212 -
 1 file changed, 91 insertions(+), 121 deletions(-)

diff --git a/main/sd/source/ui/dlg/prntopts.src 
b/main/sd/source/ui/dlg/prntopts.src
index aed5f30..6509a78 100644
--- a/main/sd/source/ui/dlg/prntopts.src
+++ b/main/sd/source/ui/dlg/prntopts.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.
- * 
+ *
  */
 
 
@@ -27,220 +27,190 @@ TabPage TP_PRINT_OPTIONS
 {
HelpID = HID_SD_PRINT_OPTIONS ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( 260 , 185 ) ;
+   Size = MAP_APPFONT ( 260, 185 ) ;
Text [ en-US ] = "Options" ;
-   Hide = TRUE;
-FixedLine GRP_PRINT
+   Hide = TRUE ;
+   FixedLine GRP_PRINT
{
-Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 118 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 3 ) ;
+   Size = MAP_APPFONT ( 118, 8 ) ;
Text [ en-US ] = "Contents" ;
};
CheckBox CBX_DRAW
{
-   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW";
+   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW" ;
TabStop = TRUE ;
-   Pos = MAP_APPFONT ( 12 , 14  ) ;
-   Size = MAP_APPFONT ( 90 , 10 ) ;
-Text [ en-US ] = "~Drawing" ;
+   Pos = MAP_APPFONT ( 12, 14 ) ;
+   Size = MAP_APPFONT ( 90, 10 ) ;
+   Text [ en-US ] = "~Drawing" ;
};
CheckBox CBX_NOTES
{
-   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES";
-   Pos = MAP_APPFONT ( 12 , 28  ) ;
-   Size = MAP_APPFONT ( 90 , 10 ) ;
+   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES" ;
+   Pos = MAP_APPFONT ( 12, 28 ) ;
+   Size = MAP_APPFONT ( 90, 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Notes" ;
};
CheckBox CBX_HANDOUTS
{
-   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS";
-   Pos = MAP_APPFONT ( 12 , 42  ) ;
-   Size = MAP_APPFONT ( 90 , 10 ) ;
+   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS" ;
+   Pos = MAP_APPFONT ( 12, 42 ) ;
+   Size = MAP_APPFONT ( 90, 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Hando~uts" ;
};
CheckBox CBX_OUTLINE
{
-   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE";
-   Pos = MAP_APPFONT ( 12 , 56  ) ;
-   Size = MAP_APPFONT ( 90 , 10 ) ;
+   HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE" ;
+   Pos = MAP_APPFONT ( 12, 56 ) ;
+   Size = MAP_APPFONT ( 90, 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "Out~line" ;
};
-FixedLine FL_SEPARATOR1
+   FixedLine FL_SEPARATOR1
{
-Pos = MAP_APPFONT ( 125 , 14 ) ;
-Size = MAP_APPFONT ( 4 , 52 ) ;
-Vert = TRUE ;
-};
-FixedLine GRP_OUTPUT
+   Pos = MAP_APPFONT ( 125, 14 ) ;
+   Size = MAP_APPFONT ( 4, 52 ) ;
+   Vert = TRUE ;
+   };
+   FixedLine GRP_OUTPUT
{
-Pos = MAP_APPFONT ( 130 , 3  ) ;
-Size = MAP_APPFONT ( 124 , 8 ) ;
+   Pos = MAP_APPFONT ( 130, 3 ) ;
+   Size = MAP_APPFONT ( 124, 8 ) ;
Text [ en-US ] = "Quality" ;
};
-RadioButton RBT_COLOR
+   RadioButton RBT_COLOR
{
-HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR";
- 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-10-13 Thread mseidel
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 a0b0729  Cleaned up resource file
a0b0729 is described below

commit a0b072901bf63fc540fb172f76e32dbc523a0025
Author: mseidel 
AuthorDate: Sun Oct 13 14:17:51 2019 +0200

Cleaned up resource file

(cherry picked from commit 2db73460ee52b94cd9bc823f716e7bfe18436044)
---
 main/extensions/source/scanner/grid.src | 99 -
 1 file changed, 36 insertions(+), 63 deletions(-)

diff --git a/main/extensions/source/scanner/grid.src 
b/main/extensions/source/scanner/grid.src
index c5ced3b..f922a13 100644
--- a/main/extensions/source/scanner/grid.src
+++ b/main/extensions/source/scanner/grid.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,105 +7,78 @@
  * 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 
 
 ModalDialog GRID_DIALOG
 {
-HelpID = "extensions:ModalDialog:GRID_DIALOG";
-OutputSize = TRUE ; 
-SVLook = TRUE ; 
-Pos = MAP_APPFONT ( 10 , 10 ) ; 
-Size = MAP_APPFONT ( 300, 200 ) ; 
-Moveable = TRUE ;
-Closeable = TRUE ;
+   HelpID = "extensions:ModalDialog:GRID_DIALOG" ;
+   OutputSize = TRUE ;
+   SVLook = TRUE ;
+   Pos = MAP_APPFONT ( 10, 10 ) ;
+   Size = MAP_APPFONT ( 300, 200 ) ;
+   Moveable = TRUE ;
+   Closeable = TRUE ;
 
OKButton GRID_DIALOG_OK_BTN
{
-   Pos = MAP_APPFONT( 245, 5 );
-   Size = MAP_APPFONT( 50, 15 );
-   DefButton = TRUE;
+   Pos = MAP_APPFONT ( 245, 5 ) ;
+   Size = MAP_APPFONT ( 50, 15 ) ;
+   DefButton = TRUE ;
+   };
+   CancelButton GRID_DIALOG_CANCEL_BTN
+   {
+   Pos = MAP_APPFONT ( 245, 25 ) ;
+   Size = MAP_APPFONT ( 50, 15 ) ;
};
-CancelButton GRID_DIALOG_CANCEL_BTN
-{
-Pos = MAP_APPFONT ( 245 , 25 ) ; 
-Size = MAP_APPFONT ( 50 , 15 ) ; 
-};
ListBox GRID_DIALOG_TYPE_BOX
{
-   HelpID = "extensions:ListBox:GRID_DIALOG:GRID_DIALOG_TYPE_BOX";
-Border = TRUE ; 
-Dropdown = TRUE ; 
-   Pos = MAP_APPFONT( 245, 45 );
-   Size = MAP_APPFONT( 50, 130 );
-   };
+   HelpID = "extensions:ListBox:GRID_DIALOG:GRID_DIALOG_TYPE_BOX" ;
+   Border = TRUE ;
+   Dropdown = TRUE ;
+   Pos = MAP_APPFONT ( 245, 45 ) ;
+   Size = MAP_APPFONT ( 50, 130 ) ;
+   };
PushButton GRID_DIALOG_RESET_BTN
{
-   HelpID = "extensions:PushButton:GRID_DIALOG:GRID_DIALOG_RESET_BTN";
-   Pos = MAP_APPFONT( 245, 65 );
-   Size = MAP_APPFONT( 50, 15 );
-   Text [ en-US ] = "Set";
+   HelpID = 
"extensions:PushButton:GRID_DIALOG:GRID_DIALOG_RESET_BTN" ;
+   Pos = MAP_APPFONT ( 245, 65 ) ;
+   Size = MAP_APPFONT ( 50, 15 ) ;
+   Text [ en-US ] = "Set" ;
};
Bitmap GRID_DIALOG_HANDLE_BMP
{
-   File = "handle.bmp";
+   File = "handle.png" ;
};
String RESET_TYPE_LINEAR_ASCENDING
{
-   Text [ en-US ] = "Linear ascending";
+   Text [ en-US ] = "Linear ascending" ;
};
String RESET_TYPE_LINEAR_DESCENDING
{
-   Text [ en-US ] = "Linear descending";
+   Text [ en-US ] = "Linear descending" ;
};
String RESET_TYPE_RESET
{
-   Text [ en-US ] = "Original values";
+   Text [ en-US ] = "Original values" ;
};
String RESET_TYPE_EXPONENTIAL
{
-   Text [ en-US ] = "Exponential increasing";
+   Text [ en-US ] = "Exponential increasing" ;
};
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// *** EOF



[openoffice] branch AOO42X updated: Cleaned up resource file

2019-10-12 Thread mseidel
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 eb25f17  Cleaned up resource file
eb25f17 is described below

commit eb25f1731d10adec42831c1c4f27cb22fd9c3b31
Author: mseidel 
AuthorDate: Sat Oct 12 23:47:27 2019 +0200

Cleaned up resource file

(cherry picked from commit c3f39834933e79bd7a51be166280378c38585ecc)
---
 main/extensions/source/scanner/sanedlg.src | 525 ++---
 1 file changed, 246 insertions(+), 279 deletions(-)

diff --git a/main/extensions/source/scanner/sanedlg.src 
b/main/extensions/source/scanner/sanedlg.src
index b5952f2..bb9c551 100644
--- a/main/extensions/source/scanner/sanedlg.src
+++ b/main/extensions/source/scanner/sanedlg.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,308 +7,275 @@
  * 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 
 ModalDialog RID_SANE_DIALOG
 {
-HelpID = "extensions:ModalDialog:RID_SANE_DIALOG";
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 10 , 10 ) ;
-Size = MAP_APPFONT ( THIRD_COLUMN + 60 , 268 ) ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-OKButton RID_SCAN_OK
-{
-Pos = MAP_APPFONT ( THIRD_COLUMN , 6 ) ;
-Size = MAP_APPFONT ( 55 , 14 ) ;
-   DefButton = TRUE;
-   };
-CancelButton RID_SCAN_CANCEL
-{
-Pos = MAP_APPFONT ( THIRD_COLUMN , 25 ) ;
-Size = MAP_APPFONT ( 55 , 14 ) ;
-};
-PushButton RID_DEVICEINFO_BTN
-{
-HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_DEVICEINFO_BTN";
-Pos = MAP_APPFONT ( THIRD_COLUMN , 44 ) ;
-Size = MAP_APPFONT ( 55 , 22 ) ;
-Text [ en-US ] = "About\n Dev~ice" ;
-   };
-PushButton RID_PREVIEW_BTN
-{
-HelpID = "extensions:PushButton:RID_SANE_DIALOG:RID_PREVIEW_BTN";
-Pos = MAP_APPFONT ( THIRD_COLUMN , 71 ) ;
-Size = MAP_APPFONT ( 55 , 22 ) ;
-Text [ en-US ] = "Create\nPreview" ;
-   };
-FixedLine RID_PREVIEW_BOX
-{
-Pos = MAP_APPFONT ( PREVIEW_UPPER_LEFT - 5 , PREVIEW_UPPER_TOP - 8 ) ;
-Size = MAP_APPFONT ( PREVIEW_WIDTH + 10 , 8 ) ;
-Text [ en-US ] = "Preview" ;
-   };
-FixedLine RID_SCANAREA_BOX
-{
-Pos = MAP_APPFONT ( SCAN_AREA_LEFT - 5 , SCAN_AREA_TOP - 12 ) ;
-Size = MAP_APPFONT ( PREVIEW_WIDTH + 10 , 8 ) ;
-Text [ en-US ] = "Scan area" ;
-   };
-FixedText RID_SCAN_LEFT_TXT
-{
-Pos = MAP_APPFONT ( SCAN_AREA_LEFT , SCAN_AREA_TOP ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
-Text [ en-US ] = "Left:" ;
-   };
-MetricField RID_SCAN_LEFT_BOX
-{
-HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_LEFT_BOX";
-Spin = TRUE ;
-Repeat = TRUE ;
-Border = TRUE ;
-Pos = MAP_APPFONT ( SCAN_AREA_LEFT + 50 , SCAN_AREA_TOP - 2 ) ;
-Size = MAP_APPFONT ( PREVIEW_WIDTH - 50 , 12 ) ;
-};
-FixedText RID_SCAN_TOP_TXT
-{
-Pos = MAP_APPFONT ( SCAN_AREA_LEFT , SCAN_AREA_TOP + 17 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
-Text [ en-US ] = "Top:" ;
-   };
-MetricField RID_SCAN_TOP_BOX
-{
-HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_TOP_BOX";
-Spin = TRUE ;
-Repeat = TRUE ;
-Border = TRUE ;
-Pos = MAP_APPFONT ( SCAN_AREA_LEFT + 50 , SCAN_AREA_TOP + 15 ) ;
-Size = MAP_APPFONT ( PREVIEW_WIDTH - 50 , 12 ) ;
-};
-FixedText RID_SCAN_RIGHT_TXT
-{
-Pos = MAP_APPFONT ( SCAN_AREA_LEFT , SCAN_AREA_TOP + 34 ) ;
-Size = MAP_APPFONT ( 50 , 8 ) ;
-Text [ en-US ] = "Right:" ;
-   };
-MetricField RID_SCAN_RIGHT_BOX
-{
-HelpID = "extensions:MetricField:RID_SANE_DIALOG:RID_SCAN_RIGHT_BOX";
-Spin = TRUE ;
-Repeat = TRUE ;
-Border = TRUE ;
-Pos = MAP_APPFONT ( SCAN_AREA_LEFT + 50 , SCAN_AREA_TOP + 32 ) ;
-Size = MAP_APPFONT ( PREVIEW_WIDTH - 50 , 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-10-10 Thread mseidel
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 cb06b95  Cleaned up resource file
cb06b95 is described below

commit cb06b9566f84d103b990dd762ab2f9173018af80
Author: mseidel 
AuthorDate: Thu Oct 10 20:07:00 2019 +0200

Cleaned up resource file

(cherry picked from commit 5c892ca83f11dda4e07a7f0e130aa8fcf11b4f68)
---
 main/cui/source/customize/cfg.src | 83 ---
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/main/cui/source/customize/cfg.src 
b/main/cui/source/customize/cfg.src
index 57d3c8e..6d01583 100644
--- a/main/cui/source/customize/cfg.src
+++ b/main/cui/source/customize/cfg.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 ---
 #include 
 #include "cfg.hrc"
@@ -65,37 +66,37 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 };
 
 #define TEXT_MENU \
-   Text [ en-US ] = "Menu" ;\
+   Text [ en-US ] = "Menu" ; \
 
 #define TEXT_BEGIN_GROUP \
-   Text [ en-US ] = "Begin a Group" ;\
+   Text [ en-US ] = "Begin a Group" ; \
 
 #define TEXT_RENAME \
-   Text [ en-US ] = "Rename..." ;\
+   Text [ en-US ] = "Rename..." ; \
 
 #define TEXT_DELETE \
-   Text [ en-US ] = "Delete..." ;\
+   Text [ en-US ] = "Delete..." ; \
 
 #define TEXT_DELETE_NODOTS \
-   Text [ en-US ] = "Delete" ;\
+   Text [ en-US ] = "Delete" ; \
 
 #define TEXT_MOVE \
-   Text [ en-US ] = "Move..." ;\
+   Text [ en-US ] = "Move..." ; \
 
 #define TEXT_DEFAULT_STYLE \
-   Text [ en-US ] = "Restore Default Settings" ;\
+   Text [ en-US ] = "Restore Default Settings" ; \
 
 #define TEXT_DEFAULT_COMMAND \
-   Text [ en-US ] = "Restore Default Command" ;\
+   Text [ en-US ] = "Restore Default Command" ; \
 
 #define TEXT_TEXT_ONLY \
-   Text [ en-US ] = "Text only" ;\
+   Text [ en-US ] = "Text only" ; \
 
 #define TEXT_TOOLBAR_NAME \
-   Text [ en-US ] = "Toolbar Name" ;\
+   Text [ en-US ] = "Toolbar Name" ; \
 
 #define TEXT_SAVE_IN \
-   Text [ en-US ] = "Save In" ;\
+   Text [ en-US ] = "Save In" ; \
 
 TabPage RID_SVXPAGE_MENUS
 {
@@ -219,10 +220,10 @@ TabPage RID_SVXPAGE_MENUS
HelpID = "cui:MultiLineEdit:RID_SVXPAGE_MENUS:ED_DESCRIPTION" ;
Pos = MAP_APPFONT ( 6, 216 ) ;
Size = MAP_APPFONT ( 261, 36 ) ;
-   Border = TRUE;
-   VScroll = TRUE;
-   IgnoreTab = TRUE;
-   ReadOnly = TRUE;
+   Border = TRUE ;
+   VScroll = TRUE ;
+   IgnoreTab = TRUE ;
+   ReadOnly = TRUE ;
};
 };
 
@@ -449,7 +450,7 @@ ModalDialog MD_MENU_ORGANISER
Text [ en-US ] = "New Menu" ;
SvLook = TRUE ;
Moveable = TRUE ;
-   HelpId = HID_SVX_CONFIG_MENU_ORGANIZER;
+   HelpId = HID_SVX_CONFIG_MENU_ORGANIZER ;
FixedText TXT_MENU_NAME
{
Pos = MAP_APPFONT ( 6, 8 ) ;
@@ -587,7 +588,7 @@ ModalDialog MD_ICONSELECTOR
Size = MAP_APPFONT ( 240, 152 ) ;
Text [ en-US ] = "Change Icon" ;
Moveable = TRUE ;
-   HelpId = HID_SVX_CONFIG_ICON_SELECTOR;
+   HelpId = HID_SVX_CONFIG_ICON_SELECTOR ;
FixedText FT_SYMBOLS
{
Pos = MAP_APPFONT ( 6, 3 ) ;
@@ -601,10 +602,10 @@ ModalDialog MD_ICONSELECTOR
Scroll = TRUE ;
LineSpacing = TRUE ;
Customize = FALSE ;
-   }; 
+   };
OKButton BTN_OK
{
-   Pos = MAP_APPFONT ( 60, 130 ) ; 
+   Pos = MAP_APPFONT ( 60, 130 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
@@ -627,7 +628,7 @@ ModalDialog MD_ICONSELECTOR
Pos = MAP_APPFONT ( 184, 7 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
 

[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-10-08 Thread mseidel
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 f9aa239  Cleaned up resource file, removed MASKCOLOR
f9aa239 is described below

commit f9aa239475d74da24189076b84b6af424f3d4aaa
Author: mseidel 
AuthorDate: Tue Oct 8 19:13:20 2019 +0200

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit 0e119c8cc9d07687d22cc32b13e52c4956988f30)
---
 main/sfx2/source/doc/docvor.src | 129 +++-
 1 file changed, 48 insertions(+), 81 deletions(-)

diff --git a/main/sfx2/source/doc/docvor.src b/main/sfx2/source/doc/docvor.src
index 3bb4fe4..04892bb 100644
--- a/main/sfx2/source/doc/docvor.src
+++ b/main/sfx2/source/doc/docvor.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,20 +7,21 @@
  * 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 ---
+
+// include ---
 #include 
 #include "doc.hrc"
 #include "docvor.hrc"
@@ -29,83 +30,79 @@
 
 // DLG_ORGANIZE --
 
-#define MASKCOLOR  MaskColor = Color { Red = 0x ; Green = 0x ; 
Blue = 0x ; }
-
 ModalDialog DLG_ORGANIZE
 {
HelpId = CMD_SID_ORGANIZER ;
OutputSize = TRUE ;
SVLook = TRUE ;
-   Size = MAP_APPFONT ( 271 , 162 ) ;
+   Size = MAP_APPFONT ( 271, 162 ) ;
Text [ en-US ] = "Template Management" ;
Moveable = TRUE ;
HelpButton BTN_HELP
{
-   Pos = MAP_APPFONT ( 205 , 43 ) ;
-   Size = MAP_APPFONT ( 60 , 14 ) ;
+   Pos = MAP_APPFONT ( 205, 43 ) ;
+   Size = MAP_APPFONT ( 60, 14 ) ;
TabStop = TRUE ;
};
OKButton BTN_OK
{
-   Pos = MAP_APPFONT ( 205 , 6 ) ;
-   Size = MAP_APPFONT ( 60 , 14 ) ;
-   /* ### ACHTUNG: Neuer Text in Resource? Schlie�en : Schlie�en */
-   /* ### ACHTUNG: Neuer Text in Resource? Schlie�en : Schlie�en */
+   Pos = MAP_APPFONT ( 205, 6 ) ;
+   Size = MAP_APPFONT ( 60, 14 ) ;
Text [ en-US ] = "Close" ;
TabStop = TRUE ;
DefButton = TRUE ;
};
PushButton BTN_FILES
{
-   HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_FILES";
-   Pos = MAP_APPFONT ( 205 , 143 ) ;
-   Size = MAP_APPFONT ( 60 , 14 ) ;
+   HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_FILES" ;
+   Pos = MAP_APPFONT ( 205, 143 ) ;
+   Size = MAP_APPFONT ( 60, 14 ) ;
Text [ en-US ] = "~File..." ;
TabStop = TRUE ;
};
PushButton BTN_ADDRESSTEMPLATE
{
-   HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE";
-   Pos = MAP_APPFONT ( 205 , 124 ) ;
-   Size = MAP_APPFONT ( 60 , 14 ) ;
+   HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE" ;
+   Pos = MAP_APPFONT ( 205, 124 ) ;
+   Size = MAP_APPFONT ( 60, 14 ) ;
Text [ en-US ] = "~Address Book..." ;
};
ListBox LB_LEFT_TYP
{
-   HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP";
+   HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP" ;
Border = TRUE ;
-   Pos = MAP_APPFONT ( 3 , 144 ) ;
-   Size = MAP_APPFONT ( 94 , 55 ) ;
+   Pos = MAP_APPFONT ( 3, 144 ) ;
+   Size = MAP_APPFONT ( 94, 55 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
StringList [ en-US ] =
{
-   < "Templates" ; Default ; > ;
-   < "Documents" ; Default ; > ;
+   < "Templates" ; Default ;   > ;
+   < "Documents" ; Default ;   > 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-09-30 Thread mseidel
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 f8a9d0d  Cleaned up resource file
f8a9d0d is described below

commit f8a9d0d0cde61f66b42174c6d313e0f17ccaebd9
Author: mseidel 
AuthorDate: Mon Sep 30 23:23:05 2019 +0200

Cleaned up resource file

(cherry picked from commit 0f2b0e66d397fc72179328e68fae6470df0bf738)
---
 main/sw/source/ui/table/table.src | 35 +--
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/main/sw/source/ui/table/table.src 
b/main/sw/source/ui/table/table.src
index baeb4c5..80c0b63 100644
--- a/main/sw/source/ui/table/table.src
+++ b/main/sw/source/ui/table/table.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.
- * 
+ *
  */
 
 
@@ -27,29 +27,4 @@ InfoBox MSG_ERR_TABLE_MERGE
Message [ en-US ] = "Selected table cells are too complex to merge." ;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// *** EOF



[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-09-29 Thread mseidel
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 acb380f  Cleaned up resource file, removed MASKCOLOR
acb380f is described below

commit acb380f9a53c8983cc1fc9d5d10ead4d512b265d
Author: mseidel 
AuthorDate: Sun Sep 29 12:55:31 2019 +0200

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit e6e9948e8854f311f80d99397341f0a04efa6fa7)
---
 main/cui/source/tabpages/tabarea.src | 1055 +-
 1 file changed, 522 insertions(+), 533 deletions(-)

diff --git a/main/cui/source/tabpages/tabarea.src 
b/main/cui/source/tabpages/tabarea.src
index fe23c3f..53b0e9f 100644
--- a/main/cui/source/tabpages/tabarea.src
+++ b/main/cui/source/tabpages/tabarea.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,64 +7,62 @@
  * 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 ---
+
+// include ---
 #include "helpid.hrc"
 #include 
 #include "tabarea.hrc"
 #include 
 
-#define MASKCOLOR  MaskColor = Color{ Red = 0xff00 ; Green = 
0x ; Blue = 0xff00 ; };
-
-
- // RID_SVXPAGE_AREA --
+// RID_SVXPAGE_AREA --
 #defineTRANS_GRAD_OFFSET_X 6
 #defineTRANS_GRAD_OFFSET_Y 64
 #defineTRANS_GRAD_FIELD_SEPARATION 24
 
 TabPage RID_SVXPAGE_TRANSPARENCE
 {
-   HelpID = HID_AREA_TRANSPARENCE;
-   Hide = TRUE;
-   Size = MAP_APPFONT ( 260 , 185 );
-FixedLine FL_PROP
+   HelpID = HID_AREA_TRANSPARENCE ;
+   Hide = TRUE ;
+   Size = MAP_APPFONT ( 260, 185 ) ;
+   FixedLine FL_PROP
{
-   Pos = MAP_APPFONT ( 6 , 3  ) ;
-Size = MAP_APPFONT ( 248, 8 ) ;
-   Text [ en-US ] = "Transparency mode";
+   Pos = MAP_APPFONT ( 6, 3 ) ;
+   Size = MAP_APPFONT ( 248, 8 ) ;
+   Text [ en-US ] = "Transparency mode" ;
};
RadioButton RBT_TRANS_OFF
{
-   HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF";
-   Pos = MAP_APPFONT ( 12 , 14  ) ;
-   Size = MAP_APPFONT ( 110 , 10 ) ;
-   Text [ en-US ] = "~No transparency";
+   HelpID = 
"cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF" ;
+   Pos = MAP_APPFONT ( 12, 14 ) ;
+   Size = MAP_APPFONT ( 110, 10 ) ;
+   Text [ en-US ] = "~No transparency" ;
};
-RadioButton RBT_TRANS_LINEAR
-{
-HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR";
-Pos = MAP_APPFONT ( 12 , 28  ) ;
-Size = MAP_APPFONT ( 60 , 10 ) ;
-   Text [ en-US ] = "~Transparency";
+   RadioButton RBT_TRANS_LINEAR
+   {
+   HelpID = 
"cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR" ;
+   Pos = MAP_APPFONT ( 12, 28 ) ;
+   Size = MAP_APPFONT ( 60, 10 ) ;
+   Text [ en-US ] = "~Transparency" ;
};
MetricField MTR_TRANSPARENT
{
-   HelpID = "cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT";
+   HelpID = 
"cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 72 , 26 ) ;
-Size = MAP_APPFONT ( 40 , 12 ) ;
+   Pos = MAP_APPFONT ( 72, 26 ) ;
+   Size = MAP_APPFONT ( 40, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -74,49 +72,49 @@ TabPage RID_SVXPAGE_TRANSPARENCE
Last = 100 ;
SpinSize = 5 ;
};
-RadioButton RBT_TRANS_GRADIENT
-{
-HelpID = "cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT";
-Pos = 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-09-25 Thread mseidel
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 b85a68f  Cleaned up resource file
b85a68f is described below

commit b85a68f1baca9395c4004553fefa7d37766ce1ea
Author: mseidel 
AuthorDate: Wed Sep 25 22:51:33 2019 +0200

Cleaned up resource file

(cherry picked from commit a228e35486128d50bec20249d13ef19fc834c74c)
---
 main/cui/source/tabpages/paragrph.src | 582 +-
 1 file changed, 292 insertions(+), 290 deletions(-)

diff --git a/main/cui/source/tabpages/paragrph.src 
b/main/cui/source/tabpages/paragrph.src
index b1dbb80..46ded75 100644
--- a/main/cui/source/tabpages/paragrph.src
+++ b/main/cui/source/tabpages/paragrph.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,45 +7,46 @@
  * 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 ---
+
+// include ---
 #include 
 #include "helpid.hrc"
 #include "paragrph.hrc"
 #include 
 
- // RID_SVXPAGE_STD_PARAGRAPH -
+// RID_SVXPAGE_STD_PARAGRAPH -
 TabPage RID_SVXPAGE_STD_PARAGRAPH
 {
HelpId = HID_FORMAT_PARAGRAPH_STD ;
Hide = TRUE ;
Text [ en-US ] = "Indents and Spacing" ;
-   Size = MAP_APPFONT ( 260 , 185 ) ;
+   Size = MAP_APPFONT ( 260, 185 ) ;
FixedText FT_LEFTINDENT
{
-   Pos = MAP_APPFONT ( 12 , 16 ) ;
-   Size = MAP_APPFONT ( 120 , 8 ) ;
-Left = TRUE ;
-Text [ en-US ] = "Before text" ;
+   Pos = MAP_APPFONT ( 12, 16 ) ;
+   Size = MAP_APPFONT ( 120, 8 ) ;
+   Left = TRUE ;
+   Text [ en-US ] = "Before text" ;
};
MetricField ED_LEFTINDENT
{
-   HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT";
+   HelpID = 
"cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT" ;
Border = TRUE ;
-   Pos = MAP_APPFONT ( 135 , 14 ) ;
-   Size = MAP_APPFONT ( 40 , 12 ) ;
+   Pos = MAP_APPFONT ( 135, 14 ) ;
+   Size = MAP_APPFONT ( 40, 12 ) ;
Group = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
@@ -58,17 +59,17 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
FixedText FT_RIGHTINDENT
{
-   Pos = MAP_APPFONT ( 12 , 32 ) ;
-   Size = MAP_APPFONT ( 120 , 8 ) ;
-Left = TRUE ;
-Text [ en-US ] = "After text" ;
+   Pos = MAP_APPFONT ( 12, 32 ) ;
+   Size = MAP_APPFONT ( 120, 8 ) ;
+   Left = TRUE ;
+   Text [ en-US ] = "After text" ;
};
MetricField ED_RIGHTINDENT
{
-   HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT";
+   HelpID = 
"cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT" ;
Border = TRUE ;
-   Pos = MAP_APPFONT ( 135 , 30 ) ;
-   Size = MAP_APPFONT ( 40 , 12 ) ;
+   Pos = MAP_APPFONT ( 135, 30 ) ;
+   Size = MAP_APPFONT ( 40, 12 ) ;
Group = TRUE ;
Left = TRUE ;
Repeat = TRUE ;
@@ -81,17 +82,17 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
};
FixedText FT_FLINEINDENT
{
-   Pos = MAP_APPFONT ( 12 , 48 ) ;
-   Size = MAP_APPFONT ( 120 , 8 ) ;
+   Pos = MAP_APPFONT ( 12, 48 ) ;
+   Size = MAP_APPFONT ( 120, 8 ) ;
Text [ en-US ] = "~First line" ;
Left = TRUE ;
};
MetricField ED_FLINEINDENT
{
-   HelpID = "cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT";
+   HelpID = 
"cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT" ;
Border = TRUE ;
-  

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-09-19 Thread mseidel
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 7d71fbe  Cleaned up resource file
7d71fbe is described below

commit 7d71fbe847586f613159a309465bad2b98dbd0d0
Author: mseidel 
AuthorDate: Thu Sep 19 11:42:45 2019 +0200

Cleaned up resource file

(cherry picked from commit 36e5b6ad91b594891ac0952ae17e96d4244e1a90)
---
 main/sfx2/source/doc/doc.src | 101 ---
 1 file changed, 48 insertions(+), 53 deletions(-)

diff --git a/main/sfx2/source/doc/doc.src b/main/sfx2/source/doc/doc.src
index 6a73b7c..e841862 100644
--- a/main/sfx2/source/doc/doc.src
+++ b/main/sfx2/source/doc/doc.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,31 +7,32 @@
  * 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 
 #include "doc.hrc"
 #define __RSC
 #include 
 //#include 
 
- // ---
+// ---
 QueryBox MSG_CONFIRM_FILTER
 {
Buttons = WB_YES_NO ;
DefButton = WB_DEF_YES ;
-   Message [ en-US ] = "Saving in external formats may have caused\n 
information loss. Do you still want to close?" ;
+   Message [ en-US ] = "Saving in external formats may have 
caused\ninformation loss. Do you still want to close?" ;
 };
 QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE
 {
@@ -57,11 +58,11 @@ String STR_QUERY_SAVE_DOCUMENT
 {
Text [ en-US ] = "The document \"$(DOC)\" has been modified.\nDo you 
want to save your changes?" ;
 };
-Bitmap BMP_STYLES_CLOSED { File = "newex.bmp" ; };
-Bitmap BMP_STYLES_OPENED { File = "newex.bmp" ; };
+Bitmap BMP_STYLES_CLOSED {File = "newex.png" ;} ;
+Bitmap BMP_STYLES_OPENED {File = "newex.png" ;} ;
 
-Bitmap BMP_STYLES_CLOSED_HC { File = "newex_h.bmp" ; };
-Bitmap BMP_STYLES_OPENED_HC { File = "newex_h.bmp" ; };
+Bitmap BMP_STYLES_CLOSED_HC {File = "newex_h.png" ;} ;
+Bitmap BMP_STYLES_OPENED_HC {File = "newex_h.png" ;} ;
 
 String STR_STYLES
 {
@@ -83,15 +84,15 @@ String STR_PRINT_STYLES
 {
Text [ en-US ] = "Printing Styles" ;
 };
-Bitmap BMP_STYLES_FAMILY1 { File = "styfam1.bmp" ; };
-Bitmap BMP_STYLES_FAMILY2 { File = "styfam2.bmp" ; };
-Bitmap BMP_STYLES_FAMILY3 { File = "styfam3.bmp" ; };
-Bitmap BMP_STYLES_FAMILY4 { File = "styfam4.bmp" ; };
+Bitmap BMP_STYLES_FAMILY1 {File = "styfam1.png" ;} ;
+Bitmap BMP_STYLES_FAMILY2 {File = "styfam2.png" ;} ;
+Bitmap BMP_STYLES_FAMILY3 {File = "styfam3.png" ;} ;
+Bitmap BMP_STYLES_FAMILY4 {File = "styfam4.png" ;} ;
 
-Bitmap BMP_STYLES_FAMILY1_HC { File = "styfam1_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY2_HC { File = "styfam2_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY3_HC { File = "styfam3_h.bmp" ; };
-Bitmap BMP_STYLES_FAMILY4_HC { File = "styfam4_h.bmp" ; };
+Bitmap BMP_STYLES_FAMILY1_HC {File = "styfam1_h.png" ;} ;
+Bitmap BMP_STYLES_FAMILY2_HC {File = "styfam2_h.png" ;} ;
+Bitmap BMP_STYLES_FAMILY3_HC {File = "styfam3_h.png" ;} ;
+Bitmap BMP_STYLES_FAMILY4_HC {File = "styfam4_h.png" ;} ;
 
 ErrorBox MSG_PRINT_ERROR
 {
@@ -187,8 +188,6 @@ InfoBox MSG_DOCINFO_CANTREAD
 };
 String STR_ERROR_NOSTORAGE
 {
-   /* ### ACHTUNG: Neuer Text in Resource? Die ausgew�hlte Datei besitzt 
ein falsches Format. : Die ausgew�hlte Datei besitzt ein falsches Format. */
-   /* ### ACHTUNG: Neuer Text in Resource? Die ausgew�hlte Datei besitzt 
ein falsches Format. : Die ausgew�hlte Datei besitzt ein falsches Format. */
Text [ en-US ] = "The selected file has an incorrect format." ;
 };
 String STR_QUERY_MUSTOWNFORMAT
@@ -217,8 +216,6 @@ String STR_CLOSEDOC
 };
 String STR_CLOSEDOC_ANDRETURN
 {
-   /* ### ACHTUNG: Neuer Text in Resource? S~chlie�en & zur�ck zu  : 
S~chlie�en & zur�ck zu  */
-   /* ### ACHTUNG: Neuer Text in Resource? S~chlie�en & zur�ck zu  : 
S~chlie�en & zur�ck zu  */
Text [ en-US ] = "~Close & Return to " ;
 };
 String STR_WIZARD
@@ -296,7 +293,7 @@ String STR_FSET_FILTERNAME0
 };
 String 

[openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR

2019-09-18 Thread mseidel
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 143eca8  Cleaned up resource file, removed MASKCOLOR
143eca8 is described below

commit 143eca8675de91779f0d6151e25ebfd86e76f849
Author: mseidel 
AuthorDate: Wed Sep 18 16:18:50 2019 +0200

Cleaned up resource file, removed MASKCOLOR

(cherry picked from commit b48ded4ca20f0c75d5afd744db51cc93dec37f89)
---
 main/cui/source/tabpages/dstribut.src | 231 +-
 1 file changed, 90 insertions(+), 141 deletions(-)

diff --git a/main/cui/source/tabpages/dstribut.src 
b/main/cui/source/tabpages/dstribut.src
index 97177a2..3247d8b 100644
--- a/main/cui/source/tabpages/dstribut.src
+++ b/main/cui/source/tabpages/dstribut.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.
- * 
+ *
  */
 
 
@@ -27,271 +27,220 @@
 #include "helpid.hrc"
 #include 
 
-// RID_SVXPAGE_DISTRIBUTE ---
-#define STD_MASKCOLOR Color { Red=0x; Green=0x; Blue=0x; }
+// RID_SVXPAGE_DISTRIBUTE 
 TabPage RID_SVXPAGE_DISTRIBUTE
 {
HelpId = HID_PAGE_DISTRIBUTE ;
Hide = TRUE ;
-   Size = MAP_APPFONT ( 260 , 81 ) ;
+   Size = MAP_APPFONT ( 260, 81 ) ;
Text [ en-US ] = "Distribution" ;
 
FixedLine FL_HORIZONTAL
{
-   Pos = MAP_APPFONT ( 6 , 3  ) ;
-   Size = MAP_APPFONT ( 248 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 3 ) ;
+   Size = MAP_APPFONT ( 248, 8 ) ;
Text [ en-US ] = "Horizontal" ;
};
 
RadioButton BTN_HOR_NONE
{
-   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE";
-   Pos = MAP_APPFONT ( 12 , 14  ) ;
-Size = MAP_APPFONT ( 48 , 10 ) ;
-Text [ en-US ] = "~None" ;
+   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE" ;
+   Pos = MAP_APPFONT ( 12, 26 ) ;
+   Size = MAP_APPFONT ( 48, 10 ) ;
+   Text [ en-US ] = "~None" ;
};
 
RadioButton BTN_HOR_LEFT
{
-   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT";
-Pos = MAP_APPFONT ( 56 , 26  ) ;
-Size = MAP_APPFONT ( 45 , 10 ) ;
-Text [ en-US ] = "~Left" ;
+   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT" ;
+   Pos = MAP_APPFONT ( 56, 26 ) ;
+   Size = MAP_APPFONT ( 45, 10 ) ;
+   Text [ en-US ] = "~Left" ;
};
 
RadioButton BTN_HOR_CENTER
{
-   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER";
-Pos = MAP_APPFONT ( 105 , 26  ) ;
-Size = MAP_APPFONT ( 45 , 10 ) ;
-Text [ en-US ] = "~Center" ;
+   HelpID = 
"cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER" ;
+   Pos = MAP_APPFONT ( 105, 26 ) ;
+   Size = MAP_APPFONT ( 45, 10 ) ;
+   Text [ en-US ] = "~Center" ;
};
 
RadioButton BTN_HOR_DISTANCE
{
-   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE";
-Pos = MAP_APPFONT ( 154 , 26  ) ;
-Size = MAP_APPFONT ( 45 , 10 ) ;
-Text [ en-US ] = "~Spacing" ;
+   HelpID = 
"cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE" ;
+   Pos = MAP_APPFONT ( 154, 26 ) ;
+   Size = MAP_APPFONT ( 45, 10 ) ;
+   Text [ en-US ] = "~Spacing" ;
};
 
RadioButton BTN_HOR_RIGHT
{
-   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT";
-Pos = MAP_APPFONT ( 203 , 26  ) ;
-Size = MAP_APPFONT ( 45 , 10 ) ;
-Text [ en-US ] = "~Right" ;
+   HelpID = "cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT" 
;
+   Pos = MAP_APPFONT ( 203, 26 ) ;
+   Size = 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-09-17 Thread mseidel
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 b1e1ca5  Cleaned up resource file
b1e1ca5 is described below

commit b1e1ca512d8a17ae11b0426213548f3eab00e067
Author: mseidel 
AuthorDate: Tue Sep 17 15:59:46 2019 +0200

Cleaned up resource file

(cherry picked from commit c44a8a350a82032b3cd596871fd3dca491eabc6c)
---
 main/cui/source/dialogs/splitcelldlg.src | 104 +++
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/main/cui/source/dialogs/splitcelldlg.src 
b/main/cui/source/dialogs/splitcelldlg.src
index dda2070..d3f8830 100644
--- a/main/cui/source/dialogs/splitcelldlg.src
+++ b/main/cui/source/dialogs/splitcelldlg.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.
- * 
+ *
  */
 
 
@@ -26,45 +26,45 @@
 
 ModalDialog RID_SVX_SPLITCELLDLG
 {
-HelpID = "cui:ModalDialog:RID_SVX_SPLITCELLDLG";
+   HelpID = "cui:ModalDialog:RID_SVX_SPLITCELLDLG" ;
OutputSize = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( 169 , 108 ) ;
+   Size = MAP_APPFONT ( 169, 108 ) ;
Text [ en-US ] = "Split Cells" ;
Moveable = TRUE ;
-   
+
OKButton BT_OK
{
-Pos = MAP_APPFONT ( 115 , 6 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 115, 6 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BT_CANCEL
{
-Pos = MAP_APPFONT ( 115 , 23 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 115, 23 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
HelpButton BT_HELP
{
-Pos = MAP_APPFONT ( 115 , 43 ) ;
-   Size = MAP_APPFONT ( 50 , 14 ) ;
+   Pos = MAP_APPFONT ( 115, 43 ) ;
+   Size = MAP_APPFONT ( 50, 14 ) ;
TabStop = TRUE ;
};
FixedText FT_COUNT
{
-   Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 67 , 8 ) ;
-Text [ en-US ] = "~Split cell into" ;
+   Pos = MAP_APPFONT ( 12, 16 ) ;
+   Size = MAP_APPFONT ( 67, 8 ) ;
+   Text [ en-US ] = "~Split cell into" ;
Left = TRUE ;
};
NumericField ED_COUNT
{
-   HelpID = "cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT";
+   HelpID = "cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT" ;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82 , 14 ) ;
-   Size = MAP_APPFONT ( 21 , 12 ) ;
+   Pos = MAP_APPFONT ( 82, 14 ) ;
+   Size = MAP_APPFONT ( 21, 12 ) ;
TabStop = TRUE ;
Left = TRUE ;
Right = TRUE ;
@@ -75,59 +75,59 @@ ModalDialog RID_SVX_SPLITCELLDLG
First = 2 ;
Last = 5 ;
};
-FixedLine FL_COUNT
+   FixedLine FL_COUNT
{
-   Pos = MAP_APPFONT ( 6 , 3 ) ;
-Size = MAP_APPFONT ( 103 , 8 ) ;
+   Pos = MAP_APPFONT ( 6, 3 ) ;
+   Size = MAP_APPFONT ( 103, 8 ) ;
Text [ en-US ] = "Split" ;
};
ImageRadioButton RB_HORZ
{
-   HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ";
-   Pos = MAP_APPFONT ( 12 , 47 ) ;
-Size = MAP_APPFONT ( 90 , 18 ) ;
-Group = TRUE;
-Text [ en-US ] = "H~orizontally" ;
+   HelpID = "cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ" ;
+   Pos = MAP_APPFONT ( 12, 47 ) ;
+   Size = MAP_APPFONT ( 90, 18 ) ;
+   Group = TRUE ;
+   Text [ en-US ] = "H~orizontally" ;
RadioButtonImage = Image
{
-   ImageBitmap = Bitmap { File = "zetlhor2.bmp" ; 

[openoffice] branch AOO42X updated: Cleaned up resource file

2019-09-15 Thread mseidel
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 3e2fcea  Cleaned up resource file
3e2fcea is described below

commit 3e2fceae12897c86496f9cb146fb03a475f99618
Author: mseidel 
AuthorDate: Sun Sep 15 17:23:17 2019 +0200

Cleaned up resource file

(cherry picked from commit 72c96935c238d996f53190701811a693901757b4)
---
 main/svx/source/sidebar/area/AreaPropertyPanel.src | 250 +++--
 1 file changed, 126 insertions(+), 124 deletions(-)

diff --git a/main/svx/source/sidebar/area/AreaPropertyPanel.src 
b/main/svx/source/sidebar/area/AreaPropertyPanel.src
index ccdc9bb..d89ff73 100644
--- a/main/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/main/svx/source/sidebar/area/AreaPropertyPanel.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,61 +7,63 @@
  * 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 "AreaPropertyPanel.hrc"
 #include 
 #include 
 #include "helpid.hrc"
 
-#define TOOLBOX_WIDTH  50
-#define TOOLBOX_HEIGHT 17
+#define TOOLBOX_WIDTH  50
+#define TOOLBOX_HEIGHT 17
 
 Control RID_SIDEBAR_AREA_PANEL
 {
-   OutputSize = TRUE;
-   DialogControl = TRUE;
-   Border = FALSE;
-   Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP 
+ SECTIONPAGE_MARGIN_VERTICAL_BOT + 2*( FIXED_TEXT_HEIGHT + 
TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT) + CONTROL_SPACING_VERTICAL );
+   OutputSize = TRUE ;
+   DialogControl = TRUE ;
+   Border = FALSE ;
+   Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, 
SECTIONPAGE_MARGIN_VERTICAL_TOP + SECTIONPAGE_MARGIN_VERTICAL_BOT + 2 * ( 
FIXED_TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT ) + 
CONTROL_SPACING_VERTICAL ) ;
HelpID = HID_PROPERTYPANEL_AREA_SECTION ;
-   Text [ en-US ] = "Area";
+   Text [ en-US ] = "Area" ;
 
FixedText FT_COLOR_LIST
{
-   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , 
SECTIONPAGE_MARGIN_VERTICAL_TOP  ) ;
-Size= MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
-   Text [ en-US ] = "~Fill:";
+   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, 
SECTIONPAGE_MARGIN_VERTICAL_TOP ) ;
+   Size = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) 
;
+   Text [ en-US ] = "~Fill:" ;
};
FixedText FL_TRSP_TEXT
{
-   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , 
SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + 
TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ; 
-Size= MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) ;
-   Text [ en-US ] = "~Transparency:";
+   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, 
SECTIONPAGE_MARGIN_VERTICAL_TOP + FIXED_TEXT_HEIGHT + 
TEXT_CONTROL_SPACING_VERTICAL + CBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
+   Size = MAP_APPFONT ( FIXED_TEXT_WIDTH + 50, FIXED_TEXT_HEIGHT ) 
;
+   Text [ en-US ] = "~Transparency:" ;
};
ToolBox TB_COLOR
{
HelpID = HID_PPROPERTYPANEL_AREA_TBX_COLOR;
SVLook = TRUE ;
-   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH 
+ CONTROL_SPACING_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + 
FIXED_TEXT_HEIGHT + 1) ;
-   Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
+   Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + MBOX_WIDTH 
+ CONTROL_SPACING_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + 
FIXED_TEXT_HEIGHT + 1 ) ;
+   Size = MAP_APPFONT ( TOOLBOX_WIDTH, TOOLBOX_HEIGHT ) ;
TabStop = TRUE ;
-   Text = "Color";
+   Text = "Color" ;
ItemList =
{
ToolBoxItem
{
Identifier = TBI_COLOR ;
-