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 90e183f Cleaned up resource files
90e183f is described below
commit 90e183f48397e8f192f842823583d28b5820ea6d
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Nov 15 18:44:14 2019 +0100
Cleaned up resource files
(cherry picked from commit 3ce2474296711fdf1fa157788ed05af36884d5c1)
---
.../source/controller/dialogs/Bitmaps_HC.src | 140 ++++++++--------
main/cui/source/tabpages/labdlg.src | 180 +++++++++------------
2 files changed, 143 insertions(+), 177 deletions(-)
diff --git a/main/chart2/source/controller/dialogs/Bitmaps_HC.src
b/main/chart2/source/controller/dialogs/Bitmaps_HC.src
index e8e6c80..fe9404b 100644
--- a/main/chart2/source/controller/dialogs/Bitmaps_HC.src
+++ b/main/chart2/source/controller/dialogs/Bitmaps_HC.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,70 +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 "Bitmaps_HC.hrc"
Image IMG_TYPE_COLUMN_HC
{
- ImageBitmap = Bitmap { File = "typecolumn_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typecolumn_16.png" ;} ;
};
Image IMG_TYPE_BAR_HC
{
- ImageBitmap = Bitmap { File = "typebar_16.png " ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typebar_16.png " ;} ;
};
Image IMG_TYPE_PIE_HC
{
- ImageBitmap = Bitmap { File = "typepie_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typepie_16.png" ;} ;
};
Image IMG_TYPE_LINE_HC
{
- ImageBitmap = Bitmap { File = "typepointline_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typepointline_16.png" ;} ;
};
Image IMG_TYPE_XY_HC
{
- ImageBitmap = Bitmap { File = "typexy_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typexy_16.png" ;} ;
};
Image IMG_TYPE_AREA_HC
{
- ImageBitmap = Bitmap { File = "typearea_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typearea_16.png" ;} ;
};
Image IMG_TYPE_NET_HC
{
- ImageBitmap = Bitmap { File = "typenet_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typenet_16.png" ;} ;
};
Image IMG_TYPE_STOCK_HC
{
- ImageBitmap = Bitmap { File = "typestock_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typestock_16.png" ;} ;
};
Image IMG_TYPE_COLUMN_LINE_HC
{
- ImageBitmap = Bitmap { File = "typecolumnline_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typecolumnline_16.png" ;} ;
};
Image IMG_TYPE_BUBBLE_HC
{
- ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
- MaskColor = SC_HC_MASKCOLOR;
+ ImageBitmap = Bitmap {File = "typebubble_16.png" ;} ;
};
Bitmap BMP_BUBBLE_1_HC
{
@@ -149,7 +140,7 @@ Bitmap BMP_CIRCLES_3D_EXPLODED_HC
//---------------------
Bitmap BMP_DONUT_2D_HC
{
- File = "donut_52x60_h.png" ;
+ File = "donut_52x60_h.png" ;
};
Bitmap BMP_DONUT_2D_EXPLODED_HC
{
@@ -157,11 +148,11 @@ Bitmap BMP_DONUT_2D_EXPLODED_HC
};
Bitmap BMP_DONUT_3D_HC
{
- File = "donut3d_52x60_h.png" ;
+ File = "donut3d_52x60_h.png" ;
};
Bitmap BMP_DONUT_3D_EXPLODED_HC
{
- File = "donut3dexploded_52x60_h.png" ;
+ File = "donut3dexploded_52x60_h.png" ;
};
//---------------------
Bitmap BMP_COLUMNS_2D_1_HC
@@ -445,95 +436,94 @@ Bitmap BMP_STOCK_4_HC
File = "stockcolumnsattach_52x60_h.png" ;
};
//---------------------
-//---------------------
-//---------------------
//error indicator
Image BMP_INDICATE_BOTH_VERTI_HC
{
- ImageBitmap = Bitmap
- {
- File = "errorbothverti_30_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "errorbothverti_30_h.png" ;
+ };
};
Image BMP_INDICATE_DOWN_HC
{
- ImageBitmap = Bitmap
- {
- File = "errordown_30_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "errordown_30_h.png" ;
+ };
};
Image BMP_INDICATE_UP_HC
{
- ImageBitmap = Bitmap
- {
- File = "errorup_30_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "errorup_30_h.png" ;
+ };
};
Image BMP_INDICATE_BOTH_HORI_HC
{
- ImageBitmap = Bitmap
- {
- File = "errorbothhori_30_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "errorbothhori_30_h.png" ;
+ };
};
Image BMP_INDICATE_RIGHT_HC
{
- ImageBitmap = Bitmap
- {
- File = "errorright_30_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "errorright_30_h.png" ;
+ };
};
Image BMP_INDICATE_LEFT_HC
{
- ImageBitmap = Bitmap
- {
- File = "errorleft_30_h.png" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "errorleft_30_h.png" ;
+ };
};
//---------------------
//regression curves
Image BMP_REGRESSION_NONE_HC
{
- ImageBitmap = Bitmap
- {
- File = "regno_h.bmp" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "regno_h.png" ;
+ };
};
Image BMP_REGRESSION_LINEAR_HC
{
- ImageBitmap = Bitmap
- {
- File = "reglin_h.bmp" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "reglin_h.png" ;
+ };
};
Image BMP_REGRESSION_LOG_HC
{
- ImageBitmap = Bitmap
- {
- File = "reglog_h.bmp" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "reglog_h.png" ;
+ };
};
Image BMP_REGRESSION_EXP_HC
{
- ImageBitmap = Bitmap
- {
- File = "regexp_h.bmp" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "regexp_h.png" ;
+ };
};
Image BMP_REGRESSION_POWER_HC
{
- ImageBitmap = Bitmap
- {
- File = "regpow_h.bmp" ;
- };
+ ImageBitmap = Bitmap
+ {
+ File = "regpow_h.png" ;
+ };
};
//---------------------
Image IMG_SELECTRANGE_HC
{
ImageBitmap = Bitmap
{
- File = "selectrange.png";
+ File = "selectrange.png" ;
};
- MaskColor = SC_HC_MASKCOLOR;
};
+
+// ********************************************************************** EOF
diff --git a/main/cui/source/tabpages/labdlg.src
b/main/cui/source/tabpages/labdlg.src
index 659f202..b2e713a 100644
--- a/main/cui/source/tabpages/labdlg.src
+++ b/main/cui/source/tabpages/labdlg.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,52 +7,53 @@
* 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 "helpid.hrc"
#include "labdlg.hrc"
#include <svx/dialogs.hrc>
- // RID_SVXPAGE_CAPTION ---------------------------------------------------
+// RID_SVXPAGE_CAPTION ---------------------------------------------------
TabPage RID_SVXPAGE_CAPTION
{
HelpId = HID_CAPTION ;
Hide = TRUE ;
- //Size = MAP_APPFONT ( 189 , 97 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ //Size = MAP_APPFONT ( 189, 97 ) ;
+ Size = MAP_APPFONT ( 260, 185 ) ;
Text [ en-US ] = "Callouts" ;
Control CT_CAPTTYPE
{
HelpId = HID_CAPTION_CTL_TYPE ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 187 , 38 ) ;
+ Pos = MAP_APPFONT ( 6, 6 ) ;
+ Size = MAP_APPFONT ( 187, 38 ) ;
TabStop = TRUE ;
};
FixedText FT_ABSTAND
{
- Pos = MAP_APPFONT ( 6 , 53 ) ;
- Size = MAP_APPFONT ( 42 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 53 ) ;
+ Size = MAP_APPFONT ( 42, 8 ) ;
Text [ en-US ] = "~Spacing" ;
};
MetricField MF_ABSTAND
{
- HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND";
+ HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 51 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
+ Pos = MAP_APPFONT ( 50, 51 ) ;
+ Size = MAP_APPFONT ( 50, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -64,64 +65,64 @@ TabPage RID_SVXPAGE_CAPTION
};
FixedText FT_WINKEL
{
- Pos = MAP_APPFONT ( 106 , 53 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 106, 53 ) ;
+ Size = MAP_APPFONT ( 35, 8 ) ;
Text [ en-US ] = "~Angle" ;
};
ListBox LB_WINKEL
{
- HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL";
+ HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_WINKEL" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 143 , 51 ) ;
- Size = MAP_APPFONT ( 50 , 60 ) ;
+ Pos = MAP_APPFONT ( 143, 51 ) ;
+ Size = MAP_APPFONT ( 50, 60 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
StringList [ en-US ] =
{
< "Free" ; 1 ; > ;
- < "30 Degrees" ; 3000 ; > ;
- < "45 Degrees" ; 4500 ; > ;
- < "60 Degrees" ; 6000 ; > ;
- < "90 Degrees" ; 9000 ; > ;
+ < "30 Degrees" ; 3000 ; > ;
+ < "45 Degrees" ; 4500 ; > ;
+ < "60 Degrees" ; 6000 ; > ;
+ < "90 Degrees" ; 9000 ; > ;
};
};
FixedText FT_ANSATZ
{
- Pos = MAP_APPFONT ( 6 , 69 ) ;
- Size = MAP_APPFONT ( 42 , 8 ) ;
+ Pos = MAP_APPFONT ( 6, 69 ) ;
+ Size = MAP_APPFONT ( 42, 8 ) ;
Text [ en-US ] = "~Extension" ;
};
ListBox LB_ANSATZ
{
- HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ";
+ HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 67 ) ;
- Size = MAP_APPFONT ( 50 , 60 ) ;
+ Pos = MAP_APPFONT ( 50, 67 ) ;
+ Size = MAP_APPFONT ( 50, 60 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
StringList [ en-US ] =
{
- < "Optimal" ; 4 ; > ;
- < "From top" ; 3 ; > ;
- < "From left" ; 3 ; > ;
- < "Horizontal" ; 1 ; > ;
- < "Vertical" ; 2 ; > ;
+ < "Optimal" ; 4 ; > ;
+ < "From top" ; 3 ; > ;
+ < "From left" ; 3 ; > ;
+ < "Horizontal" ; 1 ; > ;
+ < "Vertical" ; 2 ; > ;
};
};
FixedText FT_UM
{
- Pos = MAP_APPFONT ( 106 , 69 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 106, 69 ) ;
+ Size = MAP_APPFONT ( 35, 8 ) ;
Text [ en-US ] = "~By" ;
};
MetricField MF_ANSATZ
{
- HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ";
+ HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_ANSATZ" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 143 , 67 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
+ Pos = MAP_APPFONT ( 143, 67 ) ;
+ Size = MAP_APPFONT ( 50, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -133,33 +134,31 @@ TabPage RID_SVXPAGE_CAPTION
};
FixedText FT_ANSATZ_REL
{
- Pos = MAP_APPFONT ( 106 , 69 ) ;
- Size = MAP_APPFONT ( 35 , 8 ) ;
+ Pos = MAP_APPFONT ( 106, 69 ) ;
+ Size = MAP_APPFONT ( 35, 8 ) ;
Text [ en-US ] = "~Position" ;
};
ListBox LB_ANSATZ_REL
{
- HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL";
+ HelpID = "cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 143 , 67 ) ;
- Size = MAP_APPFONT ( 50 , 60 ) ;
+ Pos = MAP_APPFONT ( 143, 67 ) ;
+ Size = MAP_APPFONT ( 50, 60 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
FixedText FT_LAENGE
{
- Pos = MAP_APPFONT ( 6 , 85 ) ;
- Size = MAP_APPFONT ( 42 , 8 ) ;
- /* ### ACHTUNG: Neuer Text in Resource? ~L�nge : ~L�nge */
- /* ### ACHTUNG: Neuer Text in Resource? ~L�nge : ~L�nge */
+ Pos = MAP_APPFONT ( 6, 85 ) ;
+ Size = MAP_APPFONT ( 42, 8 ) ;
Text [ en-US ] = "~Length" ;
};
MetricField MF_LAENGE
{
- HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE";
+ HelpID = "cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE" ;
Border = TRUE ;
- Pos = MAP_APPFONT ( 50 , 83 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
+ Pos = MAP_APPFONT ( 50, 83 ) ;
+ Size = MAP_APPFONT ( 50, 12 ) ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;
@@ -171,9 +170,9 @@ TabPage RID_SVXPAGE_CAPTION
};
CheckBox CB_LAENGE
{
- HelpID = "cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE";
- Pos = MAP_APPFONT ( 106 , 84 ) ;
- Size = MAP_APPFONT ( 50 , 10 ) ;
+ HelpID = "cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE" ;
+ Pos = MAP_APPFONT ( 106, 84 ) ;
+ Size = MAP_APPFONT ( 50, 10 ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Optimal" ;
};
@@ -203,69 +202,69 @@ TabPage RID_SVXPAGE_CAPTION
};
Bitmap BMP_CAPTTYPE_1
{
- File = "legtyp1.bmp" ;
+ File = "legtyp1.png" ;
};
Bitmap BMP_CAPTTYPE_2
{
- File = "legtyp2.bmp" ;
+ File = "legtyp2.png" ;
};
Bitmap BMP_CAPTTYPE_3
{
- File = "legtyp3.bmp" ;
+ File = "legtyp3.png" ;
};
Bitmap BMP_CAPTTYPE_4
{
- File = "legtyp4.bmp" ;
+ File = "legtyp4.png" ;
};
Bitmap BMP_CAPTTYPE_1_H
{
- File = "legtyp1_hc.bmp" ;
+ File = "legtyp1_hc.png" ;
};
Bitmap BMP_CAPTTYPE_2_H
{
- File = "legtyp2_hc.bmp" ;
+ File = "legtyp2_hc.png" ;
};
Bitmap BMP_CAPTTYPE_3_H
{
- File = "legtyp3_hc.bmp" ;
+ File = "legtyp3_hc.png" ;
};
Bitmap BMP_CAPTTYPE_4_H
{
- File = "legtyp4_hc.bmp" ;
+ File = "legtyp4_hc.png" ;
};
};
- // RID_SVXDLG_CAPTION ----------------------------------------------------
+// RID_SVXDLG_CAPTION ----------------------------------------------------
-#define _POS_SIZE_TEXT \
- Text [ en-US ] = "Position and Size" ; \
+#define _POS_SIZE_TEXT \
+ Text [ en-US ] = "Position and Size" ; \
TabDialog RID_SVXDLG_CAPTION\
{
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 237 , 161 ) ;
- Text [ en-US ] = "Callouts" ;\
+ Size = MAP_APPFONT ( 237, 161 ) ;
+ Text [ en-US ] = "Callouts" ; \
Moveable = TRUE ;
TabControl TAB_CONTROL\
{
OutputSize = TRUE ;
- Pos = MAP_APPFONT ( 3 , 3 ) ;
- Size = MAP_APPFONT ( 189 , 97 ) ;
+ Pos = MAP_APPFONT ( 3, 3 ) ;
+ Size = MAP_APPFONT ( 189, 97 ) ;
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_CAPTION ;
PageResID = RID_SVXPAGE_CAPTION ;
@@ -274,28 +273,5 @@ TabDialog RID_SVXDLG_CAPTION\
};
};
};
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
