split out numbering position page to cui and adapt code

and move SvxNumberingPreview from svx to cui where its
::Paint impl already lives

Change-Id: I2b7bebeb9914d74d0f391d3b178b0ad3d778c479

15 files changed, 1018 insertions, 1097 deletions

diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 5a1c68d11891..9c51ec0f62aa 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -18,7 +18,8 @@ $(eval $(call gb_UI_add_uifiles,cui,\
 	cui/uiconfig/ui/insertplugin \
 	cui/uiconfig/ui/insertrowcolumn \
 	cui/uiconfig/ui/macroselectordialog \
-	cui/uiconfig/ui/numberformatpage \
+	cui/uiconfig/ui/numberingformatpage \
+	cui/uiconfig/ui/numberingpositionpage \
 	cui/uiconfig/ui/personalization_tab \
 	cui/uiconfig/ui/pickbulletpage \
 	cui/uiconfig/ui/pickgraphicpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index cfd077f3eda7..6bafaf90b88a 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -296,7 +296,6 @@
 #define HID_VALUESET_NUM "CUI_HID_VALUESET_NUM"
 #define HID_VALUESET_NUMBMP "CUI_HID_VALUESET_NUMBMP"
 #define HID_SVXPAGE_NUM_OPTIONS "CUI_HID_SVXPAGE_NUM_OPTIONS"
-#define HID_SVXPAGE_NUM_POSITION "CUI_HID_SVXPAGE_NUM_POSITION"
 #define HID_MEASURE_CTL_PREVIEW "CUI_HID_MEASURE_CTL_PREVIEW"
 #define HID_FORMAT_PARAGRAPH_EXT "CUI_HID_FORMAT_PARAGRAPH_EXT"
 #define HID_FORMAT_PARAGRAPH_ALIGN "CUI_HID_FORMAT_PARAGRAPH_ALIGN"
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 830c7a8d03c3..e396d8fbfbda 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -36,9 +36,35 @@
 class SvxNumRule;
 class SvxBmpNumValueSet;
 class SvxNumValueSet;
-class SvxNumberingPreview;
 class SvxBrushItem;
 
+class SvxNumberingPreview : public Window
+{
+    const SvxNumRule*   pActNum;
+    Font                aStdFont;
+    long                nPageWidth;
+    const String*       pOutlineNames;
+    sal_Bool                bPosition;
+    sal_uInt16              nActLevel;
+
+    protected:
+        virtual void        Paint( const Rectangle& rRect );
+
+    public:
+        SvxNumberingPreview(Window* pParent, const ResId& rResId );
+        SvxNumberingPreview(Window* pParent, WinBits nWinBits = WB_BORDER);
+
+        void    SetNumRule(const SvxNumRule* pNum)
+                    {pActNum = pNum; Invalidate();};
+        void    SetPageWidth(long nPgWidth)
+                                {nPageWidth = nPgWidth;}
+        void    SetOutlineNames(const String* pNames)
+                        {pOutlineNames = pNames;}
+        void    SetPositionMode()
+                        { bPosition = sal_True;}
+        void    SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
+
+};
 
 //------------------------------------------------
 
@@ -362,41 +388,36 @@ class SvxNumPositionTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
-    FixedLine           aPositionFL;
-    FixedText           aLevelFT;
-    MultiListBox        aLevelLB;
+    ListBox*            m_pLevelLB;
 
     // former set of controls shown for numbering rules containing list level
     // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
-    FixedText           aDistBorderFT;
-    MetricField         aDistBorderMF;
-    CheckBox            aRelativeCB;
-    FixedText           aIndentFT;
-    MetricField         aIndentMF;
-    FixedText           aDistNumFT;
-    MetricField         aDistNumMF;
-    FixedText           aAlignFT;
-    ListBox             aAlignLB;
+    FixedText*          m_pDistBorderFT;
+    MetricField*        m_pDistBorderMF;
+    CheckBox*           m_pRelativeCB;
+    FixedText*          m_pIndentFT;
+    MetricField*        m_pIndentMF;
+    FixedText*          m_pDistNumFT;
+    MetricField*        m_pDistNumMF;
+    FixedText*          m_pAlignFT;
+    ListBox*            m_pAlignLB;
 
     // new set of controls shown for numbering rules containing list level
     // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
-    FixedText           aLabelFollowedByFT;
-    ListBox             aLabelFollowedByLB;
-    FixedText           aListtabFT;
-    MetricField         aListtabMF;
-    FixedText           aAlign2FT;
-    ListBox             aAlign2LB;
-    FixedText           aAlignedAtFT;
-    MetricField         aAlignedAtMF;
-    FixedText           aIndentAtFT;
-    MetricField         aIndentAtMF;
-
-    PushButton          aStandardPB;
-
-#if OSL_DEBUG_LEVEL > 1
-    FixedText*          pDebugFixedText;
-#endif
-    SvxNumberingPreview* pPreviewWIN;
+    FixedText*          m_pLabelFollowedByFT;
+    ListBox*            m_pLabelFollowedByLB;
+    FixedText*          m_pListtabFT;
+    MetricField*        m_pListtabMF;
+    FixedText*          m_pAlign2FT;
+    ListBox*            m_pAlign2LB;
+    FixedText*          m_pAlignedAtFT;
+    MetricField*        m_pAlignedAtMF;
+    FixedText*          m_pIndentAtFT;
+    MetricField*        m_pIndentAtMF;
+
+    PushButton*         m_pStandardPB;
+
+    SvxNumberingPreview* m_pPreviewWIN;
 
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9a73624726be..b5eb4f7b8c19 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -222,8 +222,8 @@ void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt )
 
 SvxNumberFormatTabPage::SvxNumberFormatTabPage(Window* pParent,
     const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "NumberFormatPage",
-        "cui/ui/numberformatpage.ui", rCoreAttrs)
+    : SfxTabPage(pParent, "NumberingFormatPage",
+        "cui/ui/numberingformatpage.ui", rCoreAttrs)
     , pNumItem(NULL)
     , pNumFmtShell(NULL)
     , nInitFormat(ULONG_MAX)
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 4a4b29246e20..8f0215c4d03a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -29,6 +29,7 @@
 #include <helpid.hrc>
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
+#include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/gallery.hxx>
 #include <svl/urihelper.hxx>
@@ -2293,6 +2294,29 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
     return nRet;
 }
 
+SvxNumberingPreview::SvxNumberingPreview(Window* pParent, const ResId& rResId )
+    : Window(pParent, rResId), pActNum(0),nPageWidth(0), pOutlineNames(0)
+    , bPosition(sal_False), nActLevel(USHRT_MAX)
+{
+    SetBorderStyle( WINDOW_BORDER_MONO );
+}
+
+SvxNumberingPreview::SvxNumberingPreview(Window* pParent, WinBits nWinBits)
+    : Window(pParent, nWinBits)
+    , pActNum(0)
+    , nPageWidth(0)
+    , pOutlineNames(0)
+    , bPosition(false)
+    , nActLevel(USHRT_MAX)
+{
+    SetBorderStyle(WINDOW_BORDER_MONO);
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNumberingPreview(Window *pParent, VclBuilder::stringmap &)
+{
+    return new SvxNumberingPreview(pParent, WB_BORDER);
+}
+
 // paint preview of numeration
 void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
 {
@@ -2592,118 +2616,107 @@ void    SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ )
 
 }
 
