Convert RID_OFADLG_OPTIONS_TREE to .ui

Conflicts:
cui/source/inc/treeopt.hxx
cui/source/options/treeopt.cxx

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

9 files changed, 160 insertions, 390 deletions

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 9ea8a7477cee..15b9ac7bb508 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/optfontspage \
 	cui/uiconfig/ui/optgeneralpage \
 	cui/uiconfig/ui/opthtmlpage \
+	cui/uiconfig/ui/optionsdialog \
 	cui/uiconfig/ui/optjsearchpage \
 	cui/uiconfig/ui/optlanguagespage \
 	cui/uiconfig/ui/optlingupage \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 7cd6afb1c722..c02c7a2fc357 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -108,7 +108,6 @@
 #define RID_SVXPAGE_COLOR                   (RID_SVX_START +  60)
 #define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE      ( RID_OFA_START + 256 )
 #define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
-#define RID_OFADLG_OPTIONS_TREE         (RID_OFA_START + 115)
 #define RID_RIDER_SLL_SITE              (RID_OFA_START + 100)//?
 #define RID_RIDER_SLL_PERSONAL          (RID_OFA_START + 101)//?
 
@@ -441,6 +440,7 @@
 #define RID_SVXSTR_LOADACCELCONFIG                          (RID_SVX_START + 1262)
 #define RID_SVXSTR_SAVEACCELCONFIG                          (RID_SVX_START + 1263)
 #define RID_SVXSTR_FILTERNAME_CFG                           (RID_SVX_START + 1264)
+#define RID_SVXSTR_LOAD_ERROR                               (RID_SVX_START + 1265)
 
 #endif
 
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index d8077d2fe51a..447723d3ebb5 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -144,18 +144,13 @@ class OfaTreeOptionsDialog : public SfxModalDialog
 {
 private:
     SvTreeListEntry*    pCurrentPageEntry;
-    Timer           maTreeLayoutTimer;
-    DECL_DLLPRIVATE_LINK( ImplHandleTreeLayoutTimerHdl, void* );
     bool hasTreePendingLayout() const;
 
-    OKButton        aOkPB;
-    CancelButton    aCancelPB;
-    HelpButton      aHelpPB;
-    PushButton      aBackPB;
+    OKButton*       pOkPB;
+    PushButton*     pBackPB;
 
-    FixedLine       aSeparatorFL;
-
-    SvTreeListBox   aTreeLB;
+    SvTreeListBox*  pTreeLB;
+    VclBox*         pTabBox;
 
     OUString        sTitle;
     OUString        sNotLoadedError;
@@ -180,7 +175,7 @@ private:
     void            ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
     void            InitTreeAndHandler();
     void            Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame );
-    void            ResizeTreeLB( void );   // resizes dialog so that treelistbox has no horizontal scroll bar
+    void            InitWidgets();
 
     void            LoadExtensionOptions( const OUString& rExtensionId );
     OUString   GetModuleIdentifier( const com::sun::star::uno::Reference<
@@ -189,9 +184,6 @@ private:
     VectorOfNodes   LoadNodes( Module* pModule, const OUString& rExtensionId );
     void            InsertNodes( const VectorOfNodes& rNodeList );
 
-    virtual void queue_resize(StateChangedType eReason = STATE_CHANGE_LAYOUT) SAL_OVERRIDE;
-    void SetPaneSize(Window *pPane);
-
 protected:
     DECL_LINK(ExpandedHdl_Impl, SvTreeListBox* );
     DECL_LINK(ShowPageHdl_Impl, void *);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 5817013a8136..1b70a813f0af 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -19,7 +19,6 @@
 
 #include "cuires.hrc"
 #include "helpid.hrc"
-#include "treeopt.hrc"
 
 #include <svx/dialogs.hrc>
 
@@ -488,24 +487,28 @@ struct OptionsGroupInfo
     ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; }
 };
 
-
-
 #define INI_LIST() \
     pCurrentPageEntry   ( NULL ),\
-    aOkPB               ( this, CUI_RES( PB_OK ) ),\
-    aCancelPB           ( this, CUI_RES( PB_CANCEL ) ),\
-    aHelpPB             ( this, CUI_RES( PB_HELP ) ),\
-    aBackPB             ( this, CUI_RES( PB_BACK ) ),\
-    aSeparatorFL        ( this, CUI_RES( FL_SEPARATOR ) ),\
-    aTreeLB             ( this, CUI_RES( TLB_PAGES ) ),\
     sTitle              ( GetText() ),\
-    sNotLoadedError     (       CUI_RES( ST_LOAD_ERROR ) ),\
+    sNotLoadedError     (       CUI_RES( RID_SVXSTR_LOAD_ERROR ) ),\
     pColorPageItemSet   ( NULL ),\
     mpColorPage         ( NULL ),\
     bForgetSelection    ( false ),\
     bIsFromExtensionManager( false ), \
     bIsForSetDocumentLanguage( false )
 
