[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk

Caolán McNamara caolanm at redhat.com
Wed Aug 28 05:53:42 PDT 2013


 sw/UIConfig_swriter.mk                 |    1 
 sw/inc/globals.hrc                     |    2 
 sw/inc/helpid.h                        |    2 
 sw/inc/index.hrc                       |    2 
 sw/source/ui/inc/swuicnttab.hxx        |  100 +-
 sw/source/ui/index/cnttab.cxx          |  592 +++++++---------
 sw/source/ui/index/cnttab.hrc          |  131 ---
 sw/source/ui/index/cnttab.src          |  446 ------------
 sw/uiconfig/swriter/ui/tocindexpage.ui | 1192 +++++++++++++++++++++++++++++++++
 9 files changed, 1529 insertions(+), 939 deletions(-)

New commits:
commit 36b81ce89e4eddbc721afa3cd59905ea45249800
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 28 13:23:35 2013 +0100

    fix abuse of GetTabDialog to indicate that we're pre reset
    
    Change-Id: I3572ccd1e984af97ede28db558e22ee6e8019344

diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index ff26d9d..4c9c9c2 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -200,7 +200,7 @@ class SwTOXSelectTabPage : public SfxTabPage
 
     const IndexEntrySupplierWrapper* pIndexEntryWrapper;
 
-    sal_Bool            bFirstCall;
+    bool            m_bWaitingInitialSettings;
 
     DECL_LINK(TOXTypeHdl,   ListBox* );
     DECL_LINK(AddStylesHdl, PushButton* );
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index e409c1d..889686c 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -827,7 +827,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
     , aFromNames(SW_RES(RES_SRCTYPES))
     , pIndexRes(0)
     , sAutoMarkType(SW_RESSTR(STR_AUTOMARK_TYPE))
-    , bFirstCall(true)
+    , m_bWaitingInitialSettings(true)
 {
     get(m_pTitleED, "title");
     get(m_pTypeFT, "typeft");
@@ -1272,6 +1272,14 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet& )
         m_pTypeFT->Enable(sal_False);
         m_pTypeLB->Enable(sal_False);
     }
+
+    if (!m_bWaitingInitialSettings)
+    {
+        // save current values into the proper TOXDescription
+        FillTOXDescription();
+    }
+    m_bWaitingInitialSettings = false;
+
     TOXTypeHdl(m_pTypeLB);
     CheckBoxHdl(m_pAddStylesCB);
 }
