weld SwCompatibilityOptPage

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

3 files changed, 188 insertions, 132 deletions

diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index c400441c6b08..b527bf6a989f 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -52,97 +52,65 @@ struct SwCompatibilityOptPage_Impl
     std::vector< SvtCompatibilityEntry > m_aList;
 };
 
-SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "OptCompatPage", "modules/swriter/ui/optcompatpage.ui", &rSet)
+SwCompatibilityOptPage::SwCompatibilityOptPage(TabPageParent pParent, const SfxItemSet& rSet)
+    : SfxTabPage(pParent, "modules/swriter/ui/optcompatpage.ui", "OptCompatPage", &rSet)
     , m_pWrtShell(nullptr)
     , m_pImpl(new SwCompatibilityOptPage_Impl)
     , m_nSavedOptions(0)
     , m_bSavedMSFormsMenuOption(false)
+    , m_xMain(m_xBuilder->weld_frame("compatframe"))
+    , m_xGlobalOptionsFrame(m_xBuilder->weld_frame("globalcompatframe"))
+    , m_xFormattingLB(m_xBuilder->weld_combo_box("format"))
+    , m_xGlobalOptionsLB(m_xBuilder->weld_combo_box("globaloptions"))
+    , m_xOptionsLB(m_xBuilder->weld_tree_view("options"))
+    , m_xGlobalOptionsCLB(m_xBuilder->weld_tree_view("globaloptioncheckbox"))
+    , m_xDefaultPB(m_xBuilder->weld_button("default"))
 {
-    get(m_pMain, "compatframe");
-    get(m_pGlobalOptionsFrame, "globalcompatframe");
-    get(m_pFormattingLB, "format");
-    get(m_pGlobalOptionsLB, "globaloptions");
-    get(m_pOptionsLB, "options");
-    get(m_pGlobalOptionsCLB, "globaloptioncheckbox");
-    get(m_pDefaultPB, "default");
+    std::vector<int> aWidths;
+    aWidths.push_back(m_xOptionsLB->get_checkbox_column_width());
+    m_xOptionsLB->set_column_fixed_widths(aWidths);
+    m_xGlobalOptionsCLB->set_column_fixed_widths(aWidths);
 
+    int nPos = 0;
     for ( int i = static_cast<int>(SvtCompatibilityEntry::Index::Module) + 1; i < static_cast<int>(SvtCompatibilityEntry::Index::INVALID); ++i )
     {
         int nCoptIdx = i - 2; /* Do not consider "Name" & "Module" indexes */
 
-        const OUString sEntry = m_pFormattingLB->GetEntry( nCoptIdx );
-        SvTreeListEntry* pEntry = m_pOptionsLB->SvTreeListBox::InsertEntry( sEntry );
-        if ( pEntry )
-        {
-            m_pOptionsLB->SetCheckButtonState( pEntry, SvButtonState::Unchecked );
-        }
+        const OUString sEntry = m_xFormattingLB->get_text(nCoptIdx);
+        m_xOptionsLB->append();
+        m_xOptionsLB->set_toggle(nPos, TRISTATE_FALSE, 0);
+        m_xOptionsLB->set_text(nPos, sEntry, 1);
+        ++nPos;
     }
 
-    m_sUserEntry = m_pFormattingLB->GetEntry(m_pFormattingLB->GetEntryCount()-1);
-
-    m_pFormattingLB->Clear();
-
-    m_pOptionsLB->SetStyle( m_pOptionsLB->GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
-    m_pOptionsLB->SetHighlightRange();
+    m_sUserEntry = m_xFormattingLB->get_text(m_xFormattingLB->get_count() - 1);
 
+    m_xFormattingLB->clear();
 
     // Set MSOCompatibleFormsMenu entry attributes
     const bool bReadOnly = officecfg::Office::Compatibility::View::MSCompatibleFormsMenu::isReadOnly();
-    const bool bChecked = m_aViewConfigItem.HasMSOCompatibleFormsMenu();
+    m_xGlobalOptionsCLB->set_sensitive(!bReadOnly);
 
-    SvTreeListEntry* pEntry;
-    if(bReadOnly)
-    {
-        pEntry = m_pGlobalOptionsCLB->SvTreeListBox::InsertEntry( m_pGlobalOptionsLB->GetEntry( 0 ), nullptr, false,
-                                                                  TREELIST_APPEND, nullptr, SvLBoxButtonKind::DisabledCheckbox);
-    }
-    else
-    {
-        pEntry = m_pGlobalOptionsCLB->SvTreeListBox::InsertEntry( m_pGlobalOptionsLB->GetEntry( 0 ) );
-    }
-
-    if ( pEntry )
-    {
-        SvLBoxButton* pButton = static_cast<SvLBoxButton*>(pEntry->GetFirstItem(SvLBoxItemType::Button));
-        assert(pButton);
-        if (bChecked)
-            pButton->SetStateChecked();
-        else
-            pButton->SetStateUnchecked();
-    }
+    m_xGlobalOptionsCLB->append();
+    const bool bChecked = m_aViewConfigItem.HasMSOCompatibleFormsMenu();
+    m_xGlobalOptionsCLB->set_toggle(0, bChecked ? TRISTATE_TRUE : TRISTATE_FALSE, 0);
+    m_xGlobalOptionsCLB->set_text(0, m_xGlobalOptionsLB->get_text(0), 1);
 
-    m_pGlobalOptionsLB->Clear();
+    m_xGlobalOptionsLB->clear();
 
-    m_pGlobalOptionsCLB->SetStyle( m_pGlobalOptionsCLB->GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
-    m_pGlobalOptionsCLB->SetHighlightRange();
     // tdf#125799, we let only the doc options grow/shrink but give this one more than its bare
     // min request height because there's only one row in it and that looks somewhat abrupt
-    m_pGlobalOptionsCLB->set_height_request(m_pGlobalOptionsCLB->get_preferred_size().Height() * 2);
+    m_xGlobalOptionsCLB->set_size_request(-1, m_xGlobalOptionsCLB->get_preferred_size().Height() * 2);
 
     InitControls( rSet );
 
     // set handler
-    m_pFormattingLB->SetSelectHdl( LINK( this, SwCompatibilityOptPage, SelectHdl ) );
-    m_pDefaultPB->SetClickHdl( LINK( this, SwCompatibilityOptPage, UseAsDefaultHdl ) );
+    m_xFormattingLB->connect_changed( LINK( this, SwCompatibilityOptPage, SelectHdl ) );
+    m_xDefaultPB->connect_clicked( LINK( this, SwCompatibilityOptPage, UseAsDefaultHdl ) );
 }
 
 SwCompatibilityOptPage::~SwCompatibilityOptPage()
 {
-    disposeOnce();
-}
-
-void SwCompatibilityOptPage::dispose()
-{
-    m_pImpl.reset();
-    m_pMain.clear();
-    m_pGlobalOptionsFrame.clear();
-    m_pFormattingLB.clear();
-    m_pGlobalOptionsLB.clear();
-    m_pOptionsLB.clear();
-    m_pGlobalOptionsCLB.clear();
-    m_pDefaultPB.clear();
-    SfxTabPage::dispose();
 }
 
 static sal_uLong convertBools2Ulong_Impl
@@ -231,11 +199,11 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
     }
     else
     {
-        m_pMain->Disable();
-        m_pGlobalOptionsFrame->Disable();
+        m_xMain->set_sensitive(false);
+        m_xGlobalOptionsFrame->set_sensitive(false);
     }
-    const OUString& rText = m_pMain->get_label();
-    m_pMain->set_label(rText.replaceAll("%DOCNAME", sDocTitle));
+    const OUString& rText = m_xMain->get_label();
+    m_xMain->set_label(rText.replaceAll("%DOCNAME", sDocTitle));
 
     // loading file formats
     Sequence< Sequence< PropertyValue > > aList = m_aConfigItem.GetList();
@@ -277,8 +245,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
         if ( sNewEntry.isEmpty() )
             sNewEntry = sEntryName;
 
-        const sal_Int32 nPos = m_pFormattingLB->InsertEntry( sNewEntry );
-        sal_uLong nOptions = convertBools2Ulong_Impl(
+        sal_uInt32 nOptions = convertBools2Ulong_Impl(
             aEntry.getValue<bool>( SvtCompatibilityEntry::Index::UsePrtMetrics ),
             aEntry.getValue<bool>( SvtCompatibilityEntry::Index::AddSpacing ),
             aEntry.getValue<bool>( SvtCompatibilityEntry::Index::AddSpacingAtPages ),
@@ -294,22 +261,19 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
             aEntry.getValue<bool>( SvtCompatibilityEntry::Index::MsWordTrailingBlanks ),
             aEntry.getValue<bool>( SvtCompatibilityEntry::Index::SubtractFlysAnchoredAtFlys ),
             aEntry.getValue<bool>( SvtCompatibilityEntry::Index::EmptyDbFieldHidesPara ) );
-        m_pFormattingLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_IntPtr>(nOptions)) );
+        m_xFormattingLB->append(OUString::number(nOptions), sNewEntry);
     }
