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 2019/08/18 09:20:15 UTC

[openoffice] branch AOO42X updated (3edb530 -> 383b2ea)

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

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


    from 3edb530  SvnRevision.pm returns now short git hash. git-svn-id has been removed.
     new bf26ee5  Removed whitespace, unified filenames
     new 383b2ea  added renamed files

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:
 ...acing_very loose.png => spacing_very_loose.png} | Bin
 ...g_very loose_s.png => spacing_very_loose_s.png} | Bin
 ...acing_very tight.png => spacing_very_tight.png} | Bin
 ...g_very tight_s.png => spacing_very_tight_s.png} | Bin
 .../source/sidebar/paragraph/ParaPropertyPanel.src |  52 +--
 main/svx/source/sidebar/text/TextPropertyPanel.src | 482 +++++++++++----------
 6 files changed, 269 insertions(+), 265 deletions(-)
 rename main/default_images/svx/res/symphony/{spacing_very loose.png => spacing_very_loose.png} (100%)
 rename main/default_images/svx/res/symphony/{spacing_very loose_s.png => spacing_very_loose_s.png} (100%)
 rename main/default_images/svx/res/symphony/{spacing_very tight.png => spacing_very_tight.png} (100%)
 rename main/default_images/svx/res/symphony/{spacing_very tight_s.png => spacing_very_tight_s.png} (100%)


[openoffice] 01/02: Removed whitespace, unified filenames

Posted by ms...@apache.org.
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

commit bf26ee511c1eac0dd2779f3d86340de4c3328028
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Aug 18 11:11:06 2019 +0200

    Removed whitespace, unified filenames
    
    (cherry picked from commit e93c3f1c8a97ab13a7cf5db6f79db5d9d82fef64)
---
 .../svx/res/symphony/spacing_very loose.png        | Bin 2941 -> 0 bytes
 .../svx/res/symphony/spacing_very loose_s.png      | Bin 2937 -> 0 bytes
 .../svx/res/symphony/spacing_very tight.png        | Bin 2930 -> 0 bytes
 .../svx/res/symphony/spacing_very tight_s.png      | Bin 2906 -> 0 bytes
 .../source/sidebar/paragraph/ParaPropertyPanel.src |  52 +--
 main/svx/source/sidebar/text/TextPropertyPanel.src | 482 +++++++++++----------
 6 files changed, 269 insertions(+), 265 deletions(-)

diff --git a/main/default_images/svx/res/symphony/spacing_very loose.png b/main/default_images/svx/res/symphony/spacing_very loose.png
deleted file mode 100644
index 04f3969..0000000
Binary files a/main/default_images/svx/res/symphony/spacing_very loose.png and /dev/null differ
diff --git a/main/default_images/svx/res/symphony/spacing_very loose_s.png b/main/default_images/svx/res/symphony/spacing_very loose_s.png
deleted file mode 100644
index 21f5784..0000000
Binary files a/main/default_images/svx/res/symphony/spacing_very loose_s.png and /dev/null differ
diff --git a/main/default_images/svx/res/symphony/spacing_very tight.png b/main/default_images/svx/res/symphony/spacing_very tight.png
deleted file mode 100644
index 84845c3..0000000
Binary files a/main/default_images/svx/res/symphony/spacing_very tight.png and /dev/null differ
diff --git a/main/default_images/svx/res/symphony/spacing_very tight_s.png b/main/default_images/svx/res/symphony/spacing_very tight_s.png
deleted file mode 100644
index 19b4856..0000000
Binary files a/main/default_images/svx/res/symphony/spacing_very tight_s.png and /dev/null differ
diff --git a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 35d4f0e..c471d4f 100755
--- a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -25,7 +25,7 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "helpid.hrc"
 
-#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
 
 #define SVX_PROPERTYPANEL_PARA_VERT_IDLIST	\
 	IdList =				\
@@ -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 ;
@@ -185,7 +185,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 );
+		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) ;
 		SVLook = TRUE ;
 		Border = FALSE ;
