convert writer formatting aids page to .ui

Change-Id: Ia5ca3f74ebfea2a927fe8845f1a8237a96e32df7

4 files changed, 103 insertions, 314 deletions

diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 160b8f11c906..ffe8233b3716 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -17,20 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-/* TabPage View */
-#define FL_NOPRINT              2
-
-#define CB_PARA                 5
-#define CB_TAB                  6
-#define CB_SPACE                7
-#define CB_HSPACE               8
-#define CB_SHYPH                9
-#define CB_FLD_HIDDEN           10
-#define CB_BREAK                11
-
-//test tab page
-
-#define CB_FLD_HIDDEN_PARA 36  // right in the middle of it, so that HelpIds stay compatible to FPII
 #define CB_SMOOTH_SCROLL 37
 
 #define BT_OK           38
@@ -43,7 +29,6 @@
 #define BT_EDIT         55
 #define BT_NEW          56
 #define BT_DELETE       57
-#define CB_CHAR_HIDDEN  61
 // Print-Extra-Page
 #define CB_PGRF            61
 #define CB_LEFTP           64
@@ -121,18 +106,4 @@
 #define FL_TABLE_SEPARATOR          139
 #define CB_PROSPECT_RTL        140
 
-#define FL_SHDWCRSFLAG                 1
-#define CB_SHDWCRSONOFF                2
-#define FT_SHDWCRSFILLMODE             4
-#define RB_SHDWCRSFILLMARGIN           5
-#define RB_SHDWCRSFILLINDENT           6
-#define RB_SHDWCRSFILLTAB              7
-#define RB_SHDWCRSFILLSPACE            8
-#define CB_ALLOW_IN_PROT              12
-#define FL_CRSR_OPT                   13
-#define FL_SEPARATOR_SHDW             14
-#define FL_LAYOUT_OPTIONS             15
-#define CB_MATH_BASELINE_ALIGNMENT    16
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index b411db0aefff..4635874cdb2c 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -433,176 +433,6 @@ TabPage TP_OPTTABLE_PAGE
         Text [ en-US ] = "Changes affect the table size";
     };
 };
