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 13:43:47 UTC

[openoffice] branch AOO41X updated (23e8200a95 -> 237d872130)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from 23e8200a95 Updated rat excludes
     new 22a07d5fdf Cleaned up resource file
     new 237d872130 Remove unused graphics

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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     | 387 ++++++++++-----------
 .../source/sidebar/paragraph/ParaPropertyPanel.hrc |  42 ++-
 .../source/sidebar/paragraph/ParaPropertyPanel.src |  38 +-
 main/svx/source/sidebar/text/TextPropertyPanel.hrc |   2 -
 9 files changed, 228 insertions(+), 259 deletions(-)
 delete mode 100644 main/default_images/sc/res/sidebar/morebutton.bmp
 delete mode 100644 main/default_images/sc/res/sidebar/morebutton_h.bmp
 delete mode 100644 main/default_images/svx/res/symphony/__morebutton.bmp
 delete mode 100644 main/default_images/svx/res/symphony/__morebutton_h.bmp
 mode change 100755 => 100644 main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src


[openoffice] 01/02: Cleaned up resource file

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 22a07d5fdfab3574bc6de99e0d5cfb2af44a0463
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Jun 13 14:09:13 2023 +0200

    Cleaned up resource file
---
 .../ui/sidebar/CellAppearancePropertyPanel.src     | 385 ++++++++++-----------
 1 file changed, 191 insertions(+), 194 deletions(-)

diff --git a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
old mode 100755
new mode 100644
index 50ca1749e2..d6bf07e725
--- a/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.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 "CellAppearancePropertyPanel.hrc"
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "sc.hrc"
 #include "helpids.h"
 
-#define TOOLBOX_WIDTH		50
-#define TOOLBOX_HEIGHT		15
+#define TOOLBOX_WIDTH 50
+#define TOOLBOX_HEIGHT 15
 
-#define TOOLBOX_WIDTH_2		34
-#define TOOLBOX_HEIGHT_2	30
+#define TOOLBOX_WIDTH_2 34
+#define TOOLBOX_HEIGHT_2 30
 
-#define TOOLBOX_BORDER_WIDTH	107
-#define PB_BORDER_MOREBTN		57
-#define POPUPPANEL_MARGIN_SMALL_PIXEL	8
+#define TOOLBOX_BORDER_WIDTH 107
+#define PB_BORDER_MOREBTN 57
+#define POPUPPANEL_MARGIN_SMALL_PIXEL 8
 
-//////////////////////////////////////////////////////////////////////////////
 // the basic propertypanel
 
 Control RID_PROPERTYPANEL_SC_APPEAR
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
 
-	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH,  SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL * 2 +  TOOLBOX_HEIGHT_2 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT - 2);	
+	Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT_2 + CBOX_HEIGHT + SECTIONPAGE_MARGIN_VERTICAL_BOT - 2 ) ;
 	HelpID = HID_PROPERTYPANEL_SC_CELL_SECTION ;
-	Text [ en-US ] = "Cell Appearance";
-	
+	Text [ en-US ] = "Cell Appearance" ;
+
 	FixedText FT_BK_COLOR
 	{
-		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP );
-		Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2 , TEXT_HEIGHT) ;
-		Text [ en-US ] = "~Cell background:";
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP ) ;
+		Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "~Cell background:" ;
 	};
 	ToolBox TB_BK_COLOR
 	{
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL) ;
-		Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL ) ;
+		Size = MAP_APPFONT ( TOOLBOX_WIDTH, TOOLBOX_HEIGHT ) ;
 		TabStop = TRUE ;
 		HelpID = HID_PROPERTYPANEL_SC_TBX_BKCOLOR ;
-		Text [ en-US ] = "Cell Background";
+		Text [ en-US ] = "Cell Background" ;
 		ItemList =
 		{
 			ToolBoxItem
@@ -68,7 +69,7 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 				Identifier = TBI_BK_COLOR ;
 				DropDown = TRUE ;
 				Text [ en-US ] = "Cell background" ;
-				HelpID = HID_PROPERTYPANEL_SC_TBI_BKCOLOR;
+				HelpID = HID_PROPERTYPANEL_SC_TBI_BKCOLOR ;
 			};
 		};
 	};