+void OfaTreeOptionsDialog::InitWidgets()
+{
+    get(pOkPB, "ok");
+    get(pBackPB, "revert");
+    get(pTreeLB, "pages");
+    get(pTabBox, "box");
+    Size aSize(pTabBox->LogicToPixel(Size(278, 259), MAP_APPFONT));
+    pTabBox->set_width_request(aSize.Width());
+    pTabBox->set_height_request(aSize.Height() - get_action_area()->get_preferred_size().Height());
+    pTreeLB->set_height_request(pTabBox->get_height_request());
+}
+
 // Ctor() with Frame -----------------------------------------------------
 using namespace ::com::sun::star;
 OfaTreeOptionsDialog::OfaTreeOptionsDialog(
@@ -513,47 +516,43 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
     const Reference< XFrame >& _xFrame,
     bool bActivateLastSelection ) :
 
-    SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
+    SfxModalDialog( pParent, "OptionsDialog", "cui/ui/optionsdialog.ui" ),
     INI_LIST()
 {
-    FreeResource();
+    InitWidgets();
 
     InitTreeAndHandler();
     Initialize( _xFrame );
     LoadExtensionOptions( OUString() );
-    ResizeTreeLB();
     if (bActivateLastSelection)
         ActivateLastSelection();
 
-    aTreeLB.SetAccessibleName(GetDisplayText());
+    pTreeLB->SetAccessibleName(GetDisplayText());
 }
 
 // Ctor() with ExtensionId -----------------------------------------------
-
 OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) :
 
-    SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
+    SfxModalDialog( pParent, "OptionsDialog", "cui/ui/optionsdialog.ui" ),
     INI_LIST()
 {
-    FreeResource();
+    InitWidgets();
 
     bIsFromExtensionManager = ( !rExtensionId.isEmpty() );
     InitTreeAndHandler();
     LoadExtensionOptions( rExtensionId );
-    ResizeTreeLB();
     ActivateLastSelection();
 }
 
 OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
 {
-    maTreeLayoutTimer.Stop();
     pCurrentPageEntry = NULL;
-    SvTreeListEntry* pEntry = aTreeLB.First();
+    SvTreeListEntry* pEntry = pTreeLB->First();
     // first children
     while(pEntry)
     {
         // if Child (has parent), then OptionsPageInfo
-        if(aTreeLB.GetParent(pEntry))
+        if(pTreeLB->GetParent(pEntry))
         {
             OptionsPageInfo *pPageInfo = (OptionsPageInfo *)pEntry->GetUserData();
             if(pPageInfo->m_pPage)
@@ -583,21 +582,21 @@ OfaTreeOptionsDialog::~OfaTreeOptionsDialog()
 
             delete pPageInfo;
         }
-        pEntry = aTreeLB.Next(pEntry);
+        pEntry = pTreeLB->Next(pEntry);
     }
 
     // and parents
-    pEntry = aTreeLB.First();
+    pEntry = pTreeLB->First();
     while(pEntry)
     {
-        if(!aTreeLB.GetParent(pEntry))
+        if(!pTreeLB->GetParent(pEntry))
         {
             OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)pEntry->GetUserData();
             if ( pGroupInfo && pGroupInfo->m_pExtPage )
                 delete pGroupInfo->m_pExtPage;
             delete pGroupInfo;
         }
-        pEntry = aTreeLB.Next(pEntry);
+        pEntry = pTreeLB->Next(pEntry);
     }
     delete pColorPageItemSet;
     deleteGroupNames();
@@ -607,9 +606,9 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage(
     sal_uInt16 nId, const OUString& rPageName, sal_uInt16 nGroup )
 {
     OptionsPageInfo* pPageInfo = new OptionsPageInfo( nId );
-    SvTreeListEntry* pParent = aTreeLB.GetEntry( 0, nGroup );
+    SvTreeListEntry* pParent = pTreeLB->GetEntry( 0, nGroup );
     DBG_ASSERT( pParent, "OfaTreeOptionsDialog::AddTabPage(): no group found" );
-    SvTreeListEntry* pEntry = aTreeLB.InsertEntry( rPageName, pParent );
+    SvTreeListEntry* pEntry = pTreeLB->InsertEntry( rPageName, pParent );
     pEntry->SetUserData( pPageInfo );
     return pPageInfo;
 }