-/**************************************************************************/
-/*                                                                        */
-/*  TabPage ShadowCursor                                                  */
-/*                                                                        */
-/**************************************************************************/
-TabPage TP_OPTSHDWCRSR
-{
-    HelpID = HID_OPTSHDWCRSR ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE ;
-     //_----------------------------
-    FixedLine FL_NOPRINT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 118 , 8 ) ;
-        Group = TRUE ;
-        Text [ en-US ] = "Display of";
-    };
-    CheckBox CB_PARA
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_PARA";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Pa~ragraph end" ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-    };
-    CheckBox CB_SHYPH
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SHYPH";
-        Pos = MAP_APPFONT ( 12 , 27 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Custom h~yphens" ;
-    };
-    CheckBox CB_SPACE
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SPACE";
-        Pos = MAP_APPFONT ( 12 , 40 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Spac~es" ;
-    };
-    CheckBox CB_HSPACE
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_HSPACE";
-        Pos = MAP_APPFONT ( 12 , 53 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Non-breaking s~paces" ;
-    };
-    CheckBox CB_TAB
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_TAB";
-        Pos = MAP_APPFONT ( 12 , 66 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Ta~bs" ;
-    };
-    CheckBox CB_BREAK
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_BREAK";
-        Pos = MAP_APPFONT ( 12 , 79 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Brea~ks" ;
-    };
-    CheckBox CB_CHAR_HIDDEN
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN";
-        Pos = MAP_APPFONT ( 12 , 92 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Hidden text" ;
-    };
-    CheckBox CB_FLD_HIDDEN
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN";
-        Pos = MAP_APPFONT ( 12 , 105 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Fields: Hidden te~xt" ;
-    };
-    CheckBox CB_FLD_HIDDEN_PARA
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN_PARA";
-        Pos = MAP_APPFONT ( 12 , 118 ) ;
-        Size = MAP_APPFONT ( 108 , 10 ) ;
-        Text [ en-US ] = "Fields: Hidden p~aragraphs" ;
-    };
-    FixedLine FL_SEPARATOR_SHDW
-    {
-        Pos = MAP_APPFONT ( 125 , 14 ) ;
-        Size = MAP_APPFONT ( 4 , 79 ) ;
-        Vert = TRUE;
-    };
-    FixedLine FL_SHDWCRSFLAG
-    {
-        Pos = MAP_APPFONT ( 130 , 3 ) ;
-        Size = MAP_APPFONT ( 124 , 8 ) ;
-        Text [ en-US ] = "Direct cursor" ;
-    };
-    CheckBox CB_SHDWCRSONOFF
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF";
-        Pos = MAP_APPFONT ( 136 , 14 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        Text [ en-US ] = "~Direct cursor" ;
-    };
-    FixedText FT_SHDWCRSFILLMODE
-    {
-        Pos = MAP_APPFONT ( 136 , 27 ) ;
-        Size = MAP_APPFONT ( 48 , 8 ) ;
-        Left = TRUE ;
-        Text [ en-US ] = "Insert" ;
-    };
-    RadioButton RB_SHDWCRSFILLMARGIN
-    {
-        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN";
-        Pos = MAP_APPFONT ( 145 , 39 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        Text [ en-US ] = "Para~graph alignment" ;
-    };
-    RadioButton RB_SHDWCRSFILLINDENT
-    {
-        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT";
-        Pos = MAP_APPFONT ( 145 , 52 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text [ en-US ] = "~Left paragraph margin" ;
-    };
-    RadioButton RB_SHDWCRSFILLTAB
-    {
-        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB";
-        Pos = MAP_APPFONT ( 145 , 66 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text [ en-US ] = "~Tabs" ;
-    };
-    RadioButton RB_SHDWCRSFILLSPACE
-    {
-        HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE";
-        Pos = MAP_APPFONT ( 145 , 79 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text [ en-US ] = "Tabs a~nd spaces" ;
-    };
-    FixedLine FL_CRSR_OPT
-    {
-        Pos = MAP_APPFONT ( 130 , 96 ) ;
-        Size = MAP_APPFONT ( 124 , 8 ) ;
-        Text [ en-US ] = "Cursor in protected areas";
-    };
-    CheckBox CB_ALLOW_IN_PROT
-    {
-        HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT";
-        Pos = MAP_APPFONT ( 136 , 107 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        TabStop = TRUE ;
-        Group = TRUE ;
-        Text [ en-US ] = "Enable";
-    };
-    FixedLine FL_LAYOUT_OPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 133 ) ;
-        Size = MAP_APPFONT ( 118 , 8 ) ;
-        Text [ en-US ] = "Layout assistance";
-    };
-    CheckBox CB_MATH_BASELINE_ALIGNMENT
-    {
-        Pos = MAP_APPFONT ( 12 , 144 ) ;
-        Size = MAP_APPFONT ( 236 , 10 ) ;
-        Text [ en-US ] = "Math baseline alignment";
-    };
-};
 
 StringArray STR_PRINTOPTUI
 {
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 79595b23fcf5..22fae3d34e10 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1299,71 +1299,64 @@ void SwTableOptionsTabPage::PageCreated (SfxAllItemSet aSet)
 
 SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
                                                     const SfxItemSet& rSet )
-    : SfxTabPage(pParent, SW_RES(TP_OPTSHDWCRSR), rSet),
-    aUnprintFL   ( this,   SW_RES( FL_NOPRINT  ) ),
-    aParaCB       ( this,   SW_RES( CB_PARA      ) ),
-    aSHyphCB      ( this,   SW_RES( CB_SHYPH        ) ),
-    aSpacesCB     ( this,   SW_RES( CB_SPACE    ) ),
-    aHSpacesCB    ( this,   SW_RES( CB_HSPACE   ) ),
-    aTabCB        ( this,   SW_RES( CB_TAB      ) ),
-    aBreakCB      ( this,   SW_RES( CB_BREAK        ) ),
-    aCharHiddenCB     ( this,   SW_RES( CB_CHAR_HIDDEN   ) ),
-    aFldHiddenCB     ( this,   SW_RES( CB_FLD_HIDDEN   ) ),
-    aFldHiddenParaCB ( this,   SW_RES( CB_FLD_HIDDEN_PARA ) ),
-
-    aSeparatorFL(   this, SW_RES( FL_SEPARATOR_SHDW)),
-
-    aFlagFL( this, SW_RES( FL_SHDWCRSFLAG )),
-    aOnOffCB( this, SW_RES( CB_SHDWCRSONOFF )),
-
-    aFillModeFT( this, SW_RES( FT_SHDWCRSFILLMODE )),
-    aFillMarginRB( this, SW_RES( RB_SHDWCRSFILLMARGIN )),
-    aFillIndentRB( this, SW_RES( RB_SHDWCRSFILLINDENT )),
-    aFillTabRB( this, SW_RES( RB_SHDWCRSFILLTAB )),
-    aFillSpaceRB( this, SW_RES( RB_SHDWCRSFILLSPACE )),
-    aCrsrOptFL   ( this, SW_RES( FL_CRSR_OPT)),
-    aCrsrInProtCB( this, SW_RES( CB_ALLOW_IN_PROT )),
-    m_aLayoutOptionsFL( this, SW_RES( FL_LAYOUT_OPTIONS ) ),
-    m_aMathBaselineAlignmentCB( this, SW_RES( CB_MATH_BASELINE_ALIGNMENT ) ),
+   : SfxTabPage(pParent, "OptFormatAidsPage",
+                "modules/swriter/ui/optformataidspage.ui", rSet),
     m_pWrtShell( NULL )
 {
-    FreeResource();
+    get(m_pParaCB, "paragraph");
+    get(m_pSHyphCB, "hyphens");
+    get(m_pSpacesCB, "spaces");
+    get(m_pHSpacesCB, "nonbreak");
+    get(m_pTabCB, "tabs");
+    get(m_pBreakCB, "break");
+    get(m_pCharHiddenCB, "hiddentext");
+    get(m_pFldHiddenCB, "hiddentextfield");
+    get(m_pFldHiddenParaCB, "hiddenparafield");
+
+    get(m_pDirectCursorFrame, "directcrsrframe");
+    get(m_pOnOffCB, "cursoronoff");
+
+    get(m_pFillMarginRB, "fillmargin");
+    get(m_pFillIndentRB, "fillindent");
+    get(m_pFillTabRB, "filltab");
+    get(m_pFillSpaceRB, "fillspace");
+
+    get(m_pCursorProtFrame, "crsrprotframe");
+    get(m_pCrsrInProtCB, "cursorinprot");
+
+    get(m_pMathBaselineAlignmentCB, "mathbaseline");
+
     const SfxPoolItem* pItem = 0;
 
     SwShadowCursorItem aOpt;
     if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem ))
         aOpt = *(SwShadowCursorItem*)pItem;
-    aOnOffCB.Check( aOpt.IsOn() );
+    m_pOnOffCB->Check( aOpt.IsOn() );
 
     sal_uInt8 eMode = aOpt.GetMode();
-    aFillIndentRB.Check( FILL_INDENT == eMode );
-    aFillMarginRB.Check( FILL_MARGIN == eMode );
-    aFillTabRB.Check( FILL_TAB == eMode );
-    aFillSpaceRB.Check( FILL_SPACE == eMode );
+    m_pFillIndentRB->Check( FILL_INDENT == eMode );
+    m_pFillMarginRB->Check( FILL_MARGIN == eMode );
+    m_pFillTabRB->Check( FILL_TAB == eMode );
+    m_pFillSpaceRB->Check( FILL_SPACE == eMode );
 
     if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem )
         && ((SfxUInt16Item*)pItem)->GetValue() & HTMLMODE_ON)
     {
-        aTabCB      .Hide();
-        aCharHiddenCB.Hide();
-        aFldHiddenCB    .Hide();
-        aFldHiddenParaCB.Hide();
-        aBreakCB.SetPosPixel(aTabCB.GetPosPixel());
-        aFlagFL         .Hide();
-        aOnOffCB        .Hide();
-        aFillModeFT     .Hide();
-        aFillMarginRB   .Hide();
-        aFillIndentRB   .Hide();
-        aFillTabRB      .Hide();
-        aFillSpaceRB    .Hide();
-        aCrsrOptFL      .Hide();
-        aCrsrInProtCB   .Hide();
-        aSeparatorFL.Hide();
-        long nWidth = aFlagFL.GetSizePixel().Width() + aFlagFL.GetPosPixel().X()
-                                                        - aUnprintFL.GetPosPixel().X();
-        Size aSize(aUnprintFL.GetSizePixel());
-        aSize.Width() = nWidth;
-        aUnprintFL.SetSizePixel(aSize);
+        m_pTabCB->Hide();
+        m_pCharHiddenCB->Hide();
+        m_pFldHiddenCB->Hide();
+        m_pFldHiddenParaCB->Hide();
+        m_pBreakCB->SetPosPixel(m_pTabCB->GetPosPixel());
+
+        m_pDirectCursorFrame->Hide();
+        m_pOnOffCB->Hide();
+        m_pFillMarginRB->Hide();
+        m_pFillIndentRB->Hide();
+        m_pFillTabRB->Hide();
+        m_pFillSpaceRB->Hide();
+
+        m_pCursorProtFrame->Hide();
+        m_pCrsrInProtCB->Hide();
     }
 }
 