@@ -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 ;
@@ -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 ;
@@ -441,39 +441,39 @@ Control RID_SIDEBAR_PARA_PANEL
 	// end
 	Image IMG_BACK_COLOR
 	{
-		ImageBitmap = Bitmap{File = "symphony/sc_backgroundcolor.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/sc_backgroundcolor.png" ;} ;
 	};
 	Image IMG_BACK_COLOR_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/sch_backgroundcolor.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/sch_backgroundcolor.png" ;} ;
 	};
 	Image IMG_SPACE1
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing1.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/spacing1.png" ;} ;
 	};
 	Image IMG_SPACE2
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing2.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/spacing2.png" ;} ;
 	};
 	Image IMG_SPACE3
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing3.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/spacing3.png" ;} ;
 	};
 	Image IMG_INDENT1
 	{
-		ImageBitmap = Bitmap{File = "symphony/Indent2.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/Indent2.png" ;} ;
 	};
 	Image IMG_INDENT2
 	{
-		ImageBitmap = Bitmap{File = "symphony/Indent3.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/Indent3.png" ;} ;
 	};
 	Image IMG_INDENT3
 	{
-		ImageBitmap = Bitmap{File = "symphony/Indent4.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/Indent4.png" ;} ;
 	};
 	Image IMG_INDENT_HANG
 	{
-		ImageBitmap = Bitmap{File = "symphony/Indent_Hanging.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/Indent_Hanging.png" ;} ;
 	};
 };
 
@@ -606,7 +606,7 @@ Control RID_POPUPPANEL_PARAPAGE_LINESPACING
 	Control LINE_SPACING
 	{
 		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
-		Size = MAP_APPFONT ( VS_SPACING_WIDTH , 17 * 5) ;
+		Size = MAP_APPFONT ( VS_SPACING_WIDTH, 17 * 5) ;
 		TabStop = TRUE ;
 		Text = "Line Spacing" ;
 	};
@@ -686,43 +686,43 @@ Control RID_POPUPPANEL_PARAPAGE_LINESPACING
 	};
 	Image IMG_SPACING1
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpspacing-1.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpspacing-1.png" ;} ;
 	};
 	Image IMG_SPACING115
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpspacing-1_15.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpspacing-1_15.png" ;} ;
 	};
 	Image IMG_SPACING15
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpspacing-1_5.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpspacing-1_5.png" ;} ;
 	};
 	Image IMG_SPACING2
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpspacing-2.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpspacing-2.png" ;} ;
 	};
 	Image IMG_SEL_SPACING1
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-1.png" ;} ;
 	};
 	Image IMG_SEL_SPACING115
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1_15.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-1_15.png" ;} ;
 	};
 	Image IMG_SEL_SPACING15
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-1_5.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-1_5.png" ;} ;
 	};
 	Image IMG_SEL_SPACING2
 	{
-		ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-2.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-2.png" ;} ;
 	};
 	Image IMG_CUSTOM
 	{
-		ImageBitmap = Bitmap{File = "symphony/last_custom_common.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/last_custom_common.png" ;} ;
 	};
 	Image IMG_CUSTOM_GRAY
 	{
-		ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png" ;} ;
+		ImageBitmap = Bitmap {File = "symphony/last_custom_common_grey.png" ;} ;
 	};
 	String STR_LS_SINGLE
 	{
diff --git a/main/svx/source/sidebar/text/TextPropertyPanel.src b/main/svx/source/sidebar/text/TextPropertyPanel.src
index edac007..74b7d21 100644
--- a/main/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/main/svx/source/sidebar/text/TextPropertyPanel.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,76 +7,78 @@
  * 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 "TextPropertyPanel.hrc"
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "helpid.hrc"
 
 Control RID_SIDEBAR_TEXT_PANEL
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
 
-	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + TOOLBOX_ITEM_HEIGHT * 2 + CONTROL_SPACING_VERTICAL * 2 + SECTIONPAGE_MARGIN_VERTICAL_BOT );
+	Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, SECTIONPAGE_MARGIN_VERTICAL_TOP + CBOX_HEIGHT + TOOLBOX_ITEM_HEIGHT * 2 + CONTROL_SPACING_VERTICAL * 2 + SECTIONPAGE_MARGIN_VERTICAL_BOT ) ;
 	HelpID = HID_PROPERTYPANEL_TEXT_SECTION ;