@@ -1298,12 +1306,6 @@ SfxTabPage* SwTOXSelectTabPage::Create( Window* pParent, const SfxItemSet& rAttr
 IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
 {
     SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
-    if(!bFirstCall)
-    {
-        // save current values into the proper TOXDescription
-        FillTOXDescription();
-    }
-    bFirstCall = sal_False;
     const sal_uInt16 nType =  sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(
                                 pBox->GetEntryData( pBox->GetSelectEntryPos() )));
     CurTOXType eCurType = lcl_UserData2TOXTypes(nType);
@@ -1370,10 +1372,10 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
 
 IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifyHdl)
 {
-    SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
-    if(pTOXDlg)
+    if(!m_bWaitingInitialSettings)
     {
         FillTOXDescription();
+        SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
         pTOXDlg->CreateOrUpdateExample(pTOXDlg->GetCurrentTOXType().eType, TOX_PAGE_SELECT);
     }
     return 0;
@@ -1920,9 +1922,9 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
 IMPL_LINK(SwTOXEntryTabPage, ModifyHdl, void*, pVoid)
 {
     UpdateDescriptor();
-    SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
 
-    if(pTOXDlg)
+    SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
+    if (pTOXDlg)
     {
         sal_uInt16 nCurLevel = static_cast< sal_uInt16 >(m_pLevelLB->GetModel()->GetAbsPos(m_pLevelLB->FirstSelected()) + 1);
         if(aLastTOXType.eType == TOX_CONTENT && pVoid)
@@ -3664,7 +3666,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl)
 void SwTOXStylesTabPage::Modify()
 {
     SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
-    if(pTOXDlg)
+    if (pTOXDlg)
     {
         GetForm() = *m_pCurrentForm;
         pTOXDlg->CreateOrUpdateExample(pTOXDlg->GetCurrentTOXType().eType, TOX_PAGE_STYLES);
commit a4bd62fbaa231e4d67399822620481b297598267
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 27 20:30:41 2013 +0100

    convert tox index page to .ui
    
    Change-Id: I4929ac3b82af91d8b9cb95b033a9171d46554774

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index d250a6b..b680fe3 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -171,6 +171,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/stringinput \
 	sw/uiconfig/swriter/ui/tocdialog \
 	sw/uiconfig/swriter/ui/tocentriespage \
+	sw/uiconfig/swriter/ui/tocindexpage \
 	sw/uiconfig/swriter/ui/tocstylespage \
 	sw/uiconfig/swriter/ui/tablecolumnpage \
 	sw/uiconfig/swriter/ui/tableproperties \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index d11071c..c13fac8 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -124,8 +124,6 @@
 
 #define TP_OPTCAPTION_PAGE          (RC_GLOBALS_BEGIN +  77)
 #define DLG_SVXTEST_NUM_BULLET      (RC_GLOBALS_BEGIN +  79)
-#define TP_TOX_SELECT               (RC_GLOBALS_BEGIN +  90)
-#define TP_TOX_STYLES               (RC_GLOBALS_BEGIN +  92)
 #define DLG_ADD_IDX_STYLES          (RC_GLOBALS_BEGIN +  94)
 //maximum: RC_GLOBALS_BEGIN +  120
 
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8603f5c..9f77da3 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -137,10 +137,8 @@
 
 #define HID_REDLINE_CTRL                                        "SW_HID_REDLINE_CTRL"
 #define HID_OPTCAPTION_PAGE                                     "SW_HID_OPTCAPTION_PAGE"
-#define HID_TP_TOX_SELECT                                       "SW_HID_TP_TOX_SELECT"
 #define HID_DLG_ADD_IDX_STYLES                                  "SW_HID_DLG_ADD_IDX_STYLES"
 #define HID_ADD_STYLES_TLB                                      "SW_HID_ADD_STYLES_TLB"
-#define HID_OLE_CHECKLB                                         "SW_HID_OLE_CHECKLB"
 
 #define HID_COMPATIBILITY_OPTIONS_BOX                           "SW_HID_COMPATIBILITY_OPTIONS_BOX"
 
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 48351fb..d9fad14 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -37,7 +37,9 @@
 
 #define  STR_IDXMRK_INSERT      (RC_INDEX_BEGIN + 13)
 #define  STR_IDXMRK_EDIT        (RC_INDEX_BEGIN + 14)
+#define  RES_SRCTYPES           (RC_INDEX_BEGIN + 15)
 
+#define  STR_AUTOMARK_TYPE      (RC_INDEX_BEGIN + 17)
 #define  STR_FILE_NOT_FOUND     (RC_INDEX_BEGIN + 18)
 #define  DLG_CHANGE_AUTH_ENTRY  (RC_INDEX_BEGIN + 19)
 #define  STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20)
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index c5c67a9..ff26d9d 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -130,82 +130,68 @@ class IndexEntrySupplierWrapper;
 
 class SwTOXSelectTabPage : public SfxTabPage
 {
-    FixedLine       aTypeTitleFL;
-    FixedText       aTitleFT;
-    Edit            aTitleED;
-    FixedText       aTypeFT;
-    ListBox         aTypeLB;
-    CheckBox        aReadOnlyCB;
-
-    FixedLine       aAreaFL;
-    FixedText       aAreaFT;
-    ListBox         aAreaLB;
-    FixedText       aLevelFT;   //content, user
-    NumericField    aLevelNF;   //content, user
+    Edit*           m_pTitleED;
+    FixedText*      m_pTypeFT;
+    ListBox*        m_pTypeLB;
+    CheckBox*       m_pReadOnlyCB;
+
+    VclContainer*   m_pAreaFrame;
+    ListBox*        m_pAreaLB;
+    FixedText*      m_pLevelFT;   //content, user
+    NumericField*   m_pLevelNF;   //content, user
 
     //content
-    FixedLine       aCreateFromFL;  // content, user, illustration
-    CheckBox        aFromHeadingsCB;
-    CheckBox        aAddStylesCB;
-    PushButton      aAddStylesPB;
-    Point           aAddStylesPosDef;
-    Point           aAddStylesPosUser;
+    VclContainer*   m_pCreateFrame;  // content, user, illustration
+    CheckBox*       m_pFromHeadingsCB;
+    CheckBox*       m_pAddStylesCB;
+    PushButton*     m_pAddStylesPB;
     //user
-    CheckBox        aFromTablesCB;
-    CheckBox        aFromFramesCB;
-    CheckBox        aFromGraphicsCB;
-    CheckBox        aFromOLECB;
-    CheckBox        aLevelFromChapterCB;
+    CheckBox*       m_pFromTablesCB;
+    CheckBox*       m_pFromFramesCB;
+    CheckBox*       m_pFromGraphicsCB;
+    CheckBox*       m_pFromOLECB;
+    CheckBox*       m_pLevelFromChapterCB;
 
     //illustration + table
-    RadioButton     aFromCaptionsRB;
-    RadioButton     aFromObjectNamesRB;
+    RadioButton*    m_pFromCaptionsRB;
+    RadioButton*    m_pFromObjectNamesRB;
 
     //illustration and tables
-    FixedText       aCaptionSequenceFT;
-    ListBox         aCaptionSequenceLB;
-    FixedText       aDisplayTypeFT;
-    ListBox         aDisplayTypeLB;
+    FixedText*      m_pCaptionSequenceFT;
+    ListBox*        m_pCaptionSequenceLB;
+    FixedText*      m_pDisplayTypeFT;
+    ListBox*        m_pDisplayTypeLB;
 
     //all but illustration and table
-    CheckBox        aTOXMarksCB;
-
-    //
+    CheckBox*       m_pTOXMarksCB;
 
     //index only
-    FixedLine       aIdxOptionsFL;
-    CheckBox        aCollectSameCB;
-    CheckBox        aUseFFCB;
-    CheckBox        aUseDashCB;
-    CheckBox        aCaseSensitiveCB;
-    CheckBox        aInitialCapsCB;
-    CheckBox        aKeyAsEntryCB;
-    CheckBox        aFromFileCB;
-    MenuButton      aAutoMarkPB;
+    VclContainer*   m_pIdxOptionsFrame;
+    CheckBox*       m_pCollectSameCB;
+    CheckBox*       m_pUseFFCB;
+    CheckBox*       m_pUseDashCB;
+    CheckBox*       m_pCaseSensitiveCB;
+    CheckBox*       m_pInitialCapsCB;
+    CheckBox*       m_pKeyAsEntryCB;
+    CheckBox*       m_pFromFileCB;
+    MenuButton*     m_pAutoMarkPB;
 
     // object only
     SwOLENames      aFromNames;
-    SvxCheckListBox aFromObjCLB;
-    FixedLine       aFromObjFL;
+    SvxCheckListBox* m_pFromObjCLB;
+    VclContainer*   m_pFromObjFrame;
 
-    CheckBox        aSequenceCB;
-    FixedText       aBracketFT;
-    ListBox         aBracketLB;
-    FixedLine       aAuthorityFormatFL;
+    CheckBox*       m_pSequenceCB;
+    ListBox*        m_pBracketLB;
+    VclContainer*   m_pAuthorityFrame;
 
     //all
-    FixedLine       aSortOptionsFL;
-    FixedText       aLanguageFT;
-    SvxLanguageBox  aLanguageLB;
-    FixedText       aSortAlgorithmFT;
-    ListBox         aSortAlgorithmLB;
+    VclContainer*   m_pSortFrame;
+    SvxLanguageBox* m_pLanguageLB;
+    ListBox*        m_pSortAlgorithmLB;
 
     IndexEntryResource* pIndexRes;
 
-    Point           aCBLeftPos1;
-    Point           aCBLeftPos2;
-    Point           aCBLeftPos3;
-
     String          aStyleArr[MAXLEVEL];
     String          sAutoMarkURL;
     String          sAutoMarkType;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5b3e477..e409c1d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -821,134 +821,117 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn)
     return 0;
 }
 
-SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet) :
-    SfxTabPage(pParent, SW_RES(TP_TOX_SELECT), rAttrSet),
-
-    aTypeTitleFL(       this, SW_RES(FL_TYPETITLE        )),
-    aTitleFT(           this, SW_RES(FT_TITLE            )),
-    aTitleED(           this, SW_RES(ED_TITLE           )),
-    aTypeFT(            this, SW_RES(FT_TYPE                )),
-    aTypeLB(            this, SW_RES(LB_TYPE                )),
-    aReadOnlyCB(        this, SW_RES(CB_READONLY            )),
-
-    aAreaFL(            this, SW_RES(FL_AREA             )),
-    aAreaFT(            this, SW_RES(FT_AREA             )),
-    aAreaLB(            this, SW_RES(LB_AREA                )),
-    aLevelFT(           this, SW_RES(FT_LEVEL           )),
-    aLevelNF(           this, SW_RES(NF_LEVEL           )),
-
-    aCreateFromFL(      this, SW_RES(FL_CREATEFROM       )),
-    aFromHeadingsCB(    this, SW_RES(CB_FROMHEADINGS     )),
-    aAddStylesCB(       this, SW_RES(CB_ADDSTYLES       )),
-    aAddStylesPB(       this, SW_RES(PB_ADDSTYLES       )),
-
-    aFromTablesCB(      this, SW_RES(CB_FROMTABLES       )),
-    aFromFramesCB(      this, SW_RES(CB_FROMFRAMES      )),
-    aFromGraphicsCB(    this, SW_RES(CB_FROMGRAPHICS        )),
-    aFromOLECB(         this, SW_RES(CB_FROMOLE         )),
-    aLevelFromChapterCB(this, SW_RES(CB_LEVELFROMCHAPTER    )),
-
-    aFromCaptionsRB(    this, SW_RES(RB_FROMCAPTIONS     )),
-    aFromObjectNamesRB( this, SW_RES(RB_FROMOBJECTNAMES )),
-
-    aCaptionSequenceFT( this, SW_RES(FT_CAPTIONSEQUENCE  )),
-    aCaptionSequenceLB( this, SW_RES(LB_CAPTIONSEQUENCE  )),
-    aDisplayTypeFT(     this, SW_RES(FT_DISPLAYTYPE     )),
-    aDisplayTypeLB(     this, SW_RES(LB_DISPLAYTYPE     )),
-
-    aTOXMarksCB(        this, SW_RES(CB_TOXMARKS         )),
-
-    aIdxOptionsFL(      this, SW_RES(FL_IDXOPTIONS       )),
-    aCollectSameCB(     this, SW_RES(CB_COLLECTSAME      )),
-    aUseFFCB(           this, SW_RES(CB_USEFF           )),
-    aUseDashCB(         this, SW_RES(CB_USE_DASH            )),
-    aCaseSensitiveCB(   this, SW_RES(CB_CASESENSITIVE   )),
-    aInitialCapsCB(     this, SW_RES(CB_INITIALCAPS     )),
-    aKeyAsEntryCB(      this, SW_RES(CB_KEYASENTRY      )),
-    aFromFileCB(        this, SW_RES(CB_FROMFILE            )),
-    aAutoMarkPB(        this, SW_RES(MB_AUTOMARK            )),
-
-    aFromNames(         SW_RES(RES_SRCTYPES              )),
-    aFromObjCLB(        this, SW_RES(CLB_FROMOBJ            )),
-    aFromObjFL(         this, SW_RES(FL_FROMOBJ          )),
-
-    aSequenceCB(        this, SW_RES(CB_SEQUENCE         )),
-    aBracketFT(         this, SW_RES(FT_BRACKET         )),
-    aBracketLB(         this, SW_RES(LB_BRACKET         )),
-    aAuthorityFormatFL( this, SW_RES(FL_AUTHORITY        )),
-
-    aSortOptionsFL(     this, SW_RES(FL_SORTOPTIONS      )),
-    aLanguageFT(        this, SW_RES(FT_LANGUAGE         )),
-    aLanguageLB(        this, SW_RES(LB_LANGUAGE         )),
-    aSortAlgorithmFT(   this, SW_RES(FT_SORTALG          )),
-    aSortAlgorithmLB(   this, SW_RES(LB_SORTALG          )),
-
-    pIndexRes(0),
-
-    sAutoMarkType(SW_RES(ST_AUTOMARK_TYPE)),
-    sAddStyleUser(SW_RES(ST_USER_ADDSTYLE)),
-    bFirstCall(sal_True)
-{
-    aBracketLB.InsertEntry(String(SW_RES(ST_NO_BRACKET)), 0);
-
-    aAddStylesPB.SetAccessibleRelationMemberOf(&aCreateFromFL);
-    aAddStylesPB.SetAccessibleRelationLabeledBy(&aAddStylesCB);
-    aAddStylesPB.SetAccessibleName(aAddStylesCB.GetText());
-
-    FreeResource();
+SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrSet)
+    : SfxTabPage(pParent, "TocIndexPage",
+        "modules/swriter/ui/tocindexpage.ui", rAttrSet)
+    , aFromNames(SW_RES(RES_SRCTYPES))
+    , pIndexRes(0)
+    , sAutoMarkType(SW_RESSTR(STR_AUTOMARK_TYPE))
+    , bFirstCall(true)
+{
+    get(m_pTitleED, "title");
+    get(m_pTypeFT, "typeft");
+    get(m_pTypeLB, "type");
+    get(m_pReadOnlyCB, "readonly");
+
+    get(m_pAreaFrame, "areaframe");
+    get(m_pAreaLB, "scope");
+    get(m_pLevelFT, "levelft");
+    get(m_pLevelNF, "level");
+
+    get(m_pCreateFrame, "createframe");
+    get(m_pFromHeadingsCB, "fromheadings");
+    get(m_pAddStylesCB, "addstylescb");
+    sAddStyleUser = get<Window>("stylescb")->GetText();
+    get(m_pAddStylesPB, "styles");
+    get(m_pFromTablesCB, "fromtables");
+    get(m_pFromFramesCB, "fromframes");
+    get(m_pFromGraphicsCB, "fromgraphics");
+    get(m_pFromOLECB, "fromoles");
+    get(m_pLevelFromChapterCB, "uselevel");
+
+    get(m_pFromCaptionsRB, "captions");
+    get(m_pFromObjectNamesRB, "objnames");
+
+    get(m_pCaptionSequenceFT, "categoryft");
+    get(m_pCaptionSequenceLB, "category");
+    get(m_pDisplayTypeFT, "displayft");
+    get(m_pDisplayTypeLB, "display");
+    get(m_pTOXMarksCB, "indexmarks");
+
+    get(m_pIdxOptionsFrame, "optionsframe");
+    get(m_pCollectSameCB, "combinesame");
+    get(m_pUseFFCB, "useff");
+    get(m_pUseDashCB, "usedash");
+    get(m_pCaseSensitiveCB, "casesens");
+    get(m_pInitialCapsCB, "initcaps");
+    get(m_pKeyAsEntryCB, "keyasentry");
+    get(m_pFromFileCB, "fromfile");
+    get(m_pAutoMarkPB, "file");
+
+    get(m_pFromObjFrame, "objectframe");
+    get(m_pFromObjCLB, "objects");
+
+    get(m_pAuthorityFrame, "authframe");
+    get(m_pSequenceCB, "numberentries");
+    get(m_pBracketLB, "brackets");
+
+    get(m_pSortFrame, "sortframe");
+    get(m_pLanguageLB, "lang");
+    get(m_pSortAlgorithmLB, "keytype");
+
+    //Default mode is arranged to be the tallest mode
+    //of alphabetical index, lock that height in now
+    Size aPrefSize(get_preferred_size());
+    set_height_request(aPrefSize.Height());
 
     pIndexEntryWrapper = new IndexEntrySupplierWrapper();
 
-    aLanguageLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN,
+    m_pLanguageLB->SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN,
                                  sal_False, sal_False, sal_False );
 
-    sAddStyleContent = aAddStylesCB.GetText();
-
-    aCBLeftPos1 = aFromHeadingsCB.GetPosPixel();
-    aCBLeftPos2 = aAddStylesCB.GetPosPixel();
-    aCBLeftPos3 = aTOXMarksCB.GetPosPixel();
+    sAddStyleContent = m_pAddStylesCB->GetText();
 
     ResStringArray& rNames = aFromNames.GetNames();
     for(sal_uInt16 i = 0; i < rNames.Count(); i++)
     {
-        aFromObjCLB.InsertEntry(rNames.GetString(i));
-        aFromObjCLB.SetEntryData( i, (void*)rNames.GetValue(i) );
+        m_pFromObjCLB->InsertEntry(rNames.GetString(i));
+        m_pFromObjCLB->SetEntryData( i, (void*)rNames.GetValue(i) );
     }
-    aFromObjCLB.SetHelpId(HID_OLE_CHECKLB);
 
     SetExchangeSupport();
-    aTypeLB.SetSelectHdl(LINK(this, SwTOXSelectTabPage, TOXTypeHdl));
+    m_pTypeLB->SetSelectHdl(LINK(this, SwTOXSelectTabPage, TOXTypeHdl));
 
-    aAddStylesPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, AddStylesHdl));
+    m_pAddStylesPB->SetClickHdl(LINK(this, SwTOXSelectTabPage, AddStylesHdl));
 