+//See uiconfig/swriter/ui/outlinepositionpage.ui for effectively a duplicate
+//dialog to this one, except with a different preview window impl.
+//TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be
+//merged
 SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
-                               const SfxItemSet& rSet) :
-    SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_NUM_POSITION ), rSet ),
-    aPositionFL(    this, CUI_RES(FL_POSITION )),
-    aLevelFT(       this, CUI_RES(FT_LEVEL    )),
-    aLevelLB(       this, CUI_RES(LB_LEVEL  )),
-    aDistBorderFT(  this, CUI_RES(FT_BORDERDIST )),
-    aDistBorderMF(  this, CUI_RES(MF_BORDERDIST )),
-    aRelativeCB(    this, CUI_RES(CB_RELATIVE       )),
-    aIndentFT(      this, CUI_RES(FT_INDENT     )),
-    aIndentMF(      this, CUI_RES(MF_INDENT     )),
-    aDistNumFT(     this, CUI_RES(FT_NUMDIST        )),
-    aDistNumMF(     this, CUI_RES(MF_NUMDIST        )),
-    aAlignFT(       this, CUI_RES(FT_ALIGN  )),
-    aAlignLB(       this, CUI_RES(LB_ALIGN  )),
-    aLabelFollowedByFT( this, CUI_RES(FT_LABEL_FOLLOWED_BY) ),
-    aLabelFollowedByLB( this, CUI_RES(LB_LABEL_FOLLOWED_BY) ),
-    aListtabFT( this, CUI_RES(FT_LISTTAB) ),
-    aListtabMF( this, CUI_RES(MF_LISTTAB) ),
-    aAlign2FT( this, CUI_RES(FT_ALIGN_2) ),
-    aAlign2LB( this, CUI_RES(LB_ALIGN_2) ),
-    aAlignedAtFT( this, CUI_RES(FT_ALIGNED_AT) ),
-    aAlignedAtMF( this, CUI_RES(MF_ALIGNED_AT) ),
-    aIndentAtFT( this, CUI_RES(FT_INDENT_AT) ),
-    aIndentAtMF( this, CUI_RES(MF_INDENT_AT) ),
-    aStandardPB(    this, CUI_RES(PB_STANDARD       )),
-    pPreviewWIN(    new SvxNumberingPreview(this, CUI_RES(WIN_PREVIEW   ))),
-    pActNum(0),
-    pSaveNum(0),
-    nActNumLvl( USHRT_MAX ),
-    nNumItemId(SID_ATTR_NUMBERING_RULE),
-        bModified(false),
-        bPreset(false),
-    bInInintControl(sal_False),
-    bLabelAlignmentPosAndSpaceModeActive( false )
+                               const SfxItemSet& rSet)
+    : SfxTabPage(pParent, "NumberingPositionPage", "cui/ui/numberingpositionpage.ui", rSet)
+    , pActNum(0)
+    , pSaveNum(0)
+    , nActNumLvl(USHRT_MAX)
+    , nNumItemId(SID_ATTR_NUMBERING_RULE)
+    , bModified(false)
+    , bPreset(false)
+    , bInInintControl(false)
+    , bLabelAlignmentPosAndSpaceModeActive(false)
 {
-    FreeResource();
     SetExchangeSupport();
-    pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
 
-    aRelativeCB.Check();
-    aAlignLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl));
-    aAlign2LB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl));
-    for ( sal_uInt16 i = 0; i < aAlignLB.GetEntryCount(); ++i )
-    {
-        aAlign2LB.InsertEntry( aAlignLB.GetEntry( i ) );
-    }
-    aAlign2LB.SetDropDownLineCount( aAlign2LB.GetEntryCount() );
-    aAlign2FT.SetText( aAlignFT.GetText() );
+    get(m_pLevelLB, "levellb");
+    get(m_pDistBorderFT, "indent");
+    get(m_pDistBorderMF, "indentmf");
+    get(m_pRelativeCB, "relative");
+    get(m_pIndentFT, "numberingwidth");
+    get(m_pIndentMF, "numberingwidthmf");
+    get(m_pDistNumFT, "numdist");
+    get(m_pDistNumMF, "numdistmf");
+    get(m_pAlignFT, "numalign");
+    get(m_pAlignLB, "numalignlb");
+
+    get(m_pLabelFollowedByFT, "numfollowedby");
+    get(m_pLabelFollowedByLB, "numfollowedbylb");
+    get(m_pListtabFT, "at");
+    get(m_pListtabMF, "atmf");
+    get(m_pAlign2FT, "num2align");
+    get(m_pAlign2LB, "num2alignlb");
+    get(m_pAlignedAtFT, "alignedat");
+    get(m_pAlignedAtMF, "alignedatmf");
+    get(m_pIndentAtFT, "indentat");
+    get(m_pIndentAtMF, "indentatmf");
+
+    get(m_pStandardPB, "standard");
+    get(m_pPreviewWIN, "preview");
+
+    m_pPreviewWIN->SetBackground(Wallpaper(Color(COL_TRANSPARENT)));
+
+    m_pRelativeCB->Check();
+    m_pAlignLB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl));
+    m_pAlign2LB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, EditModifyHdl_Impl));
+    for ( sal_uInt16 i = 0; i < m_pAlignLB->GetEntryCount(); ++i )
+    {
+        m_pAlign2LB->InsertEntry( m_pAlignLB->GetEntry( i ) );
+    }
+    m_pAlign2LB->SetDropDownLineCount( m_pAlign2LB->GetEntryCount() );
 
     Link aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl);
 
-    aDistBorderMF.SetUpHdl(aLk);
-    aDistBorderMF.SetDownHdl(aLk);
-    aDistBorderMF.SetLoseFocusHdl(aLk);
+    m_pDistBorderMF->SetUpHdl(aLk);
+    m_pDistBorderMF->SetDownHdl(aLk);
+    m_pDistBorderMF->SetLoseFocusHdl(aLk);
 
-    aDistNumMF.SetUpHdl(aLk);
-    aDistNumMF.SetDownHdl(aLk);
-    aDistNumMF.SetLoseFocusHdl(aLk);
+    m_pDistNumMF->SetUpHdl(aLk);
+    m_pDistNumMF->SetDownHdl(aLk);
+    m_pDistNumMF->SetLoseFocusHdl(aLk);
 
-    aIndentMF.SetUpHdl(aLk);
-    aIndentMF.SetDownHdl(aLk);
-    aIndentMF.SetLoseFocusHdl(aLk);
+    m_pIndentMF->SetUpHdl(aLk);
+    m_pIndentMF->SetDownHdl(aLk);
+    m_pIndentMF->SetLoseFocusHdl(aLk);
 
-    aLabelFollowedByLB.SetDropDownLineCount( aLabelFollowedByLB.GetEntryCount() );
-    aLabelFollowedByLB.SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) );
+    m_pLabelFollowedByLB->SetDropDownLineCount( m_pLabelFollowedByLB->GetEntryCount() );
+    m_pLabelFollowedByLB->SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) );
 
     aLk = LINK(this, SvxNumPositionTabPage, ListtabPosHdl_Impl);