-	Text = "Text";
-	
+	Text = "Text" ;
+
 	ComboBox CB_SBFONT_FONT
 	{
-		Border = TRUE;
-		Pos = MAP_APPFONT (X0 , FIRST_LINE_Y); 
-		Size = MAP_APPFONT (FONTNAME_WIDTH , CONTROL_HEIGHT_FONT_NAME);
-		TabStop = TRUE;
-		DropDown = TRUE;
+		Border = TRUE ;
+		Pos = MAP_APPFONT (X0, FIRST_LINE_Y) ;
+		Size = MAP_APPFONT (FONTNAME_WIDTH, CONTROL_HEIGHT_FONT_NAME) ;
+		TabStop = TRUE ;
+		DropDown = TRUE ;
 		HelpID = HID_COMBO_FONT_NAME ;
-		QuickHelpText [ en-US ] = "Font";
-//        Command = ".uno:CharFontName";
+		QuickHelpText [ en-US ] = "Font" ;
+//		Command = ".uno:CharFontName" ;
 	};
 	MetricBox MB_SBFONT_FONTSIZE
 	{
-		Border = TRUE;
-		Pos = MAP_APPFONT (X2, FIRST_LINE_Y); 
-		Size = MAP_APPFONT (FONTSIZE_WIDTH, CONTROL_HEIGHT_FONT_SIZE);
-		TabStop = TRUE;
-		DropDown = TRUE;
-		HelpID = HID_METRIC_FONT_SIZE;
-		QuickHelpText [ en-US ] = "Font Size";
-//        Command = ".uno:FontHeight";
+		Border = TRUE ;
+		Pos = MAP_APPFONT (X2, FIRST_LINE_Y) ;
+		Size = MAP_APPFONT (FONTSIZE_WIDTH, CONTROL_HEIGHT_FONT_SIZE) ;
+		TabStop = TRUE ;
+		DropDown = TRUE ;
+		HelpID = HID_METRIC_FONT_SIZE ;
+		QuickHelpText [ en-US ] = "Font Size" ;
+//		Command = ".uno:FontHeight" ;
 	};
-	
+
 	ToolBox TB_INCREASE_DECREASE
 	{
 		SVLook = TRUE ;
 		Pos = MAP_APPFONT (X2, SECOND_LINE_Y) ;
-		Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 2 ,TOOLBOX_ITEM_HEIGHT ) ;
+		Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 2, TOOLBOX_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONTSIZE_INDE;
+		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONTSIZE_INDE ;
 		Text = "Font Size Adjusting" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				Identifier = TBI_INCREASE;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_INCREASE;
-                Command = ".uno:Grow";
+				Identifier = TBI_INCREASE ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_INCREASE ;
+				Command = ".uno:Grow" ;
 			};
 			ToolBoxItem
 			{
-				Identifier = TBI_DECREASE;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_DECREASE;
-                Command = ".uno:Shrink";
+				Identifier = TBI_DECREASE ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_DECREASE ;
+				Command = ".uno:Shrink" ;
 			};
 		};
 	};
@@ -84,459 +86,459 @@ Control RID_SIDEBAR_TEXT_PANEL
 	{
 		SVLook = TRUE ;
 		Pos = MAP_APPFONT (X0 + 1, SECOND_LINE_Y) ;
-		Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 4 + TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT ) ; 
+		Size = MAP_APPFONT ( TOOLBOX_ITEM_WIDTH * 4 + TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT;
+		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT ;
 		Text = "Font Effects" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				Identifier = TBI_BOLD;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_BOLD;
-                Command = ".uno:Bold";
+				Identifier = TBI_BOLD ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_BOLD ;
+				Command = ".uno:Bold" ;
 			};
 			ToolBoxItem
 			{
-				Identifier = TBI_ITALIC;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_ITALIC;
-                Command = ".uno:Italic";
+				Identifier = TBI_ITALIC ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_ITALIC ;
+				Command = ".uno:Italic" ;
 			};
 			ToolBoxItem
 			{
-				Identifier = TBI_UNDERLINE;
+				Identifier = TBI_UNDERLINE ;
 				DropDown = TRUE ;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_UNDERLINE;				
-                Command = ".uno:Underline";
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_UNDERLINE ;
+				Command = ".uno:Underline" ;
 			};
 			ToolBoxItem
 			{
-				Identifier = TBI_STRIKEOUT;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_STRIKEOUT;
-                Command = ".uno:Strikeout";
+				Identifier = TBI_STRIKEOUT ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_STRIKEOUT ;
+				Command = ".uno:Strikeout" ;
 			};
 			ToolBoxItem
 			{
-				Identifier = TBI_SHADOWED;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SHADOWED;
-                Command = ".uno:Shadowed";
-			};		
+				Identifier = TBI_SHADOWED ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SHADOWED ;
+				Command = ".uno:Shadowed" ;
+			};
 		};
 	};
-	
+
 	ToolBox TB_FONTCOLOR
 	{
-		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR;
+		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR ;
 		SVLook = TRUE ;
 		Pos = MAP_APPFONT (X3, THIRD_LINE_Y) ;
-		Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH ,TOOLBOX_ITEM_HEIGHT ) ;
+		Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
 				Identifier = TBI_FONTCOLOR ;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR ;
 				DropDown = TRUE ;