@@ -1388,14 +1381,14 @@ void SwShdwCrsrOptionsTabPage::PageCreated( SfxAllItemSet aSet )
 sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 {
     SwShadowCursorItem aOpt;
-    aOpt.SetOn( aOnOffCB.IsChecked() );
+    aOpt.SetOn( m_pOnOffCB->IsChecked() );
 
     sal_uInt8 eMode;
-    if( aFillIndentRB.IsChecked() )
+    if( m_pFillIndentRB->IsChecked() )
         eMode= FILL_INDENT;
-    else if( aFillMarginRB.IsChecked() )
+    else if( m_pFillMarginRB->IsChecked() )
         eMode = FILL_MARGIN;
-    else if( aFillTabRB.IsChecked() )
+    else if( m_pFillTabRB->IsChecked() )
         eMode = FILL_TAB;
     else
         eMode = FILL_SPACE;
@@ -1412,13 +1405,13 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 
     if (m_pWrtShell) {
         m_pWrtShell->GetDoc()->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT,
-                                    m_aMathBaselineAlignmentCB.IsChecked() );
-        bRet |= m_aMathBaselineAlignmentCB.IsChecked() != m_aMathBaselineAlignmentCB.GetSavedValue();
+                                    m_pMathBaselineAlignmentCB->IsChecked() );
+        bRet |= m_pMathBaselineAlignmentCB->IsChecked() != m_pMathBaselineAlignmentCB->GetSavedValue();
     }
 