-    aListtabMF.SetUpHdl(aLk);
-    aListtabMF.SetDownHdl(aLk);
-    aListtabMF.SetLoseFocusHdl(aLk);
+    m_pListtabMF->SetUpHdl(aLk);
+    m_pListtabMF->SetDownHdl(aLk);
+    m_pListtabMF->SetLoseFocusHdl(aLk);
 
     aLk = LINK(this, SvxNumPositionTabPage, AlignAtHdl_Impl);
-    aAlignedAtMF.SetUpHdl(aLk);
-    aAlignedAtMF.SetDownHdl(aLk);
-    aAlignedAtMF.SetLoseFocusHdl(aLk);
+    m_pAlignedAtMF->SetUpHdl(aLk);
+    m_pAlignedAtMF->SetDownHdl(aLk);
+    m_pAlignedAtMF->SetLoseFocusHdl(aLk);
 
     aLk = LINK(this, SvxNumPositionTabPage, IndentAtHdl_Impl);
-    aIndentAtMF.SetUpHdl(aLk);
-    aIndentAtMF.SetDownHdl(aLk);
-    aIndentAtMF.SetLoseFocusHdl(aLk);
+    m_pIndentAtMF->SetUpHdl(aLk);
+    m_pIndentAtMF->SetDownHdl(aLk);
+    m_pIndentAtMF->SetLoseFocusHdl(aLk);
 
-    aLevelLB.SetSelectHdl(LINK(this, SvxNumPositionTabPage, LevelHdl_Impl));
-    aRelativeCB.SetClickHdl(LINK(this, SvxNumPositionTabPage, RelativeHdl_Impl));
-    aStandardPB.SetClickHdl(LINK(this, SvxNumPositionTabPage, StandardHdl_Impl));
+    m_pLevelLB->EnableMultiSelection(true);
+    m_pLevelLB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, LevelHdl_Impl));
+    m_pRelativeCB->SetClickHdl(LINK(this, SvxNumPositionTabPage, RelativeHdl_Impl));
+    m_pStandardPB->SetClickHdl(LINK(this, SvxNumPositionTabPage, StandardHdl_Impl));
 
 
-    aRelativeCB.Check(bLastRelative);
-    pPreviewWIN->SetPositionMode();
+    m_pRelativeCB->Check(bLastRelative);
+    m_pPreviewWIN->SetPositionMode();
     eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
-
-#if OSL_DEBUG_LEVEL > 1
-    pDebugFixedText = new FixedText(this, 0);
-    pDebugFixedText->Show();
-    Size aSize(200, 20);
-    Point aPos(250,0);
-
-    pDebugFixedText->SetPosSizePixel(aPos, aSize);
-    pDebugFixedText->SetText(OUString("Das ist ein Debug-Text"));
-#endif
-
-    aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
 }
 
 SvxNumPositionTabPage::~SvxNumPositionTabPage()
 {
     delete pActNum;
-    delete pPreviewWIN;
     delete pSaveNum;
-#if OSL_DEBUG_LEVEL > 1
-    delete pDebugFixedText;
-#endif
 }
 /*-------------------------------------------------------*/
 
@@ -2739,13 +2752,13 @@ void SvxNumPositionTabPage::InitControls()
 {
     bInInintControl = sal_True;
     const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
-                     aRelativeCB.IsEnabled() && aRelativeCB.IsChecked();
-    const bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 &&
+                     m_pRelativeCB->IsEnabled() && m_pRelativeCB->IsChecked();
+    const bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 &&
                             USHRT_MAX != nActNumLvl;
 
-    aDistBorderMF.Enable( !bLabelAlignmentPosAndSpaceModeActive &&
+    m_pDistBorderMF->Enable( !bLabelAlignmentPosAndSpaceModeActive &&
                           ( bSingleSelection || bRelative ) );
-    aDistBorderFT.Enable( !bLabelAlignmentPosAndSpaceModeActive &&
+    m_pDistBorderFT->Enable( !bLabelAlignmentPosAndSpaceModeActive &&
                           ( bSingleSelection || bRelative ) );
 
     bool bSetDistEmpty = false;
@@ -2831,24 +2844,20 @@ void SvxNumPositionTabPage::InitControls()
         {
             nDistBorderNum = (long)aNumFmtArr[nLvl]->GetAbsLSpace()+ aNumFmtArr[nLvl]->GetFirstLineOffset();
         }
-        SetMetricValue(aDistBorderMF, nDistBorderNum, eCoreUnit);
+        SetMetricValue(*m_pDistBorderMF, nDistBorderNum, eCoreUnit);
     }
     else
         bSetDistEmpty = true;
 
-#if OSL_DEBUG_LEVEL > 1
-    lcl_PrintDebugOutput(*pDebugFixedText, *aNumFmtArr[nLvl]);
-#endif
-
     const String aEmptyStr;
     if(bSameDist)
-        SetMetricValue(aDistNumMF, aNumFmtArr[nLvl]->GetCharTextDistance(), eCoreUnit);
+        SetMetricValue(*m_pDistNumMF, aNumFmtArr[nLvl]->GetCharTextDistance(), eCoreUnit);
     else
-        aDistNumMF.SetText(aEmptyStr);
+        m_pDistNumMF->SetText(aEmptyStr);
     if(bSameIndent)
-        SetMetricValue(aIndentMF, - aNumFmtArr[nLvl]->GetFirstLineOffset(), eCoreUnit);
+        SetMetricValue(*m_pIndentMF, - aNumFmtArr[nLvl]->GetFirstLineOffset(), eCoreUnit);
     else
-        aIndentMF.SetText(aEmptyStr);
+        m_pIndentMF->SetText(aEmptyStr);
 
     if(bSameAdjust)
     {
@@ -2857,13 +2866,13 @@ void SvxNumPositionTabPage::InitControls()
             nPos = 0;
         else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
             nPos = 2;
-        aAlignLB.SelectEntryPos(nPos);
-        aAlign2LB.SelectEntryPos( nPos );
+        m_pAlignLB->SelectEntryPos(nPos);
+        m_pAlign2LB->SelectEntryPos( nPos );
     }
     else
     {
-        aAlignLB.SetNoSelection();
-        aAlign2LB.SetNoSelection();
+        m_pAlignLB->SetNoSelection();
+        m_pAlign2LB->SetNoSelection();
     }
 
     if ( bSameLabelFollowedBy )
@@ -2877,55 +2886,55 @@ void SvxNumPositionTabPage::InitControls()
         {
             nPos = 2;
         }
-        aLabelFollowedByLB.SelectEntryPos( nPos );
+        m_pLabelFollowedByLB->SelectEntryPos( nPos );
     }
     else
     {
-        aLabelFollowedByLB.SetNoSelection();
+        m_pLabelFollowedByLB->SetNoSelection();
     }
 
     if ( aNumFmtArr[nLvl]->GetLabelFollowedBy() == SvxNumberFormat::LISTTAB )
     {
-        aListtabFT.Enable( true );
-        aListtabMF.Enable( true );
+        m_pListtabFT->Enable( true );
+        m_pListtabMF->Enable( true );
         if ( bSameListtab )
         {
-            SetMetricValue( aListtabMF, aNumFmtArr[nLvl]->GetListtabPos(), eCoreUnit );
+            SetMetricValue(*m_pListtabMF, aNumFmtArr[nLvl]->GetListtabPos(), eCoreUnit);
         }
         else
         {
-            aListtabMF.SetText(aEmptyStr);
+            m_pListtabMF->SetText(aEmptyStr);
         }
     }
     else
     {
-        aListtabFT.Enable( false );
-        aListtabMF.Enable( false );
-        aListtabMF.SetText(aEmptyStr);
+        m_pListtabFT->Enable( false );
+        m_pListtabMF->Enable( false );
+        m_pListtabMF->SetText(aEmptyStr);
     }
 
     if ( bSameAlignAt )
     {
-        SetMetricValue( aAlignedAtMF,
+        SetMetricValue(*m_pAlignedAtMF,
                         aNumFmtArr[nLvl]->GetIndentAt() + aNumFmtArr[nLvl]->GetFirstLineIndent(),
-                        eCoreUnit );
+                        eCoreUnit);
     }
     else
     {
-        aAlignedAtMF.SetText(aEmptyStr);
+        m_pAlignedAtMF->SetText(aEmptyStr);
     }
 
     if ( bSameIndentAt )
     {
-        SetMetricValue( aIndentAtMF, aNumFmtArr[nLvl]->GetIndentAt(), eCoreUnit );
+        SetMetricValue(*m_pIndentAtMF, aNumFmtArr[nLvl]->GetIndentAt(), eCoreUnit);
     }
     else
     {
-        aIndentAtMF.SetText(aEmptyStr);
+        m_pIndentAtMF->SetText(aEmptyStr);
     }
 
     if ( bSetDistEmpty )
-        aDistBorderMF.SetText(aEmptyStr);
+        m_pDistBorderMF->SetText(aEmptyStr);
 
     bInInintControl = sal_False;
 }