-                Command = ".uno:Color";
+				Command = ".uno:Color" ;
 			};
 		};
 	};
 	ToolBox TB_FONTCOLOR_SW
 	{
-		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR;
+		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_FONT_COLOR ;
 		SVLook = TRUE ;
 		Pos = MAP_APPFONT (X3, THIRD_LINE_Y) ;
-		Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH ,TOOLBOX_ITEM_HEIGHT ) ;
+		Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
 				Identifier = TBI_FONTCOLOR ;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_FONT_COLOR ;
 				DropDown = TRUE ;
-                Command = ".uno:FontColor";
+				Command = ".uno:FontColor" ;
 			};
 		};
 	};
-	
+
 	ToolBox TB_HIGHLIGHT
 	{
 		SVLook = TRUE ;
 		Pos = MAP_APPFONT (X2, THIRD_LINE_Y) ;
-		Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH ,TOOLBOX_ITEM_HEIGHT ) ;
+		Size = MAP_APPFONT (TOOLBOX_ITEM_DD_WIDTH, TOOLBOX_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_HIGHLIGHT_COLOR;
+		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_HIGHLIGHT_COLOR ;
 		Text = "Highlight Color" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
 				Identifier = TBI_HIGHLIGHT ;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_HIGHLIGHT_COLOR;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_HIGHLIGHT_COLOR ;
 				DropDown = TRUE ;
-                Command = ".uno:BackColor";
+				Command = ".uno:BackColor" ;
 			};
 		};
 	};
-	
+
 	ToolBox TB_SCRIPT_SW
 	{
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT (X0 + 1 , THIRD_LINE_Y) ;
-		Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2 ,TOOLBOX_ITEM_HEIGHT ) ;
+		Pos = MAP_APPFONT (X0 + 1, THIRD_LINE_Y) ;
+		Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2, TOOLBOX_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT_SW;
+		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT_SW ;
 		Text = "Font Position" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				Identifier = TBI_SUPER_SW;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUPER_SW;
-                Command = ".uno:SuperScript";
+				Identifier = TBI_SUPER_SW ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUPER_SW ;
+				Command = ".uno:SuperScript" ;
 			};
 			ToolBoxItem
 			{
-				Identifier = TBI_SUB_SW;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUB_SW;
-                Command = ".uno:SubScript";
+				Identifier = TBI_SUB_SW ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUB_SW ;
+				Command = ".uno:SubScript" ;
 			};
 		};
 	};
 	ToolBox TB_SCRIPT
 	{
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT (X0 + 1 , THIRD_LINE_Y) ;
-		Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2 ,TOOLBOX_ITEM_HEIGHT ) ;
+		Pos = MAP_APPFONT (X0 + 1, THIRD_LINE_Y) ;
+		Size = MAP_APPFONT (TOOLBOX_ITEM_WIDTH * 2, TOOLBOX_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
-		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT;
+		HelpID = HID_PPROPERTYPANEL_TEXT_TBX_SCRIPT ;
 		Text = "Font Position" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				Identifier = TBI_SUPER;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUPER;
-                Command = ".uno:SuperScript";
+				Identifier = TBI_SUPER ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUPER ;
+				Command = ".uno:SuperScript" ;
 			};
 			ToolBoxItem
 			{
-				Identifier = TBI_SUB;
-				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUB;
-                Command = ".uno:SubScript";
+				Identifier = TBI_SUB ;
+				HelpID = HID_PPROPERTYPANEL_TEXT_TBI_SUB ;
+				Command = ".uno:SubScript" ;
 			};
 		};
 	};
-	
+
 	ToolBox TB_SPACING
 	{
 		SVLook = TRUE ;
 		Pos = MAP_APPFONT (X1, THIRD_LINE_Y) ;
 		Size = MAP_APPFONT (TOOLBOX_24_16_ITEM_DD_WIDTH, TOOLBOX_24_16_ITEM_HEIGHT ) ;
 		TabStop = TRUE ;
-		HelpID = HID_TB_SPACING;
+		HelpID = HID_TB_SPACING ;
 		Text = "Character Spacing" ;
 		ItemList =
 		{
 			ToolBoxItem
 			{
-				Identifier = TBI_SPACING;
+				Identifier = TBI_SPACING ;
 				DropDown = TRUE ;
-				HelpID = HID_TBI_SPACING;
-                Command = ".uno:Spacing";
+				HelpID = HID_TBI_SPACING ;
+				Command = ".uno:Spacing" ;
 			};
 		};
 	};
 };
 
-Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE  
+Control RID_POPUPPANEL_TEXTPAGE_UNDERLINE
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	
-	Size = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_UNDERLINE_WIDTH,  13+ VS_UNDERLINE_HEIGHT + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE);
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+
+	Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_UNDERLINE_WIDTH, 13+ VS_UNDERLINE_HEIGHT + POPUP_BORDER_HEIGHT + POPUPPANEL_MARGIN_SMALL * 2 + POPUPPANEL_MARGIN_LARGE) ;
 	Control VS_UNDERLINE
 	{
-		HelpID = HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y ); 
-        Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH  ,VS_UNDERLINE_HEIGHT);
+		HelpID = HID_PPROPERTYPANEL_TEXT_UNDERLINE_VS ;
+		Hide = TRUE ;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
+		Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH, VS_UNDERLINE_HEIGHT) ;
 		TabStop = TRUE ;
-		Text = "Underline";
+		Text = "Underline" ;
 	};
 
 	PushButton PB_OPTIONS
 	{
-		HelpID = HID_UNDERLINE_BTN;
-		Pos = MAP_APPFONT (  POPUPPANEL_MARGIN_SMALL + OFFSET_X  , POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y + VS_UNDERLINE_HEIGHT ); 
-		Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH, 13 );
-		TabStop = TRUE;
-		Text [ en-US ] = "~More Options...";
+		HelpID = HID_UNDERLINE_BTN ;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y + VS_UNDERLINE_HEIGHT ) ;
+		Size = MAP_APPFONT ( VS_UNDERLINE_WIDTH, 13 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "~More Options..." ;
 	};
-	
-	
+
+
 	Image IMG_SINGLE
 	{
-		ImageBitmap = Bitmap{File = "symphony/line1.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line1.png" ;} ;
 	};
 	Image IMG_DOUBLE
 	{
-		ImageBitmap = Bitmap{File = "symphony/line2.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line2.png" ;} ;
 	};
 	Image IMG_BOLD2
 	{
-		ImageBitmap = Bitmap{File = "symphony/line3.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line3.png" ;} ;
 	};
 	Image IMG_DOT
 	{
-		ImageBitmap = Bitmap{File = "symphony/line4.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line4.png" ;} ;
 	};
 	Image IMG_DOT_BOLD
 	{
-		ImageBitmap = Bitmap{File = "symphony/line5.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line5.png" ;} ;
 	};
 	Image IMG_DASH
 	{
-		ImageBitmap = Bitmap{File = "symphony/line6.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line6.png" ;} ;
 	};
 	Image IMG_DASH_LONG
 	{
-		ImageBitmap = Bitmap{File = "symphony/line7.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line7.png" ;} ;
 	};
 	Image IMG_DASH_DOT
 	{
-		ImageBitmap = Bitmap{File = "symphony/line8.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line8.png" ;} ;
 	};
 	Image IMG_DASH_DOT_DOT
 	{
-		ImageBitmap = Bitmap{File = "symphony/line9.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line9.png" ;} ;
 	};
 	Image IMG_WAVE
 	{
-		ImageBitmap = Bitmap{File = "symphony/line10.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line10.png" ;} ;
 	};
-	
-	//high contract
+
+	// high contract
 	Image IMG_SINGLE_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line1_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line1_h.png" ;} ;
 	};
 	Image IMG_DOUBLE_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line2_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line2_h.png" ;} ;
 	};
 	Image IMG_BOLD2_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line3_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line3_h.png" ;} ;
 	};
 	Image IMG_DOT_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line4_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line4_h.png" ;} ;
 	};
 	Image IMG_DOT_BOLD_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line5_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line5_h.png" ;} ;
 	};
 	Image IMG_DASH_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line6_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line6_h.png" ;} ;
 	};
 	Image IMG_DASH_LONG_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line7_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line7_h.png" ;} ;
 	};
 	Image IMG_DASH_DOT_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line8_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line8_h.png" ;} ;
 	};
 	Image IMG_DASH_DOT_DOT_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line9_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line9_h.png" ;} ;
 	};
 	Image IMG_WAVE_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/line10_h.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/line10_h.png" ;} ;
 	};
-	
-	//image when selected
+
+	// image when selected
 	Image IMG_SINGLE_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line1.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line1.png" ;} ;
 	};
 	Image IMG_DOUBLE_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line2.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line2.png" ;} ;
 	};
 	Image IMG_BOLD2_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line3.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line3.png" ;} ;
 	};
 	Image IMG_DOT_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line4.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line4.png" ;} ;
 	};
 	Image IMG_DOT_BOLD_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line5.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line5.png" ;} ;
 	};
 	Image IMG_DASH_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line6.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line6.png" ;} ;
 	};
 	Image IMG_DASH_LONG_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line7.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line7.png" ;} ;
 	};
 	Image IMG_DASH_DOT_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line8.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line8.png" ;} ;
 	};
 	Image IMG_DASH_DOT_DOT_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line9.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line9.png" ;} ;
 	};
 	Image IMG_WAVE_SEL
 	{
-		ImageBitmap = Bitmap{File = "symphony/selected-line10.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/selected-line10.png" ;} ;
 	};