@@ -620,17 +619,17 @@ sal_uInt16  OfaTreeOptionsDialog::AddGroup(const OUString& rGroupName,
                                         SfxModule* pCreateModule,
                                         sal_uInt16 nDialogId )
 {
-    SvTreeListEntry* pEntry = aTreeLB.InsertEntry(rGroupName);
+    SvTreeListEntry* pEntry = pTreeLB->InsertEntry(rGroupName);
     OptionsGroupInfo* pInfo =
         new OptionsGroupInfo( pCreateShell, pCreateModule, nDialogId );
     pEntry->SetUserData(pInfo);
     sal_uInt16 nRet = 0;
-    pEntry = aTreeLB.First();
+    pEntry = pTreeLB->First();
     while(pEntry)
     {
-        if(!aTreeLB.GetParent(pEntry))
+        if(!pTreeLB->GetParent(pEntry))
             nRet++;
-        pEntry = aTreeLB.Next(pEntry);
+        pEntry = pTreeLB->Next(pEntry);
     }
     return nRet - 1;
 }
@@ -643,13 +642,13 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ShowPageHdl_Impl)
 
 IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
 {
-    if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) )
+    if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
     {
         OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pCurrentPageEntry->GetUserData();
         if ( pPageInfo->m_pPage )
         {
             OptionsGroupInfo* pGroupInfo =
-                (OptionsGroupInfo*)aTreeLB.GetParent( pCurrentPageEntry )->GetUserData();
+                (OptionsGroupInfo*)pTreeLB->GetParent( pCurrentPageEntry )->GetUserData();
             if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId )
                 pPageInfo->m_pPage->Reset( pColorPageItemSet );
             else
@@ -663,14 +662,14 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
 
 IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
 {
-    aTreeLB.EndSelection();
-    if ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) )
+    pTreeLB->EndSelection();
+    if ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
     {
         OptionsPageInfo* pPageInfo = (OptionsPageInfo *)pCurrentPageEntry->GetUserData();
         if ( pPageInfo->m_pPage )
         {
             OptionsGroupInfo* pGroupInfo =
-                (OptionsGroupInfo *)aTreeLB.GetParent(pCurrentPageEntry)->GetUserData();
+                (OptionsGroupInfo *)pTreeLB->GetParent(pCurrentPageEntry)->GetUserData();
             if ( RID_SVXPAGE_COLOR != pPageInfo->m_nPageId
                 && pPageInfo->m_pPage->HasExchangeSupport() )
             {
@@ -678,7 +677,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
                 if ( nLeave == SfxTabPage::KEEP_PAGE )
                 {
                     // the page mustn't be left
-                    aTreeLB.Select(pCurrentPageEntry);
+                    pTreeLB->Select(pCurrentPageEntry);
                     return 0;
                 }
             }
@@ -686,16 +685,16 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
         }
     }
 
-    SvTreeListEntry* pEntry = aTreeLB.First();
+    SvTreeListEntry* pEntry = pTreeLB->First();
     while ( pEntry )
     {
-        if ( aTreeLB.GetParent( pEntry ) )
+        if ( pTreeLB->GetParent( pEntry ) )
         {
             OptionsPageInfo* pPageInfo = (OptionsPageInfo *)pEntry->GetUserData();
             if ( pPageInfo->m_pPage && !pPageInfo->m_pPage->HasExchangeSupport() )
             {
                 OptionsGroupInfo* pGroupInfo =
-                    (OptionsGroupInfo*)aTreeLB.GetParent(pEntry)->GetUserData();
+                    (OptionsGroupInfo*)pTreeLB->GetParent(pEntry)->GetUserData();
                 pPageInfo->m_pPage->FillItemSet(pGroupInfo->m_pOutItemSet);
             }
 
@@ -705,7 +704,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
                 pPageInfo->m_pExtPage->SavePage();
             }
         }
-        pEntry = aTreeLB.Next(pEntry);
+        pEntry = pTreeLB->Next(pEntry);
     }
     EndDialog(RET_OK);
     return 0;
@@ -748,10 +747,10 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox )
 
 void OfaTreeOptionsDialog::ApplyItemSets()
 {
-    SvTreeListEntry* pEntry = aTreeLB.First();
+    SvTreeListEntry* pEntry = pTreeLB->First();
     while(pEntry)
     {
-        if(!aTreeLB.GetParent(pEntry))
+        if(!pTreeLB->GetParent(pEntry))
         {
             OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo *)pEntry->GetUserData();
             if(pGroupInfo->m_pOutItemSet)
@@ -762,28 +761,25 @@ void OfaTreeOptionsDialog::ApplyItemSets()
                     ApplyItemSet( pGroupInfo->m_nDialogId, *pGroupInfo->m_pOutItemSet);
             }
         }
