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 c2e8c5f Cleaned up resource files
c2e8c5f is described below
commit c2e8c5fc8fa56c2c51049864235a820a9f092640
Author: mseidel <[email protected]>
AuthorDate: Sun Jul 25 15:45:21 2021 +0200
Cleaned up resource files
(cherry picked from commit 443a8ccb990242792a9095003b3d76f6748275f3)
---
main/fpicker/source/office/OfficeFilePicker.src | 35 +++---
main/fpicker/source/office/iodlg.src | 161 ++++++++++++------------
2 files changed, 97 insertions(+), 99 deletions(-)
diff --git a/main/fpicker/source/office/OfficeFilePicker.src
b/main/fpicker/source/office/OfficeFilePicker.src
index a2ed667..1da212a 100644
--- a/main/fpicker/source/office/OfficeFilePicker.src
+++ b/main/fpicker/source/office/OfficeFilePicker.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,62 +25,62 @@
String STR_SVT_FILEPICKER_AUTO_EXTENSION
{
- Text [ en-US ] = "~Automatic file name extension" ;
+ Text [ en-US ] = "~Automatic file name extension" ;
};
String STR_SVT_FILEPICKER_PASSWORD
{
- Text [ en-US ] = "Save with pass~word" ;
+ Text [ en-US ] = "Save with pass~word" ;
};
String STR_SVT_FILEPICKER_FILTER_OPTIONS
{
- Text [ en-US ] = "~Edit filter settings";
+ Text [ en-US ] = "~Edit filter settings" ;
};
String STR_SVT_FILEPICKER_READONLY
{
- Text [ en-US ] = "~Read-only" ;
+ Text [ en-US ] = "~Read-only" ;
};
String STR_SVT_FILEPICKER_INSERT_AS_LINK
{
- Text [ en-US ] = "~Link" ;
+ Text [ en-US ] = "~Link" ;
};
String STR_SVT_FILEPICKER_SHOW_PREVIEW
{
- Text [ en-US ] = "Pr~eview" ;
+ Text [ en-US ] = "Pr~eview" ;
};
String STR_SVT_FILEPICKER_PLAY
{
- Text [ en-US ] = "~Play" ;
+ Text [ en-US ] = "~Play" ;
};
String STR_SVT_FILEPICKER_VERSION
{
- Text [ en-US ] = "~Version:";
+ Text [ en-US ] = "~Version:" ;
};
String STR_SVT_FILEPICKER_TEMPLATES
{
- Text [ en-US ] = "S~tyles:" ;
+ Text [ en-US ] = "S~tyles:" ;
};
String STR_SVT_FILEPICKER_IMAGE_TEMPLATE
{
- Text [ en-US ] = "Style:";
+ Text [ en-US ] = "Style:" ;
};
String STR_SVT_FILEPICKER_SELECTION
{
- Text [ en-US ] = "~Selection" ;
+ Text [ en-US ] = "~Selection" ;
};
String STR_SVT_FILEPICKER_FILTER_TITLE
{
- Text [ en-US ] = "File ~type:" ;
+ Text [ en-US ] = "File ~type:" ;
};
String STR_SVT_FOLDERPICKER_DEFAULT_TITLE
@@ -90,6 +90,7 @@ String STR_SVT_FOLDERPICKER_DEFAULT_TITLE
String STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION
{
- Text [ en-US ] = "Please select a folder.";
+ Text [ en-US ] = "Please select a folder." ;
};
+// ********************************************************************** EOF
diff --git a/main/fpicker/source/office/iodlg.src
b/main/fpicker/source/office/iodlg.src
index 51f97d7..a3ecf0f 100644
--- a/main/fpicker/source/office/iodlg.src
+++ b/main/fpicker/source/office/iodlg.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.
- *
+ *
*************************************************************/
- // includes ******************************************************************
+// includes ******************************************************************
#include "svtools/svtools.hrc"
#include "svtools/helpid.hrc"
#include "iodlg.hrc"
@@ -32,31 +32,31 @@
IMG_FILEDLG_BTN_UP; \
IMG_FILEDLG_BTN_STD; \
IMG_FILEDLG_CREATEFOLDER; \
- }; \
+ }; \
IdCount = \
{ \
- 3; \
+ 3; \
};
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue =
0xFFFF; };
- // image lists ***************************************************************
+// image lists ***************************************************************
ImageList RID_FILEPICKER_IMAGES
{
- Prefix = "fp";
+ Prefix = "fp" ;
MASKCOLOR
FILEPICKER_IL_IDLIST
};
ImageList RID_FILEPICKER_IMAGES_HC
{
- Prefix = "fph";
+ Prefix = "fph" ;
MASKCOLOR
FILEPICKER_IL_IDLIST
};
- // dialogs *******************************************************************
+// dialogs *******************************************************************
ModalDialog DLG_SVT_EXPLORERFILE
{
@@ -64,114 +64,112 @@ ModalDialog DLG_SVT_EXPLORERFILE
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
- Sizeable = TRUE;
+ Sizeable = TRUE ;
HelpId = HID_EXPLORERDLG_FILE ;
- Size = MAP_APPFONT ( 280 , 174 ) ;
+ Size = MAP_APPFONT ( 280, 174 ) ;
FixedText FT_EXPLORERFILE_CURRENTPATH
{
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 100 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 100, 10 ) ;
NoLabel = TRUE ;
};
ImageButton BTN_EXPLORERFILE_NEWFOLDER
{
- HelpID =
"fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER";
+ HelpID =
"fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER" ;
TabStop = FALSE ;
- Pos = MAP_APPFONT ( 59 , 6 ) ;
+ Pos = MAP_APPFONT ( 59, 6 ) ;
QuickHelpText [ en-US ] = "Create New Directory" ;
};
ImageButton BTN_EXPLORERFILE_LISTVIEW
{
- HelpID =
"fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW";
+ HelpID =
"fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW" ;
TabStop = FALSE ;
- Pos = MAP_APPFONT ( 109 , 6 ) ;
+ Pos = MAP_APPFONT ( 109, 6 ) ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "list.png" ;
};
- MASKCOLOR
};
- QuickHelpText [ en-US ] = "List";
+ QuickHelpText [ en-US ] = "List" ;
};
ImageButton BTN_EXPLORERFILE_DETAILSVIEW
{
- HelpID =
"fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW";
+ HelpID =
"fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW" ;
TabStop = FALSE ;
- Pos = MAP_APPFONT ( 109 , 6 ) ;
+ Pos = MAP_APPFONT ( 109, 6 ) ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "sc06356.png" ;
};
- MASKCOLOR
};
- QuickHelpText [ en-US ] = "Details";
+ QuickHelpText [ en-US ] = "Details" ;
};
MenuButton BTN_EXPLORERFILE_UP
{
- HelpID =
"fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP";
+ HelpID =
"fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP" ;
TabStop = FALSE ;
- Pos = MAP_APPFONT ( 109 , 6 ) ;
+ Pos = MAP_APPFONT ( 109, 6 ) ;
QuickHelpText [ en-US ] = "Up One Level" ;
};
MenuButton BTN_EXPLORERFILE_STANDARD
{
- HelpID =
"fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD";
+ HelpID =
"fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD" ;
TabStop = FALSE ;
- Pos = MAP_APPFONT ( 59 , 6 ) ;
+ Pos = MAP_APPFONT ( 59, 6 ) ;
QuickHelpText [ en-US ] = "Default Directory" ;
};
Control CTL_EXPLORERFILE_FILELIST
{
TabStop = TRUE ;
- Pos = MAP_APPFONT ( 6 , 26 ) ;
- Size = MAP_APPFONT ( 268 , 85 ) ;
+ Pos = MAP_APPFONT ( 6, 26 ) ;
+ Size = MAP_APPFONT ( 268, 85 ) ;
Border = TRUE ;
};
FixedText FT_EXPLORERFILE_FILENAME
{
- Pos = MAP_APPFONT ( 6 , 118 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 118 ) ;
+ Size = MAP_APPFONT ( 50, 10 ) ;
Text [ en-US ] = "File ~name:" ;
};
Edit ED_EXPLORERFILE_FILENAME
{
- HelpID =
"fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME";
- Pos = MAP_APPFONT ( 59 , 117 ) ;
- Size = MAP_APPFONT ( 159 , 12 ) ;
+ HelpID =
"fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME" ;
+ Pos = MAP_APPFONT ( 59, 117 ) ;
+ Size = MAP_APPFONT ( 159, 12 ) ;
Border = TRUE ;
};
FixedText FT_EXPLORERFILE_SHARED_LISTBOX
{
- Pos = MAP_APPFONT ( 6 , 133 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 133 ) ;
+ Size = MAP_APPFONT ( 50, 10 ) ;
// Note: this control does not have a text. The text is filled
at runtime from the STR_SVT_FILEPICKER_VERSION,
// STR_SVT_FILEPICKER_TEMPLATES, or
STR_SVT_FILEPICKER_IMAGE_TEMPLATE resource
};
ListBox LB_EXPLORERFILE_SHARED_LISTBOX
{
- HelpID =
"fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_SHARED_LISTBOX";
- Pos = MAP_APPFONT ( 59 , 132 ) ;
- Size = MAP_APPFONT ( 159 , 40 ) ;
+ HelpID =
"fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_SHARED_LISTBOX" ;
+ Pos = MAP_APPFONT ( 59, 132 ) ;
+ Size = MAP_APPFONT ( 159, 40 ) ;
DropDown = TRUE ;
AutoSize = TRUE ;
AutoHScroll = TRUE ;
};
FixedText FT_EXPLORERFILE_FILETYPE
{
- Pos = MAP_APPFONT ( 6 , 148 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ Pos = MAP_APPFONT ( 6, 148 ) ;
+ Size = MAP_APPFONT ( 50, 10 ) ;
Text [ en-US ] = "File ~type:" ;
};
ListBox LB_EXPLORERFILE_FILETYPE
{
- HelpID =
"fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE";
- Pos = MAP_APPFONT ( 59 , 147 ) ;
- Size = MAP_APPFONT ( 159 , 80 ) ;
+ HelpID =
"fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE" ;
+ Pos = MAP_APPFONT ( 59, 147 ) ;
+ Size = MAP_APPFONT ( 159, 80 ) ;
DropDown = TRUE ;
AutoSize = TRUE ;
AutoHScroll = TRUE ;
@@ -179,45 +177,45 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
CheckBox CB_EXPLORERFILE_READONLY
{
- HelpID =
"fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY";
- Size = MAP_APPFONT ( 80 , 10 ) ;
+ HelpID =
"fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY" ;
+ Size = MAP_APPFONT ( 80, 10 ) ;
Text [ en-US ] = "~Read-only" ;
};
CheckBox CB_EXPLORERFILE_PASSWORD
{
- HelpID =
"fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_PASSWORD";
+ HelpID =
"fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_PASSWORD" ;
Size = MAP_APPFONT ( 100, 10 ) ;
Text [ en-US ] = "Save with password" ;
};
CheckBox CB_AUTO_EXTENSION
{
- HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_AUTO_EXTENSION";
- Size = MAP_APPFONT ( 160 , 10 ) ;
+ HelpID =
"fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_AUTO_EXTENSION" ;
+ Size = MAP_APPFONT ( 160, 10 ) ;
Text [ en-US ] = "~Automatic file name extension" ;
};
CheckBox CB_OPTIONS
{
- HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_OPTIONS";
- Size = MAP_APPFONT ( 120 , 10 ) ;
- Text [ en-US ] = "Edit ~filter settings";
+ HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_OPTIONS" ;
+ Size = MAP_APPFONT ( 120, 10 ) ;
+ Text [ en-US ] = "Edit ~filter settings" ;
};
PushButton BTN_EXPLORERFILE_OPEN
{
- HelpID =
"fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN";
- Pos = MAP_APPFONT ( 224 , 117 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ HelpID =
"fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN" ;
+ Pos = MAP_APPFONT ( 224, 117 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
DefButton = TRUE ;
Text [ en-US ] = "~Open" ;
};
CancelButton BTN_EXPLORERFILE_CANCEL
{
- Pos = MAP_APPFONT ( 224 , 134 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 224, 134 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
HelpButton BTN_EXPLORERFILE_HELP
{
- Pos = MAP_APPFONT ( 224 , 151 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 224, 151 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
String STR_EXPLORERFILE_OPEN
{
@@ -241,59 +239,59 @@ ModalDialog DLG_SVT_EXPLORERFILE
};
String STR_BUTTONSELECT
{
- Text [ en-US ] = "~Select";
+ Text [ en-US ] = "~Select" ;
};
String STR_ACTUALVERSION
{
- Text [ en-US ] = "Current version";
+ Text [ en-US ] = "Current version" ;
};
String STR_PREVIEW
{
- Text [ en-US ] = "File Preview";
+ Text [ en-US ] = "File Preview" ;
};
};
// QueryFolderNameDialog
----------------------------------------------------------
ModalDialog DLG_SVT_QUERYFOLDERNAME
{
- HelpID = "fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME";
+ HelpID = "fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME" ;
Border = TRUE ;
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
Text = "Ordner" ;
- Size = MAP_APPFONT ( 218 , 45 ) ;
+ Size = MAP_APPFONT ( 218, 45 ) ;
FixedText FT_SVT_QUERYFOLDERNAME_DLG_NAME
{
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 138 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 14 ) ;
+ Size = MAP_APPFONT ( 138, 10 ) ;
Text [ en-US ] = "Na~me" ;
};
Edit ED_SVT_QUERYFOLDERNAME_DLG_NAME
{
- HelpID =
"fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME";
- Pos = MAP_APPFONT ( 12 , 27 ) ;
- Size = MAP_APPFONT ( 138 , 12 ) ;
+ HelpID =
"fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME" ;
+ Pos = MAP_APPFONT ( 12, 27 ) ;
+ Size = MAP_APPFONT ( 138, 12 ) ;
Border = TRUE ;
Left = TRUE ;
};
FixedLine FL_SVT_QUERYFOLDERNAME_DLG_NAME
{
Group = TRUE ;
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 150 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 150, 8 ) ;
Text [ en-US ] = "Create new folder" ;
};
OKButton BT_SVT_QUERYFOLDERNAME_DLG_OK
{
- Pos = MAP_APPFONT ( 162 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 162, 6 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
DefButton = TRUE ;
};
CancelButton BT_SVT_QUERYFOLDERNAME_DLG_CANCEL
{
- Pos = MAP_APPFONT ( 162 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 162, 23 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
};
};
@@ -301,12 +299,12 @@ ModalDialog DLG_SVT_QUERYFOLDERNAME
String RID_FILEOPEN_INVALIDFOLDER
{
- Text [ en-US ] = "$name$ does not exist.";
+ Text [ en-US ] = "$name$ does not exist." ;
};
String RID_FILEOPEN_NOTEXISTENTFILE
{
- Text [ en-US ] = "The file $name$ does not exist.\nMake sure you have
entered the correct file name.";
+ Text [ en-US ] = "The file $name$ does not exist.\nMake sure you have
entered the correct file name." ;
};
String STR_FILTERNAME_ALL
@@ -326,7 +324,7 @@ String STR_SVT_NEW_FOLDER
String STR_SVT_NOREMOVABLEDEVICE
{
- Text [ en-US ] = "No removable storage device detected.\nMake sure it is
plugged in properly and try again." ;
+ Text [ en-US ] = "No removable storage device detected.\nMake sure it
is plugged in properly and try again." ;
};
String STR_SVT_ALLFORMATS
@@ -334,5 +332,4 @@ String STR_SVT_ALLFORMATS
Text [ en-US ] = "All Formats" ;
};
-//******************************************************************** EOF
-
+// ********************************************************************** EOF