@@ -78,18 +79,18 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 	};
 	FixedText FT_BORDER
 	{
-		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT +  TEXT_CONTROL_SPACING_VERTICAL + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL);
-		Size = MAP_APPFONT (  PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2 , TEXT_HEIGHT) ;
-		Text [ en-US ] = "Cell ~border:";
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
+		Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH - SECTIONPAGE_MARGIN_HORIZONTAL * 2, TEXT_HEIGHT ) ;
+		Text [ en-US ] = "Cell ~border:" ;
 	};
 	ToolBox TB_APP_BORDER
 	{
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL) ;
-		Size = MAP_APPFONT (TOOLBOX_WIDTH_2 ,TOOLBOX_HEIGHT_2 ) ;
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
+		Size = MAP_APPFONT ( TOOLBOX_WIDTH_2, TOOLBOX_HEIGHT_2 ) ;
 		TabStop = TRUE ;
 		HelpID = HID_PROPERTYPANEL_SC_TBX_BORDER ;
-		Text [ en-US ] = "Cell Border";
+		Text [ en-US ] = "Cell Border" ;
 		ItemList =
 		{
 			ToolBoxItem
@@ -97,7 +98,7 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 				Identifier = TBI_BORDER ;
 				DropDown = TRUE ;
 				Text [ en-US ] = "Cell border" ;
-				HelpID = HID_PROPERTYPANEL_SC_TBI_BORDER;
+				HelpID = HID_PROPERTYPANEL_SC_TBI_BORDER ;
 			};
 		};
 	};
@@ -108,11 +109,11 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 	ToolBox TB_BORDER_LINE_STYLE
 	{
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT  + CONTROL_SPACING_VERTICAL ) ;
-		Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT) ;
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL ) ;
+		Size = MAP_APPFONT ( TOOLBOX_WIDTH, TOOLBOX_HEIGHT ) ;
 		TabStop = TRUE ;
 		HelpID = HID_PROPERTYPANEL_SC_TBX_STYLE ;
-		Text [ en-US ] = "Line Style";
+		Text [ en-US ] = "Line Style" ;
 		ItemList =
 		{
 			ToolBoxItem
@@ -120,7 +121,7 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 				Identifier = TBI_LINE_STYLE ;
 				DropDown = TRUE ;
 				Text [ en-US ] = "Line style" ;
-				HelpID = HID_PROPERTYPANEL_SC_TBI_STYLE;
+				HelpID = HID_PROPERTYPANEL_SC_TBI_STYLE ;
 			};
 		};
 	};
@@ -131,11 +132,11 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 	ToolBox TB_BORDER_LINE_COLOR
 	{
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT (SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT * 2  + CONTROL_SPACING_VERTICAL + 3) ;
-		Size = MAP_APPFONT (TOOLBOX_WIDTH ,TOOLBOX_HEIGHT ) ;
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL + TOOLBOX_WIDTH_2 + 3, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT * 2 + CONTROL_SPACING_VERTICAL + 3 ) ;
+		Size = MAP_APPFONT ( TOOLBOX_WIDTH, TOOLBOX_HEIGHT ) ;
 		TabStop = TRUE ;
 		HelpID = HID_PROPERTYPANEL_SC_TBX_LINECOLOR ;
-		Text [ en-US ] = "Line Color";
+		Text [ en-US ] = "Line Color" ;
 		ItemList =
 		{
 			ToolBoxItem
@@ -143,7 +144,7 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 				Identifier = TBI_LINE_COLOR ;
 				DropDown = TRUE ;
 				Text [ en-US ] = "Line color" ;
-				HelpID = HID_PROPERTYPANEL_SC_TBI_LINECOLOR;
+				HelpID = HID_PROPERTYPANEL_SC_TBI_LINECOLOR ;
 			};
 		};
 	};
@@ -153,126 +154,124 @@ Control RID_PROPERTYPANEL_SC_APPEAR
 	};
 	CheckBox CBX_SHOW_GRID
 	{
-		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL , SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 +  TEXT_CONTROL_SPACING_VERTICAL * 2  +  TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 +  TOOLBOX_HEIGHT_2 + 2) ;
-        Size = MAP_APPFONT ( 90 , CBOX_HEIGHT ) ;
+		Pos = MAP_APPFONT ( SECTIONPAGE_MARGIN_HORIZONTAL, SECTIONPAGE_MARGIN_VERTICAL_TOP + TEXT_HEIGHT * 2 + TEXT_CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT + CONTROL_SPACING_VERTICAL * 2 + TOOLBOX_HEIGHT_2 + 2 ) ;
+		Size = MAP_APPFONT ( 90, CBOX_HEIGHT ) ;
 		TabStop = TRUE ;
 		Text [ en-US ] = "Show cell ~grid lines" ;
