Header/Footer: moved the decorator color to the options

4 files changed, 100 insertions, 77 deletions

diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index dff73253b086..e0415de30ef7 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -104,6 +104,7 @@
 #define HID_COLORPAGE_WRITERNOTESINDICATOR_LB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB"
 #define HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB"
 #define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB"
+#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB"
 #define HID_COLORPAGE_WRITERPAGEBREAKS_LB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB"
 #define HID_COLORPAGE_HTMLSGML_LB "CUI_HID_COLORPAGE_HTMLSGML_LB"
 #define HID_COLORPAGE_HTMLCOMMENT_LB "CUI_HID_COLORPAGE_HTMLCOMMENT_LB"
@@ -145,6 +146,7 @@
 #define HID_COLORPAGE_WRITERNOTESINDICATOR_CB "CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_CB"
 #define HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB "CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB"
 #define HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB "CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB"
+#define HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB "CUI_HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB"
 #define HID_COLORPAGE_WRITERPAGEBREAKS_CB "CUI_HID_COLORPAGE_WRITERPAGEBREAKS_CB"
 #define HID_COLORPAGE_HTMLSGML_CB "CUI_HID_COLORPAGE_HTMLSGML_CB"
 #define HID_COLORPAGE_HTMLCOMMENT_CB "CUI_HID_COLORPAGE_HTMLCOMMENT_CB"
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 3fda1758996a..7199c229ec1e 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -77,6 +77,7 @@ const char* aColorLBHids[] =
      HID_COLORPAGE_WRITERNOTESINDICATOR_LB,
      HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB,
      HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB,
+     HID_COLORPAGE_WRITERHEADERFOOTERMARK_LB,
      HID_COLORPAGE_WRITERPAGEBREAKS_LB,
      HID_COLORPAGE_HTMLSGML_LB,
      HID_COLORPAGE_HTMLCOMMENT_LB,
@@ -121,6 +122,7 @@ const char* aColorCBHids[] =
      HID_COLORPAGE_WRITERNOTESINDICATOR_CB,
      HID_COLORPAGE_WRITERSCRIPTINDICATOR_CB,
      HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB,
+     HID_COLORPAGE_WRITERHEADERFOOTERMARK_CB,
      HID_COLORPAGE_WRITERPAGEBREAKS_CB,
      HID_COLORPAGE_HTMLSGML_CB,
      HID_COLORPAGE_HTMLCOMMENT_CB,
@@ -218,6 +220,9 @@ class ColorConfigWindow_Impl : public Window
     CheckBox        aWrtSectionBoundCB;
     ColorListBox    aWrtSectionBoundLB;
     Window          aWrtSectionBoundWN;
+    FixedText       aWrtHeaderFooterMarkFT;
+    ColorListBox    aWrtHeaderFooterMarkLB;
+    Window          aWrtHeaderFooterMarkWN;
     FixedText       aWrtPageBreaksFT;
     ColorListBox    aWrtPageBreaksLB;
     Window          aWrtPageBreaksWN;
@@ -524,6 +529,9 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
         aWrtSectionBoundCB(this, ResId(      CB_WRITERSECTIONBOUNDARIES, *rResId.GetResMgr())),
         aWrtSectionBoundLB(this, ResId(      LB_WRITERSECTIONBOUNDARIES, *rResId.GetResMgr())),
         aWrtSectionBoundWN(this, ResId(      WN_WRITERSECTIONBOUNDARIES, *rResId.GetResMgr())),
+        aWrtHeaderFooterMarkFT(this, ResId(      FT_WRITERHEADERFOOTERMARK, *rResId.GetResMgr())),
+        aWrtHeaderFooterMarkLB(this, ResId(      LB_WRITERHEADERFOOTERMARK, *rResId.GetResMgr())),
+        aWrtHeaderFooterMarkWN(this, ResId(      WN_WRITERHEADERFOOTERMARK, *rResId.GetResMgr())),
         aWrtPageBreaksFT(this, ResId(      FT_WRITERPAGEBREAKS, *rResId.GetResMgr())),
         aWrtPageBreaksLB(this, ResId(      LB_WRITERPAGEBREAKS, *rResId.GetResMgr())),
         aWrtPageBreaksWN(this, ResId(      WN_WRITERPAGEBREAKS, *rResId.GetResMgr())),