@@ -2954,35 +2963,35 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet)
         *pActNum = *pSaveNum;
         nActNumLvl = nTmpNumLvl;
         sal_uInt16 nMask = 1;
-        aLevelLB.SetUpdateMode(sal_False);
-        aLevelLB.SetNoSelection();
-        aLevelLB.SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == USHRT_MAX);
+        m_pLevelLB->SetUpdateMode(false);
+        m_pLevelLB->SetNoSelection();
+        m_pLevelLB->SelectEntryPos( pActNum->GetLevelCount(), nActNumLvl == USHRT_MAX);
         if(nActNumLvl != USHRT_MAX)
             for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
             {
                 if(nActNumLvl & nMask)
-                    aLevelLB.SelectEntryPos( i, sal_True);
+                    m_pLevelLB->SelectEntryPos( i, sal_True);
                 nMask <<= 1 ;
             }
-        aRelativeCB.Enable(nActNumLvl != 1);
-        aLevelLB.SetUpdateMode(sal_True);
+        m_pRelativeCB->Enable(nActNumLvl != 1);
+        m_pLevelLB->SetUpdateMode(sal_True);
 
         InitPosAndSpaceMode();
         ShowControlsDependingOnPosAndSpaceMode();
 
         InitControls();
     }
-    pPreviewWIN->SetLevel(nActNumLvl);
-    pPreviewWIN->Invalidate();
+    m_pPreviewWIN->SetLevel(nActNumLvl);
+    m_pPreviewWIN->Invalidate();
 }
 
 int  SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
 {
     if(_pSet)
     {
-        if(aDistBorderMF.IsEnabled())
-            DistanceHdl_Impl(&aDistBorderMF);
-        DistanceHdl_Impl(&aIndentMF);
+        if(m_pDistBorderMF->IsEnabled())
+            DistanceHdl_Impl(m_pDistBorderMF);
+        DistanceHdl_Impl(m_pIndentMF);
         FillItemSet(*_pSet);
     }
     return sal_True;
@@ -3023,43 +3032,45 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
     pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
     // insert levels
-    if(!aLevelLB.GetEntryCount())
+    if(!m_pLevelLB->GetEntryCount())
     {
         for(sal_uInt16 i = 1; i <= pSaveNum->GetLevelCount(); i++)
-            aLevelLB.InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i)) );
+            m_pLevelLB->InsertEntry( OUString::valueOf(static_cast<sal_Int32>(i)) );
         if(pSaveNum->GetLevelCount() > 1)
         {
             OUString sEntry( "1 - " );
             sEntry += OUString::valueOf( static_cast<sal_Int32>(pSaveNum->GetLevelCount()) );
-            aLevelLB.InsertEntry(sEntry);
-            aLevelLB.SelectEntry(sEntry);
+            m_pLevelLB->InsertEntry(sEntry);
+            m_pLevelLB->SelectEntry(sEntry);
         }
         else
-            aLevelLB.SelectEntryPos(0);
+            m_pLevelLB->SelectEntryPos(0);
     }
     else
-        aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1);
+        m_pLevelLB->SelectEntryPos(m_pLevelLB->GetEntryCount() - 1);
     sal_uInt16 nMask = 1;
-    aLevelLB.SetUpdateMode(sal_False);
-    aLevelLB.SetNoSelection();
+    m_pLevelLB->SetUpdateMode(sal_False);
+    m_pLevelLB->SetNoSelection();
     if(nActNumLvl == USHRT_MAX)
     {
-        aLevelLB.SelectEntryPos( pSaveNum->GetLevelCount(), sal_True);
+        m_pLevelLB->SelectEntryPos( pSaveNum->GetLevelCount(), sal_True);
     }
     else
+    {
         for(sal_uInt16 i = 0; i < pSaveNum->GetLevelCount(); i++)
         {
             if(nActNumLvl & nMask)
-                aLevelLB.SelectEntryPos( i, sal_True);
+                m_pLevelLB->SelectEntryPos( i, sal_True);
             nMask <<= 1;
         }
-    aLevelLB.SetUpdateMode(sal_True);
+    }
+    m_pLevelLB->SetUpdateMode(sal_True);
 
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
     else if(*pSaveNum != *pActNum)
         *pActNum = *pSaveNum;
-    pPreviewWIN->SetNumRule(pActNum);
+    m_pPreviewWIN->SetNumRule(pActNum);
 
     InitPosAndSpaceMode();
     ShowControlsDependingOnPosAndSpaceMode();
