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 2c4c118 Cleaned up resource files
2c4c118 is described below
commit 2c4c1185affde197e4fdbc79c0bdc2a60b3447ee
Author: mseidel <msei...@apache.org>
AuthorDate: Mon Nov 11 14:52:19 2019 +0100
Cleaned up resource files
(cherry picked from commit 76ab84b8c2046963a568320798bdf766157ba5ea)
---
main/extensions/source/bibliography/bib.src | 46 ++-----
main/extensions/source/bibliography/toolbar.src | 173 ++++++++++++------------
2 files changed, 94 insertions(+), 125 deletions(-)
diff --git a/main/extensions/source/bibliography/bib.src
b/main/extensions/source/bibliography/bib.src
index 3a6ea23..2860736 100644
--- a/main/extensions/source/bibliography/bib.src
+++ b/main/extensions/source/bibliography/bib.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,38 @@
* 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 "bib.hrc"
String RID_BIB_STR_FIELDSELECTION
{
- Text [ en-US ] = "Field selection:";
+ Text [ en-US ] = "Field selection:" ;
};
String RID_BIB_STR_TABWIN_PREFIX
{
- Text [ en-US ] = "Table;Query;Sql;Sql [Native]";
+ Text [ en-US ] = "Table;Query;Sql;Sql [Native]" ;
};
String RID_BIB_STR_FRAME_TITLE
{
- Text [ en-US ] = "Bibliography Database";
+ Text [ en-US ] = "Bibliography Database" ;
};
String RID_MAP_QUESTION
{
- Text [ en-US ] = "Do you want to edit the column arrangement?";
+ Text [ en-US ] = "Do you want to edit the column arrangement?" ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/extensions/source/bibliography/toolbar.src
b/main/extensions/source/bibliography/toolbar.src
index 19498b9..5e7c535 100644
--- a/main/extensions/source/bibliography/toolbar.src
+++ b/main/extensions/source/bibliography/toolbar.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 <svx/svxids.hrc>
#include "bibliography.hrc"
#include "toolbar.hrc"
@@ -29,134 +30,128 @@
ToolBox RID_BIB_TOOLBAR
{
- HelpId = HID_BIB_DB_TBX;
- Sizeable = TRUE ;
- HideWhenDeactivate = TRUE ;
- LineSpacing = TRUE ;
- Border = TRUE ;
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 200 , 16 ) ;
- ButtonType = BUTTON_SYMBOL ;
- ItemList =
- {
+ HelpId = HID_BIB_DB_TBX ;
+ Sizeable = TRUE ;
+ HideWhenDeactivate = TRUE ;
+ LineSpacing = TRUE ;
+ Border = TRUE ;
+ SVLook = TRUE ;
+ Pos = MAP_APPFONT ( 0, 0 ) ;
+ Size = MAP_APPFONT ( 200, 16 ) ;
+ ButtonType = BUTTON_SYMBOL ;
+ ItemList =
+ {
ToolBoxItem
- {
- Identifier = TBC_FT_SOURCE;
- Text [ en-US ] = "Table";
+ {
+ Identifier = TBC_FT_SOURCE ;
+ Text [ en-US ] = "Table" ;
};
ToolBoxItem
- {
- Identifier = TBC_LB_SOURCE;
- HelpID = HID_BIB_TBX_TABLE;
- Command = ".uno:Bib/source" ;
- };
+ {
+ Identifier = TBC_LB_SOURCE ;
+ HelpID = HID_BIB_TBX_TABLE ;
+ Command = ".uno:Bib/source" ;
+ };
ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
+ {
+ Type = TOOLBOXITEM_SEPARATOR ;
+ };
ToolBoxItem
- {
- Identifier = TBC_FT_QUERY;
- Text [ en-US ] = "Search Key";
+ {
+ Identifier = TBC_FT_QUERY ;
+ Text [ en-US ] = "Search Key" ;
};
ToolBoxItem
- {
- Identifier = TBC_ED_QUERY;
- HelpID = HID_BIB_TBX_SEARCH;
- Command = ".uno:Bib/query" ;
- };
+ {
+ Identifier = TBC_ED_QUERY ;
+ HelpID = HID_BIB_TBX_SEARCH ;
+ Command = ".uno:Bib/query" ;
+ };
ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
+ {
+ Type = TOOLBOXITEM_SEPARATOR ;
+ };
ToolBoxItem
- {
- Identifier = TBC_BT_AUTOFILTER ;
- HelpID = HID_BIB_TBX_AUTOFILTER;
-// ItemBitmap = Bitmap { File = "sc10716.bmp" ; };
- DropDown = TRUE ;
- Command = ".uno:Bib/autoFilter" ;
- Text [ en-US ] = "AutoFilter";
+ {
+ Identifier = TBC_BT_AUTOFILTER ;
+ HelpID = HID_BIB_TBX_AUTOFILTER ;
+// ItemBitmap = Bitmap {File = "sc10716.png" ;} ;
+ DropDown = TRUE ;
+ Command = ".uno:Bib/autoFilter" ;
+ Text [ en-US ] = "AutoFilter" ;
};
ToolBoxItem
- {
- Identifier = TBC_BT_FILTERCRIT ;
-// ItemBitmap = Bitmap { File = "sc10715.bmp" ; };
-// Text [ de ] = "Standard Filter" ;
+ {
+ Identifier = TBC_BT_FILTERCRIT ;
+// ItemBitmap = Bitmap {File = "sc10715.png" ;} ;
+// Text [ de ] = "Standard Filter" ;
Command = ".uno:Bib/standardFilter" ;
- Text [ en-US ] = "Standard Filter";
+ Text [ en-US ] = "Standard Filter" ;
};
ToolBoxItem
- {
- Identifier = TBC_BT_REMOVEFILTER ;
-// ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
+ {
+ Identifier = TBC_BT_REMOVEFILTER ;
+// ItemBitmap = Bitmap {File = "sc10711.png" ;} ;
Command = ".uno:Bib/removeFilter" ;
- Text [ en-US ] = "Remove Filter";
+ Text [ en-US ] = "Remove Filter" ;
};
ToolBoxItem
{
- Identifier = TBC_BT_COL_ASSIGN ;
- HelpId = HID_BIB_MAPPINGDLG;
+ Identifier = TBC_BT_COL_ASSIGN ;
+ HelpId = HID_BIB_MAPPINGDLG ;
// Command = ".uno:Bib/Mapping" ;
-// ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
- Text [ en-US ] = "Column Arrangement";
+// ItemBitmap = Bitmap {File = "sc10711.png" ;} ;
+ Text [ en-US ] = "Column Arrangement" ;
};
ToolBoxItem
{
- Identifier = TBC_BT_CHANGESOURCE ;
+ Identifier = TBC_BT_CHANGESOURCE ;
HelpId = HID_BIB_CHANGESOURCE;
- Command = ".uno:Bib/sdbsource" ;
-// ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
+ Command = ".uno:Bib/sdbsource" ;
+// ItemBitmap = Bitmap {File = "sc10711.png" ;} ;
Checkable=TRUE;
- Text [ en-US ] = "Data Source";
+ Text [ en-US ] = "Data Source" ;
};
- };
- Scroll = TRUE ;
+ };
+ Scroll = TRUE ;
};
#define BIB_IMAGES \
- IdList = \
- { \
- SID_FM_AUTOFILTER; /*10716*/ \
- SID_FM_FILTERCRIT; /*10715*/ \
- SID_FM_REMOVE_FILTER_SORT ; /*10711*/ \
- }; \
- IdCount = { 3; };
+ IdList =
\
+ {
\
+ SID_FM_AUTOFILTER; /*10716*/ \
+ SID_FM_FILTERCRIT; /*10715*/ \
+ SID_FM_REMOVE_FILTER_SORT; /*10711*/ \
+ };
\
+ IdCount = { 3; };
ImageList RID_TOOLBAR_IMGLIST
{
- Prefix = "sc";
- MASKCOLOR
- BIB_IMAGES
+ Prefix = "sc" ;
+ MASKCOLOR
+ BIB_IMAGES
};
ImageList RID_TOOLBAR_IMGLIST_HC
{
- Prefix = "sch";
- MASKCOLOR
- BIB_IMAGES
+ Prefix = "sch" ;
+ MASKCOLOR
+ BIB_IMAGES
};
ImageList RID_TOOLBAR_BIGIMGLIST
{
- Prefix = "lc";
- MASKCOLOR
- BIB_IMAGES
+ Prefix = "lc" ;
+ MASKCOLOR
+ BIB_IMAGES
};
ImageList RID_TOOLBAR_BIGIMGLIST_HC
{
- Prefix = "lch";
- MASKCOLOR
- BIB_IMAGES
+ Prefix = "lch" ;
+ MASKCOLOR
+ BIB_IMAGES
};
-
-
-
-
-
-
-
+// ********************************************************************** EOF
