Convert tab stop page to widget UI

Conflicts:
cui/UIConfig_cui.mk

Change-Id: Idd4401966933da1e4de3e3f31f74e2908dd7d705
Reviewed-on: https://gerrit.libreoffice.org/4644
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

8 files changed, 749 insertions, 487 deletions

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 163ce003e557..5d80738f4872 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
     cui/source/tabpages/swpossizetabpage.src \
     cui/source/tabpages/tabarea.src \
     cui/source/tabpages/tabline.src \
-    cui/source/tabpages/tabstpge.src \
     cui/source/tabpages/textanim.src \
     cui/source/tabpages/textattr.src \
     cui/source/tabpages/transfrm.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index bf0e76621277..4ef51d6ad8c8 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -62,6 +62,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/pageformatpage \
 	cui/uiconfig/ui/paragalignpage \
 	cui/uiconfig/ui/paraindentspacing \
+	cui/uiconfig/ui/paratabspage \
 	cui/uiconfig/ui/pastespecial \
 	cui/uiconfig/ui/personalization_tab \
 	cui/uiconfig/ui/pickbulletpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 1fc11419e0f8..36b4924af2f2 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -258,7 +258,6 @@
 #define HID_LINE_LINE "CUI_HID_LINE_LINE"
 #define HID_LINE_DEF "CUI_HID_LINE_DEF"
 #define HID_SPELLDLG_SETWORD "CUI_HID_SPELLDLG_SETWORD"
-#define HID_TABULATOR "CUI_HID_TABULATOR"
 #define HID_PAGE_TEXTATTR "CUI_HID_PAGE_TEXTATTR"
 #define HID_TEXTATTR_CTL_POSITION "CUI_HID_TEXTATTR_CTL_POSITION"
 #define HID_TRANS_POSITION_SIZE "CUI_HID_TRANS_POSITION_SIZE"
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index e34c872b6af9..8ffa90345e7e 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -68,44 +68,38 @@ private:
     SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // tabulators and positions
-    FixedLine       aTabLabel;
-    MetricBox       aTabBox;
-    FixedLine       aTabLabelVert;
-
-    FixedLine       aTabTypeLabel;
+    MetricBox*      m_pTabBox;
     // TabType
-    RadioButton     aLeftTab;
-    RadioButton     aRightTab;
-    RadioButton     aCenterTab;
-    RadioButton     aDezTab;
-
-    TabWin_Impl*    pLeftWin;
-    TabWin_Impl*    pRightWin;
-    TabWin_Impl*    pCenterWin;
-    TabWin_Impl*    pDezWin;
-
-    FixedText       aDezCharLabel;
-    Edit            aDezChar;
-
-    FixedLine       aFillLabel;
-
-    RadioButton     aNoFillChar;
-    RadioButton     aFillPoints;
-    RadioButton     aFillDashLine ;
-    RadioButton     aFillSolidLine;
-    RadioButton     aFillSpecial;
-    Edit            aFillChar;
-
-    PushButton      aNewBtn;
-    PushButton      aDelAllBtn;
-    PushButton      aDelBtn;
+    RadioButton*    m_pLeftTab;
+    RadioButton*    m_pRightTab;
+    RadioButton*    m_pCenterTab;
+    RadioButton*    m_pDezTab;
+
+    TabWin_Impl*    m_pLeftWin;
+    TabWin_Impl*    m_pRightWin;
+    TabWin_Impl*    m_pCenterWin;
+    TabWin_Impl*    m_pDezWin;
+
+    FixedText*      m_pDezCharLabel;
+    Edit*           m_pDezChar;
+
+    RadioButton*    m_pNoFillChar;
+    RadioButton*    m_pFillPoints;
+    RadioButton*    m_pFillDashLine ;
+    RadioButton*    m_pFillSolidLine;
+    RadioButton*    m_pFillSpecial;
+    Edit*           m_pFillChar;
+
+    PushButton*     m_pNewBtn;
+    PushButton*     m_pDelAllBtn;
+    PushButton*     m_pDelBtn;
 
     // local variables, internal functions
     SvxTabStop      aAktTab;
     SvxTabStopItem  aNewTabs;
     long            nDefDist;
     FieldUnit       eDefUnit;
-    sal_Bool            bCheck;
+    sal_Bool        bCheck;
 
     void            InitTabPos_Impl( sal_uInt16 nPos = 0 );
     void            SetFillAndTabType_Impl();
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 01c6b0e2c098..0426c3b8a62f 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -23,7 +23,6 @@
 #include <svx/dialogs.hrc>
 
 #include <cuires.hrc>
-#include "tabstpge.hrc"
 #include <editeng/lrspitem.hxx>
 #include "tabstpge.hxx"
 #include <dialmgr.hxx>
@@ -39,17 +38,25 @@
 
 class TabWin_Impl : public Window
 {
+    SvxTabulatorTabPage* mpPage;
 private:
     sal_uInt16  nTabStyle;
 
 public:
-    TabWin_Impl( Window* pParent, const ResId& rId, sal_uInt16 nStyle ) :
-        Window( pParent, rId ),
-        nTabStyle( nStyle ) {}
+
+    TabWin_Impl( Window* pParent, WinBits nBits) :
+        Window( pParent, nBits ){}
 
     virtual void    Paint( const Rectangle& rRect );
+
+    void SetTabulatorTabPage(SvxTabulatorTabPage* pPage) { mpPage = pPage; }
+    void SetTabStyle(sal_uInt16 nStyle) {nTabStyle = nStyle; }
 };
 
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTabWin_Impl(Window *pParent, VclBuilder::stringmap &)
+{
+    return new TabWin_Impl(pParent, WB_BORDER);
+}
 // static ----------------------------------------------------------------
 
 static sal_uInt16 pRanges[] =