-    PopupMenu*  pMenu = aAutoMarkPB.GetPopupMenu();
+    PopupMenu*  pMenu = m_pAutoMarkPB->GetPopupMenu();
     pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl));
     pMenu->SetSelectHdl(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl));
 
     Link aLk =  LINK(this, SwTOXSelectTabPage, CheckBoxHdl);
-    aAddStylesCB    .SetClickHdl(aLk);
-    aFromHeadingsCB .SetClickHdl(aLk);
-    aTOXMarksCB     .SetClickHdl(aLk);
-    aFromFileCB     .SetClickHdl(aLk);
-    aCollectSameCB  .SetClickHdl(aLk);
-    aUseFFCB        .SetClickHdl(aLk);
-    aUseDashCB      .SetClickHdl(aLk);
-    aInitialCapsCB  .SetClickHdl(aLk);
-    aKeyAsEntryCB   .SetClickHdl(aLk);
+    m_pAddStylesCB->SetClickHdl(aLk);
+    m_pFromHeadingsCB->SetClickHdl(aLk);
+    m_pTOXMarksCB->SetClickHdl(aLk);
+    m_pFromFileCB->SetClickHdl(aLk);
+    m_pCollectSameCB->SetClickHdl(aLk);
+    m_pUseFFCB->SetClickHdl(aLk);
+    m_pUseDashCB->SetClickHdl(aLk);
+    m_pInitialCapsCB->SetClickHdl(aLk);
+    m_pKeyAsEntryCB->SetClickHdl(aLk);
 
     Link aModifyLk = LINK(this, SwTOXSelectTabPage, ModifyHdl);
-    aTitleED.SetModifyHdl(aModifyLk);
-    aLevelNF.SetModifyHdl(aModifyLk);
-    aSortAlgorithmLB.SetSelectHdl(aModifyLk);
+    m_pTitleED->SetModifyHdl(aModifyLk);
+    m_pLevelNF->SetModifyHdl(aModifyLk);
+    m_pSortAlgorithmLB->SetSelectHdl(aModifyLk);
 
     aLk =  LINK(this, SwTOXSelectTabPage, RadioButtonHdl);
-    aFromCaptionsRB.SetClickHdl(aLk);
-    aFromObjectNamesRB.SetClickHdl(aLk);
-    RadioButtonHdl(&aFromCaptionsRB);
+    m_pFromCaptionsRB->SetClickHdl(aLk);
+    m_pFromObjectNamesRB->SetClickHdl(aLk);
+    RadioButtonHdl(m_pFromCaptionsRB);
 
-    aLanguageLB.SetSelectHdl(LINK(this, SwTOXSelectTabPage, LanguageHdl));
-    aTypeLB.SelectEntryPos(0);
-    aTitleED.SaveValue();
+    m_pLanguageLB->SetSelectHdl(LINK(this, SwTOXSelectTabPage, LanguageHdl));
+    m_pTypeLB->SelectEntryPos(0);
+    m_pTitleED->SaveValue();
 }
 
 SwTOXSelectTabPage::~SwTOXSelectTabPage()
@@ -963,14 +946,14 @@ void SwTOXSelectTabPage::SetWrtShell(SwWrtShell& rSh)
     if(nUserTypeCount > 1)
     {
         //insert all new user indexes names after the standard user index
-        sal_uInt16 nPos = aTypeLB.GetEntryPos((void*)(sal_uInt32)TO_USER);
+        sal_uInt16 nPos = m_pTypeLB->GetEntryPos((void*)(sal_uInt32)TO_USER);
         nPos++;
         for(sal_uInt16 nUser = 1; nUser < nUserTypeCount; nUser++)
         {
-            nPos = aTypeLB.InsertEntry(rSh.GetTOXType(TOX_USER, nUser)->GetTypeName(), nPos);
+            nPos = m_pTypeLB->InsertEntry(rSh.GetTOXType(TOX_USER, nUser)->GetTypeName(), nPos);
             sal_uIntPtr nEntryData = nUser << 8;
             nEntryData |= TO_USER;
-            aTypeLB.SetEntryData(nPos, (void*)nEntryData);
+            m_pTypeLB->SetEntryData(nPos, (void*)nEntryData);
         }
     }
 }
@@ -1006,10 +989,10 @@ void SwTOXSelectTabPage::SelectType(TOXTypes eSet)
     CurTOXType eCurType (eSet, 0);
 
     sal_IntPtr nData = lcl_TOXTypesToUserData(eCurType);
-    aTypeLB.SelectEntryPos(aTypeLB.GetEntryPos((void*)nData));
-    aTypeFT.Enable(sal_False);
-    aTypeLB.Enable(sal_False);
-    TOXTypeHdl(&aTypeLB);
+    m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos((void*)nData));
+    m_pTypeFT->Enable(sal_False);
+    m_pTypeLB->Enable(sal_False);
+    TOXTypeHdl(m_pTypeLB);
 }
 
 static CurTOXType lcl_UserData2TOXTypes(sal_uInt16 nData)
@@ -1040,20 +1023,20 @@ void    SwTOXSelectTabPage::ApplyTOXDescription()
     SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
     const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
     SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType);
-    aReadOnlyCB.Check(rDesc.IsReadonly());
-    if(aTitleED.GetText() == aTitleED.GetSavedValue())
+    m_pReadOnlyCB->Check(rDesc.IsReadonly());
+    if(m_pTitleED->GetText() == m_pTitleED->GetSavedValue())
     {
         if(rDesc.GetTitle())
-            aTitleED.SetText(*rDesc.GetTitle());
+            m_pTitleED->SetText(*rDesc.GetTitle());
         else
-            aTitleED.SetText(aEmptyStr);
-        aTitleED.SaveValue();
+            m_pTitleED->SetText(aEmptyStr);
+        m_pTitleED->SaveValue();
     }
 
-    aAreaLB.SelectEntryPos(rDesc.IsFromChapter() ? 1 : 0);
+    m_pAreaLB->SelectEntryPos(rDesc.IsFromChapter() ? 1 : 0);
 
     if(aCurType.eType != TOX_INDEX)
-        aLevelNF.SetValue(rDesc.GetLevel());   //content, user
+        m_pLevelNF->SetValue(rDesc.GetLevel());   //content, user
 
     sal_uInt16 nCreateType = rDesc.GetContentOptions();
 
@@ -1067,83 +1050,83 @@ void    SwTOXSelectTabPage::ApplyTOXDescription()
             bHasStyleNames = sal_True;
             break;
         }
-    aAddStylesCB.Check(bHasStyleNames && (nCreateType & nsSwTOXElement::TOX_TEMPLATE));
+    m_pAddStylesCB->Check(bHasStyleNames && (nCreateType & nsSwTOXElement::TOX_TEMPLATE));
 
-    aFromOLECB.     Check( 0 != (nCreateType & nsSwTOXElement::TOX_OLE) );
-    aFromTablesCB.  Check( 0 != (nCreateType & nsSwTOXElement::TOX_TABLE) );
-    aFromGraphicsCB.Check( 0 != (nCreateType & nsSwTOXElement::TOX_GRAPHIC) );
-    aFromFramesCB.  Check( 0 != (nCreateType & nsSwTOXElement::TOX_FRAME) );
+    m_pFromOLECB->     Check( 0 != (nCreateType & nsSwTOXElement::TOX_OLE) );
+    m_pFromTablesCB->  Check( 0 != (nCreateType & nsSwTOXElement::TOX_TABLE) );
+    m_pFromGraphicsCB->Check( 0 != (nCreateType & nsSwTOXElement::TOX_GRAPHIC) );
+    m_pFromFramesCB->  Check( 0 != (nCreateType & nsSwTOXElement::TOX_FRAME) );
 
-    aLevelFromChapterCB.Check(rDesc.IsLevelFromChapter());
+    m_pLevelFromChapterCB->Check(rDesc.IsLevelFromChapter());
 
     //all but illustration and table
-    aTOXMarksCB.Check( 0 != (nCreateType & nsSwTOXElement::TOX_MARK) );
+    m_pTOXMarksCB->Check( 0 != (nCreateType & nsSwTOXElement::TOX_MARK) );
 
     //content
     if(TOX_CONTENT == aCurType.eType)
     {
-        aFromHeadingsCB.Check( 0 != (nCreateType & nsSwTOXElement::TOX_OUTLINELEVEL) );
-        aAddStylesCB.SetText(sAddStyleContent);
-        aAddStylesPB.Enable(aAddStylesCB.IsChecked());
+        m_pFromHeadingsCB->Check( 0 != (nCreateType & nsSwTOXElement::TOX_OUTLINELEVEL) );
+        m_pAddStylesCB->SetText(sAddStyleContent);
+        m_pAddStylesPB->Enable(m_pAddStylesCB->IsChecked());
     }
     //index only
     else if(TOX_INDEX == aCurType.eType)
     {
         sal_uInt16 nIndexOptions = rDesc.GetIndexOptions();
-        aCollectSameCB.     Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_SAME_ENTRY) );
-        aUseFFCB.           Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_FF) );
-        aUseDashCB.         Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_DASH) );
-        if(aUseFFCB.IsChecked())
-            aUseDashCB.Enable(sal_False);
-        else if(aUseDashCB.IsChecked())
-            aUseFFCB.Enable(sal_False);
-
-        aCaseSensitiveCB.   Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_CASE_SENSITIVE) );
-        aInitialCapsCB.     Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_INITIAL_CAPS) );
-        aKeyAsEntryCB.      Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_KEY_AS_ENTRY) );
+        m_pCollectSameCB->     Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_SAME_ENTRY) );
+        m_pUseFFCB->           Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_FF) );
+        m_pUseDashCB->         Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_DASH) );
+        if(m_pUseFFCB->IsChecked())
+            m_pUseDashCB->Enable(sal_False);
+        else if(m_pUseDashCB->IsChecked())
+            m_pUseFFCB->Enable(sal_False);
+
+        m_pCaseSensitiveCB->   Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_CASE_SENSITIVE) );
+        m_pInitialCapsCB->     Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_INITIAL_CAPS) );
+        m_pKeyAsEntryCB->      Check( 0 != (nIndexOptions & nsSwTOIOptions::TOI_KEY_AS_ENTRY) );
     }
     else if(TOX_ILLUSTRATIONS == aCurType.eType ||
         TOX_TABLES == aCurType.eType)
     {
-        aFromObjectNamesRB.Check(rDesc.IsCreateFromObjectNames());
-        aFromCaptionsRB.Check(!rDesc.IsCreateFromObjectNames());
-        aCaptionSequenceLB.SelectEntry(rDesc.GetSequenceName());
-        aDisplayTypeLB.SelectEntryPos( static_cast< sal_uInt16 >(rDesc.GetCaptionDisplay()) );
-        RadioButtonHdl(&aFromCaptionsRB);
+        m_pFromObjectNamesRB->Check(rDesc.IsCreateFromObjectNames());
+        m_pFromCaptionsRB->Check(!rDesc.IsCreateFromObjectNames());
+        m_pCaptionSequenceLB->SelectEntry(rDesc.GetSequenceName());
+        m_pDisplayTypeLB->SelectEntryPos( static_cast< sal_uInt16 >(rDesc.GetCaptionDisplay()) );
+        RadioButtonHdl(m_pFromCaptionsRB);
 
     }
     else if(TOX_OBJECTS == aCurType.eType)
     {
         long nOLEData = rDesc.GetOLEOptions();
-        for(sal_uInt16 nFromObj = 0; nFromObj < aFromObjCLB.GetEntryCount(); nFromObj++)
+        for(sal_uInt16 nFromObj = 0; nFromObj < m_pFromObjCLB->GetEntryCount(); nFromObj++)
         {
-            sal_IntPtr nData = (sal_IntPtr)aFromObjCLB.GetEntryData(nFromObj);
-            aFromObjCLB.CheckEntryPos(nFromObj, 0 != (nData & nOLEData));
+            sal_IntPtr nData = (sal_IntPtr)m_pFromObjCLB->GetEntryData(nFromObj);
+            m_pFromObjCLB->CheckEntryPos(nFromObj, 0 != (nData & nOLEData));
         }
     }
     else if(TOX_AUTHORITIES == aCurType.eType)
     {
         String sBrackets(rDesc.GetAuthBrackets());
         if(!sBrackets.Len() || sBrackets.EqualsAscii("  "))
-            aBracketLB.SelectEntryPos(0);
+            m_pBracketLB->SelectEntryPos(0);
         else
-            aBracketLB.SelectEntry(sBrackets);
-        aSequenceCB.Check(rDesc.IsAuthSequence());
+            m_pBracketLB->SelectEntry(sBrackets);
+        m_pSequenceCB->Check(rDesc.IsAuthSequence());
     }
