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 5f0cc65f26 Cleaned up resource files
5f0cc65f26 is described below
commit 5f0cc65f26563edf19b5c898b284174a87c06fc0
Author: mseidel <[email protected]>
AuthorDate: Tue May 30 22:55:28 2023 +0200
Cleaned up resource files
(cherry picked from commit c91f27c4c5d1c63361819cded38b9a4ee1bb5d4d)
---
main/cui/source/customize/cfg.src | 8 +-
main/cui/source/customize/macropg.src | 11 +-
main/cui/source/tabpages/transfrm.src | 388 ++++++++++++-------------------
main/svtools/source/control/ctrlbox.src | 114 ++++-----
main/svtools/source/control/ctrltool.src | 12 -
main/svx/source/dialog/frmsel.src | 45 ++--
6 files changed, 221 insertions(+), 357 deletions(-)
diff --git a/main/cui/source/customize/cfg.src
b/main/cui/source/customize/cfg.src
index 8a364dc971..384f8a8bd8 100644
--- a/main/cui/source/customize/cfg.src
+++ b/main/cui/source/customize/cfg.src
@@ -501,7 +501,7 @@ ModalDialog MD_MENU_ORGANISER
};
OKButton BTN_MENU_ADD
{
- DefButton = TRUE;
+ DefButton = TRUE ;
Pos = MAP_APPFONT ( 119, 6 ) ;
Size = MAP_APPFONT ( 50, 14 ) ;
};
@@ -577,10 +577,6 @@ ModalDialog MD_NEW_TOOLBAR
};
};
-#ifndef IMAGE_STDBTN_COLOR
-#define IMAGE_STDBTN_COLOR Color { Red = 0xFFFF; Green = 0x0000; Blue =
0xFFFF; }
-#endif
-
ModalDialog MD_ICONSELECTOR
{
OutputSize = TRUE ;
@@ -644,7 +640,7 @@ ModalDialog MD_ICONSELECTOR
Size = MAP_APPFONT ( 200, 24 ) ;
Text [ en-US ] = "Note:\nThe size of an icon should be 16x16
pixel to achieve best quality. Different sized icons will be scaled
automatically." ;
Left = TRUE ;
- WordBreak = TRUE;
+ WordBreak = TRUE ;
};
FixedLine FL_SEPARATOR
{
diff --git a/main/cui/source/customize/macropg.src
b/main/cui/source/customize/macropg.src
index 588c8f9767..23ce5451f5 100644
--- a/main/cui/source/customize/macropg.src
+++ b/main/cui/source/customize/macropg.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 <sfx2/sfx.hrc>
#include "macropg.hrc"
@@ -46,7 +47,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
Control LB_EVENT
{
Border = TRUE ;
- TabStop = TRUE;
+ TabStop = TRUE ;
Pos = MAP_APPFONT ( COL0, ROW0 ) ;
Size = MAP_APPFONT ( WIDTH1_2, HEIGHT0 ) ;
HelpID = HID_SVX_MACRO_LB_EVENT ;
diff --git a/main/cui/source/tabpages/transfrm.src
b/main/cui/source/tabpages/transfrm.src
index 6adb024536..7d0e791108 100644
--- a/main/cui/source/tabpages/transfrm.src
+++ b/main/cui/source/tabpages/transfrm.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 ------------------------------------------------------------------
+
+// include ------------------------------------------------------------------
#include <svtools/controldims.hrc>
#include "helpid.hrc"
#include <cuires.hrc>
#include "transfrm.hrc"
#include <svx/dialogs.hrc>
-#define MA_TABPAGE_HEIGHT 185
+#define MA_TABPAGE_HEIGHT 185
- // RID_SVXPAGE_POSITION_SIZE ------------------------------------------------
+// RID_SVXPAGE_POSITION_SIZE ------------------------------------------------
TabPage RID_SVXPAGE_POSITION_SIZE
{
HelpId = HID_TRANS_POSITION_SIZE ;
Hide = TRUE ;
Text [ en-US ] = "Position and Size" ;
- Size = MAP_APPFONT ( 260 , MA_TABPAGE_HEIGHT ) ;
+ Size = MAP_APPFONT ( 260, MA_TABPAGE_HEIGHT ) ;
FixedLine FL_POSITION
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Position" ;
};
FixedText FT_POS_X
{
- Pos = MAP_APPFONT ( 12 , 16 + 8 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 16 + 8 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "Position ~X" ;
};
FixedText FT_POS_Y
{
- Pos = MAP_APPFONT ( 12 , 32 + 8 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 32 + 8 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "Position ~Y" ;
};
MetricField MTR_FLD_POS_X
{
- HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X";
+ HelpID =
"cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 14 + 8 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 14 + 8 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -73,10 +74,10 @@ TabPage RID_SVXPAGE_POSITION_SIZE
};
MetricField MTR_FLD_POS_Y
{
- HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y";
+ HelpID =
"cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 30 + 8 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 30 + 8 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -89,16 +90,16 @@ TabPage RID_SVXPAGE_POSITION_SIZE
};
FixedText FT_POSREFERENCE
{
- Pos = MAP_APPFONT ( 178 , 2 + 8 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Base point";
+ Pos = MAP_APPFONT ( 178, 2 + 8 ) ;
+ Size = MAP_APPFONT ( 70, 10 ) ;
+ Text [ en-US ] = "Base point" ;
};
Control CTL_POSRECT
{
HelpId = HID_TPPOSITION_CTRL ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 178 , 12 + 8 ) ;
- Size = MAP_APPFONT ( 48 , 34 ) ;
+ Pos = MAP_APPFONT ( 178, 12 + 8 ) ;
+ Size = MAP_APPFONT ( 48, 34 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Base point" ;
};
@@ -107,28 +108,28 @@ TabPage RID_SVXPAGE_POSITION_SIZE
FixedLine FL_SIZE
{
- Pos = MAP_APPFONT ( 6 , 56 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6, 56 ) ;
+ Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Size" ;
};
FixedText FT_WIDTH
{
- Pos = MAP_APPFONT ( 12 , 16 + 61 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 16 + 61 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "Wi~dth" ;
};
FixedText FT_HEIGHT
{
- Pos = MAP_APPFONT ( 12 , 32 + 61 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 32 + 61 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "H~eight" ;
};
MetricField MTR_FLD_WIDTH
{
- HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH";
+ HelpID =
"cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 14 + 61 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 14 + 61 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -141,10 +142,10 @@ TabPage RID_SVXPAGE_POSITION_SIZE
};
MetricField MTR_FLD_HEIGHT
{
- HelpID = "cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT";
+ HelpID =
"cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 30 + 61 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 30 + 61 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -157,24 +158,24 @@ TabPage RID_SVXPAGE_POSITION_SIZE
};
FixedText FT_SIZEREFERENCE
{
- Pos = MAP_APPFONT ( 178 , 2 + 61 ) ;
- Size = MAP_APPFONT ( 70 , 10 ) ;
- Text [ en-US ] = "Base point";
+ Pos = MAP_APPFONT ( 178, 2 + 61 ) ;
+ Size = MAP_APPFONT ( 70, 10 ) ;
+ Text [ en-US ] = "Base point" ;
};
Control CTL_SIZERECT
{
HelpId = HID_TPSIZE_CTRL ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 178 , 12 + 61 ) ;
- Size = MAP_APPFONT ( 48 , 34 ) ;
+ Pos = MAP_APPFONT ( 178, 12 + 61 ) ;
+ Size = MAP_APPFONT ( 48, 34 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Base point" ;
};
CheckBox CBX_SCALE
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE";
- Pos = MAP_APPFONT ( 12 , 47 + 61 ) ;
- Size = MAP_APPFONT ( 162 , 10 ) ;
+ HelpID = "cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE" ;
+ Pos = MAP_APPFONT ( 12, 47 + 61 ) ;
+ Size = MAP_APPFONT ( 162, 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Keep ratio" ;
};
@@ -183,25 +184,25 @@ TabPage RID_SVXPAGE_POSITION_SIZE
FixedLine FL_PROTECT
{
- Pos = MAP_APPFONT ( 6 , 120 ) ;
- Size = MAP_APPFONT ( 119 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6, 120 ) ;
+ Size = MAP_APPFONT ( 119, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Protect" ;
};
TriStateBox TSB_POSPROTECT
{
- HelpID = "cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT";
- Pos = MAP_APPFONT ( 12 , 10 + 120 ) ;
- Size = MAP_APPFONT ( 113 , 10 ) ;
+ HelpID =
"cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT" ;
+ Pos = MAP_APPFONT ( 12, 10 + 120 ) ;
+ Size = MAP_APPFONT ( 113, 10 ) ;
Text [ en-US ] = "Position" ;
TabStop = TRUE ;
};
TriStateBox TSB_SIZEPROTECT
{
- HelpID =
"cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT";
- Pos = MAP_APPFONT ( 12 , 24 + 120 ) ;
- Size = MAP_APPFONT ( 113 , 10 ) ;
+ HelpID =
"cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT" ;
+ Pos = MAP_APPFONT ( 12, 24 + 120 ) ;
+ Size = MAP_APPFONT ( 113, 10 ) ;
Text [ en-US ] = "~Size" ;
TabStop = TRUE ;
};
@@ -210,91 +211,91 @@ TabPage RID_SVXPAGE_POSITION_SIZE
FixedLine FL_ADJUST
{
- Pos = MAP_APPFONT ( 6 + 123 + 6 , 120 ) ;
- Size = MAP_APPFONT ( 119 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6 + 123 + 6, 120 ) ;
+ Size = MAP_APPFONT ( 119, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Adapt" ;
};
TriStateBox TSB_AUTOGROW_WIDTH
{
- HelpID =
"cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH";
+ HelpID =
"cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH" ;
Pos = MAP_APPFONT ( 12 + 121 + 8, 10 + 120 ) ;
- Size = MAP_APPFONT ( 113 , 10 ) ;
+ Size = MAP_APPFONT ( 113, 10 ) ;
Text [ en-US ] = "~Fit width to text" ;
TabStop = TRUE ;
};
TriStateBox TSB_AUTOGROW_HEIGHT
{
- HelpID =
"cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT";
- Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ;
- Size = MAP_APPFONT ( 113 , 10 ) ;
+ HelpID =
"cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT" ;
+ Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ;
+ Size = MAP_APPFONT ( 113, 10 ) ;
Text [ en-US ] = "Fit ~height to text" ;
TabStop = TRUE ;
};
FixedLine FL_DIVIDER
{
- Pos = MAP_APPFONT( 6 + 119 + 5, 128 );
- Size = MAP_APPFONT( RSC_CD_FIXEDLINE_WIDTH, 26 );
- Vert = True;
+ Pos = MAP_APPFONT ( 6 + 119 + 5, 128 ) ;
+ Size = MAP_APPFONT ( RSC_CD_FIXEDLINE_WIDTH, 26 ) ;
+ Vert = TRUE ;
};
// Anchor
FixedLine FL_ANCHOR
{
- Pos = MAP_APPFONT ( 6 + 123 + 6 , 120 ) ;
- Size = MAP_APPFONT ( 119 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6 + 123 + 6, 120 ) ;
+ Size = MAP_APPFONT ( 119, RSC_CD_FIXEDLINE_HEIGHT ) ;
Hide = TRUE ;
Text [ en-US ] = "Anchor" ;
};
FixedText FT_ANCHOR
{
Pos = MAP_APPFONT ( 12 + 121 + 8, 10 + 120 ) ;
- Size = MAP_APPFONT ( 37 , 10 ) ;
+ Size = MAP_APPFONT ( 37, 10 ) ;
Hide = TRUE ;
Text [ en-US ] = "~Anchor" ;
};
ListBox LB_ANCHOR
{
- HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR";
- Pos = MAP_APPFONT ( 46 + 121 + 16 , 8 + 120 ) ;
- Size = MAP_APPFONT ( 54 , 60 ) ;
+ HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR" ;
+ Pos = MAP_APPFONT ( 46 + 121 + 16, 8 + 120 ) ;
+ Size = MAP_APPFONT ( 54, 60 ) ;
Hide = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "To paragraph" ; > ;
- < "As character" ; > ;
- < "To page" ; > ;
- < "To frame" ; > ;
+ < "To paragraph" ; > ;
+ < "As character" ; > ;
+ < "To page" ; > ;
+ < "To frame" ; > ;
};
};
FixedText FT_ORIENT
{
Pos = MAP_APPFONT ( 12 + 121 + 8, 24 + 120 ) ;
- Size = MAP_APPFONT ( 37 , 10 ) ;
- Hide = TRUE ;
- Text [ en-US ] = "P~osition";
+ Size = MAP_APPFONT ( 37, 10 ) ;
+ Hide = TRUE ;
+ Text [ en-US ] = "P~osition" ;
};
ListBox LB_ORIENT
{
- HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT";
- Pos = MAP_APPFONT ( 46 + 121 + 16 , 22 + 120 );
- Size = MAP_APPFONT ( 54 , 60 ) ;
+ HelpID = "cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT" ;
+ Pos = MAP_APPFONT ( 46 + 121 + 16, 22 + 120 ) ;
+ Size = MAP_APPFONT ( 54, 60 ) ;
Hide = TRUE ;
DropDown = TRUE ;
StringList [ en-US ] =
{
- < "From top" ; > ;
- < "Above" ; > ;
- < "Centered" ; > ;
- < "Below" ; > ;
- < "Top of character" ; > ;
- < "Center of character" ; > ;
- < "Bottom of character" ; > ;
- < "Top of line" ; > ;
- < "Center of line" ; > ;
- < "Bottom of line" ; > ;
+ < "From top" ; > ;
+ < "Above" ; > ;
+ < "Centered" ; > ;
+ < "Below" ; > ;
+ < "Top of character" ; > ;
+ < "Center of character" ; > ;
+ < "Bottom of character" ; > ;
+ < "Top of line" ; > ;
+ < "Center of line" ; > ;
+ < "Bottom of line" ; > ;
};
};
};
@@ -305,31 +306,31 @@ TabPage RID_SVXPAGE_ANGLE
HelpId = HID_TRANS_ANGLE ;
Hide = TRUE ;
Text [ en-US ] = "Angle" ;
- Size = MAP_APPFONT ( 260 , MA_TABPAGE_HEIGHT ) ;
+ Size = MAP_APPFONT ( 260, MA_TABPAGE_HEIGHT ) ;
FixedLine FL_POSITION
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Pivot point" ;
};
FixedText FT_POS_X
{
- Pos = MAP_APPFONT ( 12 , 16 + 11 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 16 + 11 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "Position ~X" ;
};
FixedText FT_POS_Y
{
- Pos = MAP_APPFONT ( 12 , 32 + 11 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 32 + 11 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "Position ~Y" ;
};
MetricField MTR_FLD_POS_X
{
- HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X";
+ HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 14 + 11 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 14 + 11 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -342,10 +343,10 @@ TabPage RID_SVXPAGE_ANGLE
};
MetricField MTR_FLD_POS_Y
{
- HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y";
+ HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 30 + 11 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 30 + 11 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -358,37 +359,37 @@ TabPage RID_SVXPAGE_ANGLE
};
FixedText FT_POSPRESETS
{
- Pos = MAP_APPFONT ( 178 , 14 ) ;
- Size = MAP_APPFONT ( 70 , 8 ) ;
- Text [ en-US ] = "Default settings";
+ Pos = MAP_APPFONT ( 178, 14 ) ;
+ Size = MAP_APPFONT ( 70, 8 ) ;
+ Text [ en-US ] = "Default settings" ;
};
Control CTL_RECT
{
HelpId = HID_TPROTATION_CTRL1 ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 178 , 14 + 11 ) ;
- Size = MAP_APPFONT ( 70 , 48 ) ;
+ Pos = MAP_APPFONT ( 178, 14 + 11 ) ;
+ Size = MAP_APPFONT ( 70, 48 ) ;
TabStop = TRUE ;
QuickHelpText [ en-US ] = "Rotation point" ;
};
FixedLine FL_ANGLE
{
- Pos = MAP_APPFONT ( 6 , 71 + 11 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6, 71 + 11 ) ;
+ Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Rotation angle" ;
};
FixedText FT_ANGLE
{
- Pos = MAP_APPFONT ( 12 , 84 + 22 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 84 + 22 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "~Angle" ;
};
MetricField MTR_FLD_ANGLE
{
- HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE";
+ HelpID = "cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 82 + 22 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 82 + 22 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -402,18 +403,18 @@ TabPage RID_SVXPAGE_ANGLE
};
FixedText FT_ANGLEPRESETS
{
- Pos = MAP_APPFONT ( 178 , 82 + 11 ) ;
- Size = MAP_APPFONT ( 70 , 8 ) ;
- Text [ en-US ] = "Default settings";
+ Pos = MAP_APPFONT ( 178, 82 + 11 ) ;
+ Size = MAP_APPFONT ( 70, 8 ) ;
+ Text [ en-US ] = "Default settings" ;
};
Control CTL_ANGLE
{
HelpId = HID_TPROTATION_CTRL2 ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 178 , 82 + 22 ) ;
- Size = MAP_APPFONT ( 70 , 48 ) ;
+ Pos = MAP_APPFONT ( 178, 82 + 22 ) ;
+ Size = MAP_APPFONT ( 70, 48 ) ;
TabStop = TRUE ;
- QuickHelpText [ en-US ] = "Rotation Angle";
+ QuickHelpText [ en-US ] = "Rotation Angle" ;
};
};
// RID_SVXPAGE_SLANT -----------------------------------------------------
@@ -421,26 +422,26 @@ TabPage RID_SVXPAGE_SLANT
{
HelpId = HID_TRANS_SLANT ;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , MA_TABPAGE_HEIGHT ) ;
+ Size = MAP_APPFONT ( 260, MA_TABPAGE_HEIGHT ) ;
Text [ en-US ] = "Slant & Corner Radius" ;
FixedLine FL_RADIUS
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6, 3 ) ;
+ Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Corner radius" ;
};
FixedText FT_RADIUS
{
- Pos = MAP_APPFONT ( 12 , 16 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 16 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "~Radius" ;
};
MetricField MTR_FLD_RADIUS
{
- HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS";
+ HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 14 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 14 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -453,22 +454,22 @@ TabPage RID_SVXPAGE_SLANT
};
FixedLine FL_SLANT
{
- Pos = MAP_APPFONT ( 6 , 35 ) ;
- Size = MAP_APPFONT ( 248 , RSC_CD_FIXEDLINE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 6, 35 ) ;
+ Size = MAP_APPFONT ( 248, RSC_CD_FIXEDLINE_HEIGHT ) ;
Text [ en-US ] = "Slant" ;
};
FixedText FT_ANGLE
{
- Pos = MAP_APPFONT ( 12 , 48 ) ;
- Size = MAP_APPFONT ( 40 , 10 ) ;
+ Pos = MAP_APPFONT ( 12, 48 ) ;
+ Size = MAP_APPFONT ( 40, 10 ) ;
Text [ en-US ] = "~Angle" ;
};
MetricField MTR_FLD_ANGLE
{
- HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE";
+ HelpID = "cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 56 , 46 ) ;
- Size = MAP_APPFONT ( 54 , 12 ) ;
+ Pos = MAP_APPFONT ( 56, 46 ) ;
+ Size = MAP_APPFONT ( 54, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -486,36 +487,36 @@ TabPage RID_SVXPAGE_SLANT
// RID_SVXDLG_TRANSFORM -----------------------------------------------------
#define _POS_SIZE_TEXT \
- Text [ en-US ] = "Position and Size" ; \
+ Text [ en-US ] = "Position and Size" ; \
TabDialog RID_SVXDLG_TRANSFORM\
{
OutputSize = TRUE ;
SvLook = TRUE ;
- Size = MAP_APPFONT ( 289 , MA_TABPAGE_HEIGHT + 41 ) ;
- Text [ en-US ] = "Position and Size" ;\
+ Size = MAP_APPFONT ( 289, MA_TABPAGE_HEIGHT + 41 ) ;
+ Text [ en-US ] = "Position and Size" ; \
Moveable = TRUE ;
TabControl TAB_CONTROL\
{
OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 260 , MA_TABPAGE_HEIGHT ) ;
+ Pos = MAP_APPFONT ( 3, 3 ) ;
+ Size = MAP_APPFONT ( 260, MA_TABPAGE_HEIGHT ) ;
PageList =
{
PageItem\
{
Identifier = RID_SVXPAGE_POSITION_SIZE ;
PageResID = RID_SVXPAGE_POSITION_SIZE ;
- _POS_SIZE_TEXT
- };
- PageItem
- {
- Identifier = RID_SVXPAGE_SWPOSSIZE;
- PageResID = RID_SVXPAGE_SWPOSSIZE;
- _POS_SIZE_TEXT
- };
- PageItem
+ _POS_SIZE_TEXT
+ };
+ PageItem
+ {
+ Identifier = RID_SVXPAGE_SWPOSSIZE ;
+ PageResID = RID_SVXPAGE_SWPOSSIZE ;
+ _POS_SIZE_TEXT
+ };
+ PageItem
{
Identifier = RID_SVXPAGE_ANGLE ;
Text [ en-US ] = "Rotation" ;
@@ -530,92 +531,5 @@ TabDialog RID_SVXDLG_TRANSFORM\
};
};
};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/svtools/source/control/ctrlbox.src
b/main/svtools/source/control/ctrlbox.src
index 7859128bd1..52e9ea425c 100644
--- a/main/svtools/source/control/ctrlbox.src
+++ b/main/svtools/source/control/ctrlbox.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,222 +7,186 @@
* 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 <svtools/svtools.hrc>
-#ifndef IMAGE_STDBTN_COLOR
-#define IMAGE_STDBTN_COLOR Color { Red = 0xFFFF; Green = 0x0000; Blue =
0xFFFF; }
-#endif
+#include <svtools/svtools.hrc>
IMAGE RID_IMG_SCALABLEFONT
{
ImageBitmap = Bitmap { File = "scalfont.png" ; };
- MaskColor = IMAGE_STDBTN_COLOR ;
};
IMAGE RID_IMG_SCALABLEFONT_HC
{
ImageBitmap = Bitmap { File = "scalfont_h.png" ; };
- MaskColor = IMAGE_STDBTN_COLOR ;
};
IMAGE RID_IMG_PRINTERFONT
{
ImageBitmap = Bitmap { File = "prnfont.png" ; };
- MaskColor = IMAGE_STDBTN_COLOR ;
};
IMAGE RID_IMG_PRINTERFONT_HC
{
ImageBitmap = Bitmap { File = "prnfont_h.png" ; };
- MaskColor = IMAGE_STDBTN_COLOR ;
};
IMAGE RID_IMG_BITMAPFONT
{
ImageBitmap = Bitmap { File = "bmpfont.png" ; };
- MaskColor = IMAGE_STDBTN_COLOR ;
};
IMAGE RID_IMG_BITMAPFONT_HC
{
ImageBitmap = Bitmap { File = "bmpfont_h.png" ; };
- MaskColor = IMAGE_STDBTN_COLOR ;
};
String STR_SVT_AUTOMATIC_COLOR
{
- Text [ en-US ] = "Automatic";
+ Text [ en-US ] = "Automatic" ;
};
/*
- * ressources for CollatorRessource / CollatorRessourceData resp.
+ * resources for CollatorRessource / CollatorRessourceData resp.
*/
String STR_SVT_COLLATE_ALPHANUMERIC
{
/* alphanumeric sorting algorithm */
- Text [ en-US ] = "Alphanumeric";
+ Text [ en-US ] = "Alphanumeric" ;
};
String STR_SVT_COLLATE_NORMAL
{
/* default or normal sorting algorithm */
- Text [ en-US ] = "Normal";
+ Text [ en-US ] = "Normal" ;
};
String STR_SVT_COLLATE_CHARSET
{
/* default or normal sorting algorithm */
- Text [ en-US ] = "Character set";
+ Text [ en-US ] = "Character set" ;
};
String STR_SVT_COLLATE_DICTIONARY
{
- /* german dictionary word order / sorting */
- Text [ en-US ] = "Dictionary";
+ /* German dictionary word order / sorting */
+ Text [ en-US ] = "Dictionary" ;
};
String STR_SVT_COLLATE_PINYIN
{
- /* chinese sorting algorithm */
- Text [ en-US ] = "Pinyin";
+ /* Chinese sorting algorithm */
+ Text [ en-US ] = "Pinyin" ;
};
String STR_SVT_COLLATE_STROKE
{
- /* chinese sorting algorithm */
- Text [ en-US ] = "Stroke";
+ /* Chinese sorting algorithm */
+ Text [ en-US ] = "Stroke" ;
};
String STR_SVT_COLLATE_RADICAL
{
- /* chinese sorting algorithm */
- Text [ en-US ] = "Radical";
+ /* Chinese sorting algorithm */
+ Text [ en-US ] = "Radical" ;
};
String STR_SVT_COLLATE_UNICODE
{
/* sorting according to the unicode code point of the character */
- Text [ en-US ] = "Unicode";
+ Text [ en-US ] = "Unicode" ;
};
String STR_SVT_COLLATE_ZHUYIN
{
- /* chinese sorting algorithm */
- Text [ en-US ] = "Zhuyin";
+ /* Chinese sorting algorithm */
+ Text [ en-US ] = "Zhuyin" ;
};
String STR_SVT_COLLATE_PHONEBOOK
{
/* phone book sorting algorithm. e.g. German */
- Text [ en-US ] = "Phone book";
+ Text [ en-US ] = "Phone book" ;
};
String STR_SVT_COLLATE_PHONETIC_F
{
- Text [ en-US ] = "Phonetic (alphanumeric first)";
+ Text [ en-US ] = "Phonetic (alphanumeric first)" ;
};
String STR_SVT_COLLATE_PHONETIC_L
{
- Text [ en-US ] = "Phonetic (alphanumeric last)";
+ Text [ en-US ] = "Phonetic (alphanumeric last)" ;
};
String STR_SVT_INDEXENTRY_ALPHANUMERIC
{
/* alphanumeric indexentry algorithm */
- Text [ en-US ] = "Alphanumeric";
+ Text [ en-US ] = "Alphanumeric" ;
};
String STR_SVT_INDEXENTRY_DICTIONARY
{
/* korean dictionary indexentry algorithm */
- Text [ en-US ] = "Dictionary";
+ Text [ en-US ] = "Dictionary" ;
};
String STR_SVT_INDEXENTRY_PINYIN
{
- /* chinese sorting algorithm */
- Text [ en-US ] = "Pinyin";
+ /* Chinese sorting algorithm */
+ Text [ en-US ] = "Pinyin" ;
};
String STR_SVT_INDEXENTRY_RADICAL
{
- /* chinese indexentry algorithm */
- Text [ en-US ] = "Radical";
+ /* Chinese indexentry algorithm */
+ Text [ en-US ] = "Radical" ;
};
String STR_SVT_INDEXENTRY_STROKE
{
- /* chinese indexentry algorithm */
- Text [ en-US ] = "Stroke";
+ /* Chinese indexentry algorithm */
+ Text [ en-US ] = "Stroke" ;
};
String STR_SVT_INDEXENTRY_ZHUYIN
{
- /* chinese indexentry algorithm */
- Text [ en-US ] = "Zhuyin";
+ /* Chinese indexentry algorithm */
+ Text [ en-US ] = "Zhuyin" ;
};
String STR_SVT_INDEXENTRY_PHONETIC_FS
{
- Text [ en-US ] = "Phonetic (alphanumeric first, grouped by syllables)";
+ Text [ en-US ] = "Phonetic (alphanumeric first, grouped by syllables)" ;
};
String STR_SVT_INDEXENTRY_PHONETIC_FC
{
- Text [ en-US ] = "Phonetic (alphanumeric first, grouped by consonants)";
+ Text [ en-US ] = "Phonetic (alphanumeric first, grouped by consonants)"
;
};
String STR_SVT_INDEXENTRY_PHONETIC_LS
{
- Text [ en-US ] = "Phonetic (alphanumeric last, grouped by syllables)";
+ Text [ en-US ] = "Phonetic (alphanumeric last, grouped by syllables)" ;
};
String STR_SVT_INDEXENTRY_PHONETIC_LC
{
- Text [ en-US ] = "Phonetic (alphanumeric last, grouped by consonants)";
+ Text [ en-US ] = "Phonetic (alphanumeric last, grouped by consonants)" ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/svtools/source/control/ctrltool.src
b/main/svtools/source/control/ctrltool.src
index 82bb575e07..f69a5fbb17 100644
--- a/main/svtools/source/control/ctrltool.src
+++ b/main/svtools/source/control/ctrltool.src
@@ -63,18 +63,6 @@ String STR_SVT_STYLE_BLACK_ITALIC
Text [ en-US ] = "Black Italic" ;
};
-/*
-Finnish text:
- "Light",
- "Light Kursivoitu",
- "Normaali",
- "Kursivoitu",
- "Lihavoitu",
- "Lihavoitu Kursivoitu",
- "Black",
- "Black Kursivoitu"
-*/
-
String STR_SVT_FONTMAP_BOTH
{
Text [ en-US ] = "The same font will be used on both your printer and
your screen." ;
diff --git a/main/svx/source/dialog/frmsel.src
b/main/svx/source/dialog/frmsel.src
index 1b408159d5..65598c80b5 100644
--- a/main/svx/source/dialog/frmsel.src
+++ b/main/svx/source/dialog/frmsel.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,33 +34,34 @@ Resource RID_SVXSTR_BORDER_CONTROL
{
ItemList [ en-US ] =
{
- < "Border setting" ; 0; > ;
- < "Left border line" ; 1; > ;
- < "Right border line" ; 2; > ;
- < "Top border line" ; 3; > ;
- < "Bottom border line" ; 4; > ;
- < "Horizontal border line" ; 5; > ;
- < "Vertical border line" ; 6; > ;
- < "Diagonal border line from top left to bottom right"
; 7; > ;
- < "Diagonal border line from bottom left to top right"
; 8; > ;
+ < "Border setting" ; 0;
> ;
+ < "Left border line" ; 1;
> ;
+ < "Right border line" ; 2;
> ;
+ < "Top border line" ; 3;
> ;
+ < "Bottom border line" ; 4;
> ;
+ < "Horizontal border line" ; 5;
> ;
+ < "Vertical border line" ; 6;
> ;
+ < "Diagonal border line from top left to bottom right"
; 7; > ;
+ < "Diagonal border line from bottom left to top right"
; 8; > ;
};
};
StringArray ARR_DESCRIPTIONS
{
ItemList [ en-US ] =
{
- < "Border setting" ; 0; > ;
- < "Left border line" ; 1; > ;
- < "Right border line" ; 2; > ;
- < "Top border line" ; 3; > ;
- < "Bottom border line" ; 4; > ;
- < "Horizontal border line" ; 5; > ;
- < "Vertical border line" ; 6; > ;
- < "Diagonal border line from top left to bottom right"
; 7; > ;
- < "Diagonal border line from bottom left to top right"
; 8; > ;
+ < "Border setting" ; 0;
> ;
+ < "Left border line" ; 1;
> ;
+ < "Right border line" ; 2;
> ;
+ < "Top border line" ; 3;
> ;
+ < "Bottom border line" ; 4;
> ;
+ < "Horizontal border line" ; 5;
> ;
+ < "Vertical border line" ; 6;
> ;
+ < "Diagonal border line from top left to bottom right"
; 7; > ;
+ < "Diagonal border line from bottom left to top right"
; 8; > ;
};
};
Bitmap BMP_FRMSEL_ARROWS { File = "frmsel.png" ; } ;
};
+// ********************************************************************** EOF