-	
+
 	String STR_WITHOUT
 	{
-		Text [ en-US ] = "(Without)";
+		Text [ en-US ] = "(Without)" ;
 	};
 
-	//tips 
+	// tips
 	String STR_SINGLE
 	{
-		Text [ en-US ] = "Single";
+		Text [ en-US ] = "Single" ;
 	};
 	String STR_DOUBLE
 	{
-		Text [ en-US ] = "Double";
+		Text [ en-US ] = "Double" ;
 	};
 	String STR_BOLD
 	{
-		Text [ en-US ] = "Bold";
+		Text [ en-US ] = "Bold" ;
 	};
 	String STR_DOT
 	{
-		Text [ en-US ] = "Dotted";
+		Text [ en-US ] = "Dotted" ;
 	};
 	String STR_DOT_BOLD
 	{
-		Text [ en-US ] = "Dotted (Bold)";
+		Text [ en-US ] = "Dotted (Bold)" ;
 	};
 	String STR_DASH
 	{
-		Text [ en-US ] = "Dash";
+		Text [ en-US ] = "Dash" ;
 	};
 	String STR_DASH_LONG
 	{
-		Text [ en-US ] = "Long Dash";
+		Text [ en-US ] = "Long Dash" ;
 	};
 	String STR_DASH_DOT
 	{
-		Text [ en-US ] = "Dot Dash";
+		Text [ en-US ] = "Dot Dash" ;
 	};
 	String STR_DASH_DOT_DOT
 	{
-		Text [ en-US ] = "Dot Dot Dash";
+		Text [ en-US ] = "Dot Dot Dash" ;
 	};
 	String STR_WAVE
 	{
-		Text [ en-US ] = "Wave";
+		Text [ en-US ] = "Wave" ;
 	};
-		
+
 };
 
 
 Control RID_POPUPPANEL_TEXTPAGE_FONT_COLOR
 {
-	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_FONT_COLOR
 	{
-		HelpID = HID_PPROPERTYPANEL_TEXT_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_PPROPERTYPANEL_TEXT_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 = "Color Picker";
+		Text = "Color Picker" ;
 	};
 	String STR_AUTOMATICE
 	{
-		Text [ en-US ] = "Automatic";
+		Text [ en-US ] = "Automatic" ;
 	};
 };
 
 Control RID_POPUPPANEL_TEXTPAGE_SPACING
 {
-	OutputSize = TRUE;
-	DialogControl = TRUE;
-	Border = FALSE;
-	
-	Size = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_SPACING_WIDTH , POPUPPANEL_MARGIN_SMALL * 3 + 15 * 6 + CUSTOM_HEIGHT + TEXT_HEIGHT + POPUPPANEL_MARGIN_LARGE + POPUP_BORDER_WIDTH + 1);
-	
+	OutputSize = TRUE ;
+	DialogControl = TRUE ;
+	Border = FALSE ;
+
+	Size = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL * 2 + POPUP_BORDER_WIDTH + VS_SPACING_WIDTH, POPUPPANEL_MARGIN_SMALL * 3 + 15 * 6 + CUSTOM_HEIGHT + TEXT_HEIGHT + POPUPPANEL_MARGIN_LARGE + POPUP_BORDER_WIDTH + 1) ;
+
 	Control VS_SPACING
 	{
 		HelpId = HID_PPROPERTYPANEL_TEXT_SPACING_VS ;
-        Hide = TRUE ;
-        Pos = MAP_APPFONT(  POPUPPANEL_MARGIN_SMALL + OFFSET_X , POPUPPANEL_MARGIN_SMALL + OFFSET_Y ); 
-        Size = MAP_APPFONT ( VS_SPACING_WIDTH  , 15 * 6);
+		Hide = TRUE ;
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_SMALL + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y ) ;
+		Size = MAP_APPFONT ( VS_SPACING_WIDTH, 15 * 6) ;
 		TabStop = TRUE ;
