fdo#47957 refactoring and simplifying the color config settings

Change-Id: I508aeee3176caea7e61ba95198233f14d3528de1

cui/source/options/optcolor.hrc

@@ -15,8 +15,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_OPTCOLOR_HRC
-#define _SVX_OPTCOLOR_HRC
+#ifndef SVX_OPTCOLOR_HRC // Note: _SVX_OPTCOLOR_HRC would be undefined behaviour
+#define SVX_OPTCOLOR_HRC
 
 //Color config page
 #define FL_COLORSCHEME      1
@@ -188,18 +188,20 @@
 
 
 
-#define _FT_WIDTH               120
-#define _LINE_HEIGHT            15
-#define _FT_HEIGHT              10
-#define _CB_WIDTH               130
-#define _FT_XPOS                14
-#define _CB_XPOS                6
-#define _LB_XPOS                139
-#define _LB_WIDTH               50
-#define _LB_HEIGHT              50
-#define _WN_WIDTH               30
-#define _WN_HEIGHT              12
-#define _WN_XPOS                195
+// Note: _FT_WIDTH etc. would be undefined behaviour
+#define FT_WIDTH                120
+#define LINE_HEIGHT             15
+#define FT_HEIGHT               10
+#define CB_WIDTH                130
+#define FT_XPOS                 14
+#define CB_XPOS                 5
+#define LB_XPOS                 139
+#define LB_WIDTH                50
+#define LB_HEIGHT               50
+#define WN_WIDTH                30
+#define WN_HEIGHT               12
+#define WN_XPOS                 195
+#define SEP_HEIGHT              8
 
 #define FT_SMARTTAGS                    168
 #define LB_SMARTTAGS                    169

cui/source/options/optcolor.hxx

@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SVX_OPTCOLOR_HXX
-#define _SVX_OPTCOLOR_HXX
+#ifndef SVX_OPTCOLOR_HXX
+#define SVX_OPTCOLOR_HXX
 
 // include ---------------------------------------------------------------
 

cui/source/options/optcolor.src

@@ -113,21 +113,21 @@ TabPage RID_SVXPAGE_COLORCONFIG
 
 // misc defines to shorten defining of standard elements
 // standard sizes
-#define FT_SEP_SIZE                     Size = MAP_APPFONT ( _FT_WIDTH , 8 )
-#define FT_SIZE                         Size = MAP_APPFONT ( _FT_WIDTH , _FT_HEIGHT )
-#define LB_SIZE                         Size = MAP_APPFONT ( _LB_WIDTH , _LB_HEIGHT )
-#define WN_SIZE                         Size = MAP_APPFONT ( _WN_WIDTH , _WN_HEIGHT )
-#define CB_SIZE                         Size = MAP_APPFONT ( _CB_WIDTH , _FT_HEIGHT )
+#define FT_SEP_SIZE                     Size = MAP_APPFONT ( FT_WIDTH , SEP_HEIGHT )
+#define FT_SIZE                         Size = MAP_APPFONT ( FT_WIDTH , FT_HEIGHT )
+#define LB_SIZE                         Size = MAP_APPFONT ( LB_WIDTH , LB_HEIGHT )
+#define WN_SIZE                         Size = MAP_APPFONT ( WN_WIDTH , WN_HEIGHT )
+#define CB_SIZE                         Size = MAP_APPFONT ( CB_WIDTH , FT_HEIGHT )
 
 // combination of position and size
-#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE )  Pos = MAP_APPFONT ( POSX , LINENUM * _LINE_HEIGHT ) ; CONTRL_SIZE
+#define POS_SIZE( POSX, LINENUM, CONTRL_SIZE )  Pos = MAP_APPFONT ( POSX , LINENUM * LINE_HEIGHT ) ; CONTRL_SIZE
 
 // ... for special types
-#define FT_SEP_POS_SIZE( LINENUM )      POS_SIZE( 0, LINENUM, FT_SEP_SIZE )
-#define FT_POS_SIZE( LINENUM )          POS_SIZE( _FT_XPOS, LINENUM, FT_SIZE )
-#define LB_POS_SIZE( LINENUM )          POS_SIZE( _LB_XPOS, LINENUM, LB_SIZE )
-#define WN_POS_SIZE( LINENUM )          POS_SIZE( _WN_XPOS, LINENUM, WN_SIZE )
-#define CB_POS_SIZE( LINENUM )          POS_SIZE( _CB_XPOS, LINENUM, CB_SIZE )
+#define FT_SEP_POS_SIZE( LINENUM )      POS_SIZE( FT_XPOS, LINENUM, FT_SEP_SIZE )
+#define FT_POS_SIZE( LINENUM )          POS_SIZE( FT_XPOS, LINENUM, FT_SIZE )
+#define LB_POS_SIZE( LINENUM )          POS_SIZE( LB_XPOS, LINENUM, LB_SIZE )
+#define WN_POS_SIZE( LINENUM )          POS_SIZE( WN_XPOS, LINENUM, WN_SIZE )
+#define CB_POS_SIZE( LINENUM )          POS_SIZE( CB_XPOS, LINENUM, CB_SIZE )
 
 // combination of a listbox (color chooser) and window (color preview)
 #define LB_WN( ID_POST, LINENUM )       ListBox LB_#ID_POST{LB_POS_SIZE(LINENUM);DropDown=TRUE;};Window WN_#ID_POST{WN_POS_SIZE(LINENUM);Border=TRUE;};