-        pEntry = aTreeLB.Next(pEntry);
+        pEntry = pTreeLB->Next(pEntry);
     }
 }
 
 void OfaTreeOptionsDialog::InitTreeAndHandler()
 {
-    maTreeLayoutTimer.SetTimeout(50);
-    maTreeLayoutTimer.SetTimeoutHdl( LINK( this, OfaTreeOptionsDialog, ImplHandleTreeLayoutTimerHdl ) );
-
-    aTreeLB.SetNodeDefaultImages();
+    pTreeLB->SetNodeDefaultImages();
 
-    aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX );
-    aTreeLB.SetStyle( aTreeLB.GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT |
+    pTreeLB->SetHelpId( HID_OFADLG_TREELISTBOX );
+    pTreeLB->SetStyle( pTreeLB->GetStyle()|WB_HASBUTTONS | WB_HASBUTTONSATROOT |
                            WB_HASLINES | WB_HASLINESATROOT |
                            WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE | WB_QUICK_SEARCH );
-    aTreeLB.SetSpaceBetweenEntries( 0 );
-    aTreeLB.SetSelectionMode( SINGLE_SELECTION );
-    aTreeLB.SetSublistOpenWithLeftRight( true );
-    aTreeLB.SetExpandedHdl( LINK( this, OfaTreeOptionsDialog, ExpandedHdl_Impl ) );
-    aTreeLB.SetSelectHdl( LINK( this, OfaTreeOptionsDialog, ShowPageHdl_Impl ) );
-    aBackPB.SetClickHdl( LINK( this, OfaTreeOptionsDialog, BackHdl_Impl ) );
-    aOkPB.SetClickHdl( LINK( this, OfaTreeOptionsDialog, OKHdl_Impl ) );
+    pTreeLB->SetSpaceBetweenEntries( 0 );
+    pTreeLB->SetSelectionMode( SINGLE_SELECTION );
+    pTreeLB->SetSublistOpenWithLeftRight( true );
+    pTreeLB->SetExpandedHdl( LINK( this, OfaTreeOptionsDialog, ExpandedHdl_Impl ) );
+    pTreeLB->SetSelectHdl( LINK( this, OfaTreeOptionsDialog, ShowPageHdl_Impl ) );
+    pBackPB->SetClickHdl( LINK( this, OfaTreeOptionsDialog, BackHdl_Impl ) );
+    pOkPB->SetClickHdl( LINK( this, OfaTreeOptionsDialog, OKHdl_Impl ) );
 }
 
 void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId )
@@ -841,11 +837,11 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
             xMacroExpander = theMacroExpander::get(xContext);
         }
 
-        SvTreeListEntry* pTemp = aTreeLB.First();
+        SvTreeListEntry* pTemp = pTreeLB->First();
         while( !pEntry && pTemp )
         {
             // restore only selection of a leaf
-            if ( aTreeLB.GetParent( pTemp ) && pTemp->GetUserData() )
+            if ( pTreeLB->GetParent( pTemp ) && pTemp->GetUserData() )
             {
                 OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pTemp->GetUserData();
                 OUString sPageURL = pPageInfo->m_sPageURL;
@@ -867,25 +863,25 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
                             || ( !pPageInfo->m_nPageId && sLastURL == sPageURL ) )
                     pEntry = pTemp;
             }
-            pTemp = aTreeLB.Next(pTemp);
+            pTemp = pTreeLB->Next(pTemp);
         }
     }
 
     if ( !pEntry )
     {
-        pEntry = aTreeLB.First();
-        pEntry = aTreeLB.Next(pEntry);
+        pEntry = pTreeLB->First();
+        pEntry = pTreeLB->Next(pEntry);
     }
 
     if ( !pEntry )
         return;
 
-    SvTreeListEntry* pParent = aTreeLB.GetParent(pEntry);
-    aTreeLB.Expand(pParent);
-    aTreeLB.MakeVisible(pParent);
-    aTreeLB.MakeVisible(pEntry);
-    aTreeLB.Select(pEntry);
-    aTreeLB.GrabFocus();
+    SvTreeListEntry* pParent = pTreeLB->GetParent(pEntry);
+    pTreeLB->Expand(pParent);
+    pTreeLB->MakeVisible(pParent);
+    pTreeLB->MakeVisible(pEntry);
+    pTreeLB->Select(pEntry);
+    pTreeLB->GrabFocus();
 }
 
 bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