-		QuickHelpText [ en-US ] = "Show the grid lines of the cells in the entire spreadsheet.";
-		HelpID = HID_PROPERTYPANEL_SC_CBOX_SHOWGRID;
-	};	
-	
+		QuickHelpText [ en-US ] = "Show the grid lines of the cells in the entire spreadsheet." ;
+		HelpID = HID_PROPERTYPANEL_SC_CBOX_SHOWGRID ;
+	};
+
 	Image IMG_BK_COLOR
 	{
-		ImageBitmap = Bitmap{File = "sidebar/fill_color.png";};
+		ImageBitmap = Bitmap {File = "sidebar/fill_color.png" ;} ;
 	};
 	Image IMG_CELL_BORDER
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder.png";};
-		//MaskColor = STD_MASKCOLOR ;
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder.png" ;} ;
 	};
 	Image IMG_LINE_COLOR
 	{
-		ImageBitmap = Bitmap{File = "sidebar/Line_color.png";};
+		ImageBitmap = Bitmap {File = "sidebar/Line_color.png" ;} ;
 	};
 	Image IMG_LINE_STYLE1
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_005.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_005.png" ;} ;
 	};
 	Image IMG_LINE_STYLE2
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_250.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_250.png" ;} ;
 	};
 	Image IMG_LINE_STYLE3
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_400.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_400.png" ;} ;
 	};
 	Image IMG_LINE_STYLE4
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_500.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_500.png" ;} ;
 	};
 	Image IMG_LINE_STYLE5
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_110.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_110.png" ;} ;
 	};
 	Image IMG_LINE_STYLE6
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_260.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_260.png" ;} ;
 	};
 	Image IMG_LINE_STYLE7
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_450.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_450.png" ;} ;
 	};
 	Image IMG_LINE_STYLE8
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_505.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_505.png" ;} ;
 	};
 	Image IMG_LINE_STYLE9
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_750.png" ;} ;
 	};
-	
-	//high contrast
+
+	// high contrast
 	Image IMG_BK_COLOR_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/fill_color_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/fill_color_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE1_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_005_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_005_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE2_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_250_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_250_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE3_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_400_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_400_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE4_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_500_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_500_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE5_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_110_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_110_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE6_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_260_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_260_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE7_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_450_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_450_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE8_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_505_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_505_h.png" ;} ;
 	};
 	Image IMG_LINE_STYLE9_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorderLineStyle_750_h.png" ;} ;
 	};
-	
+
 };
 
-//////////////////////////////////////////////////////////////////////////////
 // fill color popup
 
 Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT  );
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+	Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH, POPUP_COLOR_PICKER_HEIGHT ) ;
+
 	Control VS_FILLCOLOR
 	{
-		HelpID = HID_PROPERTYPANEL_FILL_COLOR_VS;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
-        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2);
+		HelpID = HID_PROPERTYPANEL_FILL_COLOR_VS ;
+		Hide = TRUE ;
+		Pos = MAP_APPFONT ( OFFSET_X, OFFSET_Y ) ;
+		Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2 ) ;
 		TabStop = TRUE ;
-		Text [ en-US ] = "Color";
+		Text [ en-US ] = "Color" ;
 	};
 
 	String VS_NOFILLCOLOR
@@ -281,332 +280,330 @@ Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR
 	};
 };
 
-//////////////////////////////////////////////////////////////////////////////
 // line color popup
 
 Control RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT  );
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+	Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH, POPUP_COLOR_PICKER_HEIGHT ) ;
+
 	Control VS_LINECOLOR
 	{
-		HelpID = HID_PROPERTYPANEL_LINE_COLOR_VS;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
-        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2);
+		HelpID = HID_PROPERTYPANEL_LINE_COLOR_VS ;
+		Hide = TRUE ;
+		Pos = MAP_APPFONT ( OFFSET_X, OFFSET_Y ) ;
+		Size = MAP_APPFONT ( POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT - OFFSET_Y * 2 ) ;
 		TabStop = TRUE ;