@@ -85,118 +92,98 @@ void TabWin_Impl::Paint( const Rectangle& )
 
 // class SvxTabulatorTabPage ---------------------------------------------
 
-SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
-                                          const SfxItemSet& rAttr ):
-
-    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
-
-    aTabLabel       ( this, CUI_RES( FL_TABPOS ) ),
-    aTabBox         ( this, CUI_RES( ED_TABPOS ) ),
-    aTabLabelVert   ( this, CUI_RES( FL_TABPOS_VERT ) ),
-    aTabTypeLabel   ( this, CUI_RES( FL_TABTYPE ) ),
-    aLeftTab        ( this, CUI_RES( BTN_TABTYPE_LEFT ) ),
-    aRightTab       ( this, CUI_RES( BTN_TABTYPE_RIGHT ) ),
-    aCenterTab      ( this, CUI_RES( BTN_TABTYPE_CENTER ) ),
-    aDezTab         ( this, CUI_RES( BTN_TABTYPE_DECIMAL ) ),
-    pLeftWin        ( new TabWin_Impl( this, CUI_RES( WIN_TABLEFT ), (sal_uInt16)(RULER_TAB_LEFT|WB_HORZ) ) ),
-    pRightWin       ( new TabWin_Impl( this, CUI_RES( WIN_TABRIGHT ), (sal_uInt16)(RULER_TAB_RIGHT|WB_HORZ) ) ),
-    pCenterWin      ( new TabWin_Impl( this, CUI_RES( WIN_TABCENTER ), (sal_uInt16)(RULER_TAB_CENTER|WB_HORZ) ) ),
-    pDezWin         ( new TabWin_Impl( this, CUI_RES( WIN_TABDECIMAL ), (sal_uInt16)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
-    aDezCharLabel   ( this, CUI_RES( FT_TABTYPE_DECCHAR ) ),
-    aDezChar        ( this, CUI_RES( ED_TABTYPE_DECCHAR ) ),
-    aFillLabel      ( this, CUI_RES( FL_FILLCHAR ) ),
-    aNoFillChar     ( this, CUI_RES( BTN_FILLCHAR_NO ) ),
-    aFillPoints     ( this, CUI_RES( BTN_FILLCHAR_POINTS ) ),
-    aFillDashLine   ( this, CUI_RES( BTN_FILLCHAR_DASHLINE ) ),
-    aFillSolidLine  ( this, CUI_RES( BTN_FILLCHAR_UNDERSCORE ) ),
-    aFillSpecial    ( this, CUI_RES( BTN_FILLCHAR_OTHER ) ),
-    aFillChar       ( this, CUI_RES( ED_FILLCHAR_OTHER ) ),
-    aNewBtn         ( this, CUI_RES( BTN_NEW ) ),
-    aDelAllBtn      ( this, CUI_RES( BTN_DELALL ) ),
-    aDelBtn         ( this, CUI_RES( BTN_DEL ) ),
+SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAttr ):
+
+    SfxTabPage( pParent, "ParagraphTabsPage","cui/ui/paratabspage.ui", rAttr ),
 
     aAktTab     ( 0 ),
     aNewTabs    ( 0, 0, SVX_TAB_ADJUST_LEFT, GetWhich( SID_ATTR_TABSTOP ) ),
     nDefDist    ( 0 ),
-    eDefUnit( FUNIT_100TH_MM ),
+    eDefUnit    ( FUNIT_100TH_MM ),
     bCheck      ( sal_False )
 
 {
+    get(m_pTabBox,"ED_TABPOS");
+    //the tab images
+    get(m_pLeftWin,"drawingareaWIN_TABLEFT");
+    get(m_pRightWin,"drawingareaWIN_TABRIGHT");
+    get(m_pCenterWin,"drawingareaWIN_TABCENTER");
+    get(m_pDezWin,"drawingareaWIN_TABDECIMAL");
+    m_pLeftWin->SetTabulatorTabPage(this);
+    m_pRightWin->SetTabulatorTabPage(this);
+    m_pCenterWin->SetTabulatorTabPage(this);
+    m_pDezWin->SetTabulatorTabPage(this);
+    m_pLeftWin->SetTabStyle((sal_uInt16)(RULER_TAB_LEFT|WB_HORZ));
+    m_pRightWin->SetTabStyle((sal_uInt16)(RULER_TAB_RIGHT|WB_HORZ));
+    m_pCenterWin->SetTabStyle((sal_uInt16)(RULER_TAB_CENTER|WB_HORZ));
+    m_pDezWin->SetTabStyle((sal_uInt16)(RULER_TAB_DECIMAL|WB_HORZ));
+    //upper radiobuttons
     SvtCJKOptions aCJKOptions;
-    if(aCJKOptions.IsAsianTypographyEnabled())
-    {
-        aLeftTab  .SetText(String(CUI_RES(   ST_LEFTTAB_ASIAN )));
-        aRightTab .SetText(String(CUI_RES(   ST_RIGHTTAB_ASIAN )));
-    }
+    get(m_pLeftTab,  aCJKOptions.IsAsianTypographyEnabled() ? "radiobuttonST_LEFTTAB_ASIAN" : "radiobuttonBTN_TABTYPE_LEFT");
+    get(m_pRightTab, aCJKOptions.IsAsianTypographyEnabled() ? "radiobuttonST_RIGHTTAB_ASIAN" : "radiobuttonBTN_TABTYPE_RIGHT");
+    m_pLeftTab->Show(true);
+    m_pRightTab->Show(true);
+    get(m_pCenterTab,"radiobuttonBTN_TABTYPE_CENTER");
+    get(m_pDezTab,"radiobuttonBTN_TABTYPE_DECIMAL");
+    get(m_pDezChar,"entryED_TABTYPE_DECCHAR");
+    get(m_pDezCharLabel,"labelFT_TABTYPE_DECCHAR");
+    //lower radio buttons
+    get(m_pNoFillChar,"radiobuttonBTN_FILLCHAR_NO");
+    get(m_pFillPoints,"radiobuttonBTN_FILLCHAR_POINTS");
+    get(m_pFillDashLine,"radiobuttonBTN_FILLCHAR_DASHLINE");
+    get(m_pFillSolidLine,"radiobuttonBTN_FILLCHAR_UNDERSCORE");
+    get(m_pFillSpecial,"radiobuttonBTN_FILLCHAR_OTHER");
+    get(m_pFillChar,"entryED_FILLCHAR_OTHER");
+    //button bar
+    get(m_pNewBtn,"buttonBTN_NEW");
+    get(m_pDelAllBtn,"buttonBTN_DELALL");
+    get(m_pDelBtn,"buttonBTN_DEL");
 
-    aFillChar.SetAccessibleName(String(CUI_RES(   ST_FILLCHAR_OTHER )));
     // This page needs ExchangeSupport
     SetExchangeSupport();
 
-
     // Set metric
     FieldUnit eFUnit = GetModuleFieldUnit( rAttr );
-    SetFieldUnit( aTabBox, eFUnit );
+    SetFieldUnit( *m_pTabBox, eFUnit );
 
     // Initialize buttons
-    aNewBtn.SetClickHdl( LINK( this,SvxTabulatorTabPage, NewHdl_Impl ) );
-    aDelBtn.SetClickHdl( LINK( this,SvxTabulatorTabPage, DelHdl_Impl ) );
-    aDelAllBtn.SetClickHdl( LINK( this,SvxTabulatorTabPage, DelAllHdl_Impl ) );
+    m_pNewBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, NewHdl_Impl ) );
+    m_pDelBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelHdl_Impl ) );
+    m_pDelAllBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelAllHdl_Impl ) );
 
     Link aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl );
-    aLeftTab.SetClickHdl( aLink );
-    aRightTab.SetClickHdl( aLink );
-    aDezTab.SetClickHdl( aLink );
-    aCenterTab.SetClickHdl( aLink );
+    m_pLeftTab->SetClickHdl( aLink );
+    m_pRightTab->SetClickHdl( aLink );
+    m_pDezTab->SetClickHdl( aLink );
+    m_pCenterTab->SetClickHdl( aLink );
 
-    aDezChar.SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, GetDezCharHdl_Impl ) );
-    aDezChar.SetMaxTextLen(1);
-    aDezChar.Disable();
-    aDezCharLabel.Disable();
+    m_pDezChar->SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, GetDezCharHdl_Impl ) );
+    //m_pDezChar->SetMaxTextLen(1);
+    m_pDezChar->Disable();
+    m_pDezCharLabel->Disable();
 
     aLink = LINK( this, SvxTabulatorTabPage, FillTypeCheckHdl_Impl );
-    aNoFillChar.SetClickHdl( aLink );
-    aFillPoints.SetClickHdl( aLink );
-    aFillDashLine.SetClickHdl( aLink );
-    aFillSolidLine.SetClickHdl( aLink );
-    aFillSpecial.SetClickHdl( aLink );
-    aFillChar.SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, GetFillCharHdl_Impl ) );
-    aFillChar.SetMaxTextLen(1);
-    aFillChar.Disable();
-
-    aTabBox.SetDoubleClickHdl( LINK( this, SvxTabulatorTabPage, SelectHdl_Impl ) );
-    aTabBox.SetModifyHdl( LINK( this, SvxTabulatorTabPage, ModifyHdl_Impl ) );
-
-    aLeftTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
-    aRightTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
-    aCenterTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
-    aDezTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
-    aDezCharLabel.SetAccessibleRelationMemberOf( &aTabTypeLabel );
-    aDezChar.SetAccessibleRelationMemberOf( &aTabTypeLabel );
-
-    aNoFillChar.SetAccessibleRelationMemberOf( &aFillLabel );
-    aFillPoints.SetAccessibleRelationMemberOf( &aFillLabel );
-    aFillDashLine.SetAccessibleRelationMemberOf( &aFillLabel );
-    aFillSolidLine.SetAccessibleRelationMemberOf( &aFillLabel );
-    aFillSpecial.SetAccessibleRelationMemberOf( &aFillLabel );
-    aFillChar.SetAccessibleRelationMemberOf( &aFillLabel );
-
-    aFillChar.SetAccessibleRelationLabeledBy(&aFillSpecial);
+    m_pNoFillChar->SetClickHdl( aLink );
+    m_pFillPoints->SetClickHdl( aLink );
+    m_pFillDashLine->SetClickHdl( aLink );
+    m_pFillSolidLine->SetClickHdl( aLink );
+    m_pFillSpecial->SetClickHdl( aLink );
+    m_pFillChar->SetLoseFocusHdl( LINK( this,  SvxTabulatorTabPage, GetFillCharHdl_Impl ) );
+    //m_pFillChar->SetMaxTextLen(1);
+    m_pFillChar->Disable();
+
+    m_pTabBox->SetDoubleClickHdl( LINK( this, SvxTabulatorTabPage, SelectHdl_Impl ) );
+    m_pTabBox->SetModifyHdl( LINK( this, SvxTabulatorTabPage, ModifyHdl_Impl ) );
 
     // Get the default decimal char from the system
     const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() );
     aAktTab.GetDecimal() = rLocaleWrapper.getNumDecimalSep()[0];
-    FreeResource();
 }
 
 // -----------------------------------------------------------------------
 
 SvxTabulatorTabPage::~SvxTabulatorTabPage()
 {
-    delete pLeftWin;
-    delete pRightWin;
-    delete pCenterWin;
-    delete pDezWin;
 }
 
 // -----------------------------------------------------------------------