-    if( aCrsrInProtCB.IsChecked() != aCrsrInProtCB.GetSavedValue())
+    if( m_pCrsrInProtCB->IsChecked() != m_pCrsrInProtCB->GetSavedValue())
     {
-        rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, aCrsrInProtCB.IsChecked()));
+        rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked()));
         bRet |= sal_True;
     }
 
@@ -1429,15 +1422,15 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet )
     if(pOldAttr)
         aDisp = *pOldAttr;
 
-    aDisp.bParagraphEnd         = aParaCB       .IsChecked();
-    aDisp.bTab                  = aTabCB        .IsChecked();
-    aDisp.bSpace                = aSpacesCB     .IsChecked();
-    aDisp.bNonbreakingSpace     = aHSpacesCB    .IsChecked();
-    aDisp.bSoftHyphen           = aSHyphCB      .IsChecked();
-    aDisp.bFldHiddenText        = aFldHiddenCB     .IsChecked();
-    aDisp.bCharHiddenText       = aCharHiddenCB.IsChecked();
-    aDisp.bShowHiddenPara       = aFldHiddenParaCB .IsChecked();
-    aDisp.bManualBreak          = aBreakCB      .IsChecked();
+    aDisp.bParagraphEnd         = m_pParaCB->IsChecked();
+    aDisp.bTab                  = m_pTabCB->IsChecked();
+    aDisp.bSpace                = m_pSpacesCB->IsChecked();
+    aDisp.bNonbreakingSpace     = m_pHSpacesCB->IsChecked();
+    aDisp.bSoftHyphen           = m_pSHyphCB->IsChecked();
+    aDisp.bFldHiddenText        = m_pFldHiddenCB->IsChecked();
+    aDisp.bCharHiddenText       = m_pCharHiddenCB->IsChecked();
+    aDisp.bShowHiddenPara       = m_pFldHiddenParaCB->IsChecked();
+    aDisp.bManualBreak          = m_pBreakCB->IsChecked();
 
     bRet |= (!pOldAttr || aDisp != *pOldAttr);
     if(bRet)