@@ -898,79 +894,40 @@ bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
         if( aKeyCode.GetCode() == KEY_PAGEUP ||
                 aKeyCode.GetCode() == KEY_PAGEDOWN)
         {
-            SvTreeListEntry* pCurEntry = aTreeLB.FirstSelected();
+            SvTreeListEntry* pCurEntry = pTreeLB->FirstSelected();
             SvTreeListEntry*  pTemp = 0;
             if(aKeyCode.GetCode() == KEY_PAGEDOWN)
             {
-                pTemp =  aTreeLB.Next( pCurEntry ) ;
-                if(pTemp && !aTreeLB.GetParent(pTemp))
+                pTemp =  pTreeLB->Next( pCurEntry ) ;
+                if(pTemp && !pTreeLB->GetParent(pTemp))
                 {
-                    pTemp =  aTreeLB.Next( pTemp ) ;
-                    aTreeLB.Select(pTemp);
+                    pTemp =  pTreeLB->Next( pTemp ) ;
+                    pTreeLB->Select(pTemp);
                 }
             }
             else
             {
-                pTemp =  aTreeLB.Prev( pCurEntry ) ;
-                if(pTemp && !aTreeLB.GetParent(pTemp))
+                pTemp =  pTreeLB->Prev( pCurEntry ) ;
+                if(pTemp && !pTreeLB->GetParent(pTemp))
                 {
-                    pTemp =  aTreeLB.Prev( pTemp ) ;
+                    pTemp =  pTreeLB->Prev( pTemp ) ;
                 }
             }
             if(pTemp)
             {
-                if(!aTreeLB.IsExpanded(aTreeLB.GetParent(pTemp)))
-                    aTreeLB.Expand(aTreeLB.GetParent(pTemp));
-                aTreeLB.MakeVisible(pTemp);
-                aTreeLB.Select(pTemp);
+                if(!pTreeLB->IsExpanded(pTreeLB->GetParent(pTemp)))
+                    pTreeLB->Expand(pTreeLB->GetParent(pTemp));
+                pTreeLB->MakeVisible(pTemp);
+                pTreeLB->Select(pTemp);
             }
         }
     }
     return SfxModalDialog::Notify(rNEvt);
 }
 
-bool OfaTreeOptionsDialog::hasTreePendingLayout() const
-{
-    return maTreeLayoutTimer.IsActive();
-}
-
-void OfaTreeOptionsDialog::queue_resize(StateChangedType /*eReason*/)
-{
-    if (hasTreePendingLayout())
-        return;
-    if (IsInClose())
-        return;
-    maTreeLayoutTimer.Start();
-}
-
-IMPL_LINK( OfaTreeOptionsDialog, ImplHandleTreeLayoutTimerHdl, void*, EMPTYARG )
-{
-    if (pCurrentPageEntry && aTreeLB.GetParent(pCurrentPageEntry))
-    {
-        OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pCurrentPageEntry->GetUserData();
-        if (pPageInfo->m_pPage && ::isLayoutEnabled(pPageInfo->m_pPage))
-            SetPaneSize(pPageInfo->m_pPage);
-    }
-    return 0;
-}
-
-
-void OfaTreeOptionsDialog::SetPaneSize(Window *pPane)
-{
-    //The OfaTreeOptionsDialog is not fully widget layout enabled
-    //yet so it's a classic fixed dimension dialog, but to make
-    //it possible to incrementally convert it over each pane
-    //can be converted to .ui layout format and the fixed area
-    //size reserved for panes is allocated to them here
-    Point aPos(aSeparatorFL.GetPosPixel().X(), aTreeLB.GetPosPixel().Y());
-    Size aSize(aSeparatorFL.GetSizePixel().Width(),
-               aSeparatorFL.GetPosPixel().Y() - aTreeLB.GetPosPixel().Y());
-    pPane->SetPosSizePixel( aPos, aSize );
-}
-
 void OfaTreeOptionsDialog::SelectHdl_Impl()
 {
-    SvTreeListBox* pBox = &aTreeLB;
+    SvTreeListBox* pBox = pTreeLB;
 
     if(pCurrentPageEntry == pBox->GetCurEntry())
     {
@@ -993,13 +950,13 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 
     TabPage* pOldPage = NULL;
     TabPage* pNewPage = NULL;
-    OptionsPageInfo* pOptPageInfo = ( pCurrentPageEntry && aTreeLB.GetParent( pCurrentPageEntry ) )
+    OptionsPageInfo* pOptPageInfo = ( pCurrentPageEntry && pTreeLB->GetParent( pCurrentPageEntry ) )
         ? (OptionsPageInfo*)pCurrentPageEntry->GetUserData() : NULL;
 
     if ( pOptPageInfo && pOptPageInfo->m_pPage && pOptPageInfo->m_pPage->IsVisible() )
     {
         pOldPage = pOptPageInfo->m_pPage;
-        OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)aTreeLB.GetParent(pCurrentPageEntry)->GetUserData();
+        OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)pTreeLB->GetParent(pCurrentPageEntry)->GetUserData();
         int nLeave = SfxTabPage::LEAVE_PAGE;
         if ( RID_SVXPAGE_COLOR != pOptPageInfo->m_nPageId && pOptPageInfo->m_pPage->HasExchangeSupport() )
            nLeave = pOptPageInfo->m_pPage->DeactivatePage( pGroupInfo->m_pOutItemSet );
@@ -1018,7 +975,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
         pOptPageInfo->m_pExtPage->Hide();
         pOptPageInfo->m_pExtPage->DeactivatePage();
     }