@@ -664,6 +672,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aFixedTexts[CALCREFERENCE    ]=& aCalcReferenceFT;
     aFixedTexts[CALCNOTESBACKGROUND  ]=& aCalcNotesBackFT;
     aFixedTexts[WRITERPAGEBREAKS] = &aWrtPageBreaksFT;
+    aFixedTexts[WRITERHEADERFOOTERMARK] = &aWrtHeaderFooterMarkFT;
     aFixedTexts[DRAWGRID            ] = &aDrawGridFT             ;
     aFixedTexts[BASICIDENTIFIER ] = &aBasicIdentifierFT;
     aFixedTexts[BASICCOMMENT    ] = &aBasicCommentFT;
@@ -698,6 +707,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aColorBoxes[WRITERSCRIPTINDICATOR    ] = &aWrtScriptIndicatorLB           ;
     aColorBoxes[WRITERSECTIONBOUNDARIES  ] = &aWrtSectionBoundLB           ;
     aColorBoxes[WRITERPAGEBREAKS] = &aWrtPageBreaksLB;
+    aColorBoxes[WRITERHEADERFOOTERMARK] = &aWrtHeaderFooterMarkLB;
     aColorBoxes[HTMLSGML            ] = &aHTMLSGMLLB             ;
     aColorBoxes[HTMLCOMMENT         ] = &aHTMLCommentLB          ;
     aColorBoxes[HTMLKEYWORD         ] = &aHTMLKeywdLB            ;
@@ -744,6 +754,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
     aWindows[WRITERSCRIPTINDICATOR    ] = &aWrtScriptIndicatorWN           ;
     aWindows[WRITERSECTIONBOUNDARIES  ] = &aWrtSectionBoundWN           ;
     aWindows[WRITERPAGEBREAKS] = &aWrtPageBreaksWN;
+    aWindows[WRITERHEADERFOOTERMARK] = &aWrtHeaderFooterMarkWN;
     aWindows[HTMLSGML            ] = &aHTMLSGMLWN             ;
     aWindows[HTMLCOMMENT         ] = &aHTMLCommentWN          ;
     aWindows[HTMLKEYWORD         ] = &aHTMLKeywdWN            ;
diff --git a/cui/source/options/optcolor.hrc b/cui/source/options/optcolor.hrc
index 3b96231d71d6..c0aedb12e4fe 100644
--- a/cui/source/options/optcolor.hrc
+++ b/cui/source/options/optcolor.hrc
@@ -96,20 +96,23 @@
 #define LB_WRITERPAGEBREAKS         83
 #define FT_WRITERPAGEBREAKS         84
 #define WN_WRITERPAGEBREAKS         85
-
-#define FT_HTML                     88
-#define FT_HTMLSGML                 89
-#define LB_HTMLSGML                 90
-#define WN_HTMLSGML                 91
-#define FT_HTMLCOMMENT              92
-#define LB_HTMLCOMMENT              93
-#define WN_HTMLCOMMENT              94
-#define FT_HTMLKEYWORD              95
-#define LB_HTMLKEYWORD              96
-#define WN_HTMLKEYWORD              97
-#define FT_HTMLUNKNOWN              98
-#define LB_HTMLUNKNOWN              99
-#define WN_HTMLUNKNOWN             100
+#define LB_WRITERHEADERFOOTERMARK   86
+#define FT_WRITERHEADERFOOTERMARK   87
+#define WN_WRITERHEADERFOOTERMARK   88
+
+#define FT_HTML                     89
+#define FT_HTMLSGML                 90
+#define LB_HTMLSGML                 91
+#define WN_HTMLSGML                 92
+#define FT_HTMLCOMMENT              93
+#define LB_HTMLCOMMENT              94
+#define WN_HTMLCOMMENT              95
+#define FT_HTMLKEYWORD              96
+#define LB_HTMLKEYWORD              97
+#define WN_HTMLKEYWORD              98
+#define FT_HTMLUNKNOWN              99
+#define LB_HTMLUNKNOWN             100
+#define WN_HTMLUNKNOWN             101
 
 #define FT_CALC                    103
 #define FT_CALCGRID                104
diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src
index 201495f5c1fa..284be8a6ed1e 100644
--- a/cui/source/options/optcolor.src
+++ b/cui/source/options/optcolor.src
@@ -271,238 +271,245 @@ TabPage RID_SVXPAGE_COLORCONFIG
             };
             LB_WN( WRITERSECTIONBOUNDARIES, 17 )
 
-            FixedText FT_WRITERPAGEBREAKS
+            FixedText FT_WRITERHEADERFOOTERMARK
             {
                 FT_POS_SIZE( 18 );
+                Text [ en-US ] = "Headers and Footer delimiter";
+            };
+            LB_WN( WRITERHEADERFOOTERMARK, 18 )
+
+            FixedText FT_WRITERPAGEBREAKS
+            {
+                FT_POS_SIZE( 19 );
                 Text [ en-US ] = "Page and column breaks";
             };
-            LB_WN( WRITERPAGEBREAKS, 18 )
+            LB_WN( WRITERPAGEBREAKS, 19 )
 
             FixedText FT_WRITERDIRECTCURSOR
             {
-                FT_POS_SIZE( 19 );
+                FT_POS_SIZE( 20 );
                 Text [ en-US ] = "Direct cursor";
             };
-            LB_WN( WRITERDIRECTCURSOR, 19 )
+            LB_WN( WRITERDIRECTCURSOR, 20 )
 
             FixedText FT_HTML
             {
-                FT_SEP_POS_SIZE( 20 );
+                FT_SEP_POS_SIZE( 21 );
                 Text [ en-US ] = "HTML Document";
             };
 
             FixedText FT_HTMLSGML
             {
-                FT_POS_SIZE( 21 );
+                FT_POS_SIZE( 22 );
                 Text [ en-US ] = "SGML syntax highlighting";
             };
-            LB_WN( HTMLSGML, 21 )
+            LB_WN( HTMLSGML, 22 )
 
             FixedText FT_HTMLCOMMENT
             {
-                FT_POS_SIZE( 22 );
+                FT_POS_SIZE( 23 );
                 Text [ en-US ] = "Comment highlighting";
             };
-            LB_WN( HTMLCOMMENT, 22 )
+            LB_WN( HTMLCOMMENT, 23 )
 
             FixedText FT_HTMLKEYWORD
             {
-                FT_POS_SIZE( 23 );
+                FT_POS_SIZE( 24 );
                 Text [ en-US ] = "Keyword highlighting";
             };
-            LB_WN( HTMLKEYWORD, 23 )
+            LB_WN( HTMLKEYWORD, 24 )
 
             FixedText FT_HTMLUNKNOWN
             {
-                FT_POS_SIZE( 24 );
+                FT_POS_SIZE( 25 );
                 Text [ en-US ] = "Text";
             };
-            LB_WN( HTMLUNKNOWN, 24 )
+            LB_WN( HTMLUNKNOWN, 25 )
 
             FixedText FT_CALC
             {
-                FT_SEP_POS_SIZE( 25 );
+                FT_SEP_POS_SIZE( 26 );
                 Text [ en-US ] = "Spreadsheet";
             };
 
             FixedText FT_CALCGRID
             {
-                FT_POS_SIZE( 26 );
+                FT_POS_SIZE( 27 );
                 Text [ en-US ] = "Grid lines";
             };