-    aAutoMarkPB.Enable(aFromFileCB.IsChecked());
+    m_pAutoMarkPB->Enable(m_pFromFileCB->IsChecked());
 
     for(i = 0; i < MAXLEVEL; i++)
         aStyleArr[i] = rDesc.GetStyleNames(i);
 
-    aLanguageLB.SelectLanguage(rDesc.GetLanguage());
+    m_pLanguageLB->SelectLanguage(rDesc.GetLanguage());
     LanguageHdl(0);
-    for( long nCnt = 0; nCnt < aSortAlgorithmLB.GetEntryCount(); ++nCnt )
+    for( long nCnt = 0; nCnt < m_pSortAlgorithmLB->GetEntryCount(); ++nCnt )
     {
-        const String* pEntryData = (const String*)aSortAlgorithmLB.GetEntryData( (sal_uInt16)nCnt );
+        const String* pEntryData = (const String*)m_pSortAlgorithmLB->GetEntryData( (sal_uInt16)nCnt );
         OSL_ENSURE(pEntryData, "no entry data available");
         if( pEntryData && *pEntryData == rDesc.GetSortAlgorithm())
         {
-            aSortAlgorithmLB.SelectEntryPos( (sal_uInt16)nCnt );
+            m_pSortAlgorithmLB->SelectEntryPos( (sal_uInt16)nCnt );
             break;
         }
     }
@@ -1154,30 +1137,30 @@ void SwTOXSelectTabPage::FillTOXDescription()
     SwMultiTOXTabDialog* pTOXDlg = (SwMultiTOXTabDialog*)GetTabDialog();
     CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
     SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType);
-    rDesc.SetTitle(aTitleED.GetText());
-    rDesc.SetFromChapter(1 == aAreaLB.GetSelectEntryPos());
+    rDesc.SetTitle(m_pTitleED->GetText());
+    rDesc.SetFromChapter(1 == m_pAreaLB->GetSelectEntryPos());
     sal_uInt16 nContentOptions = 0;
-    if(aTOXMarksCB.IsVisible() && aTOXMarksCB.IsChecked())
+    if(m_pTOXMarksCB->IsVisible() && m_pTOXMarksCB->IsChecked())
         nContentOptions |= nsSwTOXElement::TOX_MARK;
 
     sal_uInt16 nIndexOptions = rDesc.GetIndexOptions()&nsSwTOIOptions::TOI_ALPHA_DELIMITTER;
     switch(rDesc.GetTOXType())
     {
         case TOX_CONTENT:
-            if(aFromHeadingsCB.IsChecked())
+            if(m_pFromHeadingsCB->IsChecked())
                 nContentOptions |= nsSwTOXElement::TOX_OUTLINELEVEL;
         break;
         case TOX_USER:
         {
-            rDesc.SetTOUName(aTypeLB.GetSelectEntry());
+            rDesc.SetTOUName(m_pTypeLB->GetSelectEntry());
 
-            if(aFromOLECB.IsChecked())
+            if(m_pFromOLECB->IsChecked())
                 nContentOptions |= nsSwTOXElement::TOX_OLE;
-            if(aFromTablesCB.IsChecked())
+            if(m_pFromTablesCB->IsChecked())
                 nContentOptions |= nsSwTOXElement::TOX_TABLE;
-            if(aFromFramesCB.IsChecked())
+            if(m_pFromFramesCB->IsChecked())
                 nContentOptions |= nsSwTOXElement::TOX_FRAME;
-            if(aFromGraphicsCB.IsChecked())
+            if(m_pFromGraphicsCB->IsChecked())
                 nContentOptions |= nsSwTOXElement::TOX_GRAPHIC;
         }
         break;
@@ -1185,19 +1168,19 @@ void SwTOXSelectTabPage::FillTOXDescription()
         {
             nContentOptions = nsSwTOXElement::TOX_MARK;
 
-            if(aCollectSameCB.IsChecked())
+            if(m_pCollectSameCB->IsChecked())
                 nIndexOptions |= nsSwTOIOptions::TOI_SAME_ENTRY;
-            if(aUseFFCB.IsChecked())
+            if(m_pUseFFCB->IsChecked())
                 nIndexOptions |= nsSwTOIOptions::TOI_FF;
-            if(aUseDashCB.IsChecked())
+            if(m_pUseDashCB->IsChecked())
                 nIndexOptions |= nsSwTOIOptions::TOI_DASH;
-            if(aCaseSensitiveCB.IsChecked())
+            if(m_pCaseSensitiveCB->IsChecked())
                 nIndexOptions |= nsSwTOIOptions::TOI_CASE_SENSITIVE;
-            if(aInitialCapsCB.IsChecked())
+            if(m_pInitialCapsCB->IsChecked())
                 nIndexOptions |= nsSwTOIOptions::TOI_INITIAL_CAPS;
-            if(aKeyAsEntryCB.IsChecked())
+            if(m_pKeyAsEntryCB->IsChecked())
                 nIndexOptions |= nsSwTOIOptions::TOI_KEY_AS_ENTRY;
-            if(aFromFileCB.IsChecked())
+            if(m_pFromFileCB->IsChecked())
                 rDesc.SetAutoMarkURL(sAutoMarkURL);
             else
                 rDesc.SetAutoMarkURL(aEmptyStr);
@@ -1205,18 +1188,18 @@ void SwTOXSelectTabPage::FillTOXDescription()
         break;
         case TOX_ILLUSTRATIONS:
         case TOX_TABLES :
-            rDesc.SetCreateFromObjectNames(aFromObjectNamesRB.IsChecked());
-            rDesc.SetSequenceName(aCaptionSequenceLB.GetSelectEntry());
-            rDesc.SetCaptionDisplay((SwCaptionDisplay)aDisplayTypeLB.GetSelectEntryPos());
+            rDesc.SetCreateFromObjectNames(m_pFromObjectNamesRB->IsChecked());
+            rDesc.SetSequenceName(m_pCaptionSequenceLB->GetSelectEntry());
+            rDesc.SetCaptionDisplay((SwCaptionDisplay)m_pDisplayTypeLB->GetSelectEntryPos());
         break;
         case TOX_OBJECTS:
         {
             long nOLEData = 0;
-            for(sal_uInt16 i = 0; i < aFromObjCLB.GetEntryCount(); i++)
+            for(sal_uInt16 i = 0; i < m_pFromObjCLB->GetEntryCount(); i++)
             {
-                if(aFromObjCLB.IsChecked(i))
+                if(m_pFromObjCLB->IsChecked(i))
                 {
-                    sal_IntPtr nData = (sal_IntPtr)aFromObjCLB.GetEntryData(i);
+                    sal_IntPtr nData = (sal_IntPtr)m_pFromObjCLB->GetEntryData(i);
                     nOLEData |= nData;
                 }
             }
@@ -1225,36 +1208,36 @@ void SwTOXSelectTabPage::FillTOXDescription()
         break;
         case TOX_AUTHORITIES:
         {
-            if(aBracketLB.GetSelectEntryPos())
-                rDesc.SetAuthBrackets(aBracketLB.GetSelectEntry());
+            if(m_pBracketLB->GetSelectEntryPos())
+                rDesc.SetAuthBrackets(m_pBracketLB->GetSelectEntry());
             else
                 rDesc.SetAuthBrackets(aEmptyStr);
-            rDesc.SetAuthSequence(aSequenceCB.IsChecked());
+            rDesc.SetAuthSequence(m_pSequenceCB->IsChecked());
         }
         break;
     }
 
-    rDesc.SetLevelFromChapter(  aLevelFromChapterCB.IsVisible() &&
-                                aLevelFromChapterCB.IsChecked());
-    if(aTOXMarksCB.IsChecked() && aTOXMarksCB.IsVisible())
+    rDesc.SetLevelFromChapter(  m_pLevelFromChapterCB->IsVisible() &&
+                                m_pLevelFromChapterCB->IsChecked());
+    if(m_pTOXMarksCB->IsChecked() && m_pTOXMarksCB->IsVisible())
         nContentOptions |= nsSwTOXElement::TOX_MARK;
-    if(aFromHeadingsCB.IsChecked() && aFromHeadingsCB.IsVisible())
+    if(m_pFromHeadingsCB->IsChecked() && m_pFromHeadingsCB->IsVisible())
         nContentOptions |= nsSwTOXElement::TOX_OUTLINELEVEL;
-    if(aAddStylesCB.IsChecked() && aAddStylesCB.IsVisible())
+    if(m_pAddStylesCB->IsChecked() && m_pAddStylesCB->IsVisible())
         nContentOptions |= nsSwTOXElement::TOX_TEMPLATE;
 
     rDesc.SetContentOptions(nContentOptions);
     rDesc.SetIndexOptions(nIndexOptions);
-    rDesc.SetLevel( static_cast< sal_uInt8 >(aLevelNF.GetValue()) );
+    rDesc.SetLevel( static_cast< sal_uInt8 >(m_pLevelNF->GetValue()) );
 
-    rDesc.SetReadonly(aReadOnlyCB.IsChecked());
+    rDesc.SetReadonly(m_pReadOnlyCB->IsChecked());
 
     for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
         rDesc.SetStyleNames(aStyleArr[i], i);
 
-    rDesc.SetLanguage(aLanguageLB.GetSelectLanguage());
-    const String* pEntryData = (const String*)aSortAlgorithmLB.GetEntryData(
-                                            aSortAlgorithmLB.GetSelectEntryPos() );
+    rDesc.SetLanguage(m_pLanguageLB->GetSelectLanguage());
+    const String* pEntryData = (const String*)m_pSortAlgorithmLB->GetEntryData(
+                                            m_pSortAlgorithmLB->GetSelectEntryPos() );
     OSL_ENSURE(pEntryData, "no entry data available");
     if(pEntryData)
         rDesc.SetSortAlgorithm(*pEntryData);
@@ -1266,31 +1249,31 @@ void SwTOXSelectTabPage::Reset( const SfxItemSet& )
     SwWrtShell& rSh = pTOXDlg->GetWrtShell();
     const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
     sal_IntPtr nData = lcl_TOXTypesToUserData(aCurType);
-    aTypeLB.SelectEntryPos(aTypeLB.GetEntryPos((void*)nData));
+    m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos((void*)nData));
 
     sAutoMarkURL = INetURLObject::decode( rSh.GetTOIAutoMarkURL(),
                                         INET_HEX_ESCAPE,
                                            INetURLObject::DECODE_UNAMBIGUOUS,
                                         RTL_TEXTENCODING_UTF8 );
-    aFromFileCB.Check( 0 != sAutoMarkURL.Len() );
+    m_pFromFileCB->Check( 0 != sAutoMarkURL.Len() );
 
-    aCaptionSequenceLB.Clear();
+    m_pCaptionSequenceLB->Clear();
     sal_uInt16 i, nCount = rSh.GetFldTypeCount(RES_SETEXPFLD);
     for (i = 0; i < nCount; i++)
     {
         SwFieldType *pType = rSh.GetFldType( i, RES_SETEXPFLD );
         if( pType->Which() == RES_SETEXPFLD &&
             ((SwSetExpFieldType *) pType)->GetType() & nsSwGetSetExpType::GSE_SEQ )
-            aCaptionSequenceLB.InsertEntry(pType->GetName());
+            m_pCaptionSequenceLB->InsertEntry(pType->GetName());
     }
 
     if(pTOXDlg->IsTOXEditMode())
     {
-        aTypeFT.Enable(sal_False);
-        aTypeLB.Enable(sal_False);
+        m_pTypeFT->Enable(sal_False);
+        m_pTypeLB->Enable(sal_False);
     }
-    TOXTypeHdl(&aTypeLB);
-    CheckBoxHdl(&aAddStylesCB);
+    TOXTypeHdl(m_pTypeLB);
+    CheckBoxHdl(m_pAddStylesCB);
 }
 
 void SwTOXSelectTabPage::ActivatePage( const SfxItemSet& )