-
-    m_pFormattingLB->SetDropDownLineCount( m_pFormattingLB->GetEntryCount() );
 }
 
-IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl, weld::ComboBox&, void)
 {
-    const sal_Int32 nPos = m_pFormattingLB->GetSelectedEntryPos();
-    sal_uLong nOptions = reinterpret_cast<sal_uLong>(m_pFormattingLB->GetEntryData( nPos ));
-    SetCurrentOptions( nOptions );
+    sal_uInt32 nOptions = m_xFormattingLB->get_active_id().toUInt32();
+    SetCurrentOptions(nOptions);
 }
 
-IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void)
+IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, weld::Button&, void)
 {
-    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "modules/swriter/ui/querydefaultcompatdialog.ui"));
+    std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetDialogFrameWeld(), "modules/swriter/ui/querydefaultcompatdialog.ui"));
     std::unique_ptr<weld::MessageDialog> xQueryBox(xBuilder->weld_message_dialog("QueryDefaultCompatDialog"));
     if (xQueryBox->run() == RET_YES)
     {
@@ -317,10 +281,10 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void)
             [](const SvtCompatibilityEntry& rItem) { return rItem.isDefaultEntry(); });
         if (pItem != m_pImpl->m_aList.end())
         {
-            const sal_Int32 nCount = m_pOptionsLB->GetEntryCount();
+            const sal_Int32 nCount = m_xOptionsLB->n_children();
             for ( sal_Int32 i = 0; i < nCount; ++i )
             {
-                bool bChecked = m_pOptionsLB->IsChecked(static_cast< sal_uLong >( i ));
+                bool bChecked = m_xOptionsLB->get_toggle(i, 0);
 
                 int nCoptIdx = i + 2; /* Consider "Name" & "Module" indexes */
                 pItem->setValue<bool>( SvtCompatibilityEntry::Index(nCoptIdx), bChecked );
@@ -333,12 +297,12 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl, Button*, void)
 
 void SwCompatibilityOptPage::SetCurrentOptions( sal_uLong nOptions )
 {
-    const sal_uLong nCount = m_pOptionsLB->GetEntryCount();
+    const int nCount = m_xOptionsLB->n_children();
     OSL_ENSURE( nCount <= 32, "SwCompatibilityOptPage::Reset(): entry overflow" );
-    for ( sal_uLong i = 0; i < nCount; ++i )
+    for (int i = 0; i < nCount; ++i)
     {
         bool bChecked = ( ( nOptions & 0x00000001 ) == 0x00000001 );
-        m_pOptionsLB->CheckEntryPos( i, bChecked );
+        m_xOptionsLB->set_toggle(i, bChecked ? TRISTATE_TRUE : TRISTATE_FALSE, 0);
         nOptions = nOptions >> 1;
     }
 }
@@ -378,7 +342,7 @@ void SwCompatibilityOptPage::WriteOptions()
 
 VclPtr<SfxTabPage> SwCompatibilityOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwCompatibilityOptPage>::Create( pParent.pParent, *rAttrSet );
+    return VclPtr<SwCompatibilityOptPage>::Create( pParent, *rAttrSet );
 }
 
 bool SwCompatibilityOptPage::FillItemSet( SfxItemSet*  )