-		Text  = "Character Spacing";
-	};
-    
-    FixedText FT_LASTCUSTOM
-    {
-		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X ,POPUPPANEL_MARGIN_SMALL + OFFSET_Y + POPUPPANEL_MARGIN_SMALL + 15 * 6) ;
-        Size = MAP_APPFONT ( CUSTOM_WIDTH , TEXT_HEIGHT );
-        Left = TRUE ;
-        Text [ en-US ] = "Custom:" ;
-    };
-    //custom area
+		Text = "Character Spacing" ;
+	};
+
+	FixedText FT_LASTCUSTOM
+	{
+		Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X, POPUPPANEL_MARGIN_SMALL + OFFSET_Y + POPUPPANEL_MARGIN_SMALL + 15 * 6) ;
+		Size = MAP_APPFONT ( CUSTOM_WIDTH, TEXT_HEIGHT ) ;
+		Left = TRUE ;
+		Text [ en-US ] = "Custom:" ;
+	};
+	// custom area
 	FixedText	FT_SPACING
 	{
-		Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE);
-        Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2 , TEXT_HEIGHT );
-        Left = TRUE ;
-        Text [ en-US ] = "~Character spacing: " ;
+		Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE) ;
+		Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2, TEXT_HEIGHT ) ;
+		Left = TRUE ;
+		Text [ en-US ] = "~Character spacing: " ;
 	};
 	ListBox LB_KERNING
 	{
-		Border = TRUE;
-        Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL);//20
-		Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2 , 80 ) ;
-		TabStop = TRUE;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL); // 20
+		Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2, 80 ) ;
+		TabStop = TRUE ;
 		DropDown = TRUE ;
-		HelpID = HID_SPACING_CB_KERN;
+		HelpID = HID_SPACING_CB_KERN ;
 		StringList [ en-US ] =
 		{
-			< "Default" ; Default ; > ;
-			< "Expanded" ; Default ; > ;
-			< "Condensed" ; Default ; > ;
+			< "Default" ; Default ;		> ;
+			< "Expanded" ; Default ;	> ;
+			< "Condensed" ; Default ;	> ;
 		};
 	};
 	FixedText	FT_BY
 	{
-		Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL + CBOX_HEIGHT );
-        Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2 , TEXT_HEIGHT );
-        Left = TRUE ;
-        Text [ en-US ] = "Change ~by: " ;
+		Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL + CBOX_HEIGHT ) ;
+		Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2, TEXT_HEIGHT ) ;
+		Left = TRUE ;
+		Text [ en-US ] = "Change ~by: " ;
 	};
 	MetricField ED_KERNING
 	{
-		HelpID = HID_SPACING_MB_KERN;
-		Border = TRUE;
-        Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT * 2 + POPUPPANEL_MARGIN_SMALL * 2 + CBOX_HEIGHT);//60
-        Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2 , MBOX_HEIGHT );
-		TabStop = TRUE;
+		HelpID = HID_SPACING_MB_KERN ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE * 2 + TEXT_HEIGHT * 2 + POPUPPANEL_MARGIN_SMALL * 2 + CBOX_HEIGHT) ; // 60
+		Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2, MBOX_HEIGHT ) ;
+		TabStop = TRUE ;
 		Repeat = TRUE ;
 		Spin = TRUE ;
 		Maximum = 9999 ;
@@ -544,113 +546,115 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
 		Unit = FUNIT_POINT ;
 		SpinSize = 10 ;
 	};
-	
+
 	Image IMG_NORMAL
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_normal.bmp" ;};//"spacing_normal.bmp"
+		ImageBitmap = Bitmap {File = "symphony/spacing_normal.png" ;} ;
 	};
 	Image IMG_VERY_TIGHT
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_very tight.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_very_tight.png" ;} ;
 	};
 	Image IMG_TIGHT
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_tight.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_tight.png" ;} ;
 	};
 	Image IMG_LOOSE
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_loose.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_loose.png" ;} ;
 	};
 	Image IMG_VERY_LOOSE
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_very loose.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_very_loose.png" ;} ;
 	};
-	
+
 	Image IMG_NORMAL_S
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_normal_s.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_normal_s.png" ;} ;
 	};
 	Image IMG_VERY_TIGHT_S
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_very tight_s.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_very_tight_s.png" ;} ;
 	};
 	Image IMG_TIGHT_S
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_tight_s.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_tight_s.png" ;} ;
 	};
 	Image IMG_LOOSE_S
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_loose_s.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_loose_s.png";} ;
 	};
 	Image IMG_VERY_LOOSE_S
 	{
-		ImageBitmap = Bitmap{File = "symphony/spacing_very loose_s.bmp";};
+		ImageBitmap = Bitmap {File = "symphony/spacing_very_loose_s.png" ;} ;
 	};
-	
+
 	Image IMG_CUSTOM
 	{
-		ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
+		ImageBitmap = Bitmap {File = "symphony/last_custom_common.png" ;} ;
 	};
 	Image IMG_CUSTOM_GRAY
 	{
-		ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
+		ImageBitmap = Bitmap {File = "symphony/last_custom_common_grey.png" ;} ;
 	};