-    else if ( pCurrentPageEntry && !aTreeLB.GetParent( pCurrentPageEntry ) )
+    else if ( pCurrentPageEntry && !pTreeLB->GetParent( pCurrentPageEntry ) )
     {
         OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)pCurrentPageEntry->GetUserData();
         if ( pGroupInfo && pGroupInfo->m_pExtPage )
@@ -1064,10 +1021,10 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
                 if(bIdentical)
                     pGroupInfo->m_pShell = pGroupInfo->m_pModule;
                 // now test whether there was the same module in other groups, too (e. g. Text+HTML)
-                SvTreeListEntry* pTemp = aTreeLB.First();
+                SvTreeListEntry* pTemp = pTreeLB->First();
                 while(pTemp)
                 {
-                    if(!aTreeLB.GetParent(pTemp) && pTemp != pEntry)
+                    if(!pTreeLB->GetParent(pTemp) && pTemp != pEntry)
                     {
                         OptionsGroupInfo* pTGInfo = (OptionsGroupInfo *)pTemp->GetUserData();
                         if(pTGInfo->m_pModule == pOldModule)
@@ -1077,7 +1034,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
                                 pTGInfo->m_pShell = pGroupInfo->m_pModule;
                         }
                     }
-                    pTemp = aTreeLB.Next(pTemp);
+                    pTemp = pTreeLB->Next(pTemp);
                 }
             }
 
@@ -1094,16 +1051,16 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
         if(pPageInfo->m_nPageId == RID_SVXPAGE_COLOR)
         {
             pPageInfo->m_pPage = ::CreateGeneralTabPage(
-                pPageInfo->m_nPageId, this, *pColorPageItemSet );
+                pPageInfo->m_nPageId, pTabBox, *pColorPageItemSet );
             mpColorPage = (SvxColorTabPage*)pPageInfo->m_pPage;
             mpColorPage->SetupForViewFrame( SfxViewFrame::Current() );
         }
         else
         {
-            pPageInfo->m_pPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, this, *pGroupInfo->m_pInItemSet );
+            pPageInfo->m_pPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet );
 
             if(!pPageInfo->m_pPage && pGroupInfo->m_pModule)
-                pPageInfo->m_pPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, this, *pGroupInfo->m_pInItemSet);
+                pPageInfo->m_pPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet);
 
         }
 
@@ -1113,8 +1070,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
             SvtViewOptions aTabPageOpt( E_TABPAGE, OUString::number( pPageInfo->m_nPageId) );
             pPageInfo->m_pPage->SetUserData( GetViewOptUserItem( aTabPageOpt ) );
 
-            Point aPagePos( aSeparatorFL.GetPosPixel().X(), aTreeLB.GetPosPixel().Y());
-            pPageInfo->m_pPage->SetPosPixel( aPagePos );
             if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId )
             {
                 pPageInfo->m_pPage->Reset( pColorPageItemSet );
@@ -1124,8 +1079,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
             {
                 pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet );
             }
-            if (::isLayoutEnabled(pPageInfo->m_pPage))
-                SetPaneSize(pPageInfo->m_pPage);
         }
     }
     else if ( 0 == pPageInfo->m_nPageId && !pPageInfo->m_pExtPage )
@@ -1136,9 +1089,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
         }
 
         pPageInfo->m_pExtPage = new ExtensionsTabPage(
-            this, 0, pPageInfo->m_sPageURL, pPageInfo->m_sEventHdl, m_xContainerWinProvider );
-
-        SetPaneSize(pPageInfo->m_pExtPage);
+            pTabBox, 0, pPageInfo->m_sPageURL, pPageInfo->m_sEventHdl, m_xContainerWinProvider );
     }
 
     if ( pPageInfo->m_pPage )
@@ -1159,9 +1110,9 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
     {
         OUStringBuffer sTitleBuf(sTitle);
         sTitleBuf.append(" - ");
-        sTitleBuf.append(aTreeLB.GetEntryText(pParent));
+        sTitleBuf.append(pTreeLB->GetEntryText(pParent));
         sTitleBuf.append(" - ");
-        sTitleBuf.append(aTreeLB.GetEntryText(pEntry));
+        sTitleBuf.append(pTreeLB->GetEntryText(pEntry));
         SetText(sTitleBuf.makeStringAndClear());
     }
 
@@ -1848,69 +1799,10 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
     }
 
 /*!!!
-    ResizeTreeLB();
     ActivateLastSelection();
  */
 }
 