@@ -387,12 +351,12 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet*  )
     if ( m_pWrtShell )
     {
         sal_uLong nSavedOptions = m_nSavedOptions;
-        const sal_uLong nCount = m_pOptionsLB->GetEntryCount();
+        const int nCount = m_xOptionsLB->n_children();
         OSL_ENSURE( nCount <= 32, "SwCompatibilityOptPage::Reset(): entry overflow" );
 
-        for ( sal_uLong i = 0; i < nCount; ++i )
+        for (int i = 0; i < nCount; ++i)
         {
-            bool bChecked = m_pOptionsLB->IsChecked(i);
+            bool bChecked = m_xOptionsLB->get_toggle(i, 0) == TRISTATE_TRUE;
             bool bSavedChecked = ( ( nSavedOptions & 0x00000001 ) == 0x00000001 );
             if ( bChecked != bSavedChecked )
             {
@@ -472,7 +436,7 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet*  )
     if ( bModified )
         WriteOptions();
 
-    bool bNewMSFormsMenuOption = m_pGlobalOptionsCLB->IsChecked(0);
+    bool bNewMSFormsMenuOption = m_xGlobalOptionsCLB->get_toggle(0, 0);
     if (m_bSavedMSFormsMenuOption != bNewMSFormsMenuOption)
     {
         m_aViewConfigItem.SetMSOCompatibleFormsMenu(bNewMSFormsMenuOption);
@@ -483,7 +447,7 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet*  )
         {
             SolarMutexGuard aGuard;
             if (svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
-                                              GetFrameWeld(), svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU))
+                                              GetDialogFrameWeld(), svtools::RESTART_REASON_MSCOMPATIBLE_FORMS_MENU))
             {
                 GetParentDialog()->EndDialog(RET_OK);
             }