-		Text [ en-US ] = "Color";
+		Text [ en-US ] = "Color" ;
 	};
 };
 
-//////////////////////////////////////////////////////////////////////////////
 // cell line style popup
 
 Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	
-	Size = MAP_APPFONT(  
-        POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + 80,  
-        13 + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE + 12*9);
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+
+	Size = MAP_APPFONT (
+		POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + 80,
+		13 + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE + 12 * 9 ) ;
+
 	Control VS_STYLE
 	{
 		HelpID = HID_PROPERTYPANEL_SC_STYLE_VS ;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y ); 
-        Size = MAP_APPFONT ( 80  , 12 * 9);
+		Hide = TRUE ;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
+		Size = MAP_APPFONT ( 80, 12 * 9 ) ;
 		TabStop = TRUE ;
-		Text [ en-US ] = "Line Style";
+		Text [ en-US ] = "Line Style" ;
 	};
 	PushButton PB_OPTIONS
 	{
-		HelpID = HID_PROPERTYPANEL_SC_STYLE_PB;
-		Pos = MAP_APPFONT (  POPUPPANEL_MARGIN_LARGE + OFFSET_X , POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y + 12 * 9);
-		Size = MAP_APPFONT ( 75 , 12 );
-		TabStop = TRUE;
-		Text [ en-US ] = "~More Options...";
+		HelpID = HID_PROPERTYPANEL_SC_STYLE_PB ;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X, POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y + 12 * 9 ) ;
+		Size = MAP_APPFONT ( 75, 12 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "~More Options..." ;
 	};
 	Bitmap	BMP_UNDERLINE_MORE
 	{
-		File = "sidebar/morebutton.png";
+		File = "sidebar/morebutton.png" ;
 	};
 	Bitmap	BMP_UNDERLINE_MORE_H
 	{
-		File = "sidebar/morebutton_h.png";
-	};	
+		File = "sidebar/morebutton_h.png" ;
+	};
 };
 
-//////////////////////////////////////////////////////////////////////////////
 // cell border style popup
 
 Control RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	