@@ -1453,24 +1446,24 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet )
     SwShadowCursorItem aOpt;
     if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem ))
         aOpt = *(SwShadowCursorItem*)pItem;
-    aOnOffCB.Check( aOpt.IsOn() );
+    m_pOnOffCB->Check( aOpt.IsOn() );
 
     sal_uInt8 eMode = aOpt.GetMode();
-    aFillIndentRB.Check( FILL_INDENT == eMode );
-    aFillMarginRB.Check( FILL_MARGIN == eMode );
-    aFillTabRB.Check( FILL_TAB == eMode );
-    aFillSpaceRB.Check( FILL_SPACE == eMode );
+    m_pFillIndentRB->Check( FILL_INDENT == eMode );
+    m_pFillMarginRB->Check( FILL_MARGIN == eMode );
+    m_pFillTabRB->Check( FILL_TAB == eMode );
+    m_pFillSpaceRB->Check( FILL_SPACE == eMode );
 
     if (m_pWrtShell) {
-        m_aMathBaselineAlignmentCB.Check( m_pWrtShell->GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) );
-        m_aMathBaselineAlignmentCB.SaveValue();
+       m_pMathBaselineAlignmentCB->Check( m_pWrtShell->GetDoc()->get( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT ) );
+       m_pMathBaselineAlignmentCB->SaveValue();
     } else {
-        m_aMathBaselineAlignmentCB.Hide();
+        m_pMathBaselineAlignmentCB->Hide();
     }
 
     if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED, sal_False, &pItem ))
-        aCrsrInProtCB.Check(((const SfxBoolItem*)pItem)->GetValue());
-    aCrsrInProtCB.SaveValue();
+        m_pCrsrInProtCB->Check(((const SfxBoolItem*)pItem)->GetValue());
+    m_pCrsrInProtCB->SaveValue();
 
     const SwDocDisplayItem* pDocDisplayAttr = 0;
 