-namespace
-{
-    void MoveControl( Control& _rCtrl, long _nDeltaPixel )
-    {
-        Point   aPt( _rCtrl.GetPosPixel() );
-        aPt.X() += _nDeltaPixel;
-        _rCtrl.SetPosPixel( aPt );
-    }
-}
-
-void OfaTreeOptionsDialog::ResizeTreeLB( void )
-{
-    const long  nMax = aSeparatorFL.GetSizePixel().Width() * 42 / 100;
-                                            // don't ask where 42 comes from... but it looks / feels ok ;-)
-    long        nDelta = 50;                // min.
-    sal_uInt16      nDepth = 0;
-    const long  nIndent0 = PixelToLogic( Size( 28, 0 ) ).Width();
-    const long  nIndent1 = PixelToLogic( Size( 52, 0 ) ).Width();
-
-    SvTreeList* pTreeList = aTreeLB.GetModel();
-    DBG_ASSERT( pTreeList, "-OfaTreeOptionsDialog::ResizeTreeLB(): no model, no cookies!" );
-
-    SvTreeListEntry* pEntry = pTreeList->First();
-    while( pEntry )
-    {
-        long n = aTreeLB.GetTextWidth(aTreeLB.GetEntryText(pEntry));
-        n += ((nDepth == 0) ? nIndent0 : nIndent1);
-
-        if( n > nDelta )
-            nDelta = n;
-
-        pEntry = pTreeList->Next( pEntry, &nDepth );
-    }
-
-    nDelta = LogicToPixel( Size( nDelta + 3, 0 ) ).Width();         // + extra space [logic]
-    nDelta += GetSettings().GetStyleSettings().GetScrollBarSize();  // + scroll bar, in case it's needed
-
-    if( nDelta > nMax )
-        nDelta = nMax;
-
-    // starting resizing with this
-    Size            aSize( GetSizePixel() );
-    aSize.Width() += nDelta;
-    SetSizePixel( aSize );
-
-    // resize treelistbox
-    aSize = aTreeLB.GetSizePixel();
-    aSize.Width() += nDelta;
-    aTreeLB.SetSizePixel( aSize );
-
-    // ... and move depending controls
-    MoveControl( aOkPB, nDelta );
-    MoveControl( aCancelPB, nDelta );
-    MoveControl( aHelpPB, nDelta );
-    MoveControl( aBackPB, nDelta );
-    MoveControl( aSeparatorFL, nDelta );
-}
-
 bool isNodeActive( OptionsNode* pNode, Module* pModule )
 {
     if ( pNode )
@@ -2252,14 +2144,14 @@ void  OfaTreeOptionsDialog::InsertNodes( const VectorOfNodes& rNodeList )
                 for ( sal_uInt32 k = 0; k < pNode->m_aGroupedLeaves[j].size(); ++k )
                 {
                     OptionsLeaf* pLeaf = pNode->m_aGroupedLeaves[j][k];
-                    lcl_insertLeaf( this, pNode, pLeaf, aTreeLB );
+                    lcl_insertLeaf( this, pNode, pLeaf, *pTreeLB );
                 }
             }
 
             for ( j = 0; j < pNode->m_aLeaves.size(); ++j )
             {
                 OptionsLeaf* pLeaf = pNode->m_aLeaves[j];
-                lcl_insertLeaf( this, pNode, pLeaf, aTreeLB );
+                lcl_insertLeaf( this, pNode, pLeaf, *pTreeLB );
             }
         }
     }
diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc
deleted file mode 100644
index c3eb93193e42..000000000000
--- a/cui/source/options/treeopt.hrc
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/tabpage.hrc>
-#include <svtools/controldims.hrc>
-
-#define PB_OK                   1
-#define PB_CANCEL               2
-#define PB_HELP                 3
-#define PB_BACK                 4
-#define TLB_PAGES               5
-
-#define FL_SEPARATOR            19
-
-#define ST_LOAD_ERROR           24
-
-// metrics
-
-#define WIDTH_PAGEFRAME         TP_WIDTH
-#define HEIGHT_PAGEFRAME        TP_HEIGHT
-
-#define COL_1                   (RSC_SP_DLG_INNERBORDER_LEFT)
-#define COL_2                   (COL_1+0)
-#define COL_3                   (COL_2+RSC_SP_GRP_SPACE_X)
-#define COL_11                  (COL_3+WIDTH_PAGEFRAME)
-#define COL_12                  (COL_11+RSC_SP_DLG_INNERBORDER_RIGHT)
-#define COL_10                  (COL_11-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_9                   (COL_10-RSC_SP_CTRL_GROUP_X)
-#define COL_8                   (COL_9-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_7                   (COL_8-RSC_SP_CTRL_GROUP_X)
-#define COL_6                   (COL_7-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_5                   (COL_6-RSC_SP_CTRL_GROUP_X)
-#define COL_4                   (COL_5-RSC_CD_PUSHBUTTON_WIDTH)
-
-#define ROW_1                   (RSC_SP_DLG_INNERBORDER_TOP)
-#define ROW_2                   (ROW_1+HEIGHT_PAGEFRAME)
-#define ROW_3                   (ROW_2+RSC_SP_CTRL_GROUP_Y+RSC_CD_PUSHBUTTON_HEIGHT+RSC_CD_FIXEDLINE_HEIGHT)
-#define ROW_4                   (ROW_3+RSC_CD_FIXEDLINE_HEIGHT)
-#define ROW_5                   (ROW_4+RSC_CD_PUSHBUTTON_HEIGHT)
-#define ROW_6                   (ROW_5+RSC_SP_DLG_INNERBORDER_BOTTOM)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 2a5874252784..d509970d236a 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -17,69 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "treeopt.hrc"
 #include <cuires.hrc>
 #include "helpid.hrc"
 #include <svx/dialogs.hrc>
 