-	
+
 	String STR_VERY_TIGHT
 	{
-		Text [ en-US ] = "Very Tight";
+		Text [ en-US ] = "Very Tight" ;
 	};
 	String STR_TIGHT
 	{
-		Text [ en-US ] = "Tight";
+		Text [ en-US ] = "Tight" ;
 	};
 	String STR_NORMAL
 	{
-		Text [ en-US ] = "Normal";
+		Text [ en-US ] = "Normal" ;
 	};
 	String STR_LOOSE
 	{
-		Text [ en-US ] = "Loose";
+		Text [ en-US ] = "Loose" ;
 	};
 	String STR_VERY_LOOSE
 	{
-		Text [ en-US ] = "Very Loose";
+		Text [ en-US ] = "Very Loose" ;
 	};
 	String STR_CUSTOM
 	{
-		Text [ en-US ] = "Last Custom Value";
+		Text [ en-US ] = "Last Custom Value" ;
 	};
-	
+
 	String STR_VERY_TIGHT_TIP
 	{
-		Text [ en-US ] = " Spacing: Condensed By: 3 pt";
+		Text [ en-US ] = " Spacing: Condensed By: 3 pt" ;
 	};
 	String STR_TIGHT_TIP
 	{
-		Text [ en-US ] = " Spacing: Condensed By: 1.5 pt";
+		Text [ en-US ] = " Spacing: Condensed By: 1.5 pt" ;
 	};
 	String STR_NORMAL_TIP
 	{
-		Text [ en-US ] = " Spacing: Normal";
+		Text [ en-US ] = " Spacing: Normal" ;
 	};
 	String STR_LOOSE_TIP
 	{
-		Text [ en-US ] = " Spacing: Expanded By: 3 pt";
+		Text [ en-US ] = " Spacing: Expanded By: 3 pt" ;
 	};
 	String STR_VERY_LOOSE_TIP
 	{
-		Text [ en-US ] = " Spacing: Expanded By: 6 pt";
+		Text [ en-US ] = " Spacing: Expanded By: 6 pt" ;
 	};
 	String STR_CUSTOM_C_TIP
 	{
-		Text [ en-US ] = " Spacing: Condensed By: ";
+		Text [ en-US ] = " Spacing: Condensed By: " ;
 	};
 	String STR_CUSTOM_E_TIP
 	{
-		Text [ en-US ] = " Spacing: Expanded By: ";
+		Text [ en-US ] = " Spacing: Expanded By: " ;
 	};
 	String STR_PT
 	{
-		Text[ en-US ] = "pt";
+		Text [ en-US ] = "pt" ;
 	};
 };
+
+// ********************************************************************** EOF


[openoffice] 02/02: added renamed files

Posted by ms...@apache.org.
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

commit 383b2ea7cb5ff2588666a8087dafc9c9a4eeda7d
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Aug 18 11:13:22 2019 +0200

    added renamed files
    
    (cherry picked from commit bee76bc5fc90bff472eaa4af9746d2f6bb3532b9)
---
 .../svx/res/symphony/spacing_very_loose.png              | Bin 0 -> 2941 bytes
 .../svx/res/symphony/spacing_very_loose_s.png            | Bin 0 -> 2937 bytes
 .../svx/res/symphony/spacing_very_tight.png              | Bin 0 -> 2930 bytes
 .../svx/res/symphony/spacing_very_tight_s.png            | Bin 0 -> 2906 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/main/default_images/svx/res/symphony/spacing_very_loose.png b/main/default_images/svx/res/symphony/spacing_very_loose.png
new file mode 100644
index 0000000..04f3969
Binary files /dev/null and b/main/default_images/svx/res/symphony/spacing_very_loose.png differ
diff --git a/main/default_images/svx/res/symphony/spacing_very_loose_s.png b/main/default_images/svx/res/symphony/spacing_very_loose_s.png
new file mode 100644
index 0000000..21f5784
Binary files /dev/null and b/main/default_images/svx/res/symphony/spacing_very_loose_s.png differ
diff --git a/main/default_images/svx/res/symphony/spacing_very_tight.png b/main/default_images/svx/res/symphony/spacing_very_tight.png
new file mode 100644
index 0000000..84845c3
Binary files /dev/null and b/main/default_images/svx/res/symphony/spacing_very_tight.png differ
diff --git a/main/default_images/svx/res/symphony/spacing_very_tight_s.png b/main/default_images/svx/res/symphony/spacing_very_tight_s.png
new file mode 100644
index 0000000..19b4856
Binary files /dev/null and b/main/default_images/svx/res/symphony/spacing_very_tight_s.png differ