@@ -1302,7 +1285,7 @@ int SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
     if(_pSet)
         _pSet->Put(SfxUInt16Item(FN_PARAM_TOX_TYPE,
-            (sal_uInt16)(sal_IntPtr)aTypeLB.GetEntryData( aTypeLB.GetSelectEntryPos() )));
+            (sal_uInt16)(sal_IntPtr)m_pTypeLB->GetEntryData( m_pTypeLB->GetSelectEntryPos() )));
     FillTOXDescription();
     return LEAVE_PAGE;
 }
@@ -1326,94 +1309,57 @@ IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl,   ListBox*, pBox)
     CurTOXType eCurType = lcl_UserData2TOXTypes(nType);
     pTOXDlg->SetCurrentTOXType(eCurType);
 
-    aAreaLB.Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
-    aLevelFT.Show( 0 != (nType & (TO_CONTENT)) );
-    aLevelNF.Show( 0 != (nType & (TO_CONTENT)) );
-    aLevelFromChapterCB.Show( 0 != (nType & (TO_USER)) );
-    aAreaFT.Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
-    aAreaFL.Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
-
-    aFromHeadingsCB.Show( 0 != (nType & (TO_CONTENT)) );
-    aAddStylesCB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
-    aAddStylesPB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
+    m_pAreaLB->Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
+    m_pLevelFT->Show( 0 != (nType & (TO_CONTENT)) );
+    m_pLevelNF->Show( 0 != (nType & (TO_CONTENT)) );
+    m_pLevelFromChapterCB->Show( 0 != (nType & (TO_USER)) );
+    m_pAreaFrame->Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_INDEX|TO_TABLE|TO_OBJECT)) );
 
-    aFromTablesCB.Show( 0 != (nType & (TO_USER)) );
-    aFromFramesCB.Show( 0 != (nType & (TO_USER)) );
-    aFromGraphicsCB.Show( 0 != (nType & (TO_USER)) );
-    aFromOLECB.Show( 0 != (nType & (TO_USER)) );
+    m_pFromHeadingsCB->Show( 0 != (nType & (TO_CONTENT)) );
+    m_pAddStylesCB->Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
+    m_pAddStylesPB->Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
 
-    aFromCaptionsRB.Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
-    aFromObjectNamesRB.Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
+    m_pFromTablesCB->Show( 0 != (nType & (TO_USER)) );
+    m_pFromFramesCB->Show( 0 != (nType & (TO_USER)) );
+    m_pFromGraphicsCB->Show( 0 != (nType & (TO_USER)) );
+    m_pFromOLECB->Show( 0 != (nType & (TO_USER)) );
 
-    aTOXMarksCB.Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
+    m_pFromCaptionsRB->Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
+    m_pFromObjectNamesRB->Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
 
-    aCreateFromFL.Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_TABLE)) );
-    aCaptionSequenceFT.Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
-    aCaptionSequenceLB.Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
-    aDisplayTypeFT.Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
-    aDisplayTypeLB.Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
+    m_pTOXMarksCB->Show( 0 != (nType & (TO_CONTENT|TO_USER)) );
 
-    aSequenceCB.Show( 0 != (nType & TO_AUTHORITIES) );
-    aBracketFT.Show( 0 != (nType & TO_AUTHORITIES) );
-    aBracketLB.Show( 0 != (nType & TO_AUTHORITIES) );
-    aAuthorityFormatFL.Show( 0 != (nType & TO_AUTHORITIES) );
+    m_pCreateFrame->Show( 0 != (nType & (TO_CONTENT|TO_ILLUSTRATION|TO_USER|TO_TABLE)) );
+    m_pCaptionSequenceFT->Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
+    m_pCaptionSequenceLB->Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
+    m_pDisplayTypeFT->Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
+    m_pDisplayTypeLB->Show( 0 != (nType & (TO_ILLUSTRATION|TO_TABLE)) );
 
-    sal_Bool bEnableSortLanguage = 0 != (nType & (TO_INDEX|TO_AUTHORITIES));
-    aSortOptionsFL.Show(bEnableSortLanguage);
-    aLanguageFT.Show(bEnableSortLanguage);
-    aLanguageLB.Show(bEnableSortLanguage);
-    aSortAlgorithmFT.Show(bEnableSortLanguage);
-    aSortAlgorithmLB.Show(bEnableSortLanguage);
+    m_pAuthorityFrame->Show( 0 != (nType & TO_AUTHORITIES) );
 
-        // initialize button positions
+    bool bEnableSortLanguage = 0 != (nType & (TO_INDEX|TO_AUTHORITIES));
+    m_pSortFrame->Show(bEnableSortLanguage);
 
-    //#i111993# add styles button has two different positions
-    if( !aAddStylesPosDef.X() )
+    if( nType & TO_ILLUSTRATION )
     {
-        aAddStylesPosDef = ( aAddStylesPB.GetPosPixel() );
-        // move left!
-        Point aPos(aAddStylesPosDef);
-        aPos.X() -= 2 * aAddStylesPB.GetSizePixel().Width();
-        aAddStylesPosUser = aPos;
+        m_pCaptionSequenceLB->SelectEntry( SwStyleNameMapper::GetUIName(
+                                    RES_POOLCOLL_LABEL_ABB, OUString() ));
     }
-
-    if( nType & TO_ILLUSTRATION )       //add by zhaojianwei
-        aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName(
-                                    RES_POOLCOLL_LABEL_ABB, aEmptyStr ));
     else if( nType & TO_TABLE )
-        aCaptionSequenceLB.SelectEntry( SwStyleNameMapper::GetUIName(
-                                    RES_POOLCOLL_LABEL_TABLE, aEmptyStr ));
-    else if( nType & TO_USER )
     {
-        aAddStylesCB.SetText(sAddStyleUser);
-        aAddStylesPB.SetPosPixel(aAddStylesPosUser);
+        m_pCaptionSequenceLB->SelectEntry( SwStyleNameMapper::GetUIName(
+                                    RES_POOLCOLL_LABEL_TABLE, OUString() ));
     }
-    else if( nType & TO_CONTENT )
+    else if( nType & TO_USER )
     {
-        aAddStylesPB.SetPosPixel(aAddStylesPosDef);
+        m_pAddStylesCB->SetText(sAddStyleUser);
     }
 
-    aCollectSameCB.Show( 0 != (nType & TO_INDEX) );
-    aUseFFCB.Show( 0 != (nType & TO_INDEX) );
-    aUseDashCB.Show( 0 != (nType & TO_INDEX) );
-    aCaseSensitiveCB.Show( 0 != (nType & TO_INDEX) );
-    aInitialCapsCB.Show( 0 != (nType & TO_INDEX) );
-    aKeyAsEntryCB.Show( 0 != (nType & TO_INDEX) );
-    aFromFileCB.Show( 0 != (nType & TO_INDEX) );
-    aAutoMarkPB.Show( 0 != (nType & TO_INDEX) );
-
-    aIdxOptionsFL.Show( 0 != (nType & TO_INDEX) );
+    m_pIdxOptionsFrame->Show( 0 != (nType & TO_INDEX) );
 
     //object index