@@ -213,12 +200,12 @@ sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
     sal_Bool bModified = sal_False;
 
     // Put the controls' values in here
-    if ( aNewBtn.IsEnabled() )
+    if ( m_pNewBtn->IsEnabled() )
         NewHdl_Impl( 0 );
 
     // Call the LoseFocus-Handler first
-    GetDezCharHdl_Impl( &aDezChar );
-    GetFillCharHdl_Impl( &aFillChar );
+    GetDezCharHdl_Impl( m_pDezChar );
+    GetFillCharHdl_Impl( m_pFillChar );
 
     FillUpWithDefTabs_Impl( nDefDist, aNewTabs );
     SfxItemPool* pPool = rSet.GetPool();
@@ -231,8 +218,7 @@ sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
         // the TabStopItem needs to have a DefTab at position 0.
         const SfxPoolItem* pLRSpace;
         // If not in the new set, then maybe in the old one
-        if ( SFX_ITEM_SET !=
-             rSet.GetItemState( GetWhich( SID_ATTR_LRSPACE ), sal_True, &pLRSpace ) )
+        if ( SFX_ITEM_SET != rSet.GetItemState( GetWhich( SID_ATTR_LRSPACE ), sal_True, &pLRSpace ) )
             pLRSpace = GetOldItem( rSet, SID_ATTR_LRSPACE );
 
         if ( pLRSpace && ( (SvxLRSpaceItem*)pLRSpace )->GetTxtFirstLineOfst() < 0 )
@@ -294,8 +280,7 @@ void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet )
             for ( sal_uInt16 i = 0; i < aTmp.Count(); ++i )
             {
                 SvxTabStop aTmpStop = aTmp[i];
-                aTmpStop.GetTabPos() =
-                    LogicToLogic( aTmpStop.GetTabPos(), eUnit, MAP_100TH_MM );
+                aTmpStop.GetTabPos() = LogicToLogic( aTmpStop.GetTabPos(), eUnit, MAP_100TH_MM );
                 aNewTabs.Insert( aTmpStop );
             }
         }
@@ -329,43 +314,43 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
 {
     if ( ( TABTYPE_LEFT & nFlag ) == TABTYPE_LEFT )
     {
-        aLeftTab.Disable();
-        pLeftWin->Disable();
+        m_pLeftTab->Disable();
+        m_pLeftWin->Disable();
     }
     if ( ( TABTYPE_RIGHT & nFlag ) == TABTYPE_RIGHT )
     {
-        aRightTab.Disable();
-        pRightWin->Disable();
+        m_pRightTab->Disable();
+        m_pRightWin->Disable();
     }
     if ( ( TABTYPE_CENTER & nFlag ) == TABTYPE_CENTER )
     {
-        aCenterTab.Disable();
-        pCenterWin->Disable();
+        m_pCenterTab->Disable();
+        m_pCenterWin->Disable();
     }
     if ( ( TABTYPE_DEZIMAL & nFlag ) == TABTYPE_DEZIMAL )
     {
-        aDezTab.Disable();
-        pDezWin->Disable();
-        aDezCharLabel.Disable();
-        aDezChar.Disable();
+        m_pDezTab->Disable();
+        m_pDezWin->Disable();
+        m_pDezCharLabel->Disable();
+        m_pDezChar->Disable();
     }
-    if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL )
-        aTabTypeLabel.Disable();
+//     if ( ( TABTYPE_ALL & nFlag ) == TABTYPE_ALL )
+//         m_pTabTypeLabel->Disable();
     if ( ( TABFILL_NONE & nFlag ) == TABFILL_NONE )
-        aNoFillChar.Disable();
+        m_pNoFillChar->Disable();
     if ( ( TABFILL_POINT & nFlag ) == TABFILL_POINT )
-        aFillPoints.Disable();
+        m_pFillPoints->Disable();
     if ( ( TABFILL_DASHLINE & nFlag ) == TABFILL_DASHLINE )
-        aFillDashLine.Disable();
+        m_pFillDashLine->Disable();
     if ( ( TABFILL_SOLIDLINE & nFlag ) == TABFILL_SOLIDLINE )
-        aFillSolidLine.Disable();
+        m_pFillSolidLine->Disable();
     if ( ( TABFILL_SPECIAL & nFlag ) == TABFILL_SPECIAL )
     {
-        aFillSpecial.Disable();
-        aFillChar.Disable();
+        m_pFillSpecial->Disable();
+        m_pFillChar->Disable();
     }
-    if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL )
-        aFillLabel.Disable();
+//     if ( ( TABFILL_ALL & nFlag ) == TABFILL_ALL )
+//         m_pFillLabel->Disable();
 }
 
 // -----------------------------------------------------------------------