@@ -3100,28 +3111,28 @@ void SvxNumPositionTabPage::InitPosAndSpaceMode()
 
 void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
 {
-    aDistBorderFT.Show( !bLabelAlignmentPosAndSpaceModeActive );
-    aDistBorderMF.Show( !bLabelAlignmentPosAndSpaceModeActive );
-    aRelativeCB.Show( !bLabelAlignmentPosAndSpaceModeActive );
-    aIndentFT.Show( !bLabelAlignmentPosAndSpaceModeActive );
-    aIndentMF.Show( !bLabelAlignmentPosAndSpaceModeActive );
-    aDistNumFT.Show( !bLabelAlignmentPosAndSpaceModeActive &&
+    m_pDistBorderFT->Show( !bLabelAlignmentPosAndSpaceModeActive );
+    m_pDistBorderMF->Show( !bLabelAlignmentPosAndSpaceModeActive );
+    m_pRelativeCB->Show( !bLabelAlignmentPosAndSpaceModeActive );
+    m_pIndentFT->Show( !bLabelAlignmentPosAndSpaceModeActive );
+    m_pIndentMF->Show( !bLabelAlignmentPosAndSpaceModeActive );
+    m_pDistNumFT->Show( !bLabelAlignmentPosAndSpaceModeActive &&
                      pActNum->IsFeatureSupported(NUM_CONTINUOUS) );
-    aDistNumMF.Show( !bLabelAlignmentPosAndSpaceModeActive &&
+    m_pDistNumMF->Show( !bLabelAlignmentPosAndSpaceModeActive &&
                      pActNum->IsFeatureSupported(NUM_CONTINUOUS));
-    aAlignFT.Show( !bLabelAlignmentPosAndSpaceModeActive );
-    aAlignLB.Show( !bLabelAlignmentPosAndSpaceModeActive );
+    m_pAlignFT->Show( !bLabelAlignmentPosAndSpaceModeActive );
+    m_pAlignLB->Show( !bLabelAlignmentPosAndSpaceModeActive );
 
-    aLabelFollowedByFT.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aLabelFollowedByLB.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aListtabFT.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aListtabMF.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aAlign2FT.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aAlign2LB.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aAlignedAtFT.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aAlignedAtMF.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aIndentAtFT.Show( bLabelAlignmentPosAndSpaceModeActive );
-    aIndentAtMF.Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pLabelFollowedByFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pLabelFollowedByLB->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pListtabFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pListtabMF->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pAlign2FT->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pAlign2LB->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pAlignedAtFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pAlignedAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pIndentAtFT->Show( bLabelAlignmentPosAndSpaceModeActive );
+    m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
 }
 
 SfxTabPage* SvxNumPositionTabPage::Create( Window* pParent,
@@ -3134,19 +3145,19 @@ void    SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
 {
     if(eMetric == FUNIT_MM)
     {
-        aDistBorderMF .SetDecimalDigits(1);
-        aDistNumMF    .SetDecimalDigits(1);
-        aIndentMF     .SetDecimalDigits(1);
-        aListtabMF.SetDecimalDigits(1);
-        aAlignedAtMF.SetDecimalDigits(1);
-        aIndentAtMF.SetDecimalDigits(1);
+        m_pDistBorderMF->SetDecimalDigits(1);
+        m_pDistNumMF->SetDecimalDigits(1);
+        m_pIndentMF->SetDecimalDigits(1);
+        m_pListtabMF->SetDecimalDigits(1);
+        m_pAlignedAtMF->SetDecimalDigits(1);
+        m_pIndentAtMF->SetDecimalDigits(1);
     }
-    aDistBorderMF .SetUnit( eMetric );
-    aDistNumMF    .SetUnit( eMetric );
-    aIndentMF     .SetUnit( eMetric );
-    aListtabMF.SetUnit( eMetric );
-    aAlignedAtMF.SetUnit( eMetric );
-    aIndentAtMF.SetUnit( eMetric );
+    m_pDistBorderMF->SetUnit( eMetric );
+    m_pDistNumMF->SetUnit( eMetric );
+    m_pIndentMF->SetUnit( eMetric );
+    m_pListtabMF->SetUnit( eMetric );
+    m_pAlignedAtMF->SetUnit( eMetric );
+    m_pIndentAtMF->SetUnit( eMetric );
 }
 
 IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl)
@@ -3158,9 +3169,9 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl)
         {
             SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
 
-            const sal_uInt16 nPos = aAlignLB.IsVisible()
-                                ? aAlignLB.GetSelectEntryPos()
-                                : aAlign2LB.GetSelectEntryPos();
+            const sal_uInt16 nPos = m_pAlignLB->IsVisible()
+                                ? m_pAlignLB->GetSelectEntryPos()
+                                : m_pAlign2LB->GetSelectEntryPos();
             SvxAdjust eAdjust = SVX_ADJUST_CENTER;
             if(nPos == 0)
                 eAdjust = SVX_ADJUST_LEFT;
@@ -3213,7 +3224,7 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox )
             nMask <<=1;
         }
     }
-    aRelativeCB.Enable(nActNumLvl != 1);
+    m_pRelativeCB->Enable(nActNumLvl != 1);
     SetModified();
     InitPosAndSpaceMode();
     ShowControlsDependingOnPosAndSpaceMode();
@@ -3227,18 +3238,15 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
         return 0;
     long nValue = GetCoreValue(*pFld, eCoreUnit);
     sal_uInt16 nMask = 1;
-#if OSL_DEBUG_LEVEL > 1
-    sal_Bool bFirst = sal_True;
-#endif
     for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
     {
         if(nActNumLvl & nMask)
         {
             SvxNumberFormat aNumFmt( pActNum->GetLevel( i ) );
-            if(pFld == &aDistBorderMF)
+            if (pFld == m_pDistBorderMF)
             {
 
-                if(aRelativeCB.IsChecked())
+                if(m_pRelativeCB->IsChecked())
                 {
                     if(0 == i)
                     {
@@ -3259,11 +3267,11 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
                     aNumFmt.SetAbsLSpace( (short)nValue - aNumFmt.GetFirstLineOffset());
                 }
             }
-            else if(pFld == &aDistNumMF)
+            else if (pFld == m_pDistNumMF)
             {
                 aNumFmt.SetCharTextDistance( (short)nValue );
             }
-            else if(pFld == &aIndentMF)
+            else if (pFld == m_pIndentMF)
             {
                 // together with the FirstLineOffset the AbsLSpace must be changed, too
                 long nDiff = nValue + aNumFmt.GetFirstLineOffset();
@@ -3272,21 +3280,16 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
                 aNumFmt.SetFirstLineOffset( -(short)nValue );
             }
 
-#if OSL_DEBUG_LEVEL > 1
-            if(bFirst)
-                lcl_PrintDebugOutput(*pDebugFixedText, aNumFmt);
-            bFirst = sal_False;
-#endif
             pActNum->SetLevel( i, aNumFmt );
         }
         nMask <<= 1;
     }
 
     SetModified();
-    if(!aDistBorderMF.IsEnabled())
+    if(!m_pDistBorderMF->IsEnabled())
     {
         String aEmptyStr;
-        aDistBorderMF.SetText(aEmptyStr);
+        m_pDistBorderMF->SetText(aEmptyStr);
     }
 
     return 0;
@@ -3295,7 +3298,7 @@ IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld )
 IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
 {
     sal_Bool bOn = pBox->IsChecked();
-    sal_Bool bSingleSelection = aLevelLB.GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
+    sal_Bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
     sal_Bool bSetValue = sal_False;
     long nValue = 0;
     if(bOn || bSingleSelection)
@@ -3326,11 +3329,11 @@ IMPL_LINK( SvxNumPositionTabPage, RelativeHdl_Impl, CheckBox *, pBox )
     }
     String aEmptyStr;
     if(bSetValue)
-        SetMetricValue(aDistBorderMF, nValue,   eCoreUnit);
+        SetMetricValue(*m_pDistBorderMF, nValue,   eCoreUnit);
     else
-        aDistBorderMF.SetText(aEmptyStr);
-    aDistBorderMF.Enable(bOn || bSingleSelection);
-    aDistBorderFT.Enable(bOn || bSingleSelection);
+        m_pDistBorderMF->SetText(aEmptyStr);
+    m_pDistBorderMF->Enable(bOn || bSingleSelection);
+    m_pDistBorderFT->Enable(bOn || bSingleSelection);
     bLastRelative = bOn;
     return 0;
 }