-    aFromObjCLB.Show( 0 != (nType & TO_OBJECT) );
-    aFromObjFL.Show( 0 != (nType & TO_OBJECT) );
-
-    //move controls
-    aAddStylesCB.SetPosPixel(nType & TO_USER ? aCBLeftPos1 : aCBLeftPos2);
- Point aPBPos(aAddStylesPB.GetPosPixel());
-    aPBPos.Y() = nType & TO_USER ? aCBLeftPos1.Y() : aCBLeftPos2.Y();
-    aAddStylesPB.SetPosPixel(aPBPos);
-    aTOXMarksCB.SetPosPixel(nType & TO_USER ? aCBLeftPos2 : aCBLeftPos3);
+    m_pFromObjFrame->Show( 0 != (nType & TO_OBJECT) );
+
     //set control values from the proper TOXDescription
     {
         ApplyTOXDescription();
@@ -1440,23 +1386,23 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl,  CheckBox*, pBox )
     if(TOX_CONTENT == aCurType.eType)
     {
         //at least one of the three CheckBoxes must be checked
-        if(!aAddStylesCB.IsChecked() && !aFromHeadingsCB.IsChecked() && !aTOXMarksCB.IsChecked())
+        if(!m_pAddStylesCB->IsChecked() && !m_pFromHeadingsCB->IsChecked() && !m_pTOXMarksCB->IsChecked())
         {
             //TODO: InfoBox?
             pBox->Check(sal_True);
         }
-        aAddStylesPB.Enable(aAddStylesCB.IsChecked());
+        m_pAddStylesPB->Enable(m_pAddStylesCB->IsChecked());
     }
     if(TOX_USER == aCurType.eType)
     {
-        aAddStylesPB.Enable(aAddStylesCB.IsChecked());
+        m_pAddStylesPB->Enable(m_pAddStylesCB->IsChecked());
     }
     else if(TOX_INDEX == aCurType.eType)
     {
-        aAutoMarkPB.Enable(aFromFileCB.IsChecked());
-        aUseFFCB.Enable(aCollectSameCB.IsChecked() && !aUseDashCB.IsChecked());
-        aUseDashCB.Enable(aCollectSameCB.IsChecked() && !aUseFFCB.IsChecked());
-        aCaseSensitiveCB.Enable(aCollectSameCB.IsChecked());
+        m_pAutoMarkPB->Enable(m_pFromFileCB->IsChecked());
+        m_pUseFFCB->Enable(m_pCollectSameCB->IsChecked() && !m_pUseDashCB->IsChecked());
+        m_pUseDashCB->Enable(m_pCollectSameCB->IsChecked() && !m_pUseFFCB->IsChecked());
+        m_pCaseSensitiveCB->Enable(m_pCollectSameCB->IsChecked());
     }
     ModifyHdl(0);
     return 0;
@@ -1464,18 +1410,18 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl,  CheckBox*, pBox )
 
 IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl)
 {
-    sal_Bool bEnable = aFromCaptionsRB.IsChecked();
-    aCaptionSequenceFT.Enable(bEnable);
-    aCaptionSequenceLB.Enable(bEnable);
-    aDisplayTypeFT.Enable(bEnable);
-    aDisplayTypeLB.Enable(bEnable);
+    sal_Bool bEnable = m_pFromCaptionsRB->IsChecked();
+    m_pCaptionSequenceFT->Enable(bEnable);
+    m_pCaptionSequenceLB->Enable(bEnable);
+    m_pDisplayTypeFT->Enable(bEnable);
+    m_pDisplayTypeLB->Enable(bEnable);
     ModifyHdl(0);
     return 0;
 }
 
 IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
 {
-    lang::Locale aLcl( LanguageTag( aLanguageLB.GetSelectLanguage() ).getLocale() );
+    lang::Locale aLcl( LanguageTag( m_pLanguageLB->GetSelectLanguage() ).getLocale() );
     Sequence< OUString > aSeq = pIndexEntryWrapper->GetAlgorithmList( aLcl );
 
     if( !pIndexRes )
@@ -1483,14 +1429,14 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
 
     String sOldString;
     void* pUserData;
-    if( 0 != (pUserData = aSortAlgorithmLB.GetEntryData( aSortAlgorithmLB.GetSelectEntryPos())) )
+    if( 0 != (pUserData = m_pSortAlgorithmLB->GetEntryData( m_pSortAlgorithmLB->GetSelectEntryPos())) )
         sOldString = *(String*)pUserData;
     void* pDel;
-    sal_uInt16 nEnd = aSortAlgorithmLB.GetEntryCount();
+    sal_uInt16 nEnd = m_pSortAlgorithmLB->GetEntryCount();
     for( sal_uInt16 n = 0; n < nEnd; ++n )
-        if( 0 != ( pDel = aSortAlgorithmLB.GetEntryData( n )) )
+        if( 0 != ( pDel = m_pSortAlgorithmLB->GetEntryData( n )) )
             delete (String*)pDel;
-    aSortAlgorithmLB.Clear();
+    m_pSortAlgorithmLB->Clear();
 
     sal_uInt16 nInsPos;
     String sAlg, sUINm;
@@ -1498,14 +1444,14 @@ IMPL_LINK(SwTOXSelectTabPage, LanguageHdl, ListBox*, pBox)
     for( sal_uInt16 nCnt = 0; nCnt < nEnd; ++nCnt )
     {
         sUINm = pIndexRes->GetTranslation( sAlg = aSeq[ nCnt ] );
-        nInsPos = aSortAlgorithmLB.InsertEntry( sUINm );
-        aSortAlgorithmLB.SetEntryData( nInsPos, new String( sAlg ));
+        nInsPos = m_pSortAlgorithmLB->InsertEntry( sUINm );
+        m_pSortAlgorithmLB->SetEntryData( nInsPos, new String( sAlg ));
         if( sAlg == sOldString )
-            aSortAlgorithmLB.SelectEntryPos( nInsPos );
+            m_pSortAlgorithmLB->SelectEntryPos( nInsPos );
     }
 
-    if( LISTBOX_ENTRY_NOTFOUND == aSortAlgorithmLB.GetSelectEntryPos() )
-        aSortAlgorithmLB.SelectEntryPos( 0 );
+    if( LISTBOX_ENTRY_NOTFOUND == m_pSortAlgorithmLB->GetSelectEntryPos() )
+        m_pSortAlgorithmLB->SelectEntryPos( 0 );
 
     if(pBox)
         ModifyHdl(0);
@@ -1525,37 +1471,37 @@ IMPL_LINK(SwTOXSelectTabPage, AddStylesHdl, PushButton*, pButton)
 
 IMPL_LINK(SwTOXSelectTabPage, MenuEnableHdl, Menu*, pMenu)
 {
-    pMenu->EnableItem(MN_AUTOMARK_EDIT, sAutoMarkURL.Len() > 0);
+    pMenu->EnableItem("edit", sAutoMarkURL.Len() > 0);
     return 0;
 }
 
 IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*, pMenu)
 {
     const String sSaveAutoMarkURL = sAutoMarkURL;
-    switch(pMenu->GetCurItemId())
+    OString sIdent(pMenu->GetCurItemIdent());
+
+    if (sIdent == "open")
     {
-        case  MN_AUTOMARK_OPEN:
-            sAutoMarkURL = lcl_CreateAutoMarkFileDlg(
-                                    sAutoMarkURL, sAutoMarkType, true);
-        break;
-        case  MN_AUTOMARK_NEW :
+        sAutoMarkURL = lcl_CreateAutoMarkFileDlg(
+                                sAutoMarkURL, sAutoMarkType, true);
+    }
+    else if ((sIdent == "new") || (sIdent == "edit"))
+    {
+        bool bNew = (sIdent == "new");
+        if (bNew)
+        {
             sAutoMarkURL = lcl_CreateAutoMarkFileDlg(
                                     sAutoMarkURL, sAutoMarkType, false);
             if( !sAutoMarkURL.Len() )
-                break;
-        //no break
-        case  MN_AUTOMARK_EDIT:
-        {
-            bool bNew = pMenu->GetCurItemId()== MN_AUTOMARK_NEW;
-            SwAutoMarkDlg_Impl* pAutoMarkDlg = new SwAutoMarkDlg_Impl(
-                    &aAutoMarkPB, sAutoMarkURL, sAutoMarkType, bNew );
+                return 0;
+        }
 
-            if( RET_OK != pAutoMarkDlg->Execute() && bNew )
-                sAutoMarkURL = sSaveAutoMarkURL;
-            delete pAutoMarkDlg;
+        SwAutoMarkDlg_Impl* pAutoMarkDlg = new SwAutoMarkDlg_Impl(
+                m_pAutoMarkPB, sAutoMarkURL, sAutoMarkType, bNew );
 
-        }
-        break;
+        if( RET_OK != pAutoMarkDlg->Execute() && bNew )
+            sAutoMarkURL = sSaveAutoMarkURL;
+        delete pAutoMarkDlg;
     }
     return 0;
 }
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
index 3305765..b8ab478 100644
--- a/sw/source/ui/index/cnttab.hrc
+++ b/sw/source/ui/index/cnttab.hrc
@@ -16,135 +16,17 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#define FT_LEVEL        6
-#define FL_TITLE       14
-#define ED_TITLE       15
-#define BT_HELP        16
 
-#define LB_ENTRY       20
-#define ED_ENTRY       22
-#define FL_ENTRY       28
-#define LB_LEVEL       29
-#define FL_FORMAT      33
-#define BT_EDIT_STYLE       40
-#define CB_CASE             43
-#define CB_OBJECT           51
-#define FT_MAIN_ENTRY_STYLE 56
-#define LB_MAIN_ENTRY_STYLE 57
-
-//restart numbering
-#define FT_TYPE             1
-#define LB_TYPE             2
-#define CB_READONLY         3
-#define FT_TITLE            4
-
-#define FL_TYPETITLE            6
-#define LB_AREA             7
-
-#define NF_LEVEL            9
-#define FL_AREA                         10
-#define CB_FROMHEADINGS     11
-#define PB_CHAPTERDLG       12
-#define CB_ADDSTYLES        13
-#define PB_ADDSTYLES        14
-
-
-#define CB_FROMOLE          17
-#define CB_LEVELFROMCHAPTER 18
-#define RB_FROMCAPTIONS     19
-#define RB_FROMOBJECTNAMES  20
-#define CB_TOXMARKS         21
-#define FL_CREATEFROM           22
-#define CB_COLLECTSAME      23
-#define CB_USEFF            24
-#define CB_CASESENSITIVE    25
-#define CB_INITIALCAPS      26
-#define CB_KEYASENTRY       27
-#define CB_FROMFILE         28
-
-#define MB_AUTOMARK         29
-#define FL_IDXOPTIONS       30
-
-#define FT_TOKEN            32
-#define CB_USE_DASH         33
-#define FL_LEVEL            34
-#define PB_ENTRYNO              36
-#define PB_ENTRY                37
-#define PB_CHAPTERINFO          38
-#define PB_PAGENO               39
-#define PB_TAB                  40
-#define PB_HYPERLINK            41
-#define FT_CHARSTYLE            42
-#define LB_CHARSTYLE            43
-#define PB_EDITSTYLE            44
-#define FT_FILLCHAR             45
-#define CB_FILLCHAR             46
-#define FT_CHAPTERENTRY         47
-#define LB_CHAPTERENTRY         48
-#define FT_TABPOS               51
-#define MF_TABPOS               52
-#define CB_AUTORIGHT            53
-#define CB_RELTOSTYLE           54
-#define CB_ALPHADELIM           58
-#define CB_COMMASEPARATED       59
-
-#define CLB_FROMOBJ             62
-#define FL_FROMOBJ              63
-#define RES_SRCTYPES            64
-#define FT_AREA                 69
 #define TLB_STYLES              100