@@ -381,7 +366,7 @@ int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet )
 
 void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
 {
-    aTabBox.Clear();
+    m_pTabBox->Clear();
 
     long nOffset = 0;
     const SfxPoolItem* pItem = 0;
@@ -398,7 +383,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
     {
         if ( aNewTabs[i].GetAdjustment() != SVX_TAB_ADJUST_DEFAULT )
         {
-            aTabBox.InsertValue( aTabBox.Normalize(
+            m_pTabBox->InsertValue( m_pTabBox->Normalize(
                 aNewTabs[i].GetTabPos() + nOffset ), eDefUnit );
         }
         else
@@ -412,24 +397,24 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
         nTabPos = 0;
 
     // Switch off all RadioButtons for a start
-    aLeftTab.Check( sal_True );
-    aNoFillChar.Check( sal_True );
+    m_pLeftTab->Check( sal_True );
+    m_pNoFillChar->Check( sal_True );
 
-    if( aTabBox.GetEntryCount() > 0 )
+    if( m_pTabBox->GetEntryCount() > 0 )
     {
-        aTabBox.SetText( aTabBox.GetEntry( nTabPos ) );
+        m_pTabBox->SetText( m_pTabBox->GetEntry( nTabPos ) );
         aAktTab = aNewTabs[nTabPos];
 
         SetFillAndTabType_Impl();
-        aNewBtn.Disable();
-        aDelBtn.Enable();
+        m_pNewBtn->Disable();
+        m_pDelBtn->Enable();
     }
     else
     {   // If no entry, 0 is the default value
-        aTabBox.SetValue( 0, eDefUnit );
+        m_pTabBox->SetValue( 0, eDefUnit );
 
-        aNewBtn.Enable();
-        aDelBtn.Disable();
+        m_pNewBtn->Enable();
+        m_pDelBtn->Disable();
     }
 }
 
@@ -440,42 +425,42 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
     RadioButton* pTypeBtn = 0;
     RadioButton* pFillBtn = 0;
 
-    aDezChar.Disable();
-    aDezCharLabel.Disable();
+    m_pDezChar->Disable();
+    m_pDezCharLabel->Disable();
 
     if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_LEFT )
-        pTypeBtn = &aLeftTab;
+        pTypeBtn = m_pLeftTab;
     else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_RIGHT )
-        pTypeBtn = &aRightTab;
+        pTypeBtn = m_pRightTab;
     else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_DECIMAL )
     {
-        pTypeBtn = &aDezTab;
-        aDezChar.Enable();
-        aDezCharLabel.Enable();
-        aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
+        pTypeBtn = m_pDezTab;
+        m_pDezChar->Enable();
+        m_pDezCharLabel->Enable();
+        m_pDezChar->SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
     }
     else if ( aAktTab.GetAdjustment() == SVX_TAB_ADJUST_CENTER )
-        pTypeBtn = &aCenterTab;
+        pTypeBtn = m_pCenterTab;
 
     if ( pTypeBtn )
         pTypeBtn->Check();
 
-    aFillChar.Disable();
-    aFillChar.SetText( String() );
+    m_pFillChar->Disable();
+    m_pFillChar->SetText( "" );
 
     if ( aAktTab.GetFill() == ' ' )
-        pFillBtn = &aNoFillChar;
+        pFillBtn = m_pNoFillChar;
     else if ( aAktTab.GetFill() == '-' )
-        pFillBtn = &aFillDashLine;
+        pFillBtn = m_pFillDashLine;
     else if ( aAktTab.GetFill() == '_' )
-        pFillBtn = &aFillSolidLine;
+        pFillBtn = m_pFillSolidLine;
     else if ( aAktTab.GetFill() == '.' )
-        pFillBtn = &aFillPoints;
+        pFillBtn = m_pFillPoints;
     else
     {
-        pFillBtn = &aFillSpecial;
-        aFillChar.Enable();
-        aFillChar.SetText( OUString( (sal_Unicode)aAktTab.GetFill() ) );
+        pFillBtn = m_pFillSpecial;
+        m_pFillChar->Enable();
+        m_pFillChar->SetText( OUString( (sal_Unicode)aAktTab.GetFill() ) );
     }
     pFillBtn->Check();
 }
@@ -486,7 +471,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
 {
     // Add a new one and select it
     // Get the value from the display
-    long nVal = static_cast<long>(aTabBox.Denormalize( aTabBox.GetValue( eDefUnit ) ));
+    long nVal = static_cast<long>(m_pTabBox->Denormalize( m_pTabBox->GetValue( eDefUnit ) ));
 
     // If the pBtn == 0 && the value == 0 then do not create a tab, because we create via OK
     if ( nVal == 0 && pBtn == 0 )
@@ -503,7 +488,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
         nOffset = OutputDevice::LogicToLogic( nOffset, eUnit, MAP_100TH_MM  );
     }
     const long nReal = nVal - nOffset;
-    sal_uInt16 nSize = aTabBox.GetEntryCount();
+    sal_uInt16 nSize = m_pTabBox->GetEntryCount();
 
     sal_uInt16 i;
     for( i = 0; i < nSize; i++ )
@@ -513,28 +498,28 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
     }
 
     // Make ListBox entry
-    aTabBox.InsertValue( aTabBox.Normalize( nVal ), eDefUnit, i );
+    m_pTabBox->InsertValue( m_pTabBox->Normalize( nVal ), eDefUnit, i );
     aAktTab.GetTabPos() = nReal;
     SvxTabAdjust eAdj = SVX_TAB_ADJUST_LEFT;
 
-    if ( aRightTab.IsChecked() )
+    if ( m_pRightTab->IsChecked() )
         eAdj = SVX_TAB_ADJUST_RIGHT;
-    else if ( aCenterTab.IsChecked() )
+    else if ( m_pCenterTab->IsChecked() )
         eAdj = SVX_TAB_ADJUST_CENTER;
-    else if ( aDezTab.IsChecked() )
+    else if ( m_pDezTab->IsChecked() )
         eAdj = SVX_TAB_ADJUST_DECIMAL;
 
     aAktTab.GetAdjustment() = eAdj;
     aNewTabs.Insert( aAktTab );
 
-    aNewBtn.Disable();
-    aDelBtn.Enable();
-    aTabBox.GrabFocus();
+    m_pNewBtn->Disable();
+    m_pDelBtn->Enable();
+    m_pTabBox->GrabFocus();
 
     // If no RadioButton was clicked, we need to put anyway
     bCheck |= sal_True;
     // Set the selection into the position Edit
-    aTabBox.SetSelection(Selection(0, aTabBox.GetText().getLength()));
+    m_pTabBox->SetSelection(Selection(0, m_pTabBox->GetText().getLength()));
     return 0;
 }
 
