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 <msei...@apache.org>
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 = 0x0000; Blue = 0xFF00; };
+       ImageBitmap = Bitmap { File = "plus.png" ; } ;
 };
 
 Image RID_IMG_TREENODE_EXPANDED
 {
-       ImageBitmap = Bitmap { File = "minus.png"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
+       ImageBitmap = Bitmap { File = "minus.png" ; } ;
 };
 
 Image RID_IMG_TREENODE_COLLAPSED_HC
 {
-       ImageBitmap = Bitmap { File = "plus_sch.png"; } ;
-    MaskColor = Color { Red = 0xFF00; Green = 0x0000; 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 = 0x0000; 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 footer" ;
 };
 
 String RID_STR_UNDO_ADD_REPORTHEADERFOOTER
 {
-       Text [ en-US ] = "Add report header / report footer";
+       Text [ en-US ] = "Add report header / report footer" ;
 };
 
 String RID_STR_UNDO_REMOVE_PAGEHEADERFOOTER
 {
-       Text [ en-US ] = "Remove page header / page footer";
+       Text [ en-US ] = "Remove page header / page footer" ;
 };
 
 String RID_STR_UNDO_ADD_PAGEHEADERFOOTER
 {
-       Text [ en-US ] = "Add page header / page footer";
+       Text [ en-US ] = "Add page header / page footer" ;
 };
 
 String RID_STR_UNDO_PROPERTY
 {
-       Text [ en-US ] = "Change property '#'";
-       Text = "The # character is used for replacing";
+       Text [ en-US ] = "Change property '#'" ;
+       Text = "The # character is used for replacing" ;
 };
 
 String RID_STR_UNDO_ADD_GROUP_HEADER
 {
-       Text [ en-US ] = "Add group header ";
+       Text [ en-US ] = "Add group header " ;
 };
 
 String RID_STR_UNDO_REMOVE_GROUP_HEADER
 {
-       Text [ en-US ] = "Remove group header ";
+       Text [ en-US ] = "Remove group header " ;
 };
 
 String RID_STR_UNDO_ADD_GROUP_FOOTER
 {
-       Text [ en-US ] = "Add group footer ";
+       Text [ en-US ] = "Add group footer " ;
 };
 
 String RID_STR_UNDO_REMOVE_GROUP_FOOTER
 {
-       Text [ en-US ] = "Remove group footer ";
+       Text [ en-US ] = "Remove group footer " ;
 };
 String RID_STR_UNDO_ADDFUNCTION
 {
-       Text [ en-US ] = "Add function";
+       Text [ en-US ] = "Add function" ;
 };
 
 String RID_STR_UNDO_DELETEFUNCTION
 {
-       Text [ en-US ] = "Delete function";
+       Text [ en-US ] = "Delete function" ;
 };
 
 String RID_STR_DESIGN_VIEW
 {
-       Text [ en-US ] = "Design";
+       Text [ en-US ] = "Design" ;
 };
 
 String RID_STR_PREVIEW_VIEW
 {
-       Text [ en-US ] = "Preview";
+       Text [ en-US ] = "Preview" ;
 };
 
 String STR_RPT_TITLE
@@ -275,11 +272,11 @@ String RID_STR_UNDO_UNGROUP
 
 String RID_STR_GROUPHEADER
 {
-       Text [ en-US ] = "GroupHeader";
+       Text [ en-US ] = "GroupHeader" ;
 };
 String RID_STR_GROUPFOOTER
 {
-       Text [ en-US ] = "GroupFooter";
+       Text [ en-US ] = "GroupFooter" ;
 };
 Menu RID_MENU_REPORT
 {
@@ -287,9 +284,9 @@ Menu RID_MENU_REPORT
        {
                MenuItem
                {
-                       Identifier = SID_SORTINGANDGROUPING;
-                       Command = ".uno:DbSortingAndGrouping";
-                       Text [ en-US ] = "Sorting and Grouping...";
+                       Identifier = SID_SORTINGANDGROUPING ;
+                       Command = ".uno:DbSortingAndGrouping" ;
+                       Text [ en-US ] = "Sorting and Grouping..." ;
                };
                MenuItem
                {
@@ -297,23 +294,23 @@ Menu RID_MENU_REPORT
                };
                MenuItem
                {
-                       Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND;
-                       Command = ".uno:DBBackgroundColor";
-                       Text [ en-US ] = "Background Color...";
+                       Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND ;
+                       Command = ".uno:DBBackgroundColor" ;
+                       Text [ en-US ] = "Background Color..." ;
                };
                MenuItem
                {
-                       Identifier = SID_RULER;
-                       Command = ".uno:ShowRuler";
+                       Identifier = SID_RULER ;
+                       Command = ".uno:ShowRuler" ;
                        Checkable = TRUE;
-                       Text [ en-US ] = "Ruler...";
+                       Text [ en-US ] = "Ruler..." ;
                };
                MenuItem
                {
-                       Identifier = SID_GRID_VISIBLE;
-                       Command = ".uno:GridVisible";
-                       Checkable = TRUE;
-                       Text [ en-US ] = "Grid...";
+                       Identifier = SID_GRID_VISIBLE ;
+                       Command = ".uno:GridVisible" ;
+                       Checkable = TRUE ;
+                       Text [ en-US ] = "Grid..." ;
                };
                MenuItem
                {
@@ -321,70 +318,70 @@ Menu RID_MENU_REPORT
                };
                MenuItem
                {
-                       Identifier = SID_PAGEHEADERFOOTER;
-                       Command = ".uno:PageHeaderFooter";
-                       Checkable = TRUE;
+                       Identifier = SID_PAGEHEADERFOOTER ;
+                       Command = ".uno:PageHeaderFooter" ;
+                       Checkable = TRUE ;
                };
                MenuItem
                {
-                       Identifier = SID_REPORTHEADERFOOTER;
-                       Command = ".uno:ReportHeaderFooter";
-                       Checkable = TRUE;
+                       Identifier = SID_REPORTHEADERFOOTER ;
+                       Command = ".uno:ReportHeaderFooter" ;
+                       Checkable = TRUE ;
                };
                MenuItem
                {
-                       Separator = TRUE;
+                       Separator = TRUE ;
                };
-        MenuItem
+               MenuItem
                {
-            Identifier = SID_ARRANGEMENU ; 
-            Command = ".uno:ArrangeMenu" ; 
-            Text [ en-US ] = "~Arrange" ; 
+                       Identifier = SID_ARRANGEMENU ;
+                       Command = ".uno:ArrangeMenu" ;
+                       Text [ en-US ] = "~Arrange" ;
                        SubMenu = Menu
                        {
-                               ItemList = 
+                               ItemList =
                                {
                                        MenuItem
                                        {
-                        ITEM_FORMAT_FRAME_TO_TOP
-                    };
-                    MenuItem
-                    {
-                        Identifier = SID_FRAME_UP ; 
-                        HelpId = ".uno:ObjectForwardOne";
-                        Text [ en-US ] = "Bring ~Forward" ;
-                    };
-                    MenuItem
-                    {
-                        Identifier = SID_FRAME_DOWN ; 
-                        HelpId = ".uno:ObjectBackOne";
-                        Text [ en-US ] = "Send Back~ward" ;
-                    };
-                    MenuItem
+                                               ITEM_FORMAT_FRAME_TO_TOP
+                                       };
+                                       MenuItem
+                                       {
+                                               Identifier = SID_FRAME_UP ;
+                                               HelpId = 
".uno:ObjectForwardOne" ;
+                                               Text [ en-US ] = "Bring 
~Forward" ;
+                                       };
+                                       MenuItem
                                        {
-                        ITEM_FORMAT_FRAME_TO_BOTTOM
-                    };
-                    MenuItem
+                                               Identifier = SID_FRAME_DOWN ;
+                                               HelpId = ".uno:ObjectBackOne" ;
+                                               Text [ en-US ] = "Send 
Back~ward" ;
+                                       };
+                                       MenuItem
                                        {
-                        Separator = TRUE;
-                    };
-                    MenuItem
+                                               ITEM_FORMAT_FRAME_TO_BOTTOM
+                                       };
+                                       MenuItem
                                        {
-                        ITEM_FORMAT_OBJECT_HEAVEN
-                    };
-                    MenuItem
+                                               Separator = TRUE ;
+                                       };
+                                       MenuItem
                                        {
-                        ITEM_FORMAT_OBJECT_HELL
-                    };
-                };
-            };
-        };
+                                               ITEM_FORMAT_OBJECT_HEAVEN
+                                       };
+                                       MenuItem
+                                       {
+                                               ITEM_FORMAT_OBJECT_HELL
+                                       };
+                               };
+                       };
+               };
                MenuItem
                {
                        ITEM_FORMAT_OBJECT_ALIGN
                        SubMenu = Menu
                        {
-                               ItemList = 
+                               ItemList =
                                {
                                        MenuItem
                                        {
@@ -400,7 +397,7 @@ Menu RID_MENU_REPORT
                                        };
                                        MenuItem
                                        {
-                                               Separator = TRUE;
+                                               Separator = TRUE ;
                                        };
                                        MenuItem
                                        {
@@ -419,45 +416,45 @@ Menu RID_MENU_REPORT
                };
                MenuItem
                {
-                       Separator = TRUE;
+                       Separator = TRUE ;
                };
 
-        MenuItem
+               MenuItem
                {
-                       Identifier = SID_OBJECT_RESIZING ; 
-               Command = ".uno:ObjectResize" ; 
-            Text [ en-US ] = "~Object Resizing" ;
+                       Identifier = SID_OBJECT_RESIZING ;
+                       Command = ".uno:ObjectResize" ;
+                       Text [ en-US ] = "~Object Resizing" ;
                        SubMenu = Menu
                        {
-                               ItemList = 
+                               ItemList =
                                {
                                        MenuItem
                                        {
                                                Identifier = 
SID_OBJECT_SMALLESTWIDTH ;
-                           Command = ".uno:SmallestWidth" ;
-                        Text [ en-US ] = "~Fit to smallest width" ;
+                                               Command = ".uno:SmallestWidth" ;
+                                               Text [ en-US ] = "~Fit to 
smallest width" ;
                                        };
                                        MenuItem
                                        {
                                                Identifier = 
SID_OBJECT_GREATESTWIDTH ;
-                           Command = ".uno:GreatestWidth" ;
-                        Text [ en-US ] = "~Fit to greatest width" ;
+                                               Command = ".uno:GreatestWidth" ;
+                                               Text [ en-US ] = "~Fit to 
greatest width" ;
                                        };
-                    MenuItem
+                                       MenuItem
                                        {
-                                               Separator = TRUE;
+                                               Separator = TRUE ;
                                        };
                                        MenuItem
                                        {
                                                Identifier = 
SID_OBJECT_SMALLESTHEIGHT ;
-                           Command = ".uno:SmallestHeight" ;
-                        Text [ en-US ] = "~Fit to smallest height" ;
+                                               Command = ".uno:SmallestHeight" 
;
+                                               Text [ en-US ] = "~Fit to 
smallest height" ;
                                        };
                                        MenuItem
                                        {
                                                Identifier = 
SID_OBJECT_GREATESTHEIGHT ;
-                           Command = ".uno:GreatestHeight" ;
-                        Text [ en-US ] = "~Fit to greatest height" ;
+                                               Command = ".uno:GreatestHeight" 
;
+                                               Text [ en-US ] = "~Fit to 
greatest height" ;
                                        };
                                };
                        };
@@ -465,61 +462,61 @@ Menu RID_MENU_REPORT
 
                MenuItem
                {
-                       Separator = TRUE;
+                       Separator = TRUE ;
                };
-        MenuItem
+               MenuItem
                {
-                       Identifier = SID_SECTION_SHRINK_MENU ; 
-               Command = ".uno:SectionShrinkMenu" ; 
-            Text [ en-US ] = "Section" ;
+                       Identifier = SID_SECTION_SHRINK_MENU ;
+                       Command = ".uno:SectionShrinkMenu" ;
+                       Text [ en-US ] = "Section" ;
                        SubMenu = Menu
                        {
-                               ItemList = 
+                               ItemList =
                                {
                                        MenuItem
                                        {
                                                Identifier = SID_SECTION_SHRINK 
;
-                           Command = ".uno:SectionShrink" ;
-                        Text [ en-US ] = "Shrink" ;
+                                               Command = ".uno:SectionShrink" ;
+                                               Text [ en-US ] = "Shrink" ;
                                        };
                                        MenuItem
                                        {
                                                Identifier = 
SID_SECTION_SHRINK_TOP ;
-                           Command = ".uno:SectionShrinkTop" ;
-                        Text [ en-US ] = "Shrink from top" ;
+                                               Command = 
".uno:SectionShrinkTop" ;
+                                               Text [ en-US ] = "Shrink from 
top" ;
                                        };
                                        MenuItem
                                        {
                                                Identifier = 
SID_SECTION_SHRINK_BOTTOM ;
-                           Command = ".uno:SectionShrinkBottom" ;
-                        Text [ en-US ] = "Shrink from bottom" ;
+                                               Command = 
".uno:SectionShrinkBottom" ;
+                                               Text [ en-US ] = "Shrink from 
bottom" ;
                                        };
                                };
                        };
                };
                MenuItem
                {
-                       Separator = TRUE;
+                       Separator = TRUE ;
                };
-        MenuItem
+               MenuItem
                {
-                       Identifier = SID_DISTRIBUTION;
-                       Command = ".uno:Distribution";
-               Text [ en-US ] = "Distribution..." ;
+                       Identifier = SID_DISTRIBUTION ;
+                       Command = ".uno:Distribution" ;
+                       Text [ en-US ] = "Distribution..." ;
                };
-        MenuItem
+               MenuItem
                {
                        Separator = TRUE;
                };
                MenuItem
                {
-                       Identifier = SID_SHOW_PROPERTYBROWSER;
-                       Command = ".uno:FormProperties";
-                       Text [ en-US ] = "Properties...";
+                       Identifier = SID_SHOW_PROPERTYBROWSER ;
+                       Command = ".uno:FormProperties" ;
+                       Text [ en-US ] = "Properties..." ;
                };
                MenuItem
                {
-                       Separator = TRUE;
+                       Separator = TRUE ;
                };
                MenuItem
                {
@@ -537,7 +534,7 @@ Menu RID_MENU_REPORT
 };
 String RID_STR_FIELDSELECTION
 {
-       Text [ en-US ] = "Add field:";
+       Text [ en-US ] = "Add field:" ;
 };
 
 String RID_STR_FILTER
@@ -580,8 +577,7 @@ String RID_STR_FUNCTION
 };
 Image REPORT_TREE_ICON
 {
-       ImageBitmap = Bitmap { File = "report_16"; };
-       MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
+       ImageBitmap = Bitmap { File = "report_16.png" ; };
 };
 String RID_STR_COULD_NOT_CREATE_REPORT
 {
@@ -589,73 +585,75 @@ String RID_STR_COULD_NOT_CREATE_REPORT
 };
 String RID_STR_CAUGHT_FOREIGN_EXCEPTION
 {
-    Text [ en-US ] = "An exception of type $type$ was caught." ;
+       Text [ en-US ] = "An exception of type $type$ was caught." ;
 };
 String RID_STR_UNDO_CHANGEFONT
 {
-       Text [ en-US ] = "Change font";
+       Text [ en-US ] = "Change font" ;
 };
 String RID_STR_UNDO_CHANGEPAGE
 {
-    Text [ en-US ] = "Change page attributes";
+       Text [ en-US ] = "Change page attributes" ;
 };
 String RID_STR_PAGEHEADERFOOTER_INSERT
 {
-    Text [ en-US ] = "Insert Page Header/Footer";
+       Text [ en-US ] = "Insert Page Header/Footer" ;
 };
 String RID_STR_PAGEHEADERFOOTER_DELETE
 {
-    Text [ en-US ] = "Delete Page Header/Footer";
+       Text [ en-US ] = "Delete Page Header/Footer" ;
 };
 String RID_STR_COLUMNHEADERFOOTER_INSERT
 {
-    Text [ en-US ] = "Insert Column Header/Footer";
+       Text [ en-US ] = "Insert Column Header/Footer" ;
 };
 String RID_STR_COLUMNHEADERFOOTER_DELETE
 {
-    Text [ en-US ] = "Delete Column Header/Footer";
+       Text [ en-US ] = "Delete Column Header/Footer" ;
 };
 String RID_STR_REPORTHEADERFOOTER_INSERT
 {
-    Text [ en-US ] = "Insert Report Header/Footer";
+       Text [ en-US ] = "Insert Report Header/Footer" ;
 };
 String RID_STR_REPORTHEADERFOOTER_DELETE
 {
-    Text [ en-US ] = "Delete Report Header/Footer";
+       Text [ en-US ] = "Delete Report Header/Footer" ;
 };
 String RID_ERR_NO_COMMAND
 {
-    Text [ en-US ] = "The report can not be executed unless it is bound to 
content.";
+       Text [ en-US ] = "The report can not be executed unless it is bound to 
content." ;
 };
 String RID_ERR_NO_OBJECTS
 {
-    Text [ en-US ] = "The report can not be executed unless at least one 
object has been inserted.";
+       Text [ en-US ] = "The report can not be executed unless at least one 
object has been inserted." ;
 };
 String RID_STR_UNDO_SHRINK
 {
-       Text [ en-US ] = "Shrink Section";
+       Text [ en-US ] = "Shrink Section" ;
 };
 String RID_STR_DETAIL
 {
-       Text [ en-US ] = "Detail";
+       Text [ en-US ] = "Detail" ;
 };
 String RID_STR_PAGE_HEADER
 {
-       Text [ en-US ] = "Page Header";
+       Text [ en-US ] = "Page Header" ;
 };
 String RID_STR_PAGE_FOOTER
 {
-       Text [ en-US ] = "Page Footer";
+       Text [ en-US ] = "Page Footer" ;
 };
 String RID_STR_REPORT_HEADER
 {
-       Text [ en-US ] = "Report Header";
+       Text [ en-US ] = "Report Header" ;
 };
 String RID_STR_REPORT_FOOTER
 {
-       Text [ en-US ] = "Report Footer";
+       Text [ en-US ] = "Report Footer" ;
 };
 String RID_STR_INSERT
 {
-    Text [ en-US ] = "Insert";
+       Text [ en-US ] = "Insert" ;
 };
+
+// ********************************************************************** EOF

Reply via email to