-            LB_WN( CALCGRID, 26 )
+            LB_WN( CALCGRID, 27 )
 
             FixedText FT_CALCPAGEBREAK
             {
-                FT_POS_SIZE( 27 );
+                FT_POS_SIZE( 28 );
                 Text [ en-US ] = "Page breaks";
             };
-            LB_WN( CALCPAGEBREAK, 27 )
+            LB_WN( CALCPAGEBREAK, 28 )
 
             FixedText FT_CALCPAGEBREAKMANUAL
             {
-                FT_POS_SIZE( 28 );
+                FT_POS_SIZE( 29 );
                 Text [ en-US ] = "Manual page breaks";
             };
-            LB_WN( CALCPAGEBREAKMANUAL, 28 )
+            LB_WN( CALCPAGEBREAKMANUAL, 29 )
 
             FixedText FT_CALCPAGEBREAKAUTO
             {
-                FT_POS_SIZE( 29 );
+                FT_POS_SIZE( 30 );
                 Text [ en-US ] = "Automatic page breaks";
             };
-            LB_WN( CALCPAGEBREAKAUTO, 29)
+            LB_WN( CALCPAGEBREAKAUTO, 30)
 
             FixedText FT_CALCDETECTIVE
             {
-                FT_POS_SIZE( 30 );
+                FT_POS_SIZE( 31 );
                 Text [ en-US ] = "Detective";
             };
-            LB_WN( CALCDETECTIVE, 30 )
+            LB_WN( CALCDETECTIVE, 31 )
 
             FixedText FT_CALCDETECTIVEERROR
             {
-                FT_POS_SIZE( 31 );
+                FT_POS_SIZE( 32 );
                 Text [ en-US ] = "Detective error";
             };
-            LB_WN( CALCDETECTIVEERROR, 31 )
+            LB_WN( CALCDETECTIVEERROR, 32 )
 
             FixedText FT_CALCREFERENCE
             {
-                FT_POS_SIZE( 32 );
+                FT_POS_SIZE( 33 );
                 Text [ en-US ] = "References";
             };
-            LB_WN( CALCREFERENCE, 32 )
+            LB_WN( CALCREFERENCE, 33 )
 
             FixedText FT_CALCNOTESBACKGROUND
             {
-                FT_POS_SIZE( 33 );
+                FT_POS_SIZE( 34 );
                 Text [ en-US ] = "Notes background";
             };
-            LB_WN( CALCNOTESBACKGROUND, 33 )
+            LB_WN( CALCNOTESBACKGROUND, 34 )
 
             FixedText FT_DRAW
             {
-                FT_SEP_POS_SIZE( 34 );
+                FT_SEP_POS_SIZE( 35 );
                 Text [ en-US ] = "Drawing / Presentation";
             };
 
             FixedText FT_DRAWGRID
             {
-                FT_POS_SIZE( 35 );
+                FT_POS_SIZE( 36 );
                 Text [ en-US ] = "Grid";
             };
-            LB_WN( DRAWGRID, 35 )
+            LB_WN( DRAWGRID, 36 )
 
             FixedText FT_BASIC
             {
-                FT_SEP_POS_SIZE( 36 );
+                FT_SEP_POS_SIZE( 37 );
                 Text [ en-US ] = "Basic Syntax Highlighting";
             };
 
             FixedText FT_BASICIDENTIFIER
             {
-                FT_POS_SIZE( 37 );
+                FT_POS_SIZE( 38 );
                 Text [ en-US ] = "Identifier";
             };
-            LB_WN( BASICIDENTIFIER, 37 )
+            LB_WN( BASICIDENTIFIER, 38 )
 
             FixedText FT_BASICCOMMENT
             {
-                FT_POS_SIZE( 38 );
+                FT_POS_SIZE( 39 );
                 Text [ en-US ] = "Comment";
             };
-            LB_WN( BASICCOMMENT, 38 )
+            LB_WN( BASICCOMMENT, 39 )
 
             FixedText FT_BASICNUMBER
             {
-                FT_POS_SIZE( 39 );
+                FT_POS_SIZE( 40 );
                 Text [ en-US ] = "Number";
             };
