You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2024/09/28 21:04:24 UTC
(openoffice) branch AOO42X updated: Clean up resource files
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 1555252da4 Clean up resource files
1555252da4 is described below
commit 1555252da496fabb46d89423c037cd69685a395b
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Sep 28 23:03:09 2024 +0200
Clean up resource files
(cherry picked from commit b53b0777d0f3210c079bc99bfb2b4c20e86cbea7)
---
main/dbaccess/source/ui/dlg/dbadmin2.src | 85 ++++++++++----------
main/dbaccess/source/ui/misc/dbumiscres.src | 40 +++++-----
main/reportdesign/source/ui/dlg/Navigator.src | 110 +++++++++++++-------------
3 files changed, 116 insertions(+), 119 deletions(-)
diff --git a/main/dbaccess/source/ui/dlg/dbadmin2.src b/main/dbaccess/source/ui/dlg/dbadmin2.src
index e85fbc9ba2..ead8ece306 100644
--- a/main/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/main/dbaccess/source/ui/dlg/dbadmin2.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,18 @@
* 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
@@ -45,17 +43,17 @@
String STR_ENTER_CONNECTION_PASSWORD
{
- Text [ en-US ] = "A password is needed to connect to the data source \"$name$\".";
+ Text [ en-US ] = "A password is needed to connect to the data source \"$name$\"." ;
};
String STR_ASK_FOR_DIRECTORY_CREATION
{
- Text [ en-US ] = "The directory\n\n$path$\n\ndoes not exist. Should it be created?";
+ Text [ en-US ] = "The directory\n\n$path$\n\ndoes not exist. Should it be created?" ;
};
String STR_COULD_NOT_CREATE_DIRECTORY
{
- Text [ en-US ] = "The directory $name$ could not be created.";
+ Text [ en-US ] = "The directory $name$ could not be created." ;
};
#define EDIT_SIZE_X 50
@@ -65,82 +63,83 @@ String STR_COULD_NOT_CREATE_DIRECTORY
ModalDialog DLG_DOMAINPASSWORD
{
- HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD";
+ HelpID = "dbaccess:ModalDialog:DLG_DOMAINPASSWORD" ;
Border = TRUE ;
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
- Text[ en-US ] = "Convert Database";
+ Size = MAP_APPFONT ( WIN_X, WIN_Y ) ;
+ Text [ en-US ] = "Convert Database" ;
FixedLine FT_PASSWORD
{
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( WIN_X - 3 - 6 - 6 - 50 , 8 ) ;
- Text[ en-US ] = "Please enter the ~password for the user 'DOMAIN'.";
+ Pos = MAP_APPFONT ( 3, 3 ) ;
+ Size = MAP_APPFONT ( WIN_X - 3 - 6 - 6 - 50, 8 ) ;
+ Text [ en-US ] = "Please enter the ~password for the user 'DOMAIN'." ;
};
Edit ET_PASSWORD
{
- HelpID = "dbaccess:Edit:DLG_DOMAINPASSWORD:ET_PASSWORD";
+ HelpID = "dbaccess:Edit:DLG_DOMAINPASSWORD:ET_PASSWORD" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 12 + FT_SIZE_X , 16 ) ;
- Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
+ Pos = MAP_APPFONT ( 12 + FT_SIZE_X, 16 ) ;
+ Size = MAP_APPFONT ( EDIT_SIZE_X, 12 ) ;
PassWord = TRUE ;
};
OKButton BTN_PASSWORD_OK
{
- Pos = MAP_APPFONT ( WIN_X - 56 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 56, 6 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
DefButton = TRUE ;
};
CancelButton BTN_PASSWORD_CANCEL
{
- Pos = MAP_APPFONT ( WIN_X - 56 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 56, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
HelpButton BTN_PASSWORD_HELP
{
- Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
+ Pos = MAP_APPFONT ( WIN_X - 56, 43 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ };
};
-#define PAGE_X_T (PAGE_X -80)
-#define PAGE_Y_T (PAGE_Y -50)
+#define PAGE_X_T (PAGE_X -80)
+#define PAGE_Y_T (PAGE_Y -50)
TabPage PAGE_TABLESUBSCRIPTION
{
SVLook = TRUE ;
- Hide = TRUE;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
+ Hide = TRUE ;
+ Pos = MAP_APPFONT ( 0, 0 ) ;
Size = MAP_APPFONT ( PAGE_X_T, PAGE_Y_T) ;
- HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION;
-
+ HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION ;
+
Text [ en-US ] = "Tables Filter" ;
FixedLine FL_SEPARATOR1
{
- Pos = MAP_APPFONT ( RELATED_CONTROLS , UNRELATED_CONTROLS ) ;
+ Pos = MAP_APPFONT ( RELATED_CONTROLS, UNRELATED_CONTROLS ) ;
Size = MAP_APPFONT ( PAGE_X_T - 2* RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
- Text [ en-US ] = "Tables and table filter";
+ Text [ en-US ] = "Tables and table filter" ;
};
Control CTL_TABLESUBSCRIPTION
{
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ;
- Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ;
- Group = TRUE;
- Border = TRUE ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ;
+ Size = MAP_APPFONT ( PAGE_X_T - 2 * UNRELATED_CONTROLS, 81 ) ;
+ Group = TRUE ;
+ Border = TRUE ;
TabStop = TRUE ;
- HelpId = HID_DSADMIN_TABLE_SELECTOR;
+ HelpId = HID_DSADMIN_TABLE_SELECTOR ;
};
FixedText FT_FILTER_EXPLANATION
{
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 81 ) ;
- Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ;
- HelpId = HID_DSADMIN_FILTER_EXPLANATION;
- WordBreak = TRUE;
- Text [ en-US ] = "Mark the tables that should be visible for the applications.";
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 2 * UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 81 ) ;
+ Size = MAP_APPFONT ( PAGE_X_T - 2 * UNRELATED_CONTROLS, 16 ) ;
+ HelpId = HID_DSADMIN_FILTER_EXPLANATION ;
+ WordBreak = TRUE ;
+ Text [ en-US ] = "Mark the tables that should be visible for the applications." ;
};
};
+// ********************************************************************** EOF
diff --git a/main/dbaccess/source/ui/misc/dbumiscres.src b/main/dbaccess/source/ui/misc/dbumiscres.src
index 11e998b03d..fb6a61066e 100644
--- a/main/dbaccess/source/ui/misc/dbumiscres.src
+++ b/main/dbaccess/source/ui/misc/dbumiscres.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,67 +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.
- *
+ *
*************************************************************/
-
-
#ifndef _DBU_MISC_HRC_
#include "dbu_misc.hrc"
#endif
-
Resource RSC_CHARSETS
{
- String 1
- {
- Text [ en-US ] = "System";
+ String 1
+ {
+ Text [ en-US ] = "System" ;
};
};
String STR_ERROR_DURING_CREATION
{
- Text [ en-US ] = "Error during creation";
+ Text [ en-US ] = "Error during creation" ;
};
String STR_UNEXPECTED_ERROR
{
- Text [ en-US ] = "An unexpected error occurred. The operation could not be performed.";
+ Text [ en-US ] = "An unexpected error occurred. The operation could not be performed." ;
};
String STR_COULDNOTOPEN_LINKEDDOC
{
- Text [ en-US ] = "The document \"$file$\" could not be opened.";
+ Text [ en-US ] = "The document \"$file$\" could not be opened." ;
};
String STR_MISSING_TABLES_XDROP
{
- Text [ en-US ] = "The table cannot be deleted because the database connection does not support this.";
+ Text [ en-US ] = "The table cannot be deleted because the database connection does not support this." ;
};
String STR_BUTTON_TEXT_ALL
{
- Text [ en-US ] = "~All";
-
+ Text [ en-US ] = "~All" ;
};
String STR_UNDO_COLON
{
- Text [ en-US ] = "Undo:";
+ Text [ en-US ] = "Undo:" ;
};
String STR_REDO_COLON
{
- Text [ en-US ] = "Redo:";
+ Text [ en-US ] = "Redo:" ;
};
String STR_UNKNOWN_TYPE_FOUND
@@ -77,12 +73,12 @@ String STR_UNKNOWN_TYPE_FOUND
String STR_FILE_DOES_NOT_EXIST
{
- Text[ en-US ] = "The file \"$file$\" does not exist.";
+ Text [ en-US ] = "The file \"$file$\" does not exist." ;
};
String STR_WARNINGS_DURING_CONNECT
{
- Text [ en-US ] = "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them.";
+ Text [ en-US ] = "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them." ;
};
String STR_NAMED_OBJECT_ALREADY_EXISTS
@@ -92,5 +88,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
String RID_STR_EXTENSION_NOT_PRESENT
{
// #i96130# use hard coded name
- Text [ en-US ] = "The report, \"$file$\", requires the extension Report Builder.";
+ Text [ en-US ] = "The report, \"$file$\", requires the extension Report Builder." ;
};
+
+// ********************************************************************** EOF
diff --git a/main/reportdesign/source/ui/dlg/Navigator.src b/main/reportdesign/source/ui/dlg/Navigator.src
index f1cde2357c..b1e5366550 100644
--- a/main/reportdesign/source/ui/dlg/Navigator.src
+++ b/main/reportdesign/source/ui/dlg/Navigator.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,18 @@
* 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 "helpids.hrc"
#include "rptui_slotid.hrc"
@@ -31,64 +30,64 @@
#endif
#include <svl/solar.hrc>
-#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2)
-#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3)
-#define RID_SVXIMG_FORMS (RID_FORMS_START +13)
+#define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2)
+#define RID_SVXIMG_EXPANDEDNODE (RID_FORMS_START + 3)
+#define RID_SVXIMG_FORMS (RID_FORMS_START +13)
FloatingWindow RID_NAVIGATOR
{
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 200 , 250 ) ;
+ Size = MAP_APPFONT ( 200, 250 ) ;
Text [ en-US ] = "Report navigator" ;
- HelpId = HID_RPT_NAVIGATOR_DLG;
+ HelpId = HID_RPT_NAVIGATOR_DLG ;
Moveable = TRUE ;
Closeable = TRUE ;
- Sizeable = TRUE;
-
+ Sizeable = TRUE ;
+
Control 1
{
- Pos = MAP_APPFONT( 0, 0 );
- Size = MAP_APPFONT( 200, 250 );
- Border = TRUE;
- TabStop = TRUE;
+ Pos = MAP_APPFONT ( 0, 0 ) ;
+ Size = MAP_APPFONT ( 200, 250 ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
};
};
#define NAVIGATOR_IMAGEIDS \
IdList = \
{ \
- SID_SELECT_REPORT;\
+ SID_SELECT_REPORT ;\
SID_FM_FIXEDTEXT ; \
SID_INSERT_HFIXEDLINE ; \
- SID_INSERT_VFIXEDLINE;\
+ SID_INSERT_VFIXEDLINE ;\
SID_FM_IMAGECONTROL ; \
SID_FM_EDIT ; \
- SID_RPT_NEW_FUNCTION;\
- SID_REPORTHEADERFOOTER;\
- SID_PAGEHEADERFOOTER;\
- SID_GROUPHEADER;\
- SID_GROUPFOOTER;\
- RID_SVXIMG_COLLAPSEDNODE ; \
+ SID_RPT_NEW_FUNCTION ;\
+ SID_REPORTHEADERFOOTER ;\
+ SID_PAGEHEADERFOOTER ;\
+ SID_GROUPHEADER ;\
+ SID_GROUPFOOTER ;\
+ RID_SVXIMG_COLLAPSEDNODE ; \
RID_SVXIMG_EXPANDEDNODE ; \
- SID_SORTINGANDGROUPING;\
- SID_DRAWTBX_CS_BASIC;\
- SID_GROUP;\
- SID_ICON_DETAIL;\
+ SID_SORTINGANDGROUPING ;\
+ SID_DRAWTBX_CS_BASIC ;\
+ SID_GROUP ;\
+ SID_ICON_DETAIL ;\
}; \
IdCount = 17
ImageList RID_SVXIMGLIST_RPTEXPL
{
- Prefix = "sx";
+ Prefix = "sx" ;
MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
- NAVIGATOR_IMAGEIDS;
+ NAVIGATOR_IMAGEIDS ;
};
ImageList RID_SVXIMGLIST_RPTEXPL_HC
{
- Prefix = "sxh";
+ Prefix = "sxh" ;
MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
- NAVIGATOR_IMAGEIDS;
+ NAVIGATOR_IMAGEIDS ;
};
String RID_STR_FUNCTIONS
@@ -105,51 +104,51 @@ Menu RID_MENU_NAVIGATOR
{
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
{
- Separator = TRUE;
+ Separator = TRUE ;
};
MenuItem
{
- Identifier = SID_PAGEHEADERFOOTER;
- Command = ".uno:PageHeaderFooter";
- Checkable = TRUE;
- Text [ en-US ] = "Page Header/Footer...";
+ Identifier = SID_PAGEHEADERFOOTER ;
+ Command = ".uno:PageHeaderFooter" ;
+ Checkable = TRUE ;
+ Text [ en-US ] = "Page Header/Footer..." ;
};
MenuItem
{
- Identifier = SID_REPORTHEADERFOOTER;
- Command = ".uno:ReportHeaderFooter";
- Checkable = TRUE;
- Text [ en-US ] = "Report Header/Footer...";
+ Identifier = SID_REPORTHEADERFOOTER ;
+ Command = ".uno:ReportHeaderFooter" ;
+ Checkable = TRUE ;
+ Text [ en-US ] = "Report Header/Footer..." ;
};
MenuItem
{
- Separator = TRUE;
+ Separator = TRUE ;
};
MenuItem
{
- Identifier = SID_RPT_NEW_FUNCTION;
- Command = ".uno:NewFunction";
- Text [ en-US ] = "New Function";
+ Identifier = SID_RPT_NEW_FUNCTION ;
+ Command = ".uno:NewFunction" ;
+ Text [ en-US ] = "New Function" ;
};
MenuItem
{
- Separator = TRUE;
+ 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
{
@@ -158,7 +157,7 @@ Menu RID_MENU_NAVIGATOR
/*
MenuItem
{
- Separator = TRUE;
+ Separator = TRUE ;
};
MenuItem
{
@@ -172,7 +171,8 @@ Menu RID_MENU_NAVIGATOR
{
ITEM_EDIT_PASTE
};
-*/
+*/
};
};
+// ********************************************************************** EOF