-#define FL_STYLES                   101
+#define FL_STYLES               101
 #define PB_OK                   102
 #define PB_CANCEL               103
 #define PB_HELP                 104
-#define FT_CAPTIONSEQUENCE      105
-#define LB_CAPTIONSEQUENCE      106
-#define FT_DISPLAYTYPE          107
-#define LB_DISPLAYTYPE          108
 #define TR_HEADER               109
 #define PB_LEFT                 110
 #define PB_RIGHT                111
 #define HB_STYLES               112
 #define ST_HB_FIRST             113
-#define CB_FROMTABLES           114
-#define CB_FROMFRAMES           115
-#define CB_FROMGRAPHICS         116
-#define ST_USER_ADDSTYLE        117
-#define ST_AUTOMARK_TYPE        118
-#define LB_AUTHFIELD            119
-#define PB_AUTHINSERT           120
-#define PB_AUTHREMOVE           121
-#define CB_SEQUENCE             122
-#define FT_BRACKET              123
-#define LB_BRACKET              124
-#define FL_AUTHORITY            125
-#define RB_DOCPOS               126
-#define RB_SORTCONTENT          127
-#define FT_FIRSTKEY             128
-#define LB_FIRSTKEY             129
-#define FT_SECONDKEY            130
-#define LB_SECONDKEY            131
-#define FT_THIRDDKEY            132
-#define LB_THIRDKEY             133
-#define FL_SORTKEY              134
-#define FL_SORTING              135
-#define RB_SORTUP1              137
-#define RB_SORTUP2              138
-#define RB_SORTUP3              139
-#define RB_SORTDOWN1            140
-#define RB_SORTDOWN2            141
-#define RB_SORTDOWN3            142
-#define FL_SORTOPTIONS          144
-#define FT_LANGUAGE             145
-#define LB_LANGUAGE             146
-#define FT_SORTALG              147
-#define LB_SORTALG              148
-#define ST_NO_BRACKET           151
-
-#define FT_LEVEL_OL             152
-#define NF_LEVEL_OL             153
-#define FT_ENTRY_NO             154
-#define LB_ENTRY_NO             155
 
 #define TO_CONTENT          1
 #define TO_INDEX            2
@@ -154,15 +36,4 @@
 #define TO_OBJECT           32
 #define TO_AUTHORITIES      64
 
-#define AREA_DOCUMENT       1
-#define AREA_CHAPTER        2
-
-//TabDialog
-#define WIN_EXAMPLE         1
-
-//ButtonMenu
-#define MN_AUTOMARK_OPEN    1
-#define MN_AUTOMARK_NEW     2
-#define MN_AUTOMARK_EDIT    3
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 564a6a4..85c64e5 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -138,441 +138,35 @@ String STR_CHARSTYLE
     Text [ en-US ] = "Character Style: ";
 };
 