-	Size = MAP_PIXEL(  POPUPPANEL_MARGIN_SMALL_PIXEL * 2 + 108,  POPUPPANEL_MARGIN_SMALL_PIXEL * 2  + 138);
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+
+	Size = MAP_PIXEL( POPUPPANEL_MARGIN_SMALL_PIXEL * 2 + 108, POPUPPANEL_MARGIN_SMALL_PIXEL * 2 + 138 ) ;
+
 	ToolBox TB_BORDER1
 	{
 		SVLook = TRUE ;
-		Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL); //MAP_APPFONT (POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 1) ;
-		Size = MAP_PIXEL(TOOLBOX_BORDER_WIDTH, 31); //MAP_APPFONT (TOOLBOX_BORDER_WIDTH ,20) ;
+		Pos = MAP_PIXEL ( POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL ) ; //MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 1 ) ;
+		Size = MAP_PIXEL ( TOOLBOX_BORDER_WIDTH, 31 ) ; //MAP_APPFONT ( TOOLBOX_BORDER_WIDTH, 20 ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PROPERTYPANEL_SC_BORDER1_TBX;
-		Text [ en-US ] = "Cell Border 1";
+		HelpID = HID_PROPERTYPANEL_SC_BORDER1_TBX ;
+		Text [ en-US ] = "Cell Border 1" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
 				Identifier = TBI_BORDER1_NONE ;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_NONE;
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_NONE ;
 				Text [ en-US ] = "No Border" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = TBI_BORDER1_ALL ;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_ALL;
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_ALL ;
 				Text [ en-US ] = "All Borders" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = TBI_BORDER1_OUTER ;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER;
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_OUTER ;
 				Text [ en-US ] = "Outside Borders" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = TBI_BORDER1_OUTERBOLD ;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD;
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_OUTERBOLD ;
 				Text [ en-US ] = "Thick Box Border" ;
 			};
 		};
 	};
 	FixedLine FL_1
 	{
-		Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31); //MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1 , POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 1) ;
-        Size = MAP_PIXEL(TOOLBOX_BORDER_WIDTH, 8); // MAP_APPFONT ( TOOLBOX_BORDER_WIDTH , 5 ) ;
+		Pos = MAP_PIXEL ( POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 ) ; //MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 1 ) ;
+		Size = MAP_PIXEL ( TOOLBOX_BORDER_WIDTH, 8 ) ; // MAP_APPFONT ( TOOLBOX_BORDER_WIDTH, 5 ) ;
 	};
 	ToolBox TB_BORDER2
 	{
 		SVLook = TRUE ;
-		Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 + 8); // MAP_APPFONT (POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 5 + 1) ;
-		Size = MAP_PIXEL (TOOLBOX_BORDER_WIDTH ,61) ;
+		Pos = MAP_PIXEL ( POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 + 8 ) ; // MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 5 + 1 ) ;
+		Size = MAP_PIXEL ( TOOLBOX_BORDER_WIDTH, 61 ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PROPERTYPANEL_SC_BORDER2_TBX;
-		Text [ en-US ] = "Cell Border 2";
+		HelpID = HID_PROPERTYPANEL_SC_BORDER2_TBX ;
+		Text [ en-US ] = "Cell Border 2" ;
 	};
 	FixedLine FL_2
 	{
-		Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 + 8 + 61); // MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1 , POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 38 + 5 + 1) ;
-        Size = MAP_PIXEL ( TOOLBOX_BORDER_WIDTH , 8 ) ;
+		Pos = MAP_PIXEL ( POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 + 8 + 61 ) ; // MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 38 + 5 + 1 ) ;
+		Size = MAP_PIXEL ( TOOLBOX_BORDER_WIDTH, 8 ) ;
 	};
 	ToolBox TB_BORDER3
 	{
 		SVLook = TRUE ;
-		Pos = MAP_PIXEL(POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 +8 + 61 + 8); // MAP_APPFONT (POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 38 + 10 + 1) ;
-		Size = MAP_PIXEL (TOOLBOX_BORDER_WIDTH ,31) ;
+		Pos = MAP_PIXEL ( POPUPPANEL_MARGIN_SMALL_PIXEL, POPUPPANEL_MARGIN_SMALL_PIXEL + 31 +8 + 61 + 8 ) ; // MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X + 1, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + 20 + 38 + 10 + 1 ) ;
+		Size = MAP_PIXEL ( TOOLBOX_BORDER_WIDTH, 31 ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PROPERTYPANEL_SC_BORDER3_TBX;
-		Text [ en-US ] = "Cell Border 3";
+		HelpID = HID_PROPERTYPANEL_SC_BORDER3_TBX ;
+		Text [ en-US ] = "Cell Border 3" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				Identifier = TBI_BORDER3_S1;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S1;
-				Text [ en-US ] = "Thick Bottom Border" ;	
+				Identifier = TBI_BORDER3_S1 ;
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S1 ;
+				Text [ en-US ] = "Thick Bottom Border" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = TBI_BORDER3_S2 ;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S2;
-				Text [ en-US ] = "Double Bottom Border" ;	
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S2 ;
+				Text [ en-US ] = "Double Bottom Border" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = TBI_BORDER3_S3 ;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S3;
-				Text [ en-US ] = "Top and Thick Bottom Borders" ;	
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S3 ;
+				Text [ en-US ] = "Top and Thick Bottom Borders" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = TBI_BORDER3_S4 ;
-				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S4;
-				Text [ en-US ] = "Top and Double Bottom Borders" ;	
+				HelpID = HID_PROPERTYPANEL_SC_BORDER_TBI_S4 ;
+				Text [ en-US ] = "Top and Double Bottom Borders" ;
 			};
 		};
 	};