-            LB_WN( BASICNUMBER, 39)
+            LB_WN( BASICNUMBER, 40)
 
             FixedText FT_BASICSTRING
             {
-                FT_POS_SIZE( 40 );
+                FT_POS_SIZE( 41 );
                 Text [ en-US ] = "String";
             };
-            LB_WN( BASICSTRING, 40 )
+            LB_WN( BASICSTRING, 41 )
 
             FixedText FT_BASICOPERATOR
             {
-                FT_POS_SIZE( 41 );
+                FT_POS_SIZE( 42 );
                 Text [ en-US ] = "Operator";
             };
-            LB_WN( BASICOPERATOR, 41 )
+            LB_WN( BASICOPERATOR, 42 )
 
             FixedText FT_BASICKEYWORD
             {
-                FT_POS_SIZE( 42 );
+                FT_POS_SIZE( 43 );
                 Text [ en-US ] = "Reserved expression";
             };
-            LB_WN( BASICKEYWORD, 42 )
+            LB_WN( BASICKEYWORD, 43 )
 
             FixedText FT_BASICERROR
             {
-                FT_POS_SIZE( 43 );
+                FT_POS_SIZE( 44 );
                 Text [ en-US ] = "Error";
             };
-            LB_WN( BASICERROR, 43 )
+            LB_WN( BASICERROR, 44 )
 
             FixedText FT_SQL_COMMAND
             {
-                FT_SEP_POS_SIZE( 44 );
+                FT_SEP_POS_SIZE( 45 );
                 Text [ en-US ] = "SQL Syntax Highlighting";
             };
 
             FixedText FT_SQLIDENTIFIER
             {
-                FT_POS_SIZE( 45 );
+                FT_POS_SIZE( 46 );
                 Text [ en-US ] = "Identifier";
             };
-            LB_WN( SQLIDENTIFIER, 45 )
+            LB_WN( SQLIDENTIFIER, 46 )
 
             FixedText FT_SQLNUMBER
             {
-                FT_POS_SIZE( 46 );
+                FT_POS_SIZE( 47 );
                 Text [ en-US ] = "Number";
             };
-            LB_WN( SQLNUMBER, 46 )
+            LB_WN( SQLNUMBER, 47 )
 
             FixedText FT_SQLSTRING
             {
-                FT_POS_SIZE( 47 );
+                FT_POS_SIZE( 48 );
                 Text [ en-US ] = "String";
             };
-            LB_WN( SQLSTRING, 47 )
+            LB_WN( SQLSTRING, 48 )
 
             FixedText FT_SQLOPERATOR
             {
-                FT_POS_SIZE( 48 );
+                FT_POS_SIZE( 49 );
                 Text [ en-US ] = "Operator";
             };
-            LB_WN( SQLOPERATOR, 48 )
+            LB_WN( SQLOPERATOR, 49 )
 
             FixedText FT_SQLKEYWORD
             {
-                FT_POS_SIZE( 49 );
+                FT_POS_SIZE( 50 );
                 Text [ en-US ] = "Keyword";
             };
-            LB_WN( SQLKEYWORD, 49 )
+            LB_WN( SQLKEYWORD, 50 )
 
             FixedText FT_SQLPARAMETER
             {
-                FT_POS_SIZE( 50 );
+                FT_POS_SIZE( 51 );
                 Text [ en-US ] = "Parameter";
             };
-            LB_WN( SQLPARAMETER, 50 )
+            LB_WN( SQLPARAMETER, 51 )
 
             FixedText FT_SQLCOMMENT
             {
-                FT_POS_SIZE( 51 );
+                FT_POS_SIZE( 52 );
                 Text [ en-US ] = "Comment";
             };
-            LB_WN( SQLCOMMENT, 51 )
+            LB_WN( SQLCOMMENT, 52 )
 
             String ST_EXTENSION
             {