@@ -495,13 +459,13 @@ bool SwCompatibilityOptPage::FillItemSet( SfxItemSet*  )
 
 void SwCompatibilityOptPage::Reset( const SfxItemSet*  )
 {
-    m_pOptionsLB->SelectEntryPos( 0 );
+    m_xOptionsLB->select(0);
 
     sal_uLong nOptions = GetDocumentOptions();
     SetCurrentOptions( nOptions );
     m_nSavedOptions = nOptions;
 
-    m_pGlobalOptionsCLB->CheckEntryPos( 0, m_aViewConfigItem.HasMSOCompatibleFormsMenu() );
+    m_xGlobalOptionsCLB->set_toggle(0, m_aViewConfigItem.HasMSOCompatibleFormsMenu() ? TRISTATE_TRUE : TRISTATE_FALSE, 0);
     m_bSavedMSFormsMenuOption = m_aViewConfigItem.HasMSOCompatibleFormsMenu();
 }
 
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index aa76d70bc09c..ca12a02e4fde 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -35,14 +35,6 @@ struct SwCompatibilityOptPage_Impl;
 class SwCompatibilityOptPage : public SfxTabPage
 {
 private:
-    // controls
-    VclPtr<VclFrame>               m_pMain;
-    VclPtr<VclFrame>               m_pGlobalOptionsFrame;
-    VclPtr<ListBox>                m_pFormattingLB;
-    VclPtr<ListBox>                m_pGlobalOptionsLB;
-    VclPtr<SvxCheckListBox>        m_pOptionsLB;
-    VclPtr<SvxCheckListBox>        m_pGlobalOptionsCLB;
-    VclPtr<PushButton>             m_pDefaultPB;
     // config item
     SvtCompatibilityOptions m_aConfigItem;
     // config item
@@ -57,9 +49,18 @@ private:
     sal_uLong                   m_nSavedOptions;
     bool                        m_bSavedMSFormsMenuOption;
 
+    // controls
+    std::unique_ptr<weld::Frame> m_xMain;
+    std::unique_ptr<weld::Frame> m_xGlobalOptionsFrame;
+    std::unique_ptr<weld::ComboBox> m_xFormattingLB;
+    std::unique_ptr<weld::ComboBox> m_xGlobalOptionsLB;
+    std::unique_ptr<weld::TreeView> m_xOptionsLB;
+    std::unique_ptr<weld::TreeView> m_xGlobalOptionsCLB;
+    std::unique_ptr<weld::Button> m_xDefaultPB;
+
     // handler
-    DECL_LINK(SelectHdl, ListBox&, void);
-    DECL_LINK(UseAsDefaultHdl, Button*, void);
+    DECL_LINK(SelectHdl, weld::ComboBox&, void);
+    DECL_LINK(UseAsDefaultHdl, weld::Button&, void);
 
     // private methods
     void                    InitControls( const SfxItemSet& rSet );
@@ -68,9 +69,8 @@ private:
     void                    WriteOptions();
 
 public:
-    SwCompatibilityOptPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    SwCompatibilityOptPage(TabPageParent pParent, const SfxItemSet& rSet);
     virtual ~SwCompatibilityOptPage() override;
-    virtual void            dispose() override;
 
     static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
 
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index abb693a99a02..a142c38c2e27 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -1,7 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
+  <object class="GtkTreeStore" id="liststore1">
+    <columns>
+      <!-- column-name check1 -->
+      <column type="gboolean"/>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name checkvis1 -->
+      <column type="gboolean"/>
+      <!-- column-name checktri1 -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="liststore2">
+    <columns>
+      <!-- column-name check1 -->
+      <column type="gboolean"/>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name checkvis1 -->
+      <column type="gboolean"/>
+      <!-- column-name checktri1 -->
+      <column type="gboolean"/>
+    </columns>
+  </object>
   <object class="GtkBox" id="OptCompatPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -32,28 +60,64 @@
                 <property name="can_focus">False</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <object class="svxcorelo-SvxCheckListBox" id="options:border">
+                  <object class="GtkScrolledWindow" id="optionsscroll">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="Check List Box-selection1"/>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" id="options">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="model">liststore1</property>
+                        <property name="headers_visible">False</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="treeviewcolumn4">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererToggle" id="cellrenderer5"/>
+                              <attributes>
+                                <attribute name="visible">4</attribute>
+                                <attribute name="active">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="treeviewcolumn5">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderer4"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
                     </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="GtkComboBoxText" id="format">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
                     <items>
                       <item translatable="yes" context="optcompatpage|format">Use printer metrics for document formatting</item>
                       <item translatable="yes" context="optcompatpage|format">Add spacing between paragraphs and tables</item>
@@ -76,8 +140,6 @@
                   <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>
@@ -92,8 +154,6 @@
                   <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>
               </object>
@@ -112,10 +172,9 @@
         </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>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child>
@@ -140,28 +199,64 @@
                 <property name="can_focus">False</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <object class="svxcorelo-SvxCheckListBox" id="globaloptioncheckbox:border">
+                  <object class="GtkScrolledWindow" id="globaloptioncheckboxscroll">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="vexpand">False</property>
-                    <child internal-child="selection">
-                      <object class="GtkTreeSelection" id="Check List Box-selection1"/>
+                    <property name="vexpand">True</property>
+                    <property name="shadow_type">in</property>
+                    <child>
+                      <object class="GtkTreeView" id="globaloptioncheckbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="model">liststore2</property>
+                        <property name="headers_visible">False</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <child internal-child="selection">
+                          <object class="GtkTreeSelection" id="Macro Library List-selection1"/>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="treeviewcolumn6">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <property name="alignment">0.5</property>
+                            <child>
+                              <object class="GtkCellRendererToggle" id="cellrenderer7"/>
+                              <attributes>
+                                <attribute name="visible">4</attribute>
+                                <attribute name="active">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="treeviewcolumn8">
+                            <property name="resizable">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderer9"/>
+                              <attributes>
+                                <attribute name="text">1</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
                     </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="GtkComboBoxText" id="globaloptions">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="entry_text_column">0</property>
-                    <property name="id_column">1</property>
                     <items>
                       <item translatable="yes" context="optcompatpage|globalcompatoptions">Reorganize Forms menu to have it MS compatible</item>
                     </items>
@@ -169,8 +264,6 @@
                   <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>
               </object>
@@ -189,10 +282,9 @@
         </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>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>