[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Jul 31 16:09:57 UTC 2018


 cui/source/customize/acccfg.src   |   32 ++--
 cui/source/customize/cfg.src      |  270 +++++++++++++++++++-------------------
 cui/source/customize/eventdlg.src |   51 +++----
 cui/source/customize/macropg.src  |   78 +++++-----
 cui/source/customize/selector.src |  225 +++++++++++++++----------------
 5 files changed, 318 insertions(+), 338 deletions(-)

New commits:
commit 9abb5e861c0ccd5f2052b7836ffcc0dbdded86b3
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Tue Jul 31 15:09:41 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Tue Jul 31 15:09:41 2018 +0000

    Cleaned up resource file for Customize dialog.
    
    Removed entry for MASKCOLOR.

diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 8949729428ca..1b30d028043f 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -60,21 +60,21 @@ TabPage RID_SVXPAGE_KEYBOARD
     Size = MAP_APPFONT ( 273, 258 ) ;
     RadioButton RB_OFFICE
     {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE";
+        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE" ;
         Pos = MAP_APPFONT ( 192, 6 ) ;
         Size = MAP_APPFONT ( 75, 10 ) ;
         Text = "%PRODUCTNAME" ;
     };
     RadioButton RB_MODULE
     {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE";
+        HelpID = "cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE" ;
         Pos = MAP_APPFONT ( 192, 19 ) ;
         Size = MAP_APPFONT ( 75, 10 ) ;
         Text = "$(MODULE)" ;
     };
     PushButton BTN_ACC_CHANGE
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE";
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE" ;
         Pos = MAP_APPFONT ( 192, 35 ) ;
         Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
@@ -82,7 +82,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_ACC_REMOVE
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE";
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE" ;
         Pos = MAP_APPFONT ( 192, 52 ) ;
         Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
@@ -94,7 +94,7 @@ TabPage RID_SVXPAGE_KEYBOARD
         Pos = MAP_APPFONT ( 6, 3 ) ;
         Size = MAP_APPFONT ( 180, 8 ) ;
         Group = TRUE ;
-        Text [ en-US ] = "Shortcut keys";
+        Text [ en-US ] = "Shortcut keys" ;
     };
     Control BOX_ACC_ENTRIES
     {
@@ -159,7 +159,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_LOAD
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD";
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD" ;
         Pos = MAP_APPFONT ( 192, 86 ) ;
         Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
@@ -168,7 +168,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_SAVE
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE";
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE" ;
         Pos = MAP_APPFONT ( 192, 103 ) ;
         Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
@@ -177,7 +177,7 @@ TabPage RID_SVXPAGE_KEYBOARD
     };
     PushButton BTN_RESET
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET";
+        HelpID = "cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET" ;
         Pos = MAP_APPFONT ( 192, 120 ) ;
         Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
