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 2023/06/13 11:33:52 UTC
[openoffice] branch trunk updated: Remove unused graphics
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new f51ffce592 Remove unused graphics
f51ffce592 is described below
commit f51ffce592993dad51bf92cbe3b68e08f8014d0a
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Jun 13 13:33:32 2023 +0200
Remove unused graphics
---
main/default_images/sc/res/sidebar/morebutton.bmp | Bin 5346 -> 0 bytes
.../default_images/sc/res/sidebar/morebutton_h.bmp | Bin 5346 -> 0 bytes
.../svx/res/symphony/__morebutton.bmp | Bin 5346 -> 0 bytes
.../svx/res/symphony/__morebutton_h.bmp | Bin 5346 -> 0 bytes
.../ui/sidebar/CellAppearancePropertyPanel.hrc | 18 ++++-----
.../ui/sidebar/CellAppearancePropertyPanel.src | 8 ----
.../source/sidebar/paragraph/ParaPropertyPanel.hrc | 42 ++++++++++-----------
.../source/sidebar/paragraph/ParaPropertyPanel.src | 38 ++++++-------------
main/svx/source/sidebar/text/TextPropertyPanel.hrc | 2 -
9 files changed, 40 insertions(+), 68 deletions(-)
diff --git a/main/default_images/sc/res/sidebar/morebutton.bmp b/main/default_images/sc/res/sidebar/morebutton.bmp
deleted file mode 100644
index c665b3e866..0000000000
Binary files a/main/default_images/sc/res/sidebar/morebutton.bmp and /dev/null differ
diff --git a/main/default_images/sc/res/sidebar/morebutton_h.bmp b/main/default_images/sc/res/sidebar/morebutton_h.bmp
deleted file mode 100644
index c665b3e866..0000000000
Binary files a/main/default_images/sc/res/sidebar/morebutton_h.bmp and /dev/null differ
diff --git a/main/default_images/svx/res/symphony/__morebutton.bmp b/main/default_images/svx/res/symphony/__morebutton.bmp
deleted file mode 100644
index c665b3e866..0000000000
Binary files a/main/default_images/svx/res/symphony/__morebutton.bmp and /dev/null differ
diff --git a/main/default_images/svx/res/symphony/__morebutton_h.bmp b/main/default_images/svx/res/symphony/__morebutton_h.bmp
deleted file mode 100644
index c665b3e866..0000000000
Binary files a/main/default_images/svx/res/symphony/__morebutton_h.bmp and /dev/null differ
diff --git a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
index 356e3da843..abe1df72a8 100644
--- a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
+++ b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
@@ -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,18 +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.
- *
+ *
*************************************************************/
+
+
#define FT_BK_COLOR 1
#define TB_BK_COLOR 2
#define TBI_BK_COLOR 3
@@ -71,13 +73,11 @@
//line style page
#define VS_STYLE 1
#define PB_OPTIONS 2
-#define BMP_UNDERLINE_MORE 3
-#define BMP_UNDERLINE_MORE_H 4
//line border page
#define TB_BORDER1 1
-#define TB_BORDER2 2
-#define TB_BORDER3 3
+#define TB_BORDER2 2
+#define TB_BORDER3 3
#define TBI_BORDER1_NONE 7
#define TBI_BORDER1_ALL 8
@@ -143,7 +143,7 @@
#define IMG_BORDER16_H 80
#define VS_FILLCOLOR 1
-#define VS_NOFILLCOLOR 2
+#define VS_NOFILLCOLOR 2
#define VS_LINECOLOR 1
// eof
diff --git a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index b6b9f0f009..b6d126ae4c 100644
--- a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -329,14 +329,6 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE
TabStop = TRUE ;
Text [ en-US ] = "~More Options..." ;
};
- Bitmap BMP_UNDERLINE_MORE
- {
- File = "sidebar/morebutton.png" ;
- };
- Bitmap BMP_UNDERLINE_MORE_H
- {
- File = "sidebar/morebutton_h.png" ;
- };
};
// cell border style popup
diff --git a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
index a6d1545652..7f71a2eb8c 100644
--- a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
@@ -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,24 +7,26 @@
* 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/dialogs.hrc"
-#define BT_SUBSTLEFT 1
-#define BT_SUBSTCENTER 2
-#define BT_SUBSTRIGHT 3
-#define BT_SUBSTJUSTIFY 4
+#define BT_SUBSTLEFT 1
+#define BT_SUBSTCENTER 2
+#define BT_SUBSTRIGHT 3
+#define BT_SUBSTJUSTIFY 4
#define BT_BTX_LINESP 1
#define BT_TBX_INDENT_INC 1
#define BT_TBX_INDENT_DEC 2
@@ -37,9 +39,9 @@
#define MF_BEFORE_INDENT 2
#define MF_AFTER_INDENT 4
#define MF_FL_INDENT 6
-#define TBX_HORIZONTALALIGNMENT 5
+#define TBX_HORIZONTALALIGNMENT 5
#define IMG_INDENT_HANG 15
-#define FT_INDENT 16
+#define FT_INDENT 16
#define TBX_INDENT_INC_DEC 17
#define FI_SPACE1 18
#define FI_SPACE2 19
@@ -82,25 +84,21 @@
#define TBI_UL_INC 71
#define TBI_UL_DEC 72
-//for vertical alignment
+// for vertical alignment
#define IID_VERT_TOP 1
#define IID_VERT_CENTER 2
#define IID_VERT_BOTTOM 3
-//for numbering and bullett
+// for numbering and bullet
#define IID_BULLET 1
#define IID_NUMBER 2
//============================== popup bullet and numbering & back color =========================
#define VS_VALUES 1
#define IL_BULLET_BITMAPS 2
#define CB_BULLET_MORE 4
-#define BMP_BULLET_MORE 5
-#define BMP_BULLET_MORE_H 6
#define VS_NUMBERING 10
#define CB_NUMBERING_MORE 12
-#define BMP_NUMERING_MORE 13
-#define BMP_NUMERING_MORE_H 14
#define VS_FONT_COLOR 1
#define STR_NOFILL 2
@@ -112,7 +110,7 @@
#define FT_CUSTOM 14
#define FT_LINE_SPACING 15
-#define FT_OF 16
+#define FT_OF 16
#define IMG_SPACING1 18
#define IMG_SPACING115 19
#define IMG_SPACING15 20
@@ -139,8 +137,8 @@
#define STR_LS_OF 42
//============================== Help ID ==============================
-#define HID_TBX_HORIZONTALALIGNMENT "HID_TBX_HORIZONTALALIGNMENT"
-#define HID_TBI_HOR_ALIGN_LEFT "HID_TBI_HOR_ALIGN_LEFT"
+#define HID_TBX_HORIZONTALALIGNMENT "HID_TBX_HORIZONTALALIGNMENT"
+#define HID_TBI_HOR_ALIGN_LEFT "HID_TBI_HOR_ALIGN_LEFT"
#define HID_TBI_HOR_ALIGN_CENTER "HID_TBI_HOR_ALIGN_CENTER"
#define HID_TBI_HOR_ALIGN_RIGHT "HID_TBI_HOR_ALIGN_RIGHT"
#define HID_TBI_HOR_ALIGN_JUSTIFY "HID_TBI_HOR_ALIGN_JUSTIFY"
@@ -150,9 +148,9 @@
#define HID_TBI_VERT_ALIGN_CENTER "HID_TBI_VERT_ALIGN_CENTER"
#define HID_TBI_VERT_ALIGN_BOT "HID_TBI_VERT_ALIGN_BOT"
-#define HID_TBX_INDENT "HID_TBX_INDENT"
+#define HID_TBX_INDENT "HID_TBX_INDENT"
#define HID_TBI_INDENT "HID_TBI_INDENT"
-//#define HID_TBX_LINESP 705263129
+//#define HID_TBX_LINESP 705263129
//#define HID_TBI_LINESP 705262617
#define HID_TBX_GRSPACE "HID_TBX_GRSPACE"
#define HID_TBI_GRSPACE "HID_TBI_GRSPACE"
@@ -360,4 +358,4 @@
#define FT_2_X FT_1_X
#define FT_2_Y EDIT_1_Y + CONTROL_HEIGHT + CONTROL_SPACING_VERTICAL - 3
#define EDIT_2_X FT_1_X
-#define EDIT_2_Y FT_2_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
\ No newline at end of file
+#define EDIT_2_Y FT_2_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
diff --git a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index c15059f0f8..288950be05 100644
--- a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -65,7 +65,7 @@ Control RID_SIDEBAR_PARA_PANEL
ToolBox TBX_HORIZONTALALIGNMENT
{
Pos = MAP_APPFONT ( TBX_HORI_ALIGN_X, TBX_HORI_ALIGN_Y ) ;
- Size = MAP_APPFONT ( ALIGNMENT_TBX_WIDTH*4, ALIGNMENT_TBX_HEIGHT) ;
+ Size = MAP_APPFONT ( ALIGNMENT_TBX_WIDTH * 4, ALIGNMENT_TBX_HEIGHT) ;
SVLook = TRUE ;
Border = FALSE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBX_HALIGN ;
@@ -186,7 +186,7 @@ Control RID_SIDEBAR_PARA_PANEL
ToolBox TBX_UL_INC_DEC
{
Pos = MAP_APPFONT ( TBX_PARA_SPACE_INC_DEC_X,TBX_PARA_SPACE_INC_DEC_Y ) ;
- Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH*2,ALIGNMENT_TBX_HEIGHT) ;
+ Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH * 2, ALIGNMENT_TBX_HEIGHT) ;
SVLook = TRUE ;
Border = FALSE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBX_INC_DEC ;
@@ -224,7 +224,7 @@ Control RID_SIDEBAR_PARA_PANEL
HelpID = HID_POPUP_PS_ED_SBINDE_TOPDIST ;
Border = TRUE ;
Pos = MAP_APPFONT ( MBX_TOP_DIST_X, MBX_TOP_DIST_Y ) ;
- Size = MAP_APPFONT ( CONTROL_WIDTH -10, MBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( CONTROL_WIDTH - 10, MBOX_HEIGHT ) ;
QuickHelpText [ en-US ] = "Above Paragraph Spacing" ;
TabStop = TRUE ;
Repeat = TRUE ;
@@ -239,7 +239,7 @@ Control RID_SIDEBAR_PARA_PANEL
{
Border = TRUE ;
Pos = MAP_APPFONT ( MBX_BOT_DIST_X, MBX_BOT_DIST_Y ) ;
- Size = MAP_APPFONT ( CONTROL_WIDTH -10,MBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( CONTROL_WIDTH - 10, MBOX_HEIGHT ) ;
QuickHelpText [ en-US ] = "Below Paragraph Spacing" ;
HelpID = HID_POPUP_PS_ED_SBINDE_BOTTOMDIST ;
Repeat = TRUE ;
@@ -258,7 +258,7 @@ Control RID_SIDEBAR_PARA_PANEL
ToolBox TBX_INDENT_INC_DEC
{
Pos = MAP_APPFONT ( TBX_PARA_INDENT_INC_DEC_X, TBX_PARA_INDENT_INC_DEC_Y ) ;
- Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH*2,ALIGNMENT_TBX_HEIGHT) ;
+ Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH * 2, ALIGNMENT_TBX_HEIGHT) ;
SVLook = TRUE ;
Border = FALSE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBX_INDENT_INC_DEC ;
@@ -292,7 +292,7 @@ Control RID_SIDEBAR_PARA_PANEL
ToolBox TBX_INDENT_PRO_DEMOTE
{
Pos = MAP_APPFONT ( TBX_PARA_INDENT_INC_DEC_X, TBX_PARA_INDENT_INC_DEC_Y ) ;
- Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH*2,ALIGNMENT_TBX_HEIGHT) ;
+ Size = MAP_APPFONT (ALIGNMENT_TBX_WIDTH * 2, ALIGNMENT_TBX_HEIGHT) ;
SVLook = TRUE ;
Border = FALSE ;
HelpID = HID_PPROPERTYPANEL_PARA_TBX_INDENTP_INC_DEC ;
@@ -327,7 +327,7 @@ Control RID_SIDEBAR_PARA_PANEL
{
Border = TRUE ;
Pos = MAP_APPFONT ( MBX_LEFT_DIST_X, MBX_LEFT_DIST_Y ) ;
- Size = MAP_APPFONT ( CONTROL_WIDTH - 10,MBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( CONTROL_WIDTH - 10, MBOX_HEIGHT ) ;
QuickHelpText [ en-US ] = "Before Text Indent" ;
HelpID = HID_POPUP_INDENT_ED_INDENT_LEFTINDENT ;
Repeat = TRUE ;
@@ -342,7 +342,7 @@ Control RID_SIDEBAR_PARA_PANEL
{
Border = TRUE ;
Pos = MAP_APPFONT ( MBX_RIGHT_DIST_X, MBX_RIGHT_DIST_Y ) ;
- Size = MAP_APPFONT ( CONTROL_WIDTH -10, MBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( CONTROL_WIDTH - 10, MBOX_HEIGHT ) ;
QuickHelpText [ en-US ] = "After Text Indent" ;
HelpID = HID_POPUP_INDENT_ED_INDENT_RIGHTINDENT ;
Repeat = TRUE ;
@@ -357,7 +357,7 @@ Control RID_SIDEBAR_PARA_PANEL
{
Border = TRUE ;
Pos = MAP_APPFONT ( MBX_FLINE_DIST_X, MBX_FLINE_DIST_Y ) ;
- Size = MAP_APPFONT ( CONTROL_WIDTH -10, MBOX_HEIGHT ) ;
+ Size = MAP_APPFONT ( CONTROL_WIDTH - 10, MBOX_HEIGHT ) ;
QuickHelpText [ en-US ] = "First Line Indent" ;
HelpID = HID_POPUP_INDENT_ED_INDENT_FLINDENT ;
Repeat = TRUE ;
@@ -519,19 +519,11 @@ Control RID_POPUPPANEL_PARAPAGE_BULLETS
PushButton CB_BULLET_MORE
{
Pos = MAP_APPFONT (CUST_MORE_BUTTON_X + POPUPPANEL_MARGIN_NB, VS_HEIGHT_BULLET + POPUPPANEL_MARGIN_NB * 2 ) ;
- Size = MAP_APPFONT (POPUP_WIDTH_BULLET - 2*CUST_MORE_BUTTON_X - POPUPPANEL_MARGIN_NB*2, CUST_MORE_BUTTON_HEIGHT ) ;
+ Size = MAP_APPFONT (POPUP_WIDTH_BULLET - 2 * CUST_MORE_BUTTON_X - POPUPPANEL_MARGIN_NB * 2, CUST_MORE_BUTTON_HEIGHT ) ;
HelpID = HID_POPUP_BULLET_CB_BULLET_MORE ;
TabStop = TRUE ;
Text [ en-US ] = "~More Options" ;
};
- Bitmap BMP_BULLET_MORE
- {
- File = "symphony/__morebutton.bmp" ;
- };
- Bitmap BMP_BULLET_MORE_H
- {
- File = "symphony/__morebutton_h.bmp" ;
- };
};
String RID_SVXSTR_SIDEBAR_BULLET_DESCRIPTIONS_0
@@ -579,19 +571,11 @@ Control RID_POPUPPANEL_PARAPAGE_NUMBERING
PushButton CB_NUMBERING_MORE
{
Pos = MAP_APPFONT (CUST_MORE_BUTTON_X + POPUPPANEL_MARGIN_NB, VS_HEIGHT_NUM + POPUPPANEL_MARGIN_NB * 2 ) ;
- Size = MAP_APPFONT (POPUP_WIDTH_NUM - 2*CUST_MORE_BUTTON_X - POPUPPANEL_MARGIN_NB*2, CUST_MORE_BUTTON_HEIGHT ) ;
+ Size = MAP_APPFONT (POPUP_WIDTH_NUM - 2 * CUST_MORE_BUTTON_X - POPUPPANEL_MARGIN_NB * 2, CUST_MORE_BUTTON_HEIGHT ) ;
HelpID = HID_POPUP_NUM_CB_NUMBERING_MORE ;
TabStop = TRUE ;
Text [ en-US ] = "~More Options" ;
};
- Bitmap BMP_NUMERING_MORE
- {
- File = "symphony/__morebutton.bmp" ;
- };
- Bitmap BMP_NUMERING_MORE_H
- {
- File = "symphony/__morebutton_h.bmp" ;
- };
};
// ===========================================Line Space popup page==============================
diff --git a/main/svx/source/sidebar/text/TextPropertyPanel.hrc b/main/svx/source/sidebar/text/TextPropertyPanel.hrc
index 1f9f3de922..9b899b9205 100644
--- a/main/svx/source/sidebar/text/TextPropertyPanel.hrc
+++ b/main/svx/source/sidebar/text/TextPropertyPanel.hrc
@@ -88,8 +88,6 @@
// popup window underline
#define VS_UNDERLINE 1
#define PB_OPTIONS 2
-#define BMP_UNDERLINE_MORE 3
-#define BMP_UNDERLINE_MORE_H 4
#define IMG_SINGLE 10
#define IMG_DOUBLE 11