-
-//------------------------------------------------------------------
-TabPage TP_TOX_SELECT
+Resource RES_SRCTYPES
 {
-    HelpID =  HID_TP_TOX_SELECT;
-    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-    Hide = TRUE ;
-
-    FixedLine        FL_TYPETITLE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Type and title";
-    };
-    FixedText       FT_TITLE
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 30 ,10 ) ;
-        Text [ en-US ] = "~Title";
-    };
-    Edit            ED_TITLE
-    {
-        HelpID = "sw:Edit:TP_TOX_SELECT:ED_TITLE";
-        Pos = MAP_APPFONT ( 45 , 14 ) ;
-        Size = MAP_APPFONT ( 203 , 12 ) ;
-        Border = TRUE;
-    };
-    FixedText       FT_TYPE
-    {
-        Pos = MAP_APPFONT ( 12 , 32 ) ;
-        Size = MAP_APPFONT (  30, 10 ) ;
-        Text [ en-US ] = "Type";
-    };
-    ListBox         LB_TYPE
-    {
-        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_TYPE";
-        Pos = MAP_APPFONT ( 45 , 30 ) ;
-        Size = MAP_APPFONT ( 80 , 80 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    StringList [ en-US ] =
-    {
-            < "Table of Contents" ;     TO_CONTENT      ;> ;
-        < "Alphabetical Index" ;    TO_INDEX        ;> ;
-        < "Illustration Index" ; TO_ILLUSTRATION ;> ;
-        < "Index of Tables" ;   TO_TABLE        ;> ;
-        < "User-Defined" ;  TO_USER         ;> ;
-        < "Table of Objects" ;  TO_OBJECT       ;> ;
-        < "Bibliography" ;  TO_AUTHORITIES  ;> ;
-    };
-    };
-    CheckBox        CB_READONLY
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_READONLY";
-        Pos = MAP_APPFONT ( 51 , 46 ) ;
-        Size = MAP_APPFONT ( 200 , 10 ) ;
-        Check = TRUE;
-        Text [ en-US ] = "Protected against manual changes";
-    };
-    FixedLine  FL_AREA
-    {
-        Pos = MAP_APPFONT ( 6 , 59 ) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Create index/table";
-    };
-    FixedText       FT_AREA
-    {
-        Pos = MAP_APPFONT ( 12 , 72 ) ;
-        Size = MAP_APPFONT (  30, 8 ) ;
-        Text [ en-US ] = "for";
-    };
-    ListBox         LB_AREA
-    {
-        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_AREA";
-        Pos = MAP_APPFONT ( 45 , 70 ) ;
-        Size = MAP_APPFONT ( 80 , 12 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    StringList [ en-US ] =
-    {
-            < "Entire document" ;   AREA_DOCUMENT       ;> ;
-        < "Chapter" ;               AREA_CHAPTER        ;> ;
-    };
-    };
-    FixedText       FT_LEVEL
-    {
-        Pos = MAP_APPFONT ( 130 , 72 ) ;
-        Size = MAP_APPFONT ( 95 , 8 ) ;
-        Text [ en-US ] = "Evaluate up to level";
-    };
-    NumericField    NF_LEVEL
-    {
-        HelpID = "sw:NumericField:TP_TOX_SELECT:NF_LEVEL";
-        Pos = MAP_APPFONT ( 231 , 70 ) ;
-        Size = MAP_APPFONT ( 20 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 10 ;
-        Value = 10 ;
-        SpinSize = 1 ;
-    };
-    FixedLine        FL_CREATEFROM
-    {
-        Pos = MAP_APPFONT ( 6 , 87 ) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Create from";
-    };
-    CheckBox        CB_FROMHEADINGS
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMHEADINGS";
-        Pos = MAP_APPFONT ( 12 , 99 ) ;
-        Size = MAP_APPFONT ( 95 , 10 ) ;
-        Check = TRUE;
-        Text [ en-US ] = "Outline";
-    };
-//  #outline level,removed by zhaojianwei
-/*  PushButton  PB_CHAPTERDLG
-    {
-        Pos = MAP_APPFONT ( 115 , 98 ) ;
-        Size = MAP_APPFONT ( 12 , 12 ) ;
-        Text = "~..." ;
-        TabStop = TRUE ;
-    };
-*/
-    CheckBox CB_ADDSTYLES
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES";
-        Pos = MAP_APPFONT ( 12 , 115 ) ;
-        Size = MAP_APPFONT ( 75 , 10  ) ;
-        Text [ en-US ] = "~Additional Styles";
-    };
-    String ST_USER_ADDSTYLE
-    {
-        Text [ en-US ] = "Styl~es";
-    };
-    PushButton      PB_ADDSTYLES
-    {
-        HelpID = "sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES";
-        Pos = MAP_APPFONT ( 115 , 114 ) ;
-        Size = MAP_APPFONT ( 12 , 12 ) ;
-        Text = "..." ;
-        TabStop = TRUE ;
-    };
-    CheckBox        CB_TOXMARKS
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_TOXMARKS";
-        Pos = MAP_APPFONT ( 12 , 131 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Text [ en-US ] = "Inde~x marks";
-    };
-
-    RadioButton     RB_FROMCAPTIONS
-    {
-        HelpID = "sw:RadioButton:TP_TOX_SELECT:RB_FROMCAPTIONS";
-        Pos = MAP_APPFONT ( 12 , 98 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Text [ en-US ] = "Captions";
-    };
-    FixedText FT_CAPTIONSEQUENCE
-    {
-        Pos = MAP_APPFONT ( 12 , 114 ) ;
-        Size = MAP_APPFONT ( 40 , 8 ) ;
-        Text [ en-US ] = "Category";
-    };
-    ListBox LB_CAPTIONSEQUENCE
-    {
-        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_CAPTIONSEQUENCE";
-        Pos = MAP_APPFONT ( 55 , 112 ) ;
-        Size = MAP_APPFONT ( 70 , 40 ) ;
-        DropDown = TRUE;
-        TabStop = TRUE;
-    };
-    FixedText FT_DISPLAYTYPE
-    {
-        Pos = MAP_APPFONT ( 12 , 130 ) ;
-        Size = MAP_APPFONT ( 40 , 8 ) ;
-        Text [ en-US ] = "Display";
-    };
-    ListBox LB_DISPLAYTYPE
-    {
-        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_DISPLAYTYPE";
-        Pos = MAP_APPFONT ( 55 , 128 ) ;
-        Size = MAP_APPFONT ( 70 , 40 ) ;
-        DropDown = TRUE;
-        TabStop = TRUE;
-    StringList [ en-US ] =
-    {
-            < "References" ; > ;
-        < "Category and Number" ; > ;
-        < "Caption Text" ; > ;
-    };
-    };
-    RadioButton        RB_FROMOBJECTNAMES
-    {
-        HelpID = "sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES";
-        Pos = MAP_APPFONT ( 156 , 98 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Text [ en-US ] = "Object names";
-    };
-    CheckBox        CB_COLLECTSAME
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_COLLECTSAME";
-        Pos = MAP_APPFONT ( 12 , 98 ) ;
-        Size = MAP_APPFONT ( 121 , 10 ) ;
-        Text [ en-US ] = "Combine identical entries";
-    };
-    CheckBox        CB_USEFF
+    StringArray 1
     {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_USEFF";
-        Pos = MAP_APPFONT ( 18 ,  111 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text [ en-US ] = "Combine identical entries with p or ~pp";
-    };
-    CheckBox CB_USE_DASH
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_USE_DASH";
-        Pos = MAP_APPFONT ( 18 , 124 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text [ en-US ] = "Combine with -";
-    };
-    CheckBox        CB_CASESENSITIVE
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_CASESENSITIVE";
-        Pos = MAP_APPFONT ( 18 , 137 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text [ en-US ] = "Case sensitive";
-    };
-    CheckBox        CB_INITIALCAPS
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_INITIALCAPS";
-        Pos = MAP_APPFONT ( 136 , 98 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text [ en-US ] = "AutoCapitalize entries";
-    };
-    CheckBox        CB_KEYASENTRY
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_KEYASENTRY";
-        Pos = MAP_APPFONT ( 136, 111 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text [ en-US ] = "Keys as separate entries";
-    };
-    CheckBox    CB_FROMFILE
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMFILE";
-        Pos = MAP_APPFONT ( 136 , 124 ) ;
-        Size = MAP_APPFONT ( 115 , 10 ) ;
-        Text [ en-US ] = "~Concordance file";
-    };
-    MenuButton  MB_AUTOMARK
-    {
-        HelpID = "sw:MenuButton:TP_TOX_SELECT:MB_AUTOMARK";
-        Pos = MAP_APPFONT ( 136 , 137 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        ButtonMenu = Menu
-        {
-            ItemList =
-            {
-                MenuItem
-                {
-                    Identifier = MN_AUTOMARK_OPEN ;
-                    Text [ en-US ] = "Open";
-                };
-                MenuItem
-                {
-                    Identifier = MN_AUTOMARK_NEW ;
-                    Text [ en-US ] = "~New...";
-                };
-                MenuItem
-                {
-                    Identifier = MN_AUTOMARK_EDIT ;
-                    Text [ en-US ] = "~Edit...";
-                };
-            };
-        };
-        Text [ en-US ] = "~File";
-    };
-    CheckBox    CB_FROMTABLES
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMTABLES";
-        Pos = MAP_APPFONT ( 112 , 99 ) ;
-        Size = MAP_APPFONT ( 68 , 10 ) ;
-        Text [ en-US ] = "Tables";
-    };
-    CheckBox    CB_FROMFRAMES
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMFRAMES";
-        Pos = MAP_APPFONT ( 182 , 99 ) ;
-        Size = MAP_APPFONT ( 68 , 10 ) ;
-        Text [ en-US ] = "Te~xt frames";
-    };
-    CheckBox    CB_FROMGRAPHICS
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMGRAPHICS";
-        Pos = MAP_APPFONT ( 112 , 113 ) ;
-        Size = MAP_APPFONT ( 68 , 10 ) ;
-        Text [ en-US ] = "Graphics";
-    };
-    CheckBox        CB_FROMOLE
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMOLE";
-        Pos = MAP_APPFONT ( 182 , 113 ) ;
-        Size = MAP_APPFONT ( 68 , 10 ) ;
-        Text [ en-US ] = "OLE objects";
-    };
-    CheckBox        CB_LEVELFROMCHAPTER
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_LEVELFROMCHAPTER";
-        Pos = MAP_APPFONT ( 118 ,  127 ) ;
-        Size = MAP_APPFONT ( 103 , 10 ) ;
-        Text [ en-US ] = "Use level from source chapter";
-    };
-    FixedLine        FL_IDXOPTIONS
-    {
-        Pos = MAP_APPFONT ( 6 , 87 ) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Options";
-    };
-    Control CLB_FROMOBJ
-    {
-        Pos = MAP_APPFONT ( 12 , 98 ) ;
-        Size = MAP_APPFONT ( 236 ,49 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    Resource RES_SRCTYPES
-    {
-        StringArray 1
-        {
 /*  ids from tox.hxx
-    TOO_MATH        = 0x01,
-    TOO_CHART       = 0x02,
-    TOO_IMAGE       = 0x04,
-    TOO_CALC        = 0x08,
-    TOO_DRAW_IMPRESS= 0x10,
-    TOO_OTHER       = 0x80*/
+TOO_MATH        = 0x01,
+TOO_CHART       = 0x02,
+TOO_IMAGE       = 0x04,
+TOO_CALC        = 0x08,
+TOO_DRAW_IMPRESS= 0x10,
+TOO_OTHER       = 0x80*/
 
-        ItemList [ en-US ] =
-        {
-            < "%PRODUCTNAME Math" ;                 1;> ;
-            < "%PRODUCTNAME Chart" ;            2;> ;
-            < "%PRODUCTNAME Calc" ;                 8;> ;
-            < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
-            < "Other OLE Objects";  128;> ;
-            };
-    };
-    };
-    FixedLine FL_FROMOBJ
-    {
-        Pos = MAP_APPFONT ( 6 , 87) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Create from the following objects";
-    };
-    CheckBox CB_SEQUENCE
-    {
-        HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_SEQUENCE";
-        Pos = MAP_APPFONT ( 12, 70) ;
-        Size = MAP_APPFONT ( 100, 10 ) ;
-        Text [ en-US ] = "~Number entries";
-    };
-    FixedText FT_BRACKET
+    ItemList [ en-US ] =
     {
-        Pos = MAP_APPFONT ( 12, 86) ;
-        Size = MAP_APPFONT ( 60, 8 ) ;
-        Text [ en-US ] = "~Brackets";
-    };
-    ListBox LB_BRACKET
-    {
-        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_BRACKET";
-        Pos = MAP_APPFONT ( 75, 84) ;
-        Size = MAP_APPFONT ( 40, 50 ) ;
-        Border = TRUE;
-        DropDown = TRUE;
-        StringList =
-        {
-            < "[]" ;> ;
-            < "()" ;> ;
-            < "{}" ;> ;
-            < "<>" ;> ;
+        < "%PRODUCTNAME Math" ;                 1;> ;
+        < "%PRODUCTNAME Chart" ;            2;> ;
+        < "%PRODUCTNAME Calc" ;                 8;> ;
+        < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ;    16;> ;
+        < "Other OLE Objects";  128;> ;
         };
     };
-    String ST_NO_BRACKET
-    {
-        Text [ en-US ] = "[none]";
-    };
-    FixedLine FL_AUTHORITY
-    {
-        Pos = MAP_APPFONT ( 6 , 59) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Formatting of the entries";
-    };
-    String ST_AUTOMARK_TYPE
-    {
-        Text [ en-US ] = "Selection file for the alphabetical index (*.sdi)";
-    };
-    FixedLine FL_SORTOPTIONS
-    {
-        Pos = MAP_APPFONT ( 6, 153) ;
-        Size = MAP_APPFONT ( 248, 8 ) ;
-        Text [ en-US ] = "Sort";
-    };
-    FixedText FT_LANGUAGE
-    {
-        Pos = MAP_APPFONT ( 12, 166) ;
-        Size = MAP_APPFONT ( 33, 8 ) ;
-        Text [ en-US ] = "Language";
-    };
-    ListBox LB_LANGUAGE
-    {
-        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_LANGUAGE";
-        Pos = MAP_APPFONT ( 47, 164) ;
-        Size = MAP_APPFONT ( 80, 50 ) ;
-        Border = TRUE;
-        DropDown = TRUE;
-    };
-    FixedText FT_SORTALG
-    {
-        Pos = MAP_APPFONT ( 130, 166) ;
-        Size = MAP_APPFONT ( 50, 8 ) ;
-        Text [ en-US ] = "Key type";
-    };
-    ListBox LB_SORTALG
-    {
-        HelpID = "sw:ListBox:TP_TOX_SELECT:LB_SORTALG";
-        Pos = MAP_APPFONT ( 201, 164) ;
-        Size = MAP_APPFONT ( 50, 50 ) ;
-        Border = TRUE;
-        DropDown = TRUE;
-    };
 };
 
+String STR_AUTOMARK_TYPE
+{
+    Text [ en-US ] = "Selection file for the alphabetical index (*.sdi)";
+};
+
+//------------------------------------------------------------------
 ModalDialog DLG_ADD_IDX_STYLES
 {
     HelpId = HID_DLG_ADD_IDX_STYLES;
diff --git a/sw/uiconfig/swriter/ui/tocindexpage.ui b/sw/uiconfig/swriter/ui/tocindexpage.ui
new file mode 100644
index 0000000..593995f
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/tocindexpage.ui
@@ -0,0 +1,1192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkBox" id="TocIndexPage">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="border_width">6</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkFrame" id="formatframe">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid6">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkLabel" id="mainstyleft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">_Title</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">title</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="GtkEntry" id="title">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hexpand">True</property>
+                    <property name="invisible_char">•</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="GtkLabel" id="typeft">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Type</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">type</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="GtkComboBox" id="type">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="model">liststore1</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="GtkCheckButton" id="readonly">
+                    <property name="label" translatable="yes">Protected against manual changes</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">2</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Type and title</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="areaframe">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="column_spacing">18</property>
+                <child>
+                  <object class="GtkGrid" id="grid3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="mainstyleft2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">for</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">scope</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="GtkComboBoxText" id="scope">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="entry_text_column">0</property>
+                        <property name="id_column">1</property>
+                        <items>
+                          <item translatable="yes">Entire document</item>
+                          <item translatable="yes">Chapter</item>
+                        </items>
+                      </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>
+                  </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="GtkGrid" id="grid4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="levelft">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Evaluate up to level</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">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="GtkSpinButton" id="level">
+                        <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="adjustment">adjustment1</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>
+                  </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>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Create index/table</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="createframe">
+        <property name="can_focus">False</property>
+        <property name="no_show_all">True</property>
+        <property name="hexpand">True</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="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <object class="GtkGrid" id="grid2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <object class="GtkGrid" id="grid10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="row_spacing">6</property>
+                    <property name="column_spacing">12</property>
+                    <property name="column_homogeneous">True</property>
+                    <child>
+                      <object class="GtkCheckButton" id="fromheadings">
+                        <property name="label" translatable="yes">Outline</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</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="GtkCheckButton" id="indexmarks">
+                        <property name="label" translatable="yes">Inde_x marks</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </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="GtkCheckButton" id="fromtables">
+                        <property name="label" translatable="yes">Tables</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</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="GtkCheckButton" id="fromframes">
+                        <property name="label" translatable="yes">Te_xt frames</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="fromgraphics">
+                        <property name="label" translatable="yes">Graphics</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</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="GtkCheckButton" id="fromoles">
+                        <property name="label" translatable="yes">OLE objects</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="uselevel">
+                        <property name="label" translatable="yes">Use level from source chapter</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="margin_left">12</property>
+                        <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">3</property>
+                        <property name="width">2</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="box1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="valign">center</property>
+                        <property name="spacing">12</property>
+                        <child>
+                          <object class="GtkBox" id="box2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkCheckButton" id="addstylescb">
+                                <property name="label" translatable="yes">_Additional Styles</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="stylescb">
+                                <property name="label" translatable="yes">Styl_es</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="styles">
+                            <property name="label" translatable="yes">...</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <accessibility>
+                              <relation type="labelled-by" target="addstylescb"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkGrid" id="grid13">
+                    <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_homogeneous">True</property>
+                    <child>
+                      <object class="GtkRadioButton" id="captions">
+                        <property name="label" translatable="yes">Captions</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="xalign">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">objnames</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="GtkRadioButton" id="objnames">
+                        <property name="label" translatable="yes">Object names</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="xalign">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</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="GtkGrid" id="grid12">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
+                        <child>
+                          <object class="GtkLabel" id="categoryft">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Category</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">lang</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="GtkComboBoxText" id="category">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list