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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 3 18:09:14 UTC 2018


 cui/source/options/optgdlg.src         |  506 ++++++++++++++++-----------------
 cui/source/options/optmemory.src       |  117 +++----
 sw/source/ui/config/mailconfigpage.src |  383 ++++++++++++------------
 sw/source/ui/frmdlg/wrap.src           |  163 +++++-----
 4 files changed, 583 insertions(+), 586 deletions(-)

New commits:
commit eddf59961747429b8f8a26256c5a1925e574e712
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Aug 3 16:10:50 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Aug 3 16:10:50 2018 +0000

    Cleaned up resource files.

diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 49ece8cf94d0..fdd84ee8bed4 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -20,131 +20,132 @@
  *************************************************************/
 
 
- // include ---------------------------------------------------------------
+
+// include ---------------------------------------------------------------
 
 #include <cuires.hrc>
 #include "optgdlg.hrc"
 #include "helpid.hrc"
 
- //****************************************************************************
- //
- // TabPage Sonstiges
- //
- //****************************************************************************
+//****************************************************************************
+//
+// TabPage General
+//
+//****************************************************************************
 
 TabPage OFA_TP_MISC
 {
     HelpID = HID_OFA_TP_MISC ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( 260, 185 ) ;
     Hide = TRUE ;
     FixedLine FL_HELP
     {
-        Pos = MAP_APPFONT( COL0, ROW0 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Help";
+        Pos = MAP_APPFONT ( COL0, ROW0 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Help" ;
     };
     CheckBox CB_TOOLTIP
     {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP";
-        Pos = MAP_APPFONT( COL1, ROW1 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Tips";
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP" ;
+        Pos = MAP_APPFONT ( COL1, ROW1 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "~Tips" ;
     };
     CheckBox CB_EXTHELP
     {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP";
-        Pos = MAP_APPFONT( COL2, ROW2 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Extended tips";
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP" ;
+        Pos = MAP_APPFONT ( COL2, ROW2 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "~Extended tips" ;
     };
     CheckBox CB_HELPAGENT
     {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT";
-        Pos = MAP_APPFONT( COL1, ROW3 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Help Agent";
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT" ;
+        Pos = MAP_APPFONT ( COL1, ROW3 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "~Help Agent" ;
     };
     PushButton PB_HELPAGENT_RESET
     {
-        HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET";
-        Pos = MAP_APPFONT( COL2, ROW4 );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text [ en-US ] = "~Reset Help Agent";
+        HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET" ;
+        Pos = MAP_APPFONT ( COL2, ROW4 ) ;
+        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ) ;
+        Text [ en-US ] = "~Reset Help Agent" ;
     };
     FixedText FT_HELPFORMAT
     {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) );
-        Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Help ~formatting";
+        Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) ) ;
+        Size = MAP_APPFONT ( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Help ~formatting" ;
     };
     ListBox LB_HELPFORMAT
     {
-        HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT";
-        Pos = MAP_APPFONT( COL4, ROW5 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
+        HelpID = "cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT" ;
+        Pos = MAP_APPFONT ( COL4, ROW5 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL4, 50 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
         StringList [ en-US ] =
         {
-            < "Default" ; > ;
-            < "High Contrast #1" ; > ;
-            < "High Contrast #2" ; > ;
+            < "Default"     ; > ;
+            < "High Contrast #1"    ; > ;
+            < "High Contrast #2"    ; > ;
             < "High Contrast Black" ; > ;
             < "High Contrast White" ; > ;
         };
     };
     FixedLine FL_FILEDLG
     {
-        Pos = MAP_APPFONT( COL0, ROW6 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Open/Save dialogs";
+        Pos = MAP_APPFONT ( COL0, ROW6 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Open/Save dialogs" ;
     };
     FixedImage FI_FILEDLG_RO
     {
-        Pos = MAP_APPFONT( COL1 - 7, ROW7 + 2 );
-        Size = MAP_APPFONT( 6, 6 );
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( COL1 - 7, ROW7 + 2 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     CheckBox CB_FILEDLG
     {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG";
-        Pos = MAP_APPFONT( COL1, ROW7 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG" ;
+        Pos = MAP_APPFONT ( COL1, ROW7 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "~Use %PRODUCTNAME dialogs" ;
     };
     FixedLine FL_DOCSTATUS
     {
-        Pos = MAP_APPFONT( COL0, ROW8 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Document status";
+        Pos = MAP_APPFONT ( COL0, ROW8 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Document status" ;
     };
     CheckBox CB_DOCSTATUS
     {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS";
-        Pos = MAP_APPFONT( COL1, ROW9 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "~Printing sets \"document modified\" status";
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS" ;
+        Pos = MAP_APPFONT ( COL1, ROW9 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "~Printing sets \"document modified\" status" ;
     };
     FixedLine FL_TWOFIGURE
     {
-        Pos = MAP_APPFONT( COL0, ROW10 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+        Pos = MAP_APPFONT ( COL0, ROW10 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
         Text [ en-US ] = "Year (two digits)" ;
     };
     FixedText FT_INTERPRET
     {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) );
-        Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Interpret as years between";
+        Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ) ;
+        Size = MAP_APPFONT ( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Interpret as years between" ;
     };
     NumericField NF_YEARVALUE
     {
-        HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE";
+        HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT( COL4, ROW11 );
-        Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
+        Pos = MAP_APPFONT ( COL4, ROW11 ) ;
+        Size = MAP_APPFONT ( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ) ;
         Minimum = 1583 ;
         Maximum = 9857 ;
         Spin = TRUE ;
@@ -152,54 +153,54 @@ TabPage OFA_TP_MISC
     };
     FixedText FT_TOYEAR
     {
-        Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT ( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "and " ;
     };
     FixedLine FL_PRINTDLG
     {
-        Pos = MAP_APPFONT( COL0, ROW8 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Print dialogs";
+        Pos = MAP_APPFONT ( COL0, ROW8 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Print dialogs" ;
     };
     CheckBox CB_PRINTDLG
     {
-        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG";
-        Pos = MAP_APPFONT( COL1, ROW9 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
+        HelpID = "cui:CheckBox:OFA_TP_MISC:CB_PRINTDLG" ;
+        Pos = MAP_APPFONT ( COL1, ROW9 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "Use %PRODUCTNAME ~dialogs" ;
     };
 };
 
- //****************************************************************************
- //
- // TabPage Ansicht
- //
- //****************************************************************************
+//****************************************************************************
+//
+// TabPage View
+//
+//****************************************************************************
 
 TabPage OFA_TP_VIEW
 {
     HelpID = HID_OFA_TP_VIEW ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( 260, 185 ) ;
     Hide = TRUE ;
     FixedLine FL_USERINTERFACE
     {
-        Pos = MAP_APPFONT ( 6 , ROW0 ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, ROW0 ) ;
+        Size = MAP_APPFONT ( 120, 8 ) ;
         Text [ en-US ] = "User Interface" ;
     };
     FixedText FT_WINDOWSIZE
     {
-        Pos = MAP_APPFONT ( 12 , OFFS_TEXTBOX_FIXEDTEXT( ROW_MF_SCALING ) ) ;
-        Size = MAP_APPFONT ( 80 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, OFFS_TEXTBOX_FIXEDTEXT ( ROW_MF_SCALING ) ) ;
+        Size = MAP_APPFONT ( 80, 8 ) ;
         Text [ en-US ] = "Sc~aling" ;
     };
     MetricField MF_WINDOWSIZE
     {
-        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE";
-        Pos = MAP_APPFONT ( 95 , ROW_MF_SCALING ) ;
-        Size = MAP_APPFONT ( 31 , 12 ) ;
+        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE" ;
+        Pos = MAP_APPFONT ( 95, ROW_MF_SCALING ) ;
+        Size = MAP_APPFONT ( 31, 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
         Left = TRUE ;
@@ -215,8 +216,8 @@ TabPage OFA_TP_VIEW
     };
     FixedText FT_ICONSIZESTYLE
     {
-        Pos = MAP_APPFONT ( 12 , ROW_FT_ICONSIZESTYLE  ) ;
-        Size = MAP_APPFONT ( 114 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, ROW_FT_ICONSIZESTYLE ) ;
+        Size = MAP_APPFONT ( 114, 8 ) ;
         Text [ en-US ] = "Icon size and style" ;
     };
     String STR_ICONSIZE
@@ -225,9 +226,9 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_ICONSIZE
     {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE";
-        Pos = MAP_APPFONT ( 12 , ROW_LB_ICONSIZESTYLE ) ;
-        Size = MAP_APPFONT ( 45 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE" ;
+        Pos = MAP_APPFONT ( 12, ROW_LB_ICONSIZESTYLE ) ;
+        Size = MAP_APPFONT ( 45, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
@@ -240,51 +241,51 @@ TabPage OFA_TP_VIEW
     };
     ListBox LB_ICONSTYLE
     {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE";
-        Pos = MAP_APPFONT ( 61 , ROW_LB_ICONSIZESTYLE ) ;
-        Size = MAP_APPFONT ( 65 , 70 ) ;
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE" ;
+        Pos = MAP_APPFONT ( 61, ROW_LB_ICONSIZESTYLE ) ;
+        Size = MAP_APPFONT ( 65, 70 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
         StringList [ en-US ] =
         {
-            < "Automatic" ; > ;
-            < "Galaxy (default)" ; > ;
+            < "Automatic" ;     > ;
+            < "Galaxy (default)" ;  > ;
             < "High Contrast" ; > ;
-            < "Industrial" ; > ;
-            < "Classic" ; > ;
+            < "Industrial" ;    > ;
+            < "Classic" ;       > ;
         };
     };
     CheckBox CB_SYSTEM_FONT
     {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT";
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT" ;
         TabStop = TRUE ;
-        Pos = MAP_APPFONT( 12, ROW_CB_SYSTEM_FONT );
-        Size = MAP_APPFONT( 114, 16 );
-        WordBreak = TRUE;
-        Text[ en-US ] = "Use system ~font for user interface";
+        Pos = MAP_APPFONT ( 12, ROW_CB_SYSTEM_FONT ) ;
+        Size = MAP_APPFONT ( 114, 16 ) ;
+        WordBreak = TRUE ;
+        Text[ en-US ] = "Use system ~font for user interface" ;
     };
 
     CheckBox CB_FONTANTIALIASING
     {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING";
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING" ;
         TabStop = TRUE ;
-        Pos = MAP_APPFONT ( 12 , ROW_CB_FONTANTIALIASING ) ;
-        Size = MAP_APPFONT ( 110 , RSC_CD_CHECKBOX_HEIGHT ) ;
+        Pos = MAP_APPFONT ( 12, ROW_CB_FONTANTIALIASING ) ;
+        Size = MAP_APPFONT ( 110, RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Screen font antialiasing" ;
     };
     FixedText FT_POINTLIMIT_LABEL
     {
-        Pos = MAP_APPFONT ( 23 , OFFS_TEXTBOX_FIXEDTEXT( ROW_NF_AA_POINTLIMIT ) ) ;
-        Size = MAP_APPFONT ( 20 , 8 ) ;
-        Text [ en-US ] = "from";
+        Pos = MAP_APPFONT ( 23, OFFS_TEXTBOX_FIXEDTEXT ( ROW_NF_AA_POINTLIMIT ) ) ;
+        Size = MAP_APPFONT ( 20, 8 ) ;
+        Text [ en-US ] = "from" ;
     };
     NumericField NF_AA_POINTLIMIT
     {
-        HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT";
+        HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT" ;
         Border = TRUE ;
         Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ;
-        Size = MAP_APPFONT ( 30 , 12 ) ;
+        Size = MAP_APPFONT ( 30, 12 ) ;
         Minimum = 1;
         Maximum = 10000;
         SpinSize = 1;
@@ -293,150 +294,150 @@ TabPage OFA_TP_VIEW
     };
     FixedText FT_POINTLIMIT_UNIT
     {
-        Pos = MAP_APPFONT ( 79 , OFFS_TEXTBOX_FIXEDTEXT( ROW_NF_AA_POINTLIMIT ) ) ;
-        Size = MAP_APPFONT ( 47 , 8 ) ;
-        Text [ en-US ] = "Pixels";
+        Pos = MAP_APPFONT ( 79, OFFS_TEXTBOX_FIXEDTEXT ( ROW_NF_AA_POINTLIMIT ) ) ;
+        Size = MAP_APPFONT ( 47, 8 ) ;
+        Text [ en-US ] = "Pixels" ;
     };
     FixedLine FL_MENU
     {
         Pos = MAP_APPFONT ( 6, ROW_FL_MENU ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
+        Size = MAP_APPFONT ( 120, 8 ) ;
         Text [ en-US ] = "Menu" ;
     };
     FixedText FT_MENU_ICONS
     {
-        Pos = MAP_APPFONT ( 12 , ROW_FT_MENU_ICONS ) ;
-        Size = MAP_APPFONT ( 114 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, ROW_FT_MENU_ICONS ) ;
+        Size = MAP_APPFONT ( 114, 8 ) ;
         Text [ en-US ] = "Icons in menus" ;
     };
     ListBox LB_MENU_ICONS
     {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS";
-        Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ;
-        Size = MAP_APPFONT ( 114 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS" ;
+        Pos = MAP_APPFONT ( 12, ROW_LB_MENU_ICONS ) ;
+        Size = MAP_APPFONT ( 114, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
         StringList [ en-US ] =
         {
             < "Automatic" ; > ;
-            < "Hide" ; > ;
-            < "Show" ; > ;
+            < "Hide" ;  > ;
+            < "Show" ;  > ;
         };
     };
     FixedLine FL_FONTLISTS
     {
         Pos = MAP_APPFONT ( 6, ROW_FL_FONTLISTS ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
+        Size = MAP_APPFONT ( 120, 8 ) ;
         Text [ en-US ] = "Font Lists" ;
     };
     CheckBox CB_FONT_SHOW
     {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW";
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW" ;
         Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
+        Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Show p~review of fonts" ;
     };
     CheckBox CB_FONT_HISTORY
     {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY";
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY" ;
         Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
+        Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Show font h~istory" ;
     };
     FixedLine FL_RENDERING
     {
-        Pos = MAP_APPFONT ( 133 , ROW_FL_RENDERING ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "Graphics output";
+        Pos = MAP_APPFONT ( 133, ROW_FL_RENDERING ) ;
+        Size = MAP_APPFONT ( 120, 8 ) ;
+        Text [ en-US ] = "Graphics output" ;
     };
 
     CheckBox CB_USE_HARDACCELL
     {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL";
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL" ;
         Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
+        Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use hardware acceleration" ;
     };
 
     CheckBox CB_USE_ANTIALIASE
     {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE";
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE" ;
         Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ;
-        Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
+        Size = MAP_APPFONT ( 118, RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Use Anti-Aliasing" ;
     };
 
     FixedLine FL_MOUSE
     {
-        Pos = MAP_APPFONT ( 133 , ROW_FL_MOUSE ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "Mouse";
+        Pos = MAP_APPFONT ( 133, ROW_FL_MOUSE ) ;
+        Size = MAP_APPFONT ( 120, 8 ) ;
+        Text [ en-US ] = "Mouse" ;
     };
     FixedText FT_MOUSEPOS
     {
         Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEPOS ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
+        Size = MAP_APPFONT ( 120, 8 ) ;
         Text [ en-US ] = "Mouse positioning" ;
     };
     ListBox LB_MOUSEPOS
     {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS";
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS" ;
         Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ;
-        Size = MAP_APPFONT ( 114 , 60 ) ;
+        Size = MAP_APPFONT ( 114, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
         StringList [ en-US ] =
         {
-            < "Default button" ; > ;
-            < "Dialog center" ; > ;
-            < "No automatic positioning" ; > ;
+            < "Default button" ;        > ;
+            < "Dialog center" ;     > ;
+            < "No automatic positioning" ;  > ;
         };
     };
     FixedText FT_MOUSEMIDDLE
     {
         Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEMIDDLE ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "Middle mouse button";
+        Size = MAP_APPFONT ( 120, 8 ) ;
+        Text [ en-US ] = "Middle mouse button" ;
     };
     ListBox LB_MOUSEMIDDLE
     {
-        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE";
+        HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE" ;
         Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ;
-        Size = MAP_APPFONT ( 114 , 60 ) ;
+        Size = MAP_APPFONT ( 114, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
         StringList [ en-US ] =
         {
-            < "No function" ; > ;
-            < "Automatic scrolling" ; > ;
-            < "Paste clipboard" ; > ;
+            < "No function" ;       > ;
+            < "Automatic scrolling" ;   > ;
+            < "Paste clipboard" ;       > ;
         };
     };
 
     // #i97672#
     FixedLine FL_SELECTION
     {
-        Pos = MAP_APPFONT ( 133 , ROW_FL_SELECTION ) ;
-        Size = MAP_APPFONT ( 120 , 8 ) ;
-        Text [ en-US ] = "Selection";
+        Pos = MAP_APPFONT ( 133, ROW_FL_SELECTION ) ;
+        Size = MAP_APPFONT ( 120, 8 ) ;
+        Text [ en-US ] = "Selection" ;
     };
 
     CheckBox CB_SELECTION
     {
-        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION";
+        HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION" ;
         Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
-        Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
+        Size = MAP_APPFONT ( 118 - 34, RSC_CD_CHECKBOX_HEIGHT ) ;
         Text [ en-US ] = "Transparency" ;
     };
 
     MetricField MF_SELECTION
     {
-        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION";
+        HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION" ;
         Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ;
-        Size = MAP_APPFONT ( 31 , 12 ) ;
+        Size = MAP_APPFONT ( 31, 12 ) ;
         Border = TRUE ;
         TabStop = TRUE ;
         Repeat = TRUE ;
@@ -450,216 +451,219 @@ TabPage OFA_TP_VIEW
         Unit = FUNIT_PERCENT ;
     };
 };
-// *******************************************************************
+
+//****************************************************************************
+//
+// TabPage Languages
+//
+//****************************************************************************
 
 TabPage OFA_TP_LANGUAGES
 {
     HelpID = HID_OFA_TP_LANGUAGES ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( 260, 185 ) ;
     Hide = TRUE ;
     FixedLine FL_UI_LANG
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Language of";
+        Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
+        Text [ en-US ] = "Language of" ;
     };
     FixedImage FI_USERINTERFACE
     {
-        Pos = MAP_APPFONT ( 5 , 17 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 17 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     FixedText FT_USERINTERFACE
     {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "~User interface";
+        Pos = MAP_APPFONT ( 12, 16 ) ;
+        Size = MAP_APPFONT ( 108, 8 ) ;
+        Text [ en-US ] = "~User interface" ;
     };
     ListBox LB_USERINTERFACE
     {
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE";
-        Pos = MAP_APPFONT ( 123 , 14 ) ;
-        Size = MAP_APPFONT ( 125 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE" ;
+        Pos = MAP_APPFONT ( 123, 14 ) ;
+        Size = MAP_APPFONT ( 125, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
-        Sort = TRUE;
+        Sort = TRUE ;
     };
     FixedImage FI_LOCALESETTING
     {
-        Pos = MAP_APPFONT ( 5 , 32 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 32 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     FixedText FT_LOCALESETTING
     {
-        Pos = MAP_APPFONT ( 12 , 31 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "Locale setting";
+        Pos = MAP_APPFONT ( 12, 31 ) ;
+        Size = MAP_APPFONT ( 108, 8 ) ;
+        Text [ en-US ] = "Locale setting" ;
     };
     ListBox LB_LOCALESETTING
     {
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING";
-        Pos = MAP_APPFONT ( 123 , 30 ) ;
-        Size = MAP_APPFONT ( 125 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING" ;
+        Pos = MAP_APPFONT ( 123, 30 ) ;
+        Size = MAP_APPFONT ( 125, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
-        Sort = TRUE;
+        Sort = TRUE ;
     };
     FixedText FT_DECIMALSEPARATOR
     {
-        Pos = MAP_APPFONT ( 12 , 46 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "Decimal separator key";
+        Pos = MAP_APPFONT ( 12, 46 ) ;
+        Size = MAP_APPFONT ( 108, 8 ) ;
+        Text [ en-US ] = "Decimal separator key" ;
     };
     CheckBox CB_DECIMALSEPARATOR
     {
-        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR";
-        Pos = MAP_APPFONT ( 123 , 46) ;
-        Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "~Same as locale setting ( %1 )";
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR" ;
+        Pos = MAP_APPFONT ( 123, 46) ;
+        Size = MAP_APPFONT ( 125, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "~Same as locale setting ( %1 )" ;
     };
     FixedImage FI_CURRENCY
     {
-        Pos = MAP_APPFONT ( 5 , 63 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 63 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     FixedText FT_CURRENCY
     {
-        Pos = MAP_APPFONT ( 12 , 61 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "~Default currency";
+        Pos = MAP_APPFONT ( 12, 61 ) ;
+        Size = MAP_APPFONT ( 108, 8 ) ;
+        Text [ en-US ] = "~Default currency" ;
     };
     ListBox LB_CURRENCY
     {
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY";
-        Pos = MAP_APPFONT ( 123 , 59 ) ;
-        Size = MAP_APPFONT ( 125 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY" ;
+        Pos = MAP_APPFONT ( 123, 59 ) ;
+        Size = MAP_APPFONT ( 125, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
-        Sort = TRUE;
+        Sort = TRUE ;
     };
     FixedLine FL_LINGU_LANG
     {
-        Pos = MAP_APPFONT ( 6 , 77 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Default languages for documents";
+        Pos = MAP_APPFONT ( 6, 77 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
+        Text [ en-US ] = "Default languages for documents" ;
     };
     FixedImage FI_WEST_LANG
     {
-        Pos = MAP_APPFONT ( 5 , 92 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 92 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     FixedText FT_WEST_LANG
     {
-        Pos = MAP_APPFONT ( 12 , 90 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "Western";
+        Pos = MAP_APPFONT ( 12, 90 ) ;
+        Size = MAP_APPFONT ( 108, 8 ) ;
+        Text [ en-US ] = "Western" ;
     };
 
     ListBox LB_WEST_LANG
     {
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG";
-        Pos = MAP_APPFONT ( 123 ,  88 ) ;
-        Size = MAP_APPFONT ( 125 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG" ;
+        Pos = MAP_APPFONT ( 123, 88 ) ;
+        Size = MAP_APPFONT ( 125, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
-        Sort = TRUE;
+        Sort = TRUE ;
     };
     FixedImage FI_ASIAN_LANG
     {
-        Pos = MAP_APPFONT ( 5 , 108 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 108 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     FixedText FT_ASIAN_LANG
     {
-        Pos = MAP_APPFONT ( 12 , 106 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "Asian";
+        Pos = MAP_APPFONT ( 12, 106 ) ;
+        Size = MAP_APPFONT ( 108, 8 ) ;
+        Text [ en-US ] = "Asian" ;
     };
     ListBox LB_ASIAN_LANG
     {
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG";
-        Pos = MAP_APPFONT ( 123 , 104 ) ;
-        Size = MAP_APPFONT ( 125 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG" ;
+        Pos = MAP_APPFONT ( 123, 104 ) ;
+        Size = MAP_APPFONT ( 125, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
-        Sort = TRUE;
+        Sort = TRUE ;
     };
     FixedImage FI_COMPLEX_LANG
     {
-        Pos = MAP_APPFONT ( 5 , 124 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 124 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     FixedText FT_COMPLEX_LANG
     {
-        Pos = MAP_APPFONT ( 12 , 122 ) ;
-        Size = MAP_APPFONT ( 108 , 8 ) ;
-        Text [ en-US ] = "C~TL";
+        Pos = MAP_APPFONT ( 12, 122 ) ;
+        Size = MAP_APPFONT ( 108, 8 ) ;
+        Text [ en-US ] = "C~TL" ;
     };
     ListBox LB_COMPLEX_LANG
     {
-        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG";
-        Pos = MAP_APPFONT ( 123 , 120 ) ;
-        Size = MAP_APPFONT ( 125 , 60 ) ;
+        HelpID = "cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG" ;
+        Pos = MAP_APPFONT ( 123, 120 ) ;
+        Size = MAP_APPFONT ( 125, 60 ) ;
         DropDown = TRUE ;
         Border = TRUE ;
         TabStop = TRUE ;
-        Sort = TRUE;
+        Sort = TRUE ;
     };
     CheckBox CB_CURRENT_DOC
     {
-        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC";
-        Pos = MAP_APPFONT ( 123 , 135 ) ;
-        Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "For the current document only";
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC" ;
+        Pos = MAP_APPFONT ( 123, 135 ) ;
+        Size = MAP_APPFONT ( 125, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "For the current document only" ;
     };
     FixedLine FL_ENHANCED
     {
-        Pos = MAP_APPFONT ( 6 , 145 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Enhanced language support";
+        Pos = MAP_APPFONT ( 6, 145 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
+        Text [ en-US ] = "Enhanced language support" ;
     };
     FixedImage FI_ASIANSUPPORT
     {
-        Pos = MAP_APPFONT ( 5 , 160 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 160 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     CheckBox CB_ASIANSUPPORT
     {
-        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT";
-        Pos = MAP_APPFONT ( 12 , 158 ) ;
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT" ;
+        Pos = MAP_APPFONT ( 12, 158 ) ;
         Size = MAP_APPFONT ( 236 ,RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Show UI elements for East Asia~n writings";
+        Text [ en-US ] = "Show UI elements for East Asia~n writings" ;
     };
     FixedImage FI_CTLSUPPORT
     {
-        Pos = MAP_APPFONT ( 5 , 175 ) ;
-        Size = MAP_APPFONT ( 6 , 6 ) ;
-        Hide = TRUE;
+        Pos = MAP_APPFONT ( 5, 175 ) ;
+        Size = MAP_APPFONT ( 6, 6 ) ;
+        Hide = TRUE ;
     };
     CheckBox CB_CTLSUPPORT
     {
-        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT";
-        Pos = MAP_APPFONT ( 12 , 173 ) ;
-        Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
-        Text [ en-US ] = "Show UI elements for B~i-Directional writing";
+        HelpID = "cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT" ;
+        Pos = MAP_APPFONT ( 12, 173 ) ;
+        Size = MAP_APPFONT ( 236, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "Show UI elements for B~i-Directional writing" ;
     };
 };
 
 InfoBox RID_SVX_MSGBOX_LANGUAGE_RESTART
 {
-    Message [ en-US ] = "The language setting of the user interface has been updated and will take effect the next time you start %PRODUCTNAME %PRODUCTVERSION";
+    Message [ en-US ] = "The language setting of the user interface has been updated and will take effect the next time you start %PRODUCTNAME %PRODUCTVERSION" ;
 };
-
-
diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src
index 0e80a4d3f092..c7f861116a8b 100644
--- a/cui/source/options/optmemory.src
+++ b/cui/source/options/optmemory.src
@@ -31,26 +31,26 @@ TabPage OFA_TP_MEMORY
 {
     HelpID = HID_OFA_TP_MEMORY ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( 260, 185 ) ;
     Hide = TRUE ;
     FixedLine GB_UNDO
     {
-        Pos = MAP_APPFONT( COL0, ROW0 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+        Pos = MAP_APPFONT ( COL0, ROW0 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
         Text [ en-US ] = "Undo" ;
     };
     FixedText FT_UNDO
     {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW1 ) );
-        Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Number of steps";
+        Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW1 ) ) ;
+        Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Number of steps" ;
     };
     NumericField ED_UNDO
     {
-        HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO";
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:ED_UNDO" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT( COL3, ROW1 );
-        Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+        Pos = MAP_APPFONT ( COL3, ROW1 ) ;
+        Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
         TabStop = TRUE ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -65,22 +65,22 @@ TabPage OFA_TP_MEMORY
     };
     FixedLine GB_GRAPHICCACHE
     {
-        Pos = MAP_APPFONT( COL0, ROW2 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Graphics cache";
+        Pos = MAP_APPFONT ( COL0, ROW2 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Graphics cache" ;
     };
     FixedText FT_GRAPHICCACHE
     {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW3 ) );
-        Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Use for %PRODUCTNAME";
+        Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW3 ) ) ;
+        Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Use for %PRODUCTNAME" ;
     };
     NumericField NF_GRAPHICCACHE
     {
-        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE";
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT( COL3, ROW3 );
-        Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+        Pos = MAP_APPFONT ( COL3, ROW3 ) ;
+        Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
         Minimum = 1;
         Maximum = 256;
         SpinSize = 1;
@@ -89,22 +89,22 @@ TabPage OFA_TP_MEMORY
     };
     FixedText FT_GRAPHICCACHE_UNIT
     {
-        Pos = MAP_APPFONT( COL5, OFFS_TEXTBOX_FIXEDTEXT( ROW3 ) );
-        Size = MAP_APPFONT( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "MB";
+        Pos = MAP_APPFONT ( COL5, OFFS_TEXTBOX_FIXEDTEXT ( ROW3 ) ) ;
+        Size = MAP_APPFONT ( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "MB" ;
     };
     FixedText FT_GRAPHICOBJECTCACHE
     {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW4 ) );
-        Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
+        Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW4 ) ) ;
+        Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
         Text [ en-US ] = "Memory per object" ;
     };
     NumericField NF_GRAPHICOBJECTCACHE
     {
-        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE";
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT( COL3, ROW4 );
-        Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+        Pos = MAP_APPFONT ( COL3, ROW4 ) ;
+        Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
         Minimum = 10;
         Maximum = 2560;
         SpinSize = 1;
@@ -114,32 +114,32 @@ TabPage OFA_TP_MEMORY
     };
     FixedText FT_GRAPHICOBJECTCACHE_UNIT
     {
-        Pos = MAP_APPFONT( COL5, OFFS_TEXTBOX_FIXEDTEXT( ROW4 ) );
-        Size = MAP_APPFONT( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "MB";
+        Pos = MAP_APPFONT ( COL5, OFFS_TEXTBOX_FIXEDTEXT ( ROW4 ) ) ;
+        Size = MAP_APPFONT ( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "MB" ;
     };
     FixedText FT_GRAPHICOBJECTTIME
     {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW5 ) );
-        Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Remove from memory after";
+        Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW5 ) ) ;
+        Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Remove from memory after" ;
     };
     TimeField TF_GRAPHICOBJECTTIME
     {
-        HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME";
+        HelpID = "cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT( COL3, ROW5 );
-        Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+        Pos = MAP_APPFONT ( COL3, ROW5 ) ;
+        Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
         Value = Time
         {
-            Minute = 10;
+            Minute = 10 ;
         };
         Minimum = Time
         {
-            Minute = 1;
+            Minute = 1 ;
         };
         Maximum = Time
         {
@@ -148,7 +148,7 @@ TabPage OFA_TP_MEMORY
         };
         First = Time
         {
-            Minute = 10;
+            Minute = 10 ;
         };
         Last = Time
         {
@@ -161,28 +161,28 @@ TabPage OFA_TP_MEMORY
     };
     FixedText FT_GRAPHICOBJECTTIME_UNIT
     {
-        Pos = MAP_APPFONT( COL5, OFFS_TEXTBOX_FIXEDTEXT( ROW5 ) );
-        Size = MAP_APPFONT( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "hh:mm";
+        Pos = MAP_APPFONT ( COL5, OFFS_TEXTBOX_FIXEDTEXT ( ROW5 ) ) ;
+        Size = MAP_APPFONT ( WIDTH3, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "hh:mm" ;
     };
     FixedLine GB_OLECACHE
     {
-        Pos = MAP_APPFONT( COL0, ROW6 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Cache for inserted objects";
+        Pos = MAP_APPFONT ( COL0, ROW6 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "Cache for inserted objects" ;
     };
     FixedText FT_OLECACHE
     {
-        Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT( ROW7 ) );
-        Size = MAP_APPFONT( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT );
-        Text [ en-US ] = "Number of objects";
+        Pos = MAP_APPFONT ( COL1, OFFS_TEXTBOX_FIXEDTEXT ( ROW7 ) ) ;
+        Size = MAP_APPFONT ( WIDTH1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+        Text [ en-US ] = "Number of objects" ;
     };
     NumericField NF_OLECACHE
     {
-        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE";
+        HelpID = "cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT( COL3, ROW7 );
-        Size = MAP_APPFONT( WIDTH2, RSC_CD_TEXTBOX_HEIGHT );
+        Pos = MAP_APPFONT ( COL3, ROW7 ) ;
+        Size = MAP_APPFONT ( WIDTH2, RSC_CD_TEXTBOX_HEIGHT ) ;
         Minimum = 1;
         Maximum = 1024;
         Spin = TRUE ;
@@ -190,20 +190,19 @@ TabPage OFA_TP_MEMORY
     };
     FixedLine FL_QUICKLAUNCH
     {
-        Pos = MAP_APPFONT( COL0, ROW8 );
-        Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "%PRODUCTNAME Quickstarter";
+        Pos = MAP_APPFONT ( COL0, ROW8 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
+        Text [ en-US ] = "%PRODUCTNAME Quickstarter" ;
     };
     CheckBox CB_QUICKLAUNCH
     {
-        HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH";
-        Pos = MAP_APPFONT( COL1, ROW9 );
-        Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
-        Text [ en-US ] = "Load %PRODUCTNAME during system start-up";
+        HelpID = "cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH" ;
+        Pos = MAP_APPFONT ( COL1, ROW9 ) ;
+        Size = MAP_APPFONT ( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ) ;
+        Text [ en-US ] = "Load %PRODUCTNAME during system start-up" ;
     };
     String STR_QUICKLAUNCH_UNX
     {
-    Text[ en-US ] = "Enable systray Quickstarter";
+        Text [ en-US ] = "Enable systray Quickstarter" ;
     };
 };
-
diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src
index f6844d927952..6e303e6bcf5d 100644
--- a/sw/source/ui/config/mailconfigpage.src
+++ b/sw/source/ui/config/mailconfigpage.src
@@ -30,94 +30,94 @@
 TabPage TP_MAILCONFIG
 {
     HelpID = HID_TP_MAILCONFIG;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( 260, 185 ) ;
     Hide = TRUE ;
 
-    Text[ en-US ] = "Mail Merge E-mail";
+    Text[ en-US ] = "Mail Merge e-mail" ;
 
-    FixedLine  FL_IDENTITY
+    FixedLine FL_IDENTITY
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text[ en-US ] = "User information";
+        Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
+        Text[ en-US ] = "User information" ;
     };
-    FixedText       FT_DISPLAYNAME
+    FixedText FT_DISPLAYNAME
     {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 74 , 8 ) ;
-        Text[ en-US ] = "~Your name";
+        Pos = MAP_APPFONT ( 12, 16 ) ;
+        Size = MAP_APPFONT ( 74, 8 ) ;
+        Text[ en-US ] = "~Your name" ;
     };
-    Edit  ED_DISPLAYNAME
+    Edit ED_DISPLAYNAME
     {
-        HelpID = "sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME";
-        Pos = MAP_APPFONT ( 88 , 14 ) ;
-        Size = MAP_APPFONT ( 160 , 12 ) ;
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME" ;
+        Pos = MAP_APPFONT ( 88, 14 ) ;
+        Size = MAP_APPFONT ( 160, 12 ) ;
         Border = TRUE;
     };
-    FixedText       FT_ADDRESS
+    FixedText FT_ADDRESS
     {
-        Pos = MAP_APPFONT ( 12 , 31 ) ;
-        Size = MAP_APPFONT ( 74 , 8 ) ;
-        Text[ en-US ] = "~E-Mail address";
+        Pos = MAP_APPFONT ( 12, 31 ) ;
+        Size = MAP_APPFONT ( 74, 8 ) ;
+        Text[ en-US ] = "~E-Mail address" ;
     };
-    Edit   ED_ADDRESS
+    Edit ED_ADDRESS
     {
-        HelpID = "sw:Edit:TP_MAILCONFIG:ED_ADDRESS";
-        Pos = MAP_APPFONT ( 88 , 29 ) ;
-        Size = MAP_APPFONT ( 160 , 12 ) ;
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_ADDRESS" ;
+        Pos = MAP_APPFONT ( 88, 29 ) ;
+        Size = MAP_APPFONT ( 160, 12 ) ;
         Border = TRUE;
     };
-    CheckBox        CB_REPLYTO
+    CheckBox CB_REPLYTO
     {
-        HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO";
-        Pos = MAP_APPFONT ( 12 , 45 ) ;
-        Size = MAP_APPFONT ( 242 , 10 ) ;
-        Text[ en-US ] = "Send replies to ~different e-mail address";
+        HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO" ;
+        Pos = MAP_APPFONT ( 12, 45 ) ;
+        Size = MAP_APPFONT ( 242, 10 ) ;
+        Text[ en-US ] = "Send replies to ~different e-mail address" ;
     };
-    FixedText       FT_REPLYTO
+    FixedText FT_REPLYTO
     {
-        Pos = MAP_APPFONT ( 18 , 60 ) ;
-        Size = MAP_APPFONT ( 68 , 8 ) ;
-        Text[ en-US ] = "~Reply address";
+        Pos = MAP_APPFONT ( 18, 60 ) ;
+        Size = MAP_APPFONT ( 68, 8 ) ;
+        Text[ en-US ] = "~Reply address" ;
     };
     Edit ED_REPLYTO
     {
-        HelpID = "sw:Edit:TP_MAILCONFIG:ED_REPLYTO";
-        Pos = MAP_APPFONT ( 88 , 58 ) ;
-        Size = MAP_APPFONT ( 160 , 12 ) ;
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_REPLYTO" ;
+        Pos = MAP_APPFONT ( 88, 58 ) ;
+        Size = MAP_APPFONT ( 160, 12 ) ;
         Border = TRUE;
     };
-    FixedLine       FL_SMTP
+    FixedLine FL_SMTP
     {
-        Pos = MAP_APPFONT ( 6 , 76 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text[ en-US ] = "Outgoing server (SMTP) Settings";
+        Pos = MAP_APPFONT ( 6, 76 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
+        Text[ en-US ] = "Outgoing server (SMTP) Settings" ;
     };
-    FixedText       FT_SERVER
+    FixedText FT_SERVER
     {
-        Pos = MAP_APPFONT ( 12 , 89 ) ;
-        Size = MAP_APPFONT ( 74 , 8 ) ;
-        Text[ en-US ] = "~Server name";
+        Pos = MAP_APPFONT ( 12, 89 ) ;
+        Size = MAP_APPFONT ( 74, 8 ) ;
+        Text[ en-US ] = "~Server name" ;
     };
     Edit ED_SERVER
     {
-        HelpID = "sw:Edit:TP_MAILCONFIG:ED_SERVER";
-        Pos = MAP_APPFONT ( 88 , 87 ) ;
-        Size = MAP_APPFONT ( 105 , 12 ) ;
+        HelpID = "sw:Edit:TP_MAILCONFIG:ED_SERVER" ;
+        Pos = MAP_APPFONT ( 88, 87 ) ;
+        Size = MAP_APPFONT ( 105, 12 ) ;
         Border = TRUE;
     };
-    FixedText       FT_PORT
+    FixedText FT_PORT
     {
-        Pos = MAP_APPFONT ( 197 , 89 ) ;
-        Size = MAP_APPFONT ( 24 , 8 ) ;
+        Pos = MAP_APPFONT ( 197, 89 ) ;
+        Size = MAP_APPFONT ( 24, 8 ) ;
         Right = TRUE;
-        Text[ en-US ] = "~Port";
+        Text[ en-US ] = "~Port" ;
     };
-    NumericField    NF_PORT
+    NumericField NF_PORT
     {
-        HelpID = "sw:NumericField:TP_MAILCONFIG:NF_PORT";
-        Pos = MAP_APPFONT ( 223 , 87 ) ;
-        Size = MAP_APPFONT ( 25 , 12 ) ;
+        HelpID = "sw:NumericField:TP_MAILCONFIG:NF_PORT" ;
+        Pos = MAP_APPFONT ( 223, 87 ) ;
+        Size = MAP_APPFONT ( 25, 12 ) ;
         Border = TRUE;
         Left = TRUE ;
         First = 1 ;
@@ -127,31 +127,31 @@ TabPage TP_MAILCONFIG
         Spin = FALSE ;
         TabStop = TRUE ;
     };
-    CheckBox        CB_SECURE
+    CheckBox CB_SECURE
     {
-        HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_SECURE";
-        Pos = MAP_APPFONT ( 12 , 104 ) ;
-        Size = MAP_APPFONT ( 242 , 10 ) ;
-        Text[ en-US ] = "~Use secure connection (SSL)";
+        HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_SECURE" ;
+        Pos = MAP_APPFONT ( 12, 104 ) ;
+        Size = MAP_APPFONT ( 242, 10 ) ;
+        Text[ en-US ] = "~Use secure connection (SSL)" ;
     };
     PushButton PB_AUTHENTICATION
     {
-        HelpID = "sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION";
-        Pos = MAP_APPFONT ( 88 , 118 ) ;
-        Size = MAP_APPFONT ( 105 , 14 ) ;
-        Text[ en-US ] = "Server Au~thentication";
+        HelpID = "sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION" ;
+        Pos = MAP_APPFONT ( 88, 118 ) ;
+        Size = MAP_APPFONT ( 105, 14 ) ;
+        Text[ en-US ] = "Server Au~thentication" ;
     };
     FixedLine FL_SEPARATOR
     {
-        Pos = MAP_APPFONT ( 6 , 156 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 156 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
     };
-    PushButton      PB_TEST
+    PushButton PB_TEST
     {
-        HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST";
-        Pos = MAP_APPFONT ( 88 , 164 ) ;
-        Size = MAP_APPFONT ( 105 , 14 ) ;
-        Text[ en-US ] = "Test S~ettings...";
+        HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST" ;
+        Pos = MAP_APPFONT ( 88, 164 ) ;
+        Size = MAP_APPFONT ( 105, 14 ) ;
+        Text[ en-US ] = "Test S~ettings..." ;
     };
 };
 ModalDialog DLG_MM_TESTACCOUNTSETTINGS
@@ -159,107 +159,105 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS
     OutputSize = TRUE ;
     SVLook = TRUE ;
     HelpID = HID_MM_TESTACCOUNTSETTINGS;
-    Size = MAP_APPFONT ( 250 , 176 ) ;
+    Size = MAP_APPFONT ( 250, 176 ) ;
     Moveable = TRUE ;
 
-    Text[ en-US ] = "Test Account Settings";
+    Text[ en-US ] = "Test Account Settings" ;
 
     FixedText FI_INFO
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 238 , 8 ) ;
-        Text[ en-US ] = "%PRODUCTNAME is testing the e-mail account settings...";
+        Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 238, 8 ) ;
+        Text[ en-US ] = "%PRODUCTNAME is testing the e-mail account settings..." ;
     };
-    Control        LB_STATUS
+    Control LB_STATUS
     {
         Pos = MAP_APPFONT ( 6, 14 ) ;
-        Size = MAP_APPFONT ( 238 , 50 ) ;
+        Size = MAP_APPFONT ( 238, 50 ) ;
         Border = TRUE;
     };
-    FixedText           FI_ERROR
+    FixedText FI_ERROR
     {
-        Pos = MAP_APPFONT ( 6 , 68 ) ;
-        Size = MAP_APPFONT ( 238 , 8 ) ;
-        Text[ en-US ] = "Errors";
+        Pos = MAP_APPFONT ( 6, 68 ) ;
+        Size = MAP_APPFONT ( 238, 8 ) ;
+        Text[ en-US ] = "Errors" ;
     };
-    MultiLineEdit       ED_ERROR
+    MultiLineEdit ED_ERROR
     {
-        HelpID = "sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR";
-        Pos = MAP_APPFONT ( 6 , 79 ) ;
-        Size = MAP_APPFONT ( 238 , 60 ) ;
+        HelpID = "sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR" ;
+        Pos = MAP_APPFONT ( 6, 79 ) ;
+        Size = MAP_APPFONT ( 238, 60 ) ;
         Border = TRUE;
         Readonly = TRUE;
     };
-    FixedLine   FL_SEPAPARATOR
+    FixedLine FL_SEPAPARATOR
     {
-        Pos = MAP_APPFONT ( 0 , 145 ) ;
-        Size = MAP_APPFONT ( 250 , 8 ) ;
+        Pos = MAP_APPFONT ( 0, 145 ) ;
+        Size = MAP_APPFONT ( 250, 8 ) ;
     };
-    PushButton          PB_STOP
+    PushButton PB_STOP
     {
-        HelpID = "sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP";
-        Pos = MAP_APPFONT ( 85 , 156 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text[ en-US ] = "~Stop";
+        HelpID = "sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP" ;
+        Pos = MAP_APPFONT ( 85, 156 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
+        Text[ en-US ] = "~Stop" ;
     };
-    CancelButton        PB_CANCEL
+    CancelButton PB_CANCEL
     {
-        Pos = MAP_APPFONT ( 138 , 156 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 138, 156 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
-    HelpButton          PB_HELP
+    HelpButton PB_HELP
     {
-        Pos = MAP_APPFONT ( 194 , 156 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 194, 156 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
     #define IMGLIST_IDS\
         IdList = \
         { \
-            FN_FORMULA_CANCEL ;\
-            FN_FORMULA_APPLY     ;\
+            FN_FORMULA_CANCEL   ;\
+            FN_FORMULA_APPLY    ;\
         }; \
         IdCount = 2
 
     ImageList ILIST
     {
-        Prefix = "sc";
-        MaskColor = IMAGE_MASK_COLOR;
+        Prefix = "sc" ;
         IMGLIST_IDS;
     };
 
     ImageList ILIST_HC
     {
-        Prefix = "sch";
-        MaskColor = IMAGE_MASK_COLOR ;
+        Prefix = "sch" ;
         IMGLIST_IDS;
     };
     String ST_TASK
     {
-        Text[ en-US ] = "Task";
+        Text[ en-US ] = "Task" ;
     };
     String ST_STATUS
     {
-        Text[ en-US ] = "Status";
+        Text[ en-US ] = "Status" ;
     };
     String ST_ESTABLISH
     {
-        Text[ en-US ] = "Establish network connection";
+        Text[ en-US ] = "Establish network connection" ;
     };
     String ST_FINDSERVER
     {
-        Text[ en-US ] = "Find outgoing mail server";
+        Text[ en-US ] = "Find outgoing mail server" ;
     };
     String ST_COMPLETED
     {
-        Text[ en-US ] = "Successful";
+        Text[ en-US ] = "Successful" ;
     };
     String ST_FAILED
     {
-        Text[ en-US ] = "Failed";
+        Text[ en-US ] = "Failed" ;
     };
     String ST_ERROR_SERVER
     {
-        Text[ en-US ] = "%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings";
+        Text[ en-US ] = "%PRODUCTNAME could not connect to the outgoing mail server. Check your system's settings and the settings in %PRODUCTNAME. Check the server name, the port and the secure connections settings" ;
     };
 
 };
@@ -268,97 +266,97 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     OutputSize = TRUE ;
     SVLook = TRUE ;
     HelpID = HID_MM_SERVERAUTHENTICATION;
-    Size = MAP_APPFONT ( 250 , 211 ) ;
+    Size = MAP_APPFONT ( 250, 211 ) ;
     Moveable = TRUE ;
 
-    Text[ en-US ] = "Server Authentication";
+    Text[ en-US ] = "Server Authentication" ;
 
-    CheckBox        CB_AUTHENTICATION
+    CheckBox CB_AUTHENTICATION
     {
-        HelpID = "sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION";
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 238 , 10 ) ;
-        Text[ en-US ] = "The outgoing mail server (SMTP) requires au~thentication";
+        HelpID = "sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION" ;
+        Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 238, 10 ) ;
+        Text[ en-US ] = "The outgoing mail server (SMTP) requires au~thentication" ;
     };
     RadioButton RB_SEP_AUTHENTICATION
     {
-        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION";
-        Pos = MAP_APPFONT ( 12 , 17 ) ;
-        Size = MAP_APPFONT ( 232 , 10 ) ;
-        Text[ en-US ] = "The outgoing mail server (SMTP) requires ~separate authentication";
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION" ;
+        Pos = MAP_APPFONT ( 12, 17 ) ;
+        Size = MAP_APPFONT ( 232, 10 ) ;
+        Text[ en-US ] = "The outgoing mail server (SMTP) requires ~separate authentication" ;
     };
     FixedText FT_OUTGOINGSERVER
     {
-        Pos = MAP_APPFONT ( 18 , 31 ) ;
-        Size = MAP_APPFONT ( 200 , 8 ) ;
-        Text[ en-US ] = "Outgoing mail server:";
+        Pos = MAP_APPFONT ( 18, 31 ) ;
+        Size = MAP_APPFONT ( 200, 8 ) ;
+        Text[ en-US ] = "Outgoing mail server:" ;
     };
-    FixedText       FT_USERNAME
+    FixedText FT_USERNAME
     {
-        Pos = MAP_APPFONT ( 18 , 44 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text[ en-US ] = "~User name";
+        Pos = MAP_APPFONT ( 18, 44 ) ;
+        Size = MAP_APPFONT ( 53, 8 ) ;
+        Text[ en-US ] = "~User name" ;
     };
-    Edit  ED_USERNAME
+    Edit ED_USERNAME
     {
-        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME";
-        Pos = MAP_APPFONT ( 78 , 42 ) ;
-        Size = MAP_APPFONT ( 115 , 12 ) ;
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME" ;
+        Pos = MAP_APPFONT ( 78, 42 ) ;
+        Size = MAP_APPFONT ( 115, 12 ) ;
         Border = TRUE;
     };
-    FixedText       FT_OUTPASSWORD
+    FixedText FT_OUTPASSWORD
     {
-        Pos = MAP_APPFONT ( 18 , 59 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text[ en-US ] = "~Password";
+        Pos = MAP_APPFONT ( 18, 59 ) ;
+        Size = MAP_APPFONT ( 53, 8 ) ;
+        Text[ en-US ] = "~Password" ;
     };
-    Edit  ED_OUTPASSWORD
+    Edit ED_OUTPASSWORD
     {
-        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD";
-        Pos = MAP_APPFONT ( 78 , 57 ) ;
-        Size = MAP_APPFONT ( 115 , 12 ) ;
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD" ;
+        Pos = MAP_APPFONT ( 78, 57 ) ;
+        Size = MAP_APPFONT ( 115, 12 ) ;
         Border = TRUE;
         PassWord = TRUE;
     };
     RadioButton RB_SMPTAFTERPOP
     {
-        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP";
-        Pos = MAP_APPFONT ( 12 , 73 ) ;
-        Size = MAP_APPFONT ( 232 , 20 ) ;
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP" ;
+        Pos = MAP_APPFONT ( 12, 73 ) ;
+        Size = MAP_APPFONT ( 232, 20 ) ;
         WordBreak = TRUE;
-        Text[ en-US ] = "The outgoing mail server uses the same authentication as the ~incoming mail server. Enter the settings of the incoming mail server.";
+        Text[ en-US ] = "The outgoing mail server uses the same authentication as the ~incoming mail server. Enter the settings of the incoming mail server." ;
     };
     FixedText FT_INCOMINGSERVER
     {
-        Pos = MAP_APPFONT ( 18 ,  97 ) ;
-        Size = MAP_APPFONT ( 230 , 8 ) ;
-        Text[ en-US ] = "Incoming mail server:";
+        Pos = MAP_APPFONT ( 18, 97 ) ;
+        Size = MAP_APPFONT ( 230, 8 ) ;
+        Text[ en-US ] = "Incoming mail server:" ;
     };
     FixedText FT_SERVER
     {
-        Pos = MAP_APPFONT ( 18 , 110 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text[ en-US ] = "Server ~name";
+        Pos = MAP_APPFONT ( 18, 110 ) ;
+        Size = MAP_APPFONT ( 53, 8 ) ;
+        Text[ en-US ] = "Server ~name" ;
     };
-    Edit  ED_SERVER
+    Edit ED_SERVER
     {
-        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER";
-        Pos = MAP_APPFONT ( 78 , 108 ) ;
-        Size = MAP_APPFONT ( 115 , 12 ) ;
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER" ;
+        Pos = MAP_APPFONT ( 78, 108 ) ;
+        Size = MAP_APPFONT ( 115, 12 ) ;
         Border = TRUE;
     };
     FixedText FT_PORT
     {
-        Pos = MAP_APPFONT ( 195 , 110 ) ;
-        Size = MAP_APPFONT ( 20 , 10 ) ;
+        Pos = MAP_APPFONT ( 195, 110 ) ;
+        Size = MAP_APPFONT ( 20, 10 ) ;
         Right = TRUE;
-        Text[ en-US ] = "P~ort";
+        Text[ en-US ] = "P~ort" ;
     };
     NumericField NF_PORT
     {
-        HelpID = "sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT";
-        Pos = MAP_APPFONT ( 219 , 108 ) ;
-        Size = MAP_APPFONT ( 25 , 12 ) ;
+        HelpID = "sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT" ;
+        Pos = MAP_APPFONT ( 219, 108 ) ;
+        Size = MAP_APPFONT ( 25, 12 ) ;
         Border = TRUE;
         Left = TRUE ;
         First = 1 ;
@@ -370,70 +368,69 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION
     };
     FixedText FT_PROTOCOL
     {
-        Pos = MAP_APPFONT ( 18 , 126 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text[ en-US ] = "Type";
+        Pos = MAP_APPFONT ( 18, 126 ) ;
+        Size = MAP_APPFONT ( 53, 8 ) ;
+        Text[ en-US ] = "Type" ;
     };
     RadioButton RB_POP3
     {
-        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3";
-        Pos = MAP_APPFONT ( 78 , 125 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text[ en-US ] = "~POP 3";
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3" ;
+        Pos = MAP_APPFONT ( 78, 125 ) ;
+        Size = MAP_APPFONT ( 115, 10 ) ;
+        Text[ en-US ] = "~POP3" ;
     };
     RadioButton RB_IMAP
     {
-        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP";
-        Pos = MAP_APPFONT ( 78 , 138 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text[ en-US ] = "~IMAP";
+        HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP" ;
+        Pos = MAP_APPFONT ( 78, 138 ) ;
+        Size = MAP_APPFONT ( 115, 10 ) ;
+        Text[ en-US ] = "~IMAP" ;
     };
     FixedText FT_INUSERNAME
     {
-        Pos = MAP_APPFONT ( 18 , 152 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text[ en-US ] = "Us~er name";
+        Pos = MAP_APPFONT ( 18, 152 ) ;
+        Size = MAP_APPFONT ( 53, 8 ) ;
+        Text[ en-US ] = "Us~er name" ;
     };
     Edit ED_INUSERNAME
     {
-        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME";
-        Pos = MAP_APPFONT ( 78 , 150 ) ;
-        Size = MAP_APPFONT ( 115 , 12 ) ;
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME" ;
+        Pos = MAP_APPFONT ( 78, 150 ) ;
+        Size = MAP_APPFONT ( 115, 12 ) ;
         Border = TRUE;
     };
     FixedText FT_INPASSWORD
     {
-        Pos = MAP_APPFONT ( 18 , 167 ) ;
-        Size = MAP_APPFONT ( 53 , 8 ) ;
-        Text[ en-US ] = "Pass~word";
+        Pos = MAP_APPFONT ( 18, 167 ) ;
+        Size = MAP_APPFONT ( 53, 8 ) ;
+        Text[ en-US ] = "Pass~word" ;
     };
     Edit ED_INPASSWORD
     {
-        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD";
-        Pos = MAP_APPFONT ( 78 , 165 ) ;
-        Size = MAP_APPFONT ( 115 , 12 ) ;
+        HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD" ;
+        Pos = MAP_APPFONT ( 78, 165 ) ;
+        Size = MAP_APPFONT ( 115, 12 ) ;
         Border = TRUE;
         PassWord = TRUE;
     };
     FixedLine FL_SEPARATOR
     {
-        Pos = MAP_APPFONT ( 0 , 183 ) ;
-        Size = MAP_APPFONT ( 250 , 8 ) ;
+        Pos = MAP_APPFONT ( 0, 183 ) ;
+        Size = MAP_APPFONT ( 250, 8 ) ;
     };
     OKButton PB_OK
     {
-        Pos = MAP_APPFONT ( 85 , 191 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 85, 191 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
     CancelButton PB_CANCEL
     {
-        Pos = MAP_APPFONT ( 138 , 191 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 138, 191 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
     HelpButton PB_HELP
     {
-        Pos = MAP_APPFONT ( 194 , 191 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
+        Pos = MAP_APPFONT ( 194, 191 ) ;
+        Size = MAP_APPFONT ( 50, 14 ) ;
     };
 };
-
diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src
index 8d7abbef25cb..5cb6c9d53618 100644
--- a/sw/source/ui/frmdlg/wrap.src
+++ b/sw/source/ui/frmdlg/wrap.src
@@ -25,69 +25,70 @@
 #include "wrap.hrc"
 #include "globals.hrc"
 #include "helpid.h"
+
 TabPage TP_FRM_WRAP
 {
     SVLook = TRUE ;
     HelpID = HID_FRM_EXT ;
-    Pos = MAP_APPFONT ( 0 , 0 ) ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Pos = MAP_APPFONT ( 0, 0 ) ;
+    Size = MAP_APPFONT ( 260, 185 ) ;
     Hide = TRUE;
     FixedLine C_WRAP_FL
     {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Text [ en-US ] = "Settings";
+        Pos = MAP_APPFONT ( 6, 3 ) ;
+        Size = MAP_APPFONT ( 248, 8 ) ;
+        Text [ en-US ] = "Settings" ;
     };
     ImageRadioButton RB_NO_WRAP
     {
-        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP";
-        Pos = MAP_APPFONT ( 6 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP" ;
+        Pos = MAP_APPFONT ( 6, 14 ) ;
+        Size = MAP_APPFONT ( 40, 37 ) ;
         WordBreak = TRUE;
         Text [ en-US ] = "~None" ;
         TopImage = True ;
     };
     ImageRadioButton RB_WRAP_LEFT
     {
-        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT";
-        Pos = MAP_APPFONT ( 65 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT" ;
+        Pos = MAP_APPFONT ( 65, 14 ) ;
+        Size = MAP_APPFONT ( 40, 37 ) ;
         WordBreak = TRUE;
         TopImage = True ;
         Text [ en-US ] = "Before" ;
     };
     ImageRadioButton RB_WRAP_RIGHT
     {
-        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT";
-        Pos = MAP_APPFONT ( 121 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT" ;
+        Pos = MAP_APPFONT ( 121, 14 ) ;
+        Size = MAP_APPFONT ( 40, 37 ) ;
         WordBreak = TRUE;
         TopImage = True ;
         Text [ en-US ] = "After" ;
     };
     ImageRadioButton RB_WRAP_PARALLEL
     {
-        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL";
-        Pos = MAP_APPFONT ( 177 , 14 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL" ;
+        Pos = MAP_APPFONT ( 177, 14 ) ;
+        Size = MAP_APPFONT ( 40, 37 ) ;
         WordBreak = TRUE;
         Text [ en-US ] = "~Parallel" ;
         TopImage = True ;
     };
     ImageRadioButton RB_WRAP_THROUGH
     {
-        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH";
-        Pos = MAP_APPFONT ( 6 , 57 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH" ;
+        Pos = MAP_APPFONT ( 6, 57 ) ;
+        Size = MAP_APPFONT ( 40, 37 ) ;
         WordBreak = TRUE;
         Text [ en-US ] = "Thro~ugh" ;
         TopImage = True ;
     };
     ImageRadioButton RB_WRAP_IDEAL
     {
-        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL";
-        Pos = MAP_APPFONT ( 65 , 57 ) ;
-        Size = MAP_APPFONT ( 40 , 37 ) ;
+        HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL" ;
+        Pos = MAP_APPFONT ( 65, 57 ) ;
+        Size = MAP_APPFONT ( 40, 37 ) ;
         WordBreak = TRUE;
         TopImage = True ;
         Text [ en-US ] = "~Optimal" ;
@@ -95,59 +96,59 @@ TabPage TP_FRM_WRAP
 
     CheckBox CB_ANCHOR_ONLY
     {
-        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY";
-        Pos = MAP_APPFONT ( 139 , 111 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY" ;
+        Pos = MAP_APPFONT ( 139, 111 ) ;
+        Size = MAP_APPFONT ( 109, 10 ) ;
         Text [ en-US ] = "~First paragraph" ;
     };
     CheckBox CB_TRANSPARENT
     {
-        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT";
-        Pos = MAP_APPFONT ( 139 , 125 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT" ;
+        Pos = MAP_APPFONT ( 139, 125 ) ;
+        Size = MAP_APPFONT ( 109, 10 ) ;
         Text [ en-US ] = "In bac~kground" ;
     };
     CheckBox CB_OUTLINE
     {
-        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE";
-        Pos = MAP_APPFONT ( 139 , 139 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE" ;
+        Pos = MAP_APPFONT ( 139, 139 ) ;
+        Size = MAP_APPFONT ( 109, 10 ) ;
         Hide = TRUE ;
         Text [ en-US ] = "~Contour" ;
     };
     CheckBox CB_ONLYOUTSIDE
     {
-        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE";
-        Pos = MAP_APPFONT ( 139 , 153 ) ;
-        Size = MAP_APPFONT ( 109 , 10 ) ;
+        HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE" ;
+        Pos = MAP_APPFONT ( 139, 153 ) ;
+        Size = MAP_APPFONT ( 109, 10 ) ;
         Hide = TRUE ;
         Text [ en-US ] = "Outside only" ;
     };
     FixedLine FL_OPTION
     {
-        Pos = MAP_APPFONT ( 133 , 100 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
+        Pos = MAP_APPFONT ( 133, 100 ) ;
+        Size = MAP_APPFONT ( 121, 8 ) ;
         Text [ en-US ] = "Options" ;
     };
     FixedLine FL_OPTION_SEP
     {
-        Pos = MAP_APPFONT ( 128 , 111 ) ;
-        Size = MAP_APPFONT ( 4 , 60 ) ;
+        Pos = MAP_APPFONT ( 128, 111 ) ;
+        Size = MAP_APPFONT ( 4, 60 ) ;
         Vert = TRUE;
     };
     FixedText FT_LEFT_MARGIN
     {
-        Pos = MAP_APPFONT ( 12 , 113 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 113 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
         Text [ en-US ] = "L~eft" ;
         Left = TRUE ;
     };
     MetricField ED_LEFT_MARGIN
     {
-        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN";
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 111 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Pos = MAP_APPFONT ( 81, 111 ) ;
+        Size = MAP_APPFONT ( 40, 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -160,17 +161,17 @@ TabPage TP_FRM_WRAP
     };
     FixedText FT_RIGHT_MARGIN
     {
-        Pos = MAP_APPFONT ( 12 , 129 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 129 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
         Text [ en-US ] = "~Right" ;
         Left = TRUE ;
     };
     MetricField ED_RIGHT_MARGIN
     {
-        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN";
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 127 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Pos = MAP_APPFONT ( 81, 127 ) ;
+        Size = MAP_APPFONT ( 40, 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -183,17 +184,17 @@ TabPage TP_FRM_WRAP
     };
     FixedText FT_TOP_MARGIN
     {
-        Pos = MAP_APPFONT ( 12 , 145 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 145 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
         Text [ en-US ] = "~Top" ;
         Left = TRUE ;
     };
     MetricField ED_TOP_MARGIN
     {
-        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN";
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 143 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Pos = MAP_APPFONT ( 81, 143 ) ;
+        Size = MAP_APPFONT ( 40, 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -206,17 +207,17 @@ TabPage TP_FRM_WRAP
     };
     FixedText FT_BOTTOM_MARGIN
     {
-        Pos = MAP_APPFONT ( 12 , 161 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
+        Pos = MAP_APPFONT ( 12, 161 ) ;
+        Size = MAP_APPFONT ( 60, 8 ) ;
         Text [ en-US ] = "~Bottom" ;
         Left = TRUE ;
     };
     MetricField ED_BOTTOM_MARGIN
     {
-        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN";
+        HelpID = "sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN" ;
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 81 , 159 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
+        Pos = MAP_APPFONT ( 81, 159 ) ;
+        Size = MAP_APPFONT ( 40, 12 ) ;
         TabStop = TRUE ;
         Left = TRUE ;
         Repeat = TRUE ;
@@ -229,39 +230,35 @@ TabPage TP_FRM_WRAP
     };
     FixedLine FL_MARGIN
     {
-        Pos = MAP_APPFONT ( 6 , 100 ) ;
-        Size = MAP_APPFONT ( 121 , 8 ) ;
+        Pos = MAP_APPFONT ( 6, 100 ) ;
+        Size = MAP_APPFONT ( 121, 8 ) ;
         Text [ en-US ] = "Spacing" ;
     };
-#define WRAP_IDLIST \
-        IdList =            \
-        {                   \
-            IMG_NONE ;      \
-            IMG_LEFT ;      \
-            IMG_RIGHT ;     \
-            IMG_PARALLEL ;  \
-            IMG_THROUGH ;   \
-            IMG_IDEAL ;     \
-            IMG_KON_NONE ;  \
-            IMG_KON_LEFT ;  \
-            IMG_KON_RIGHT ; \
-            IMG_KON_PARALLEL ;\
-            IMG_KON_IDEAL ;\
-        };                 \
-        IdCount = { 11 ; };
+#define WRAP_IDLIST         \
+    IdList =            \
+    {               \
+        IMG_NONE ;      \
+        IMG_LEFT ;      \
+        IMG_RIGHT ;     \
+        IMG_PARALLEL ;      \
+        IMG_THROUGH ;       \
+        IMG_IDEAL ;     \
+        IMG_KON_NONE ;      \
+        IMG_KON_LEFT ;      \
+        IMG_KON_RIGHT ;     \
+        IMG_KON_PARALLEL;   \
+        IMG_KON_IDEAL ;     \
+    };              \
+    IdCount = { 11 ; };
 
     ImageList IL_WRAP
     {
-        Prefix = "wr";
-        MaskColor = IMAGE_MASK_COLOR ;
+        Prefix = "wr" ;
         WRAP_IDLIST
     };
     ImageList ILH_WRAP
     {
-        Prefix = "wrh";
-        MaskColor = IMAGE_MASK_COLOR ;
+        Prefix = "wrh" ;
         WRAP_IDLIST
     };
-
 };
-


More information about the Libreoffice-commits mailing list