@@ -202,11 +202,11 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
 {
     String STR_MYMACROS
     {
-        Text [ en-US ] = "My Macros";
+        Text [ en-US ] = "My Macros" ;
     };
     String STR_PRODMACROS
     {
-        Text [ en-US ] = "%PRODUCTNAME Macros";
+        Text [ en-US ] = "%PRODUCTNAME Macros" ;
     };
     String STR_BASICMACROS
     {
@@ -234,27 +234,27 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
     };
     Image IMG_LIB
     {
-        ImageBitmap = Bitmap { File = "im30820.png"; };
+        ImageBitmap = Bitmap { File = "im30820.png" ; };
     };
     Image IMG_LIB_HC
     {
-        ImageBitmap = Bitmap { File = "imh30820.png"; };
+        ImageBitmap = Bitmap { File = "imh30820.png" ; };
     };
     Image IMG_MACRO
     {
-        ImageBitmap = Bitmap { File = "im30821.png"; };
+        ImageBitmap = Bitmap { File = "im30821.png" ; };
     };
     Image IMG_MACRO_HC
     {
-        ImageBitmap = Bitmap { File = "imh30821.png"; };
+        ImageBitmap = Bitmap { File = "imh30821.png" ; };
     };
     Image IMG_DOC
     {
-        ImageBitmap = Bitmap { File = "im30826.png"; };
+        ImageBitmap = Bitmap { File = "im30826.png" ; };
     };
     Image IMG_DOC_HC
     {
-        ImageBitmap = Bitmap { File = "imh30826.png"; };
+        ImageBitmap = Bitmap { File = "imh30826.png" ; };
     };
     Image BMP_COLLAPSED
     {
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 05dcc8ddbdc4..ea727acd58ec 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -20,6 +20,7 @@
  *************************************************************/
 
 
+// include ---------------------------------------------------------------
 #include <cuires.hrc>
 #include "cfg.hrc"
 #include "helpid.hrc"
@@ -99,125 +100,125 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 TabPage RID_SVXPAGE_MENUS
 {
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 273 , 258 ) ;
+    Size = MAP_APPFONT ( 273, 258 ) ;
     HelpId = HID_SVX_CONFIG_MENU ;
     FixedLine GRP_MENUS
     {
-        Pos = MAP_APPFONT ( 6 , 11 ) ;
-        Size = MAP_APPFONT ( 261 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 11 ) ;
+        Size = MAP_APPFONT ( 261, 8 ) ;
         Text [ en-US ] = "%PRODUCTNAME %MODULENAME Menus" ;
     };
     FixedText FT_MENUS
     {
-        Pos = MAP_APPFONT ( 9 , 24 ) ;
-        Size = MAP_APPFONT ( 55 , 8 ) ;
+        Pos = MAP_APPFONT ( 9, 24 ) ;
+        Size = MAP_APPFONT ( 55, 8 ) ;
         TEXT_MENU
     };
     ListBox LB_MENUS
     {
-        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS";
+        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 64 , 22 ) ;
-        Size = MAP_APPFONT ( 108 , 108 ) ;
+        Pos = MAP_APPFONT ( 64, 22 ) ;
+        Size = MAP_APPFONT ( 108, 108 ) ;
         DropDown = TRUE ;
     };
     PushButton BTN_NEW
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW";
-        Pos = MAP_APPFONT ( 192 , 22 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
+        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW" ;
+        Pos = MAP_APPFONT ( 192, 22 ) ;
+        Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "New..." ;
     };
     MenuButton BTN_CHANGE
     {
-        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE";
-        Pos = MAP_APPFONT ( 192 , 39 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
+        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE" ;
+        Pos = MAP_APPFONT ( 192, 39 ) ;
+        Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
         TEXT_MENU
     };
     FixedLine GRP_MENU_SEPARATOR
     {
-        Pos = MAP_APPFONT ( 6 , 56 ) ;
-        Size = MAP_APPFONT ( 261 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 56 ) ;
+        Size = MAP_APPFONT ( 261, 8 ) ;
         Text [ en-US ] = "Menu Content" ;
     };
     FixedText GRP_MENU_ENTRIES
     {
-        Pos = MAP_APPFONT ( 9 , 67 ) ;
-        Size = MAP_APPFONT ( 55 , 8 ) ;
+        Pos = MAP_APPFONT ( 9, 67 ) ;
+        Size = MAP_APPFONT ( 55, 8 ) ;
         Group = TRUE ;
         Text [ en-US ] = "Entries" ;
     };
     Control BOX_ENTRIES
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 64 , 67 ) ;
-        Size = MAP_APPFONT ( 108 , 115 ) ;
+        Pos = MAP_APPFONT ( 64, 67 ) ;
+        Size = MAP_APPFONT ( 108, 115 ) ;
         TabStop = TRUE ;
         HelpId = HID_SVX_CONFIG_MENU_CONTENTS ;
     };
     PushButton BTN_ADD_COMMANDS
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS";
-        Pos = MAP_APPFONT ( 192 , 67 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
+        HelpID = "cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS" ;
+        Pos = MAP_APPFONT ( 192, 67 ) ;
+        Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Add..." ;
     };
     MenuButton BTN_CHANGE_ENTRY
     {
-        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY";
-        Pos = MAP_APPFONT ( 192 , 84 ) ;
-        Size = MAP_APPFONT ( 75 , 14 ) ;
+        HelpID = "cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY" ;
+        Pos = MAP_APPFONT ( 192, 84 ) ;
+        Size = MAP_APPFONT ( 75, 14 ) ;
         TabStop = TRUE ;
         Text [ en-US ] = "Modify" ;
     };
     ImageButton BTN_UP
     {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP";
-        Pos = MAP_APPFONT ( 175 , 102 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
+        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP" ;
+        Pos = MAP_APPFONT ( 175, 102 ) ;
+        Size = MAP_APPFONT ( 14, 14 ) ;
         TabStop = TRUE ;
         Symbol = IMAGEBUTTON_ARROW_UP ;
         Disable = TRUE ;
     };
     ImageButton BTN_DOWN
     {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN";
-        Pos = MAP_APPFONT ( 175 , 119 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
+        HelpID = "cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN" ;
+        Pos = MAP_APPFONT ( 175, 119 ) ;
+        Size = MAP_APPFONT ( 14, 14 ) ;
         TabStop = TRUE ;
         Symbol = IMAGEBUTTON_ARROW_DOWN ;
         Disable = TRUE ;
     };
     FixedText TXT_SAVEIN
     {
-        Pos = MAP_APPFONT ( 9 , 190 ) ;
-        Size = MAP_APPFONT ( 55 , 8 ) ;
+        Pos = MAP_APPFONT ( 9, 190 ) ;
+        Size = MAP_APPFONT ( 55, 8 ) ;
         Group = TRUE ;
         TEXT_SAVE_IN
     };
     ListBox LB_SAVEIN
     {
-        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN";
+        HelpID = "cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 64 , 188 ) ;
-        Size = MAP_APPFONT ( 108 , 53 ) ;
+        Pos = MAP_APPFONT ( 64, 188 ) ;
+        Size = MAP_APPFONT ( 108, 53 ) ;
         DropDown = TRUE ;
     };
     FixedText FT_DESCRIPTION
     {
-        Pos = MAP_APPFONT ( 6 , 205 ) ;
-        Size = MAP_APPFONT ( 261 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 205 ) ;
+        Size = MAP_APPFONT ( 261, 8 ) ;
         Text [ en-US ] = "Description" ;
     };
     MultiLineEdit ED_DESCRIPTION
     {
-        HelpID = "cui:MultiLineEdit:RID_SVXPAGE_MENUS:ED_DESCRIPTION";
-        Pos = MAP_APPFONT ( 6 , 216 ) ;
-        Size = MAP_APPFONT ( 261 , 36 ) ;
+        HelpID = "cui:MultiLineEdit:RID_SVXPAGE_MENUS:ED_DESCRIPTION" ;
+        Pos = MAP_APPFONT ( 6, 216 ) ;
+        Size = MAP_APPFONT ( 261, 36 ) ;
         Border = TRUE;
         VScroll = TRUE;
         IgnoreTab = TRUE;
@@ -412,63 +413,63 @@ Menu MODIFY_TOOLBAR_CONTENT
 /* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
 String RID_SVXSTR_NEW_MENU
 {
-    Text [ en-US ] = "New Menu %n";
+    Text [ en-US ] = "New Menu %n" ;
 };
 
 /* %n will be replaced at runtime by a number starting with 1 and increasing as necessary */
 String RID_SVXSTR_NEW_TOOLBAR
 {
-    Text [ en-US ] = "New Toolbar %n";
+    Text [ en-US ] = "New Toolbar %n" ;
 };
 
 String RID_SVXSTR_MOVE_MENU
 {
-    Text [ en-US ] = "Move Menu";
+    Text [ en-US ] = "Move Menu" ;
 };
 
 String RID_SVXSTR_ADD_SUBMENU
 {
-    Text [ en-US ] = "Add Submenu";
+    Text [ en-US ] = "Add Submenu" ;
 };
 
 String RID_SVXSTR_SUBMENU_NAME
 {
-    Text [ en-US ] = "Submenu name";
+    Text [ en-US ] = "Submenu name" ;
 };
 
 String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION
 {
-    Text [ en-US ] = "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog.";
+    Text [ en-US ] = "To add a command to a menu, select the category and then the command. You can also drag the command to the Commands list of the Menus tab page in the Customize dialog." ;
 };
 
 ModalDialog MD_MENU_ORGANISER
 {
     OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 172 , 154 ) ;
+    Size = MAP_APPFONT ( 172, 154 ) ;
     Text [ en-US ] = "New Menu" ;
     SvLook = TRUE ;
     Moveable = TRUE ;
     HelpId = HID_SVX_CONFIG_MENU_ORGANIZER;
     FixedText TXT_MENU_NAME
     {
-        Pos = MAP_APPFONT ( 6 , 8 ) ;
-        Size = MAP_APPFONT ( 93 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 8 ) ;
+        Size = MAP_APPFONT ( 93, 8 ) ;
         Group = TRUE ;
         Left = TRUE ;
         Text [ en-US ] = "Menu name" ;
     };
     Edit EDIT_MENU_NAME
     {
-        HelpID = "cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME";
+        HelpID = "cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 19 ) ;
-        Size = MAP_APPFONT ( 93 , 12 ) ;
+        Pos = MAP_APPFONT ( 6, 19 ) ;
+        Size = MAP_APPFONT ( 93, 12 ) ;
         TabStop = TRUE ;
     };
     FixedText TXT_MENU
     {
-        Pos = MAP_APPFONT ( 6 , 37 ) ;
-        Size = MAP_APPFONT ( 93 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 37 ) ;
+        Size = MAP_APPFONT ( 93, 8 ) ;
         Group = TRUE ;
         Left = TRUE ;
         Text [ en-US ] = "Menu position" ;
@@ -477,100 +478,100 @@ ModalDialog MD_MENU_ORGANISER
     {
         HelpId = HID_SVX_CONFIG_MENU_LISTBOX ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 48 ) ;
-        Size = MAP_APPFONT ( 93 , 100 ) ;
+        Pos = MAP_APPFONT ( 6, 48 ) ;
+        Size = MAP_APPFONT ( 93, 100 ) ;
         TabStop = TRUE ;
     };
     ImageButton BTN_MENU_UP
     {
-        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP";
-        Pos = MAP_APPFONT ( 102 , 80 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
+        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP" ;
+        Pos = MAP_APPFONT ( 102, 80 ) ;
+        Size = MAP_APPFONT ( 14, 14 ) ;
         TabStop = TRUE ;
         Symbol = IMAGEBUTTON_ARROW_UP ;
     };
     ImageButton BTN_MENU_DOWN
     {
-        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN";
-        Pos = MAP_APPFONT ( 102 , 97 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
+        HelpID = "cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN" ;
+        Pos = MAP_APPFONT ( 102, 97 ) ;
+        Size = MAP_APPFONT ( 14, 14 ) ;
         TabStop = TRUE ;
         Symbol = IMAGEBUTTON_ARROW_DOWN ;
     };
     OKButton BTN_MENU_ADD
     {
         DefButton = TRUE;
-        Pos = MAP_APPFONT ( 119 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 119, 6 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
     CancelButton BTN_MENU_CLOSE
     {
-        Pos = MAP_APPFONT ( 119 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 119, 23 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
     HelpButton BTN_MENU_HELP
     {
-        Pos = MAP_APPFONT ( 119 , 40 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 119, 40 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
 };
 
 // MD_NEW_TOOLBAR -------------------------------------------------
 ModalDialog MD_NEW_TOOLBAR
 {
-    HelpID = "cui:ModalDialog:MD_NEW_TOOLBAR";
+    HelpID = "cui:ModalDialog:MD_NEW_TOOLBAR" ;
     OutputSize = TRUE ;
     SvLook = TRUE ;
-    Size = MAP_APPFONT ( 165 , 63 ) ;
+    Size = MAP_APPFONT ( 165, 63 ) ;
     Text [ en-US ] = "Name" ;
     Moveable = TRUE ;
     FixedText FT_NAME
     {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 98 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 6 ) ;
+        Size = MAP_APPFONT ( 98, 8 ) ;
         TEXT_TOOLBAR_NAME
         WordBreak = TRUE ;
     };
     Edit EDT_STRING
     {
-        HelpID = "cui:Edit:MD_NEW_TOOLBAR:EDT_STRING";
+        HelpID = "cui:Edit:MD_NEW_TOOLBAR:EDT_STRING" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 17 ) ;
-        Size = MAP_APPFONT ( 97 , 12 ) ;
+        Pos = MAP_APPFONT ( 6, 17 ) ;
+        Size = MAP_APPFONT ( 97, 12 ) ;
         TabStop = TRUE ;
     };
     FixedText TXT_SAVEIN
     {
-        Pos = MAP_APPFONT ( 6 , 35 ) ;
-        Size = MAP_APPFONT ( 98 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 35 ) ;
+        Size = MAP_APPFONT ( 98, 8 ) ;
         Group = TRUE ;
         TEXT_SAVE_IN
     };
     ListBox LB_SAVEIN
     {
-        HelpID = "cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN";
+        HelpID = "cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 43 ) ;
-        Size = MAP_APPFONT ( 97 , 53 ) ;
+        Pos = MAP_APPFONT ( 6, 43 ) ;
+        Size = MAP_APPFONT ( 97, 53 ) ;
         DropDown = TRUE ;
     };
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT ( 109 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 109, 6 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
     CancelButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT ( 109 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 109, 23 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT ( 109 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 109, 43 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
 };
@@ -583,63 +584,63 @@ ModalDialog MD_ICONSELECTOR
 {
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 240 , 152 ) ;
+    Size = MAP_APPFONT ( 240, 152 ) ;
     Text [ en-US ] = "Change Icon" ;
     Moveable = TRUE ;
     HelpId = HID_SVX_CONFIG_ICON_SELECTOR;
     FixedText FT_SYMBOLS
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 172 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 172, 8 ) ;
         Text [ en-US ] = "Icons" ;
     };
     ToolBox TB_SYMBOLS
     {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 160 , 80 ) ;
+        Pos = MAP_APPFONT ( 12, 14 ) ;
+        Size = MAP_APPFONT ( 160, 80 ) ;
         Scroll = TRUE ;
         LineSpacing = TRUE ;
         Customize = FALSE ;
     };
     OKButton BTN_OK
     {
-        Pos = MAP_APPFONT ( 60 , 130 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 60, 130 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
     CancelButton BTN_CANCEL
     {
-        Pos = MAP_APPFONT ( 120 , 130 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 120, 130 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
     HelpButton BTN_HELP
     {
-        Pos = MAP_APPFONT ( 180 , 130 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 180, 130 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
     };
     PushButton BTN_IMPORT
     {
-        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT";
-        Pos = MAP_APPFONT ( 184 , 7 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT" ;
+        Pos = MAP_APPFONT ( 184, 7 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
-            Text[ en-US ] = "Import...";
+            Text[ en-US ] = "Import..." ;
     };
     PushButton BTN_DELETE
     {
-        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_DELETE";
-        Pos = MAP_APPFONT ( 184 , 24 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_DELETE" ;
+        Pos = MAP_APPFONT ( 184, 24 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
-            Text[ en-US ] = "Delete...";
+            Text[ en-US ] = "Delete..." ;
     };
     FixedText FT_NOTE
     {
-        Pos = MAP_APPFONT ( 12 , 95 ) ;
-        Size = MAP_APPFONT ( 200 , 24 ) ;
+        Pos = MAP_APPFONT ( 12, 95 ) ;
+        Size = MAP_APPFONT ( 200, 24 ) ;
         Text [ en-US ] = "Note:\nThe size of an icon should be 16x16 pixel to achieve best quality. Different sized icons will be scaled automatically." ;
         Left = TRUE ;
         WordBreak = TRUE;
@@ -659,16 +660,16 @@ ModalDialog MD_ICONSELECTOR
 //added for issue83555
 ModalDialog MD_ICONCHANGE
 {
-    HelpID = "cui:ModalDialog:MD_ICONCHANGE";
+    HelpID = "cui:ModalDialog:MD_ICONCHANGE" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 200 , 150 ) ;
+    Size = MAP_APPFONT ( 200, 150 ) ;
     Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ;
     Moveable = TRUE ;
     FixedImage FI_INFO
     {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 24 , 24 ) ;
+        Pos = MAP_APPFONT ( 6, 6 ) ;
+        Size = MAP_APPFONT ( 24, 24 ) ;
         Fixed = Image
         {
 
@@ -677,15 +678,15 @@ ModalDialog MD_ICONCHANGE
     FixedText FTCHGE_DESCRIPTION
     {
         Pos = MAP_APPFONT ( 30 ,15 ) ;
-        Size = MAP_APPFONT ( 200 , 50 ) ;
+        Size = MAP_APPFONT ( 200, 50 ) ;
         Text [ en-US ] = "The files listed below could not be imported.\nThe file format could not be interpreted." ;
     };
 
     MultiLineEdit EDT_ADDR
     {
-        HelpID = "cui:MultiLineEdit:MD_ICONCHANGE:EDT_ADDR";
-        Pos = MAP_APPFONT ( 30 , 38) ;
-        Size = MAP_APPFONT ( 140 , 83 ) ;
+        HelpID = "cui:MultiLineEdit:MD_ICONCHANGE:EDT_ADDR" ;
+        Pos = MAP_APPFONT ( 30, 38) ;
+        Size = MAP_APPFONT ( 140, 83 ) ;
         Border = TRUE;
       //  VScroll = TRUE;
         IgnoreTab = TRUE;
@@ -693,8 +694,8 @@ ModalDialog MD_ICONCHANGE
     };
     OKButton MD_BTN_OK
     {
-        Pos = MAP_APPFONT ( 68 , 131 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 68, 131 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
@@ -714,17 +715,17 @@ String RID_SVXSTR_DELETE_ICON_CONFIRM  //added for issue73355
 
 String RID_SVXSTR_REPLACE_ICON_WARNING  //added for issue73355
 {
-    Text [ en-US ] = "The icon %ICONNAME is already contained in the image list.\nWould you like to replace the existing icon?";
+    Text [ en-US ] = "The icon %ICONNAME is already contained in the image list.\nWould you like to replace the existing icon?" ;
 };
 
 String RID_SVXSTR_REPLACE_ICON_CONFIRM //added for issue73355
 {
-    Text [ en-US ] = "Confirm Icon Replacement";
+    Text [ en-US ] = "Confirm Icon Replacement" ;
 };
 
 String RID_SVXSTR_YESTOALL //added for issue73355
 {
-    Text [ en-US ] = "Yes to All";
+    Text [ en-US ] = "Yes to All" ;
 };
 
 String RID_SVXSTR_PRODUCTNAME_TOOLBARS
@@ -760,14 +761,14 @@ String RID_SVXSTR_TOOLBAR_NAME
 /* %MENUNAME will be replaced at runtime by the name of the selected menu. */
 QueryBox QBX_CONFIRM_DELETE_MENU
 {
-    Message [ en-US ] = "Are you sure you want to delete the '%MENUNAME' menu?";
+    Message [ en-US ] = "Are you sure you want to delete the '%MENUNAME' menu?" ;
     BUTTONS = WB_YES_NO ;
     DEFBUTTON = WB_DEF_NO ;
 };
 
 QueryBox QBX_CONFIRM_DELETE_TOOLBAR
 {
-    Message [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
+    Message [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?" ;
     BUTTONS = WB_YES_NO ;
     DEFBUTTON = WB_DEF_NO ;
 };
@@ -777,28 +778,28 @@ QueryBox QBX_CONFIRM_DELETE_TOOLBAR
 */
 QueryBox QBX_CONFIRM_RESET
 {
-    Message [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
+    Message [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?" ;
     BUTTONS = WB_YES_NO ;
     DEFBUTTON = WB_DEF_NO ;
 };
 
-/* Translators: Do not translate %SAVE IN SELECTION% It is a placeholder
+/* Translators: Do not translate %SAVE IN SELECTION%. It is a placeholder
    and will be replaced at runtime by the name of the selected application
    or document.
 */
 String RID_SVXSTR_CONFIRM_MENU_RESET
 {
-    Text [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
+    Text [ en-US ] = "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?" ;
 };
 
 String RID_SVXSTR_CONFIRM_TOOLBAR_RESET
 {
-    Text [ en-US ] = "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?";
+    Text [ en-US ] = "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?" ;
 };
 
 QueryBox QBX_CONFIRM_RESTORE_DEFAULT
 {
-    Message [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?";
+    Message [ en-US ] = "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?" ;
     BUTTONS = WB_YES_NO ;
     DEFBUTTON = WB_DEF_NO ;
 };
@@ -810,24 +811,25 @@ InfoBox IBX_MNUCFG_ALREADY_INCLUDED
 
 String RID_SVXSTR_LABEL_NEW_NAME
 {
-    Text [ en-US ] = "~New name";
+    Text [ en-US ] = "~New name" ;
 };
 
 String RID_SVXSTR_RENAME_MENU
 {
-    Text [ en-US ] = "Rename Menu";
+    Text [ en-US ] = "Rename Menu" ;
 };
 
 String RID_SVXSTR_RENAME_TOOLBAR
 {
-    Text [ en-US ] = "Rename Toolbar";
+    Text [ en-US ] = "Rename Toolbar" ;
 };
 String BUTTON_STR_UP
 {
-    Text [ en-US ] = "Up";
+    Text [ en-US ] = "Up" ;
 };
 String BUTTON_STR_DOWN
 {
-    Text [ en-US ] = "Down";
+    Text [ en-US ] = "Down" ;
 };
 
+// ********************************************************************** EOF
diff --git a/cui/source/customize/eventdlg.src b/cui/source/customize/eventdlg.src
index f1fe2c57ea7c..bdfcd57839ae 100644
--- a/cui/source/customize/eventdlg.src
+++ b/cui/source/customize/eventdlg.src
@@ -20,20 +20,17 @@
  *************************************************************/
 
 
-
+// include ---------------------------------------------------------------
 #include "helpid.hrc"
 #include "eventdlg.hrc"
 
-#define MASKCOLOR  MaskColor = \
-    Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
- // TP_CONFIG_EVENT -------------------------------------------------------
+// TP_CONFIG_EVENT -------------------------------------------------------
 TabPage RID_SVXPAGE_EVENTS
 {
     HelpId = HID_SVX_CONFIG_EVENT ;
     OutputSize = TRUE ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 272 , 258 ) ;
+    Size = MAP_APPFONT ( 272, 258 ) ;
     String STR_EVENT
     {
         Text [ en-US ] = "Event" ;
@@ -45,66 +42,64 @@ TabPage RID_SVXPAGE_EVENTS
     Control LB_EVENT
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 205 , 229 ) ;
+        Pos = MAP_APPFONT ( 6, 6 ) ;
+        Size = MAP_APPFONT ( 205, 229 ) ;
         TabStop = TRUE ;
         HelpID = HID_SVX_MACRO_LB_EVENT ;
     };
     FixedText TXT_SAVEIN
     {
-        Pos = MAP_APPFONT ( 6 , 240 ) ;
-        Size = MAP_APPFONT ( 55 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 240 ) ;
+        Size = MAP_APPFONT ( 55, 8 ) ;
         Group = TRUE ;
         Text [ en-US ] = "Save In" ;
     };
     ListBox LB_SAVEIN
     {
-        HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN";
+        HelpID = "cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 54 , 238 ) ;
-        Size = MAP_APPFONT ( 132 , 53 ) ;
+        Pos = MAP_APPFONT ( 54, 238 ) ;
+        Size = MAP_APPFONT ( 132, 53 ) ;
         DropDown = TRUE ;
     };
     FixedText FT_ASSIGN
     {
         Pos = MAP_APPFONT ( 217, ROW0 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Assign:" ;
     };
     PushButton PB_ASSIGN
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN";
-        Pos = MAP_APPFONT ( 217 , ROW0A ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" ;
+        Pos = MAP_APPFONT ( 217, ROW0A ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         Disable = TRUE ;
         Text [ en-US ] = "M~acro..." ;
     };
     PushButton PB_DELETE
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE";
-        Pos = MAP_APPFONT ( 217 , ROW0A+RSC_CD_PUSHBUTTON_HEIGHT+12 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        HelpID = "cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" ;
+        Pos = MAP_APPFONT ( 217, ROW0A+RSC_CD_PUSHBUTTON_HEIGHT+12 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
         Disable = TRUE ;
         Text [ en-US ] = "~Remove" ;
     };
     Image IMG_MACRO
     {
-        ImageBitmap = Bitmap { File = "id018.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "id018.png" ; };
     };
     Image IMG_COMPONENT
     {
-        ImageBitmap = Bitmap { File = "component_16.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "component_16.png" ; };
     };
     Image IMG_MACRO_H
     {
-        ImageBitmap = Bitmap { File = "idh018.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "idh018.png" ; };
     };
     Image IMG_COMPONENT_H
     {
-        ImageBitmap = Bitmap { File = "component_16_h.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "component_16_h.png" ; };
     };
 };
+
+// ********************************************************************** EOF
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 89be5223b786..c434a8a19b84 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -20,23 +20,20 @@
  *************************************************************/
 
 
-
+// include ---------------------------------------------------------------
 #include <sfx2/sfx.hrc>
 #include "macropg.hrc"
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include <svx/dialogs.hrc>
 
-#define MASKCOLOR  MaskColor = \
-    Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
 TabPage RID_SVXPAGE_MACROASSIGN
 {
     HelpID = "cui:TabPage:RID_SVXPAGE_MACROASSIGN" ;
     Hide = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( WIDTH_TP , HEIGHT_TP ) ;
+    Size = MAP_APPFONT ( WIDTH_TP, HEIGHT_TP ) ;
     Text [ en-US ] = "Assign action" ;
     String STR_EVENT
     {
@@ -50,110 +47,106 @@ TabPage RID_SVXPAGE_MACROASSIGN
     {
         Border = TRUE ;
         TabStop = TRUE;
-        Pos = MAP_APPFONT ( COL0 , ROW0 ) ;
-        Size = MAP_APPFONT ( WIDTH1_2 , HEIGHT0 ) ;
+        Pos = MAP_APPFONT ( COL0, ROW0 ) ;
+        Size = MAP_APPFONT ( WIDTH1_2, HEIGHT0 ) ;
         HelpID = HID_SVX_MACRO_LB_EVENT ;
     };
     FixedText FT_ASSIGN
     {
-        Pos = MAP_APPFONT ( COL4 , ROW0 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Pos = MAP_APPFONT ( COL4, ROW0 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Assign:" ;
     };
     PushButton PB_ASSIGN
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN";
-        Pos = MAP_APPFONT ( COL4 , ROW0A  ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN" ;
+        Pos = MAP_APPFONT ( COL4, ROW0A ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "M~acro..." ;
         Disable = TRUE ;
         TabStop = TRUE ;
     };
     PushButton PB_ASSIGN_COMPONENT
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT";
-        Pos = MAP_APPFONT ( COL4 , ROW2  ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT" ;
+        Pos = MAP_APPFONT ( COL4, ROW2 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Disable = TRUE ;
         TabStop = TRUE ;
         Text [ en-US ] = "Com~ponent..." ;
     };
     PushButton PB_DELETE
     {
-        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE";
-        Pos = MAP_APPFONT ( COL4 , ROW5_REMOVE  ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
+        HelpID = "cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE" ;
+        Pos = MAP_APPFONT ( COL4, ROW5_REMOVE ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
         Text [ en-US ] = "~Remove" ;
         Disable = TRUE ;
         TabStop = TRUE ;
     };
     Image IMG_MACRO
     {
-        ImageBitmap = Bitmap { File = "id018.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "id018.png" ; };
     };
     Image IMG_COMPONENT
     {
-        ImageBitmap = Bitmap { File = "component_16.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "component_16.png" ; };
     };
     Image IMG_MACRO_H
     {
-        ImageBitmap = Bitmap { File = "idh018.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "idh018.png" ; };
     };
     Image IMG_COMPONENT_H
     {
-        ImageBitmap = Bitmap { File = "component_16_h.png"; };
-        MASKCOLOR
+        ImageBitmap = Bitmap { File = "component_16_h.png" ; };
     };
 };
 
 ModalDialog RID_SVXDLG_ASSIGNCOMPONENT
 {
-    HelpID = "cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT";
+    HelpID = "cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT" ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( COMP_WIDTH , COMP_HEIGHT ) ;
+    Size = MAP_APPFONT ( COMP_WIDTH, COMP_HEIGHT ) ;
     Moveable = TRUE ;
     Closeable = TRUE ;
-    Text [ en-US ] = "Assign Component";
+    Text [ en-US ] = "Assign Component" ;
     OKButton RID_PB_OK
     {
-        Pos = MAP_APPFONT ( COMP_COL1 , COMP_ROW0 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
+        Pos = MAP_APPFONT ( COMP_COL1, COMP_ROW0 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
     };
     CancelButton RID_PB_CANCEL
     {
-        Pos = MAP_APPFONT ( COMP_COL1 , COMP_ROW1 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
+        Pos = MAP_APPFONT ( COMP_COL1, COMP_ROW1 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
     };
     HelpButton RID_PB_HELP
     {
-        Pos = MAP_APPFONT ( COMP_COL1 , COMP_ROW2 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
+        Pos = MAP_APPFONT ( COMP_COL1, COMP_ROW2 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
     };
     FixedText FT_METHOD
     {
-        Pos = MAP_APPFONT ( COMP_COL0 , ROW0 ) ;
-        Size = MAP_APPFONT ( COMP_EDIT_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Pos = MAP_APPFONT ( COMP_COL0, ROW0 ) ;
+        Size = MAP_APPFONT ( COMP_EDIT_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Component method name" ;
     };
     Edit EDIT_METHOD
     {
-        HelpID = "cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD";
+        HelpID = "cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( COMP_COL0 , COMP_ROWEDIT ) ;
-        Size = MAP_APPFONT ( COMP_EDIT_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
+        Pos = MAP_APPFONT ( COMP_COL0, COMP_ROWEDIT ) ;
+        Size = MAP_APPFONT ( COMP_EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ) ;
         TabStop = TRUE ;
     };
 };
 
 
-//DF
+// DF
 String RID_SVXSTR_EVENT_STARTAPP
 {
     Text [ en-US ] = "Start Application" ;
@@ -285,7 +278,7 @@ String RID_SVXSTR_EVENT_ERROROCCURED
 };
 String RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED
 {
-    Text [ en-US ] = "While adjusting";
+    Text [ en-US ] = "While adjusting" ;
 };
 String RID_SVXSTR_EVENT_FOCUSGAINED
 {
@@ -484,3 +477,4 @@ String RID_SVXSTR_EVENT_CONTENTCHANGED
     Text [ en-US ] = "Content changed" ;
 };
 
+// ********************************************************************** EOF
diff --git a/cui/source/customize/selector.src b/cui/source/customize/selector.src
index c6d1ba6d6d29..b4ddc6b71390 100644
--- a/cui/source/customize/selector.src
+++ b/cui/source/customize/selector.src
@@ -20,24 +20,22 @@
  *************************************************************/
 
 
+// include ---------------------------------------------------------------
 #include "helpid.hrc"
 #include <cuires.hrc>
 #include "selector.hrc"
 
-#define MASKCOLOR  MaskColor = \
-    Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
 #define FIXEDTEXT_DIALOG_DESCRIPTION \
-Text [ en-US ] = "Select the library that contains the macro you want. Then select the macro under 'Macro name'." ;\
+    Text [ en-US ] = "Select the library that contains the macro you want. Then select the macro under 'Macro name'." ;\
 
 String STR_SELECTOR_ADD_COMMANDS
 {
-  TEXT [ en-US ] = "Add Commands" ;
+    Text [ en-US ] = "Add Commands" ;
 };
 
 String STR_SELECTOR_MACROS
 {
-  Text [ en-US ] = "%PRODUCTNAME Macros" ;
+    Text [ en-US ] = "%PRODUCTNAME Macros" ;
 };
 
 String STR_SELECTOR_CATEGORIES
@@ -47,29 +45,27 @@ String STR_SELECTOR_CATEGORIES
 
 String STR_SELECTOR_COMMANDS
 {
-  Text [ en-US ] = "Commands" ;
+    Text [ en-US ] = "Commands" ;
 };
 
 String STR_SELECTOR_ADD
 {
-  TEXT [ en-US ] = "Add" ;
+    Text [ en-US ] = "Add" ;
 };
 
 String STR_SELECTOR_RUN
 {
-  TEXT [ en-US ] = "Run" ;
-
+    Text [ en-US ] = "Run" ;
 };
 
 String STR_SELECTOR_CLOSE
 {
-  TEXT [ en-US ] = "Close" ;
-
+    Text [ en-US ] = "Close" ;
 };
 
 String STR_SELECTOR_ADD_COMMANDS_DESCRIPTION
 {
-  TEXT [ en-US ] = "To add a command to a toolbar, select the category and then the command. Then drag the command to the Commands list of the Toolbars tab page in the Customize dialog.";
+    Text [ en-US ] = "To add a command to a toolbar, select the category and then the command. Then drag the command to the Commands list of the Toolbars tab page in the Customize dialog." ;
 };
 
 String STR_BASICMACROS
@@ -80,129 +76,122 @@ String STR_BASICMACROS
 
 ModelessDialog RID_DLG_SCRIPTSELECTOR
 {
-  OutputSize = TRUE ;
-  Size = MAP_APPFONT ( 256 , 233 ) ;
-  Text [ en-US ] = "Macro Selector" ;
-  HelpId = HID_SELECTOR_DIALOG;
-  SvLook = TRUE ;
-  Moveable = TRUE ;
-  Hide = TRUE;
-  FixedText TXT_SELECTOR_DIALOG_DESCRIPTION
-  {
-    Pos = MAP_APPFONT ( 6 , 8 ) ;
-    Size = MAP_APPFONT ( 190 , 48 ) ;
-    Group = TRUE ;
-    Left = TRUE ;
-    WordBreak = TRUE ;
-    FIXEDTEXT_DIALOG_DESCRIPTION
-  };
-  FixedText TXT_SELECTOR_CATEGORIES
-  {
-    Pos = MAP_APPFONT ( 6 , 62 ) ;
-    Size = MAP_APPFONT ( 83 , 8 ) ;
-    Group = TRUE ;
-    Left = TRUE ;
-    Text [ en-US ] = "Library" ;
-  };
-  Control BOX_SELECTOR_CATEGORIES
-  {
-    Border = TRUE ;
-    Pos = MAP_APPFONT ( 6 , 73 ) ;
-    Size = MAP_APPFONT ( 83 , 89 ) ;
-    TabStop = TRUE;
-    HelpId = HID_SELECTOR_CATEGORIES;
-    String STR_MYMACROS
+    OutputSize = TRUE ;
+    Size = MAP_APPFONT ( 256, 233 ) ;
+    Text [ en-US ] = "Macro Selector" ;
+    HelpId = HID_SELECTOR_DIALOG;
+    SvLook = TRUE ;
+    Moveable = TRUE ;
+    Hide = TRUE;
+    FixedText TXT_SELECTOR_DIALOG_DESCRIPTION
     {
-        Text [ en-US ] = "My Macros";
+        Pos = MAP_APPFONT ( 6, 8 ) ;
+        Size = MAP_APPFONT ( 190, 48 ) ;
+        Group = TRUE ;
+        Left = TRUE ;
+        WordBreak = TRUE ;
+        FIXEDTEXT_DIALOG_DESCRIPTION
     };
-    String STR_PRODMACROS
+    FixedText TXT_SELECTOR_CATEGORIES
     {
-        Text [ en-US ] = "%PRODUCTNAME Macros";
+        Pos = MAP_APPFONT ( 6, 62 ) ;
+        Size = MAP_APPFONT ( 83, 8 ) ;
+        Group = TRUE ;
+        Left = TRUE ;
+        Text [ en-US ] = "Library" ;
     };
-    Image IMG_HARDDISK
+    Control BOX_SELECTOR_CATEGORIES
     {
-        ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
-        MASKCOLOR
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 6, 73 ) ;
+        Size = MAP_APPFONT ( 83, 89 ) ;
+        TabStop = TRUE;
+        HelpId = HID_SELECTOR_CATEGORIES;
+        String STR_MYMACROS
+        {
+                Text [ en-US ] = "My Macros" ;
+        };
+        String STR_PRODMACROS
+        {
+                Text [ en-US ] = "%PRODUCTNAME Macros" ;
+        };
+        Image IMG_HARDDISK
+        {
+                ImageBitmap = Bitmap { File = "harddisk_16.png" ; };
+        };
+        Image IMG_HARDDISK_HC
+        {
+                ImageBitmap = Bitmap { File = "harddisk_16_h.png" ; };
+        };
+        Image IMG_LIB
+        {
+                ImageBitmap = Bitmap { File = "im30820.png" ; };
+        };
+        Image IMG_LIB_HC
+        {
+                ImageBitmap = Bitmap { File = "imh30820.png" ; };
+        };
+        Image IMG_MACRO
+        {
+                ImageBitmap = Bitmap { File = "im30821.png" ; };
+        };
+        Image IMG_MACRO_HC
+        {
+                ImageBitmap = Bitmap { File = "imh30821.png" ; };
+        };
+        Image IMG_DOC
+        {
+                ImageBitmap = Bitmap { File = "im30826.png" ; };
+        };
+        Image IMG_DOC_HC
+        {
+                ImageBitmap = Bitmap { File = "imh30826.png" ; };
+        };
     };
-    Image IMG_HARDDISK_HC
+    FixedText TXT_SELECTOR_COMMANDS
     {
-        ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
-        MASKCOLOR
+        Pos = MAP_APPFONT ( 101, 62 ) ;
+        Size = MAP_APPFONT ( 93, 8 ) ;
+        Left = TRUE ;
+        Text [ en-US ] = "Macro name" ;
     };
-    Image IMG_LIB
+    Control BOX_SELECTOR_COMMANDS
     {
-        ImageBitmap = Bitmap { File = "im30820.png"; };
-        MASKCOLOR
+        Border = TRUE ;
+        Pos = MAP_APPFONT ( 101, 73 ) ;
+        Size = MAP_APPFONT ( 93, 89 ) ;
+        TabStop = TRUE;
+        HelpId = HID_SELECTOR_COMMANDS;
     };
-    Image IMG_LIB_HC
+    OKButton BTN_SELECTOR_OK
     {
-        ImageBitmap = Bitmap { File = "imh30820.png"; };
-        MASKCOLOR
+        Pos = MAP_APPFONT ( 200, 73 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+        DefButton = TRUE;
     };
-    Image IMG_MACRO
+    CancelButton BTN_SELECTOR_CANCEL
     {
-        ImageBitmap = Bitmap { File = "im30821.png"; };
-        MASKCOLOR
+        Pos = MAP_APPFONT ( 200, 90 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
-    Image IMG_MACRO_HC
+    HelpButton BTN_SELECTOR_HELP
     {
-        ImageBitmap = Bitmap { File = "imh30821.png"; };
-        MASKCOLOR
+        Pos = MAP_APPFONT ( 200, 107 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
-    Image IMG_DOC
+    FixedLine GRP_SELECTOR_DESCRIPTION
     {
-        ImageBitmap = Bitmap { File = "im30826.png"; };
-        MASKCOLOR
+        Pos = MAP_APPFONT ( 6, 168 ) ;
+        Size = MAP_APPFONT ( 224, 8 ) ;
+        Group = TRUE ;
+        Text [ en-US ] = "Description" ;
     };
-    Image IMG_DOC_HC
+    FixedText TXT_SELECTOR_DESCRIPTION
     {
-        ImageBitmap = Bitmap { File = "imh30826.png"; };
-        MASKCOLOR
+        Pos = MAP_APPFONT ( 12, 179 ) ;
+        Size = MAP_APPFONT ( 224, 48 ) ;
+        WordBreak = TRUE ;
     };
-  };
-  FixedText TXT_SELECTOR_COMMANDS
-  {
-    Pos = MAP_APPFONT ( 101 , 62 ) ;
-    Size = MAP_APPFONT ( 93 , 8 ) ;
-    Left = TRUE ;
-    Text [ en-US ] = "Macro name" ;
-  };
-  Control BOX_SELECTOR_COMMANDS
-  {
-    Border = TRUE ;
-    Pos = MAP_APPFONT ( 101 , 73 ) ;
-    Size = MAP_APPFONT ( 93 , 89 ) ;
-    TabStop = TRUE;
-    HelpId = HID_SELECTOR_COMMANDS;
-  };
-  OKButton BTN_SELECTOR_OK
-  {
-    Pos = MAP_APPFONT ( 200 , 73 ) ;
-    Size = MAP_APPFONT ( 50 , 14 ) ;
-    DefButton = TRUE;
-  };
-  CancelButton BTN_SELECTOR_CANCEL
-  {
-    Pos = MAP_APPFONT ( 200 , 90 ) ;
-    Size = MAP_APPFONT ( 50 , 14 ) ;
-  };
-  HelpButton BTN_SELECTOR_HELP
-  {
-    Pos = MAP_APPFONT ( 200 , 107 ) ;
-    Size = MAP_APPFONT ( 50 , 14 ) ;
-  };
-  FixedLine GRP_SELECTOR_DESCRIPTION
-  {
-    Pos = MAP_APPFONT ( 6 , 168 ) ;
-    Size = MAP_APPFONT ( 224 , 8 ) ;
-    Group = TRUE ;
-    Text [ en-US ] = "Description" ;
-  };
-  FixedText TXT_SELECTOR_DESCRIPTION
-  {
-    Pos = MAP_APPFONT ( 12 , 179 ) ;
-    Size = MAP_APPFONT ( 224 , 48 ) ;
-    WordBreak = TRUE ;
-  };
 };
- // ********************************************************************** EOF
+
+// ********************************************************************** EOF


More information about the Libreoffice-commits mailing list