@@ -3340,7 +3343,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl)
     // determine value to be set at the chosen list levels
     SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB;
     {
-        const sal_uInt16 nPos = aLabelFollowedByLB.GetSelectEntryPos();
+        const sal_uInt16 nPos = m_pLabelFollowedByLB->GetSelectEntryPos();
         if ( nPos == 1 )
         {
             eLabelFollowedBy = SvxNumberFormat::SPACE;
@@ -3378,15 +3381,15 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl)
 
     // enable/disable metric field for list tab stop position depending on
     // selected item following the list label.
-    aListtabFT.Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
-    aListtabMF.Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
+    m_pListtabFT->Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
+    m_pListtabMF->Enable( eLabelFollowedBy == SvxNumberFormat::LISTTAB );
     if ( bSameListtabPos && eLabelFollowedBy == SvxNumberFormat::LISTTAB )
     {
-        SetMetricValue( aListtabMF, pActNum->GetLevel( nFirstLvl ).GetListtabPos(), eCoreUnit );
+        SetMetricValue(*m_pListtabMF, pActNum->GetLevel( nFirstLvl ).GetListtabPos(), eCoreUnit);
     }
     else
     {
-        aListtabMF.SetText( String() );
+        m_pListtabMF->SetText( String() );
     }
 
     SetModified();
@@ -3408,9 +3411,6 @@ IMPL_LINK( SvxNumPositionTabPage, ListtabPosHdl_Impl, MetricField*, pFld )
             SvxNumberFormat aNumFmt( pActNum->GetLevel(i) );
             aNumFmt.SetListtabPos( nValue );
             pActNum->SetLevel( i, aNumFmt );
-#if OSL_DEBUG_LEVEL > 1
-            lcl_PrintDebugOutput(*pDebugFixedText, aNumFmt);
-#endif
         }
         nMask <<= 1;
     }
@@ -3435,9 +3435,6 @@ IMPL_LINK( SvxNumPositionTabPage, AlignAtHdl_Impl, MetricField*, pFld )
             const long nFirstLineIndent = nValue - aNumFmt.GetIndentAt();
             aNumFmt.SetFirstLineIndent( nFirstLineIndent );
             pActNum->SetLevel( i, aNumFmt );
-#if OSL_DEBUG_LEVEL > 1
-            lcl_PrintDebugOutput(*pDebugFixedText, aNumFmt);
-#endif
         }
         nMask <<= 1;
     }
@@ -3465,9 +3462,6 @@ IMPL_LINK( SvxNumPositionTabPage, IndentAtHdl_Impl, MetricField*, pFld )
             const long nNewFirstLineIndent = nAlignedAt - nValue;
             aNumFmt.SetFirstLineIndent( nNewFirstLineIndent );
             pActNum->SetLevel( i, aNumFmt );
-#if OSL_DEBUG_LEVEL > 1
-            lcl_PrintDebugOutput(*pDebugFixedText, aNumFmt);
-#endif
         }
         nMask <<= 1;
     }
@@ -3522,8 +3516,8 @@ void SvxNumPositionTabPage::SetModified(sal_Bool bRepaint)
     bModified = sal_True;
     if(bRepaint)
     {
-        pPreviewWIN->SetLevel(nActNumLvl);
-        pPreviewWIN->Invalidate();
+        m_pPreviewWIN->SetLevel(nActNumLvl);
+        m_pPreviewWIN->Invalidate();
     }
 }
 
diff --git a/cui/source/tabpages/numpages.hrc b/cui/source/tabpages/numpages.hrc
index 728b6306758f..ef90df07ea9d 100644
--- a/cui/source/tabpages/numpages.hrc
+++ b/cui/source/tabpages/numpages.hrc
@@ -37,10 +37,6 @@
 #define LB_FMT          158
 #define FT_SUFFIX       159
 #define ED_SUFFIX       160
-#define FT_BORDERDIST   161
-#define MF_BORDERDIST   162
-#define FT_NUMDIST      163
-#define MF_NUMDIST      164
 #define FT_INDENT       165
 #define MF_INDENT       166
 #define FT_CHARFMT      167
@@ -60,9 +56,7 @@
 #define FT_ORIENT       182
 #define LB_ORIENT       183
 #define MB_BITMAP       184
-#define CB_RELATIVE     185
 #define FT_ALL_LEVEL    186
-#define PB_STANDARD     187
 #define CB_SAME_LEVEL   188
 #define FL_SAME_LEVEL   189
 #define FT_BUL_COLOR    190
diff --git a/cui/source/tabpages/numpages.src b/cui/source/tabpages/numpages.src
index 310f61b4e49c..be5b9ff0ed8b 100644
--- a/cui/source/tabpages/numpages.src
+++ b/cui/source/tabpages/numpages.src
@@ -415,265 +415,6 @@ TabPage RID_SVXPAGE_NUM_OPTIONS
     };
 
 };