-#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
-
-ModalDialog RID_OFADLG_OPTIONS_TREE
-{
-    HelpID = HID_OFADLG_OPTIONS_TREE;
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-
-    Size = MAP_APPFONT ( COL_12 , ROW_6 ) ;
-    Text [ en-US ] = "Options";
-
-    OKButton PB_OK
-    {
-        Pos = MAP_APPFONT ( COL_4, ROW_4 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE;
-    };
-    CancelButton PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( COL_6, ROW_4 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton PB_HELP
-    {
-        Pos = MAP_APPFONT ( COL_8, ROW_4 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-    };
-    PushButton PB_BACK
-    {
-        HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK";
-        Pos = MAP_APPFONT ( COL_10, ROW_4 ) ;
-        Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Revert" ;
-    };
-    //TreeListBox
-    Control TLB_PAGES
-    {
-        Pos = MAP_APPFONT ( COL_1, ROW_1 ) ;
-        Size = MAP_APPFONT ( (COL_2-COL_1), (ROW_5-ROW_1) );
-        TabStop = TRUE ;
-        Border = TRUE;
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( COL_3, ROW_3 ) ;
-        Size = MAP_APPFONT ( WIDTH_PAGEFRAME, ROW_4-ROW_3 ) ;
-    };
-    String ST_LOAD_ERROR
-    {
-        Text [ en-US ] = "The selected module could not be loaded.";
-    };
-};
-
 Resource RID_OFADLG_OPTIONS_TREE_PAGES
 {
     StringArray SID_GENERAL_OPTIONS
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index 9de66cc0183f..da547d479992 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -195,5 +195,9 @@ String RID_SVXSTR_READ_DATA_ERROR
 {
     Text [ en-US ] = "The file could not be loaded!" ;
 };
+String RID_SVXSTR_LOAD_ERROR
+{
+    Text [ en-US ] = "The selected module could not be loaded.";
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index 4f13ef3fac83..92950c87c9c1 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -1,16 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="OptionsDialog">
     <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Options</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
         <property name="orientation">vertical</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="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <child>
+              <object class="svtlo-SvTreeListBox" id="pages:border">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="vexpand">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="Tree List-selection"/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
@@ -18,8 +69,11 @@
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -32,6 +86,7 @@
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -46,6 +101,7 @@
             <child>
               <object class="GtkButton" id="help">
                 <property name="label">gtk-help</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -60,6 +116,7 @@
             <child>
               <object class="GtkButton" id="revert">
                 <property name="label">gtk-revert-to-saved</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -76,64 +133,6 @@
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="grid1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="column_spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="notloaded">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">The selected module could not be loaded.</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">2</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="svtlo-SvTreeListBox" id="pages">
-                <property name="visible">True</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">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="GtkBox" id="pages">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <placeholder/>
-                </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>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
index 68afcee64aff..97dd10533bbe 100644
--- a/svx/source/src/app.hrc
+++ b/svx/source/src/app.hrc
@@ -46,7 +46,6 @@
 #define RID_OFA_FORMNEW_DLG             (RID_OFA_START + 112)
 #define RID_OFA_TABPROPERTIES           (RID_OFA_START + 113)
 #define RID_OFADLG_REGISTRATION         (RID_OFA_START + 114)
-#define RID_OFADLG_OPTIONS_TREE         (RID_OFA_START + 115)
 #define RID_OFADLG_OPTIONS_TREE_PAGES   (RID_OFA_START + 116)
 #define RID_OFADLG_AWCP_VALUES          (RID_OFA_START + 117)
 #define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)