-	
+
 	Image IMG_BORDER1
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Empty_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Empty_18x18.png" ;} ;
 	};
 	Image IMG_BORDER2
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_All_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_All_18x18.png" ;} ;
 	};
 	Image IMG_BORDER3
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_FourBorders_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_FourBorders_18x18.png" ;} ;
 	};
 	Image IMG_BORDER4
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_FourBorders_Thick_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_FourBorders_Thick_18x18.png" ;} ;
 	};
 	Image IMG_BORDER5
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Left_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Left_18x18.png" ;} ;
 	};
 	Image IMG_BORDER6
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Right_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Right_18x18.png" ;} ;
 	};
 	Image IMG_BORDER7
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Top_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Top_18x18.png" ;} ;
 	};
 	Image IMG_BORDER8
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Bottom_18x18.png" ;} ;
 	};
 	Image IMG_BORDER9
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_RightDiagonal_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_RightDiagonal_18x18.png" ;} ;
 	};
 	Image IMG_BORDER10
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_LeftDiagonal_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_LeftDiagonal_18x18.png" ;} ;
 	};
 	Image IMG_BORDER11
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopAndBottom_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_TopAndBottom_18x18.png" ;} ;
 	};
 	Image IMG_BORDER12
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_LeftAndRight_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_LeftAndRight_18x18.png" ;} ;
 	};
 	Image IMG_BORDER13
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_Thick_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Bottom_Thick_18x18.png" ;} ;
 	};
 	Image IMG_BORDER14
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_Double_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Bottom_Double_18x18.png" ;} ;
 	};
 	Image IMG_BORDER15
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopThin_BottomThick_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_TopThin_BottomThick_18x18.png" ;} ;
 	};
 	Image IMG_BORDER16
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopSingle_BottomDouble_18x18.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_TopSingle_BottomDouble_18x18.png" ;} ;
 	};
 	String STR_BORDER_1
 	{
-		Text [ en-US ] = "Left Border";
+		Text [ en-US ] = "Left Border" ;
 	};
 	String STR_BORDER_2
 	{
-		Text [ en-US ] = "Right Border";
+		Text [ en-US ] = "Right Border" ;
 	};
 	String STR_BORDER_3
 	{
-		Text [ en-US ] = "Top Border";
+		Text [ en-US ] = "Top Border" ;
 	};
 	String STR_BORDER_4
 	{
-		Text [ en-US ] = "Bottom Border";
+		Text [ en-US ] = "Bottom Border" ;
 	};
 	String STR_BORDER_5
 	{
-		Text [ en-US ] = "Diagonal Up Border";
+		Text [ en-US ] = "Diagonal Up Border" ;
 	};
 	String STR_BORDER_6
 	{
-		Text [ en-US ] = "Diagonal Down Border";
+		Text [ en-US ] = "Diagonal Down Border" ;
 	};
 	String STR_BORDER_7
 	{
-		Text [ en-US ] = "Top and Bottom Borders";
+		Text [ en-US ] = "Top and Bottom Borders" ;
 	};
 	String STR_BORDER_8
 	{
-		Text [ en-US ] = "Left and Right Borders";
+		Text [ en-US ] = "Left and Right Borders" ;
 	};
 
-	//high contrast
+	// high contrast
 	Image IMG_BORDER1_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Empty_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Empty_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER2_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_All_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_All_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER3_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_FourBorders_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_FourBorders_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER4_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_FourBorders_Thick_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_FourBorders_Thick_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER5_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Left_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Left_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER6_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Right_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Right_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER7_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Top_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Top_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER8_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Bottom_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER9_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_RightDiagonal_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_RightDiagonal_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER10_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_LeftDiagonal_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_LeftDiagonal_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER11_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopAndBottom_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_TopAndBottom_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER12_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_LeftAndRight_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_LeftAndRight_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER13_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_Thick_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Bottom_Thick_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER14_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_Bottom_Double_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_Bottom_Double_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER15_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopThin_BottomThick_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_TopThin_BottomThick_18x18_h.png" ;} ;
 	};
 	Image IMG_BORDER16_H
 	{
-		ImageBitmap = Bitmap{File = "sidebar/CellBorder_TopSingle_BottomDouble_18x18_h.png";};
+		ImageBitmap = Bitmap {File = "sidebar/CellBorder_TopSingle_BottomDouble_18x18_h.png" ;} ;
 	};
 };
 
-// eof
+// ********************************************************************** EOF
+


[openoffice] 02/02: Remove unused graphics

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 237d872130957ce6f4a3e32e05b439fb668e6100
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Jun 13 13:33:32 2023 +0200

    Remove unused graphics
    
    (cherry picked from commit f51ffce592993dad51bf92cbe3b68e08f8014d0a)
---
 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 100755
--- 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 d6bf07e725..942a0d6d0c 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 100755
--- 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 c471d4f8b7..578104793c 100755
--- 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