@@ -1478,15 +1471,15 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet )
                                     (const SfxPoolItem**)&pDocDisplayAttr );
     if(pDocDisplayAttr)
     {
-        aParaCB     .Check  (pDocDisplayAttr->bParagraphEnd         );
-        aTabCB      .Check  (pDocDisplayAttr->bTab                  );
-        aSpacesCB   .Check  (pDocDisplayAttr->bSpace                );
-        aHSpacesCB  .Check  (pDocDisplayAttr->bNonbreakingSpace     );
-        aSHyphCB    .Check  (pDocDisplayAttr->bSoftHyphen           );
-        aCharHiddenCB.Check (pDocDisplayAttr->bCharHiddenText );
-        aFldHiddenCB   .Check  (pDocDisplayAttr->bFldHiddenText );
-        aFldHiddenParaCB.Check (pDocDisplayAttr->bShowHiddenPara       );
-        aBreakCB    .Check  (pDocDisplayAttr->bManualBreak          );
+        m_pParaCB->Check  ( pDocDisplayAttr->bParagraphEnd );
+        m_pTabCB->Check  ( pDocDisplayAttr->bTab );
+        m_pSpacesCB->Check  ( pDocDisplayAttr->bSpace );
+        m_pHSpacesCB->Check  ( pDocDisplayAttr->bNonbreakingSpace );
+        m_pSHyphCB->Check  ( pDocDisplayAttr->bSoftHyphen );
+        m_pCharHiddenCB->Check ( pDocDisplayAttr->bCharHiddenText );
+        m_pFldHiddenCB->Check  ( pDocDisplayAttr->bFldHiddenText );
+        m_pFldHiddenParaCB->Check ( pDocDisplayAttr->bShowHiddenPara );
+        m_pBreakCB->Check  ( pDocDisplayAttr->bManualBreak );
     }
 }
 
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx
index bf4166a2d610..93f3cb57f1d8 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/ui/inc/optpage.hxx
@@ -284,33 +284,28 @@ public:
 class SwShdwCrsrOptionsTabPage : public SfxTabPage
 {
     //nonprinting characters
-    FixedLine   aUnprintFL;
-    CheckBox    aParaCB;
-    CheckBox    aSHyphCB;
-    CheckBox    aSpacesCB;
-    CheckBox    aHSpacesCB;
-    CheckBox    aTabCB;
-    CheckBox    aBreakCB;
-    CheckBox    aCharHiddenCB;
-    CheckBox    aFldHiddenCB;
-    CheckBox    aFldHiddenParaCB;
-
-    FixedLine   aSeparatorFL;
-
-    FixedLine       aFlagFL;
-    CheckBox        aOnOffCB;
-
-    FixedText       aFillModeFT;
-    RadioButton     aFillMarginRB;
-    RadioButton     aFillIndentRB;
-    RadioButton     aFillTabRB;
-    RadioButton     aFillSpaceRB;
-
-    FixedLine       aCrsrOptFL;
-    CheckBox        aCrsrInProtCB;
-
-    FixedLine       m_aLayoutOptionsFL;
-    CheckBox        m_aMathBaselineAlignmentCB;
+    CheckBox* m_pParaCB;
+    CheckBox* m_pSHyphCB;
+    CheckBox* m_pSpacesCB;
+    CheckBox* m_pHSpacesCB;
+    CheckBox* m_pTabCB;
+    CheckBox* m_pBreakCB;
+    CheckBox* m_pCharHiddenCB;
+    CheckBox* m_pFldHiddenCB;
+    CheckBox* m_pFldHiddenParaCB;
+
+    VclFrame* m_pDirectCursorFrame;
+    CheckBox* m_pOnOffCB;
+
+    RadioButton* m_pFillMarginRB;
+    RadioButton* m_pFillIndentRB;
+    RadioButton* m_pFillTabRB;
+    RadioButton* m_pFillSpaceRB;
+
+    VclFrame* m_pCursorProtFrame;
+    CheckBox* m_pCrsrInProtCB;
+
+    CheckBox* m_pMathBaselineAlignmentCB;
 
     SwWrtShell *    m_pWrtShell;