-/**************************************************************************/
-/*                                                                        */
-/*  TabPage Positionen                                                    */
-/*                                                                        */
-/**************************************************************************/
-TabPage RID_SVXPAGE_NUM_POSITION
-{
-    HelpID = HID_SVXPAGE_NUM_POSITION ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE;
-    FixedText FT_LEVEL
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 50, 8 ) ;
-        Text [ en-US ] = "Level" ;
-    };
-    MultiListBox LB_LEVEL
-    {
-        HelpID = "cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL";
-        Pos = MAP_APPFONT ( 12 , 25 ) ;
-        Size = MAP_APPFONT ( 26 , 154 ) ;
-        TabStop = TRUE ;
-        DropDown = FALSE ;
-        Border = TRUE ;
-        SimpleMode = TRUE ;
-    };
-    FixedLine FL_POSITION
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248 , 8 ) ;
-        Group = TRUE ;
-        Text [ en-US ] = "Position and spacing" ;
-    };
-    FixedText FT_BORDERDIST
-    {
-        Pos = MAP_APPFONT ( 50 , 27 ) ;
-        Size = MAP_APPFONT ( 105 , 10 ) ;
-        Text [ en-US ] = "Indent" ;
-    };
-    MetricField MF_BORDERDIST
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_BORDERDIST";
-        Pos = MAP_APPFONT ( 198 , 25 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = -1999 ;
-        Maximum = 1999 ;
-        DecimalDigits = 2 ;
-        Value = 0 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 1999 ;
-        SpinSize = 5 ;
-    };
-    CheckBox CB_RELATIVE
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE";
-        Pos = MAP_APPFONT ( 198 , 41 ) ;
-        Size = MAP_APPFONT ( 52 , 10 ) ;
-        Text [ en-US ] = "Relati~ve" ;
-    };
-    FixedText FT_INDENT
-    {
-        Pos = MAP_APPFONT ( 50 , 59 ) ;
-        Size = MAP_APPFONT ( 105 , 8 ) ;
-        Text [ en-US ] = "Width of numbering" ;
-    };
-    MetricField MF_INDENT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT";
-        Pos = MAP_APPFONT ( 198 , 57 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 1999 ;
-        DecimalDigits = 2 ;
-        Value = 0 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 1999 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_NUMDIST
-    {
-        Pos = MAP_APPFONT ( 50 , 75 ) ;
-        Size = MAP_APPFONT ( 105 , 8 ) ;
-        Text [ en-US ] = "Minimum space numbering <-> text" ;
-    };
-    MetricField MF_NUMDIST
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST";
-        Pos = MAP_APPFONT ( 198 , 73 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 1999 ;
-        DecimalDigits = 2 ;
-        Value = 0 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 1999 ;
-        SpinSize = 5 ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_ALIGN
-    {
-        Pos = MAP_APPFONT ( 50 , 91 ) ;
-        Size = MAP_APPFONT ( 105 , 8 ) ;
-        Text [ en-US ] = "N~umbering alignment" ;
-    };
-    ListBox LB_ALIGN
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN";
-        Pos = MAP_APPFONT ( 198 , 89 ) ;
-        Size = MAP_APPFONT ( 40 , 40 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Left" ; > ;
-            < "Centered" ; > ;
-            < "Right" ; > ;
-        };
-    };
-    FixedText FT_LABEL_FOLLOWED_BY
-    {
-        Pos = MAP_APPFONT ( 50 , 27 ) ;
-        Size = MAP_APPFONT ( 105 , 10 ) ;
-        Text [ en-US ] = "Numbering followed by" ;
-    };
-    ListBox LB_LABEL_FOLLOWED_BY
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY";
-        Pos = MAP_APPFONT ( 198 , 25 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-        StringList [ en-US ] =
-        {
-            < "Tab stop" ; > ;
-            < "Space" ; > ;
-            < "Nothing" ; > ;
-        };
-    };
-    FixedText FT_LISTTAB
-    {
-        Pos = MAP_APPFONT ( 50 , 43 ) ;
-        Size = MAP_APPFONT ( 143 , 10 ) ;
-        Right = TRUE ;
-        Text [ en-US ] = "at" ;
-    };
-    MetricField MF_LISTTAB
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB";
-        Pos = MAP_APPFONT ( 198 , 41 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 0 ;
-        Maximum = 1999 ;
-        DecimalDigits = 2 ;
-        Value = 0 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 1999 ;
-        SpinSize = 5 ;
-    };
-    FixedText FT_ALIGN_2
-    {
-        Pos = MAP_APPFONT ( 50 , 59 ) ;
-        Size = MAP_APPFONT ( 105 , 8 ) ;
-    };
-    ListBox LB_ALIGN_2
-    {
-        HelpID = "cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2";
-        Pos = MAP_APPFONT ( 198 , 57 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    FixedText FT_ALIGNED_AT
-    {
-        Pos = MAP_APPFONT ( 50 , 75 ) ;
-        Size = MAP_APPFONT ( 105 , 8 ) ;
-        Text [ en-US ] = "Aligned at" ;
-    };
-    MetricField MF_ALIGNED_AT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT";
-        Pos = MAP_APPFONT ( 198 , 73 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = -1999 ;
-        Maximum = 1999 ;
-        DecimalDigits = 2 ;
-        Value = 0 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 1999 ;
-        SpinSize = 5 ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_INDENT_AT
-    {
-        Pos = MAP_APPFONT ( 50 , 91 ) ;
-        Size = MAP_APPFONT ( 105 , 8 ) ;
-        Text [ en-US ] = "Indent at" ;
-    };
-    MetricField MF_INDENT_AT
-    {
-        HelpID = "cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT";
-        Pos = MAP_APPFONT ( 198 , 89 ) ;
-        Size = MAP_APPFONT ( 40 , 12 ) ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = -1999 ;
-        Maximum = 1999 ;
-        DecimalDigits = 2 ;
-        Value = 0 ;
-        Unit = FUNIT_CM ;
-        First = 0 ;
-        Last = 1999 ;
-        SpinSize = 5 ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    PushButton PB_STANDARD
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD";
-        Pos = MAP_APPFONT ( 198 , 165 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        Text [ en-US ] = "Default" ;
-    };
-    Window WIN_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 50 , 113 ) ;
-        Size = MAP_APPFONT ( 143 , 67 ) ;
-        Border = TRUE ;
-    };
-};
 
 String RID_STR_EDIT_GRAPHIC
 {
diff --git a/cui/uiconfig/ui/numberformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index 280d3e02c452..181349744870 100644
--- a/cui/uiconfig/ui/numberformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -6,7 +6,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkGrid" id="NumberFormatPage">
+  <object class="GtkGrid" id="NumberingFormatPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="row_spacing">10</property>
diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui
new file mode 100644
index 000000000000..057ff289de0b
--- /dev/null
+++ b/cui/uiconfig/ui/numberingpositionpage.ui
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">19.989999999999998</property>
+    <property name="step_increment">0.050000000000000003</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="lower">-19.989999999999998</property>
+    <property name="upper">19.989999999999998</property>
+    <property name="step_increment">0.050000000000000003</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Left</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Centered</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Right</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Tab stop</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Space</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Nothing</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkBox" id="NumberingPositionPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">10</property>
+    <property name="margin_right">10</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <child>
+      <object class="GtkFrame" id="frame3">
+        <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="alignment5">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkTreeView" id="levellb">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="headers_visible">False</property>
+                <property name="search_column">0</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="treeview-selection6">
+                    <property name="mode">multiple</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Level</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="numberingframe">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment6">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</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="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">12</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkLabel" id="numfollowedby">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Numbering followed by</property>
+                  </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="GtkLabel" id="num2align">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Numbering Alignment</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="GtkLabel" id="alignedat">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Aligned at</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="GtkLabel" id="indentat">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Indent at</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="GtkComboBox" id="num2alignlb">
+                    <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="GtkSpinButton" id="indentatmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="digits">2</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="GtkLabel" id="at">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">at</property>
+                  </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="GtkSpinButton" id="atmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="digits">2</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="GtkSpinButton" id="alignedatmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="digits">2</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="GtkComboBox" id="numfollowedbylb">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststore2</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:SvxNumberingPreview" id="preview">
+                    <property name="width_request">300</property>
+                    <property name="height_request">150</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">10</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="standard">
+                    <property name="label" translatable="yes">Default</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="valign">end</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">10</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="indent">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Indent</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="indentmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="adjustment">adjustment2</property>
+                    <property name="digits">2</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="relative">
+                    <property name="label" translatable="yes">Relative</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">end</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="numberingwidth">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Width of numbering</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">7</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="numberingwidthmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="digits">2</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">7</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="numdistmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="digits">2</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">8</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="numdist">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Minimum space numbering &lt;-&gt; textlabel</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">8</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="numalign">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Numbering alignment</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">9</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="numalignlb">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststore1</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">9</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label10">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Position and spacing</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 0db131e9a18e..2248c51c5423 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -553,6 +553,8 @@
                 <property name="height_request">100</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
               </object>
             </child>
           </object>
diff --git a/sc/qa/unoapi/sc.sce b/sc/qa/unoapi/sc.sce
index 7dbb88adf438..4ececd9a9235 100644
--- a/sc/qa/unoapi/sc.sce
+++ b/sc/qa/unoapi/sc.sce
@@ -26,7 +26,7 @@
 # i88330 -o sc.ScAccessibleDocument
 # i91045 -o sc.ScAccessibleDocumentPagePreview
 -o sc.ScAccessiblePageHeader
--o sc.ScAccessiblePageHeaderArea
+# fdo#FOO -o sc.ScAccessiblePageHeaderArea
 -o sc.ScAccessiblePreviewCell
 -o sc.ScAccessiblePreviewHeaderCell
 -o sc.ScAccessiblePreviewTable
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index 53d6b12a1f42..264f1ffa2459 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -112,37 +112,6 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
 
 };
 
-class SvxNumberingPreview : public Window
-{
-    const SvxNumRule*   pActNum;
-    Font                aStdFont;
-    long                nPageWidth;
-    const String*       pOutlineNames;
-    sal_Bool                bPosition;
-    sal_uInt16              nActLevel;
-
-    protected:
-        virtual void        Paint( const Rectangle& rRect );
-
-    public:
-        SvxNumberingPreview(Window* pParent, const ResId& rResId ) :
-            Window(pParent, rResId),
-            pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX)
-            { SetBorderStyle( WINDOW_BORDER_MONO ); }
-
-        void    SetNumRule(const SvxNumRule* pNum)
-                    {pActNum = pNum; Invalidate();};
-        void    SetPageWidth(long nPgWidth)
-                                {nPageWidth = nPgWidth;}
-        void    SetOutlineNames(const String* pNames)
-                        {pOutlineNames = pNames;}
-        void    SetPositionMode()
-                        { bPosition = sal_True;}
-        void    SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
-
-};
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 87ad5b38df8d..bd74e07bce39 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -57,6 +57,10 @@
 
 static sal_Bool bLastRelative = sal_False;
 
+//See cui/uiconfig/ui/numberingpositionpage.ui for effectively a duplicate
+//dialog to this one, except with a different preview window impl.
+//TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be
+//merged
 SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
                                const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OutlinePositionPage",
diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index 1613cb54762f..69618378a2f1 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -152,251 +152,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame3">
-                <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="left_padding">12</property>
-                    <child>
-                      <object class="GtkGrid" id="grid4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="row_spacing">2</property>
-                        <property name="column_spacing">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">start</property>
-                            <property name="label" translatable="yes">Level</property>
-                          </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="GtkScrolledWindow" id="scrolledwindow2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <placeholder/>
-                            </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="GtkGrid" id="grid5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="row_spacing">10</property>
-                            <property name="column_spacing">8</property>
-                            <child>
-                              <object class="GtkLabel" id="label13">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Numbering followed by </property>
-                              </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="GtkLabel" id="label14">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">at</property>
-                              </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="GtkLabel" id="label15">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="yalign">0</property>
-                                <property name="label" translatable="yes">Numbering alignment</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="GtkLabel" id="label16">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Aligned at</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="GtkLabel" id="label17">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Indent at</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="GtkComboBoxText" id="comboboxtext4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="entry_text_column">0</property>
-                                <property name="id_column">1</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="GtkSpinButton" id="spinbutton3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</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="GtkComboBoxText" id="comboboxtext5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="entry_text_column">0</property>
-                                <property name="id_column">1</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="GtkSpinButton" id="spinbutton4">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</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="GtkSpinButton" id="spinbutton5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</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="GtkButton" id="button1">
-                                <property name="label" translatable="yes">Default</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">5</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkDrawingArea" id="drawingarea2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">5</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
-                          </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>
-                          <placeholder/>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label11">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Position and spacing</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
+              <placeholder/>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label10">
diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
index eadf6faf9b0d..1b5964efc486 100644
--- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui
+++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui
@@ -17,6 +17,8 @@
     <property name="can_focus">False</property>
     <property name="margin_left">10</property>
     <property name="margin_right">10</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
     <child>
       <object class="GtkFrame" id="frame3">
         <property name="visible">True</property>
@@ -64,335 +66,326 @@
       <object class="GtkFrame" id="numberingframe">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
           <object class="GtkAlignment" id="alignment6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="GtkBox" id="box6">
+              <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="row_spacing">12</property>
+                <property name="column_spacing">12</property>
                 <child>
-                  <object class="GtkGrid" id="grid1">
+                  <object class="GtkLabel" id="numfollowedby">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">10</property>
-                    <child>
-                      <object class="GtkLabel" id="numfollowedby">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Numbering followed by</property>
-                      </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="GtkLabel" id="num2align">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Numbering Alignment</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="GtkLabel" id="alignedat">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Aligned at</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="GtkLabel" id="indentat">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Indent at</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="GtkComboBox" id="num2alignlb">
-                        <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="GtkSpinButton" id="indentatmf:0.00cm">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
-                        <property name="digits">2</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="GtkLabel" id="at">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">at</property>
-                      </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="GtkSpinButton" id="atmf:0.00cm">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
-                        <property name="digits">2</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="GtkSpinButton" id="alignedatmf:0.00cm">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="invisible_char_set">True</property>
-                        <property name="digits">2</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="GtkComboBox" id="numfollowedbylb">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="model">liststore2</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="swuilo:NumberingPreview" id="preview">
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Numbering followed by</property>
+                  </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="GtkLabel" id="num2align">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Numbering Alignment</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="GtkLabel" id="alignedat">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Aligned at</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="GtkLabel" id="indentat">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Indent at</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="GtkComboBox" id="num2alignlb">
+                    <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="GtkSpinButton" id="indentatmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="digits">2</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="GtkLabel" id="at">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">at</property>
+                  </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="GtkSpinButton" id="atmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="digits">2</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="GtkSpinButton" id="alignedatmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <property name="digits">2</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="GtkComboBox" id="numfollowedbylb">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststore2</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="swuilo:NumberingPreview" id="preview">
                         <property name="width_request">300</property>
                         <property name="height_request">150</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
                       </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">10</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="standard">
-                        <property name="label" translatable="yes">Default</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="valign">end</property>
-                        <property name="use_action_appearance">False</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">10</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="indent">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Indent</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="indentmf:0.00cm">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="adjustment">adjustment2</property>
-                        <property name="digits">2</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="relative">
-                        <property name="label" translatable="yes">Relative</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="halign">end</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="numberingwidth">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Width of numbering</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">7</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="numberingwidthmf:0.00cm">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="adjustment">adjustment1</property>
-                        <property name="digits">2</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">7</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="numdistmf:0.00cm">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">●</property>
-                        <property name="adjustment">adjustment1</property>
-                        <property name="digits">2</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">8</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="numdist">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Minimum space numbering &lt;-&gt; textlabel</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">8</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="numalign">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Numbering alignment</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">9</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="numalignlb">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="model">liststore1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">9</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">10</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="standard">
+                    <property name="label" translatable="yes">Default</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="valign">end</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">10</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="indent">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Indent</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="indentmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="adjustment">adjustment2</property>
+                    <property name="digits">2</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="relative">
+                    <property name="label" translatable="yes">Relative</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">end</property>
+                    <property name="xalign">0</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="numberingwidth">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Width of numbering</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">7</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="numberingwidthmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="digits">2</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">7</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinButton" id="numdistmf:0.00cm">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">●</property>
+                    <property name="adjustment">adjustment1</property>
+                    <property name="digits">2</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">8</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="numdist">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Minimum space numbering &lt;-&gt; textlabel</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">8</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="numalign">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Numbering alignment</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">9</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="numalignlb">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="model">liststore1</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">9</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
@@ -400,7 +393,7 @@
           </object>
         </child>
         <child type="label">
-          <object class="GtkLabel" id="3">
+          <object class="GtkLabel" id="label10">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label" translatable="yes">Position and spacing</property>