@@ -542,19 +527,19 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl)
 {
-    sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue() );
+    sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue() );
 
     if ( nPos == COMBOBOX_ENTRY_NOTFOUND )
         return 0;
 
-    if ( aTabBox.GetEntryCount() == 1 )
+    if ( m_pTabBox->GetEntryCount() == 1 )
     {
         DelAllHdl_Impl( 0 );
         return 0;
     }
 
     // Delete Tab
-    aTabBox.RemoveEntry( nPos );
+    m_pTabBox->RemoveEntry( nPos );
     aNewTabs.Remove( nPos );
 
     // Reset aAktTab
@@ -564,16 +549,16 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl)
     {
         // Correct Pos
         nPos = ( ( nSize - 1 ) >= nPos) ? nPos : nPos - 1;
-        aTabBox.SetValue( aTabBox.GetValue( nPos ) );
+        m_pTabBox->SetValue( m_pTabBox->GetValue( nPos ) );
         aAktTab = aNewTabs[nPos];
     }
 
     // If no Tabs Enable Disable Controls
-    if ( aTabBox.GetEntryCount() == 0 )
+    if ( m_pTabBox->GetEntryCount() == 0 )
     {
-        aDelBtn.Disable();
-        aNewBtn.Enable();
-        aTabBox.GrabFocus();
+        m_pDelBtn->Disable();
+        m_pNewBtn->Enable();
+        m_pTabBox->GrabFocus();
     }
 
     // If no RadioButton was clicked, we need to put anyway
@@ -602,26 +587,26 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox )
 {
     bCheck |= sal_True;
     SvxTabAdjust eAdj;
-    aDezChar.Disable();
-    aDezCharLabel.Disable();
-    aDezChar.SetText( String() );
+    m_pDezChar->Disable();
+    m_pDezCharLabel->Disable();
+    m_pDezChar->SetText( "" );
 
-    if ( pBox == &aLeftTab )
+    if ( pBox == m_pLeftTab )
         eAdj = SVX_TAB_ADJUST_LEFT;
-    else if ( pBox == &aRightTab )
+    else if ( pBox == m_pRightTab )
         eAdj = SVX_TAB_ADJUST_RIGHT;
-    else if ( pBox == &aCenterTab )
+    else if ( pBox == m_pCenterTab )
         eAdj = SVX_TAB_ADJUST_CENTER;
     else
     {
         eAdj = SVX_TAB_ADJUST_DECIMAL;
-        aDezChar.Enable();
-        aDezCharLabel.Enable();
-        aDezChar.SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
+        m_pDezChar->Enable();
+        m_pDezCharLabel->Enable();
+        m_pDezChar->SetText( OUString( (sal_Unicode)aAktTab.GetDecimal() ) );
     }
 
     aAktTab.GetAdjustment() = eAdj;
-    sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit );
+    sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
 
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
@@ -637,22 +622,22 @@ IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox )
 {
     bCheck |= sal_True;
     sal_uInt8 cFill = ' ';
-    aFillChar.SetText( String() );
-    aFillChar.Disable();
+    m_pFillChar->SetText( "" );
+    m_pFillChar->Disable();
 
-    if( pBox == &aFillSpecial )
-        aFillChar.Enable();
-    else if ( pBox == &aNoFillChar )
+    if( pBox == m_pFillSpecial )
+        m_pFillChar->Enable();
+    else if ( pBox == m_pNoFillChar )
         cFill = ' ';
-    else if ( pBox == &aFillSolidLine )
+    else if ( pBox == m_pFillSolidLine )
         cFill = '_';
-    else if ( pBox == &aFillPoints )
+    else if ( pBox == m_pFillPoints )
         cFill = '.';
-    else if ( pBox == &aFillDashLine )
+    else if ( pBox == m_pFillDashLine )
         cFill = '-';
 
     aAktTab.GetFill() = cFill;
-    sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit );
+    sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
 
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
@@ -668,10 +653,10 @@ IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit )
 {
     String aChar( pEdit->GetText() );
 
-    if ( aChar.Len() > 0 )
+    if ( aChar.Len() > 0)
         aAktTab.GetFill() = aChar.GetChar( 0 );
 
-    const sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit);
+    const sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit);
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
         aNewTabs.Remove( nPos );
@@ -688,7 +673,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit )
     if ( aChar.Len() > 0 && ( aChar.GetChar( 0 ) >= ' '))
         aAktTab.GetDecimal() = aChar.GetChar( 0 );
 
-    sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit );
+    sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
         aNewTabs.Remove( nPos );
@@ -701,11 +686,11 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit )
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl)
 {
-    sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit );
+    sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
         aAktTab = aNewTabs[nPos];
-        aNewBtn.Disable();
+        m_pNewBtn->Disable();
         SetFillAndTabType_Impl();
     }
     return 0;
@@ -715,21 +700,21 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl)
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl)
 {
-    sal_uInt16 nPos = aTabBox.GetValuePos( aTabBox.GetValue( eDefUnit ), eDefUnit );
+    sal_uInt16 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
     {
         aAktTab = aNewTabs[nPos];
         SetFillAndTabType_Impl();
 
         aAktTab.GetTabPos() =
-            static_cast<long>(aTabBox.Denormalize( aTabBox.GetValue( eDefUnit ) ));
+            static_cast<long>(m_pTabBox->Denormalize( m_pTabBox->GetValue( eDefUnit ) ));
 
-        aNewBtn.Disable();
-        aDelBtn.Enable();
+        m_pNewBtn->Disable();
+        m_pDelBtn->Enable();
         return 0;
     }
-    aNewBtn.Enable();
-    aDelBtn.Disable();
+    m_pNewBtn->Enable();
+    m_pDelBtn->Disable();
     return 0;
 }
 
diff --git a/cui/source/tabpages/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc
deleted file mode 100644
index 9e2b209bc6d2..000000000000
--- a/cui/source/tabpages/tabstpge.hrc
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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_TABSTPGE_HRC
-#define _SVX_TABSTPGE_HRC
-
-// defines ------------------------------------------------------------------
-
-#define ED_TABPOS                       10
-#define FL_TABPOS                       11
-#define FL_TABPOS_VERT                  12
-
-#define BTN_TABTYPE_LEFT        20
-#define WIN_TABLEFT                     21
-#define BTN_TABTYPE_RIGHT       22
-#define WIN_TABRIGHT            23
-#define BTN_TABTYPE_CENTER      24
-#define WIN_TABCENTER           25
-#define BTN_TABTYPE_DECIMAL     26
-#define WIN_TABDECIMAL          27
-#define ED_TABTYPE_DECCHAR      28
-#define FT_TABTYPE_DECCHAR      29
-#define FL_TABTYPE                      30
-
-
-#define BTN_FILLCHAR_NO         40
-#define BTN_FILLCHAR_POINTS     41
-#define BTN_FILLCHAR_DASHLINE           42
-#define BTN_FILLCHAR_UNDERSCORE         43
-#define BTN_FILLCHAR_OTHER      44
-#define ED_FILLCHAR_OTHER       45
-#define FL_FILLCHAR                     46
-
-#define BTN_NEW                         50
-#define BTN_DEL                         51
-#define BTN_DELALL                      52
-#define ST_LEFTTAB_ASIAN                53
-#define ST_RIGHTTAB_ASIAN               54
-#define ST_FILLCHAR_OTHER               55
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
deleted file mode 100644
index 1436df01b647..000000000000
--- a/cui/source/tabpages/tabstpge.src
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpid.hrc"
-#include <cuires.hrc>
-#include "tabstpge.hrc"
-#include <svx/dialogs.hrc>
-
- // RID_SVXPAGE_TABULATOR -------------------------------------------------
-TabPage RID_SVXPAGE_TABULATOR
-{
-    HelpId = HID_TABULATOR ;
-    Hide = TRUE ;
-    Text [ en-US ] = "Tabs" ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    FixedLine FL_TABPOS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 48 , 8 ) ;
-        Text [ en-US ] = "Position" ;
-    };
-    MetricBox ED_TABPOS
-    {
-        HelpID = "cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS";
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 39 , 165 ) ;
-        Minimum = -5600 ;
-        Maximum = 5600 ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_CM ;
-    };
-    FixedLine FL_TABPOS_VERT
-    {
-        Pos = MAP_APPFONT ( 55 , 14 ) ;
-        Size = MAP_APPFONT ( 4 , 165 ) ;
-        Vert = TRUE;
-    };
-    FixedLine FL_TABTYPE
-    {
-        Pos = MAP_APPFONT ( 60 , 3 ) ;
-        Size = MAP_APPFONT ( 138 , 8 ) ;
-        Text [ en-US ] = "Type" ;
-    };
-    RadioButton BTN_TABTYPE_LEFT
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT";
-        Pos = MAP_APPFONT ( 66 , 14 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "~Left" ;
-        Check = TRUE ;
-    };
-    Window WIN_TABLEFT
-    {
-        Pos = MAP_APPFONT ( 157 , 14 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    RadioButton BTN_TABTYPE_RIGHT
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT";
-        Pos = MAP_APPFONT ( 66 , 28 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "Righ~t" ;
-    };
-    Window WIN_TABRIGHT
-    {
-        Pos = MAP_APPFONT ( 157 , 28 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    RadioButton BTN_TABTYPE_CENTER
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER";
-        Pos = MAP_APPFONT ( 66 , 42 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "C~entered" ;
-    };
-    Window WIN_TABCENTER
-    {
-        Pos = MAP_APPFONT ( 157 , 42 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    RadioButton BTN_TABTYPE_DECIMAL
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL";
-        Pos = MAP_APPFONT ( 66 , 56 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "Deci~mal" ;
-    };
-    Window WIN_TABDECIMAL
-    {
-        Pos = MAP_APPFONT ( 157 , 56 ) ;
-        Size = MAP_APPFONT ( 7 , 10 ) ;
-    };
-    FixedText FT_TABTYPE_DECCHAR
-    {
-        Pos = MAP_APPFONT ( 75 , 70 ) ;
-        Size = MAP_APPFONT ( 79 , 8 ) ;
-        Text [ en-US ] = "~Character" ;
-    };
-    Edit ED_TABTYPE_DECCHAR
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 156 , 68 ) ;
-        Size = MAP_APPFONT ( 9 , 12 ) ;
-        Left = TRUE ;
-    };
-    FixedLine FL_FILLCHAR
-    {
-        Pos = MAP_APPFONT ( 60 , 86 ) ;
-        Size = MAP_APPFONT ( 138 , 8 ) ;
-        Text [ en-US ] = "Fill character" ;
-    };
-    RadioButton BTN_FILLCHAR_NO
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO";
-        Pos = MAP_APPFONT ( 66 , 97 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "N~one" ;
-        Check = TRUE ;
-    };
-    RadioButton BTN_FILLCHAR_POINTS
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS";
-        Pos = MAP_APPFONT ( 66 , 111 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text = "~........" ;
-    };
-    RadioButton BTN_FILLCHAR_DASHLINE
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE";
-        Pos = MAP_APPFONT ( 66 , 125 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text = "~--------" ;
-    };
-    RadioButton BTN_FILLCHAR_UNDERSCORE
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE";
-        Pos = MAP_APPFONT ( 66 , 139 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text = "~_____" ;
-    };
-    RadioButton BTN_FILLCHAR_OTHER
-    {
-        HelpID = "cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER";
-        Pos = MAP_APPFONT ( 66 , 153 ) ;
-        Size = MAP_APPFONT ( 89 , 10 ) ;
-        Text [ en-US ] = "Character" ;
-    };
-    Edit ED_FILLCHAR_OTHER
-    {
-        HelpID = "cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 156 , 151 ) ;
-        Size = MAP_APPFONT ( 9 , 12 ) ;
-        Left = TRUE ;
-    };
-    PushButton BTN_NEW
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW";
-        Pos = MAP_APPFONT ( 204 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~New" ;
-    };
-    PushButton BTN_DELALL
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL";
-        Pos = MAP_APPFONT ( 204 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "Delete ~All" ;
-    };
-    PushButton BTN_DEL
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL";
-        Pos = MAP_APPFONT ( 204 , 40 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "~Delete" ;
-    };
-    String ST_LEFTTAB_ASIAN
-    {
-        Text [ en-US ] = "~Left/Top" ;
-    };
-    String ST_RIGHTTAB_ASIAN
-    {
-        Text [ en-US ] = "Righ~t/Bottom" ;
-    };
-    String ST_FILLCHAR_OTHER
-    {
-        Text [ en-US ] = "Character" ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
new file mode 100644
index 000000000000..709e9df234c5
--- /dev/null
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -0,0 +1,549 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">-56</property>
+    <property name="upper">56</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkBox" id="ParagraphTabsPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="border_width">6</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="vexpand">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="vexpand">True</property>
+            <property name="top_padding">6</property>
+            <child>
+              <object class="VclComboBoxNumeric" id="ED_TABPOS:0cm">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="vexpand">True</property>
+                <property name="dropdown">False</property>
+                <property name="adjustment">adjustment1</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Position</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="box2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkFrame" id="frameFL_TABTYPE">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_DECIMAL">
+                        <property name="label" translatable="yes">Deci_mal</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobuttonBTN_TABTYPE_LEFT</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entryED_TABTYPE_DECCHAR">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="invisible_char">•</property>
+                        <property name="width_chars">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="cuilo-TabWin_Impl" id="drawingareaWIN_TABLEFT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="cuilo-TabWin_Impl" id="drawingareaWIN_TABRIGHT">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="cuilo-TabWin_Impl" id="drawingareaWIN_TABCENTER">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="cuilo-TabWin_Impl" id="drawingareaWIN_TABDECIMAL">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_LEFT">
+                            <property name="label" translatable="yes">_Left</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radiobuttonST_LEFTTAB_ASIAN</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobuttonST_LEFTTAB_ASIAN">
+                            <property name="label" translatable="yes">_Left/Top</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radiobuttonBTN_TABTYPE_RIGHT</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_RIGHT">
+                            <property name="label" translatable="yes">Righ_t</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radiobuttonST_RIGHTTAB_ASIAN</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkRadioButton" id="radiobuttonST_RIGHTTAB_ASIAN">
+                            <property name="label" translatable="yes">Righ_t/Bottom</property>
+                            <property name="can_focus">False</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="xalign">0</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">radiobuttonBTN_TABTYPE_CENTER</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobuttonBTN_TABTYPE_CENTER">
+                        <property name="label" translatable="yes">C_entered</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobuttonBTN_TABTYPE_DECIMAL</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkLabel" id="labelFT_TABTYPE_DECCHAR">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">_Character</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">entryED_TABTYPE_DECCHAR</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Type</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="frameFL_FILLCHAR">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="alignment3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkGrid" id="grid1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_NO">
+                        <property name="label" translatable="yes">N_one</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobuttonBTN_FILLCHAR_POINTS</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_POINTS">
+                        <property name="label" translatable="yes">_........</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobuttonBTN_FILLCHAR_DASHLINE</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_DASHLINE">
+                        <property name="label" translatable="yes">_--------</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobuttonBTN_FILLCHAR_UNDERSCORE</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_UNDERSCORE">
+                        <property name="label" translatable="yes">______</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobuttonBTN_FILLCHAR_OTHER</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="radiobuttonBTN_FILLCHAR_OTHER">
+                        <property name="label" translatable="yes">C_haracter</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0.090000003576278687</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">radiobuttonBTN_FILLCHAR_NO</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="entryED_FILLCHAR_OTHER">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="invisible_char">•</property>
+                        <property name="width_chars">1</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">4</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Fill character</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkButtonBox" id="buttonbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="margin_top">6</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <property name="layout_style">start</property>
+        <child>
+          <object class="GtkButton" id="buttonBTN_NEW">
+            <property name="label">gtk-new</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">True</property>
+            <property name="use_stock">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="buttonBTN_DELALL">
+            <property name="label" translatable="yes">Delete _all</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">True</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="buttonBTN_DEL">
+            <property name="label">gtk-delete</property>
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="receives_default">True</property>
+            <property name="use_stock">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup2">
+    <property name="mode">vertical</property>
+    <widgets>
+      <widget name="entryED_TABTYPE_DECCHAR"/>
+      <widget name="entryED_FILLCHAR_OTHER"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup3">
+    <widgets>
+      <widget name="radiobuttonBTN_TABTYPE_DECIMAL"/>
+      <widget name="box3"/>
+      <widget name="box4"/>
+      <widget name="radiobuttonBTN_TABTYPE_CENTER"/>
+      <widget name="alignment4"/>
+      <widget name="radiobuttonBTN_FILLCHAR_NO"/>
+      <widget name="radiobuttonBTN_FILLCHAR_POINTS"/>
+      <widget name="radiobuttonBTN_FILLCHAR_DASHLINE"/>
+      <widget name="radiobuttonBTN_FILLCHAR_UNDERSCORE"/>
+      <widget name="radiobuttonBTN_FILLCHAR_OTHER"/>
+    </widgets>
+  </object>
+</interface>