weld SwTextGridPage

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

extras/source/glade/libreoffice-catalog.xml.in

@@ -362,9 +362,6 @@
     <glade-widget-class title="Paragraph Preview" name="svxlo-SvxParaPrevWindow"
                         generic-name="Paragraph Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>
-    <glade-widget-class title="Page Preview" name="swlo-SwPageGridExample"
-                        generic-name="Grid Page Preview Window" parent="GtkDrawingArea"
-                        icon-name="widget-gtk-drawingarea"/>
     <glade-widget-class title="Page Preview" name="swlo-SwColExample"
                         generic-name="Page Preview Window" parent="GtkDrawingArea"
                         icon-name="widget-gtk-drawingarea"/>

include/svx/colorbox.hxx

@@ -96,9 +96,12 @@ private:
     std::unique_ptr<ColorWindow> m_xColorWindow;
     std::unique_ptr<weld::MenuButton> m_xButton;
     weld::Window* m_pTopLevel;
+    Link<ColorListBox&, void> m_aSelectedLink;
     ListBoxColorWrapper m_aColorWrapper;
     Color m_aAutoDisplayColor;
+    Color m_aSaveColor;
     NamedColor m_aSelectedColor;
+    bool m_bInterimBuilder;
     std::shared_ptr<PaletteManager> m_xPaletteManager;
     BorderColorStatus m_aBorderColorStatus;
 
@@ -107,9 +110,14 @@ private:
     void LockWidthRequest();
     ColorWindow* getColorWindow() const;
 public:
-    ColorListBox(weld::MenuButton* pControl, weld::Window* pWindow);
+    ColorListBox(weld::MenuButton* pControl, weld::Window* pWindow, bool bInterimBuilder = false);
     ~ColorListBox();
 
+    void SetSelectHdl(const Link<ColorListBox&, void>& rLink)
+    {
+        m_aSelectedLink = rLink;
+    }
+
     Color const & GetSelectEntryColor() const { return m_aSelectedColor.first; }
 
     void SelectEntry(const Color& rColor);
@@ -118,6 +126,9 @@ public:
 
     void ShowPreview(const NamedColor &rColor);
     void EnsurePaletteManager();
+
+    void SaveValue() { m_aSaveColor = GetSelectEntryColor(); }
+    bool IsValueChangedFromSaved() const { return m_aSaveColor != GetSelectEntryColor(); }
 };
 
 /** A wrapper for SvxColorListBox. */

include/svx/colorwindow.hxx

@@ -147,6 +147,7 @@ public:
                 sal_uInt16 nSlotId,
                 const css::uno::Reference< css::frame::XFrame >& rFrame,
                 weld::Window* pParentWindow, weld::MenuButton* pMenuButton,
+                bool bInterimBuilder,
                 ColorSelectFunction const& rColorSelectFunction);
     weld::Container* GetWidget() { return mxTopLevel.get(); }
     virtual ~ColorWindow() override;

include/vcl/svapp.hxx

@@ -1397,6 +1397,7 @@ public:
 
     static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString &rUIFile);
     static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile); //for the duration of same SfxTabPages in mixed parent types
+    static weld::Builder* CreateInterimBuilder(weld::Widget* pParent, const OUString &rUIFile); //for the duration of same SfxTabPages in mixed parent types
 
     static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType,
                                                     VclButtonsType eButtonType, const OUString& rPrimaryMessage);

include/vcl/weld.hxx

@@ -543,6 +543,18 @@ public:
         get_range(min, dummy);
         set_range(min, max);
     }
+    int get_min() const
+    {
+        int min, dummy;
+        get_range(min, dummy);
+        return min;
+    }
+    int get_max() const
+    {
+        int dummy, max;
+        get_range(dummy, max);
+        return max;
+    }
     virtual void set_increments(int step, int page) = 0;
     virtual void get_increments(int& step, int& page) const = 0;
     virtual void set_digits(unsigned int digits) = 0;

svx/source/tbxctrls/tbcontrl.cxx

@@ -1370,9 +1370,11 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager
                          const Reference< XFrame >& rFrame,
                          weld::Window*              pParentWindow,
                          weld::MenuButton*          pMenuButton,
+                         bool                       bInterimBuilder,
                          std::function<void(const OUString&, const NamedColor&)> const & aFunction)
     : ToolbarPopupBase(rFrame)
-    , m_xBuilder(Application::CreateBuilder(pMenuButton, "svx/ui/colorwindow.ui"))
+    , m_xBuilder(bInterimBuilder ? Application::CreateInterimBuilder(pMenuButton, "svx/ui/colorwindow.ui")
+                                 : Application::CreateBuilder(pMenuButton, "svx/ui/colorwindow.ui"))
     , theSlotId(nSlotId)
     , mpParentWindow(pParentWindow)
     , mpMenuButton(pMenuButton)
@@ -3740,11 +3742,12 @@ void SvxColorListBox::SelectEntry(const Color& rColor)
     ShowPreview(m_aSelectedColor);
 }
 
-ColorListBox::ColorListBox(weld::MenuButton* pControl, weld::Window* pTopLevel)
+ColorListBox::ColorListBox(weld::MenuButton* pControl, weld::Window* pTopLevel, bool bInterimBuilder)
     : m_xButton(pControl)
     , m_pTopLevel(pTopLevel)
     , m_aColorWrapper(this)
     , m_aAutoDisplayColor(Application::GetSettings().GetStyleSettings().GetDialogColor())
+    , m_bInterimBuilder(bInterimBuilder)
 {
     m_aSelectedColor = GetAutoColor(0);
     LockWidthRequest();
@@ -3777,6 +3780,7 @@ void ColorListBox::createColorWindow()
                             xFrame,
                             m_pTopLevel,
                             m_xButton.get(),
+                            m_bInterimBuilder,
                             m_aColorWrapper));
 
     SetNoSelection();
@@ -3796,6 +3800,8 @@ void ColorListBox::Selected(const NamedColor& rColor)
 {
     ShowPreview(rColor);
     m_aSelectedColor = rColor;
+    if (m_aSelectedLink.IsSet())
+        m_aSelectedLink.Call(*this);
 }
 
 //to avoid the box resizing every time the color is changed to

sw/source/uibase/frmdlg/colex.cxx

@@ -194,6 +194,159 @@ void SwPageExample::UpdateExample( const SfxItemSet& rSet )
     Invalidate();
 }
 
+void PageExample::UpdateExample( const SfxItemSet& rSet )
+{
+    if (SfxItemState::DEFAULT <= rSet.GetItemState(RES_FRAMEDIR))
+    {
+        const SvxFrameDirectionItem& rDirItem = rSet.Get(RES_FRAMEDIR);
+        m_bVertical = rDirItem.GetValue() == SvxFrameDirection::Vertical_RL_TB||
+                    rDirItem.GetValue() == SvxFrameDirection::Vertical_LR_TB;
+    }
+
+    SfxItemPool* pPool = rSet.GetPool();
+    sal_uInt16 nWhich = pPool->GetWhich( SID_ATTR_PAGE );
+    if ( rSet.GetItemState( nWhich, false ) == SfxItemState::SET )
+    {
+        // alignment
+        const SvxPageItem* pPage = static_cast<const SvxPageItem*>(&rSet.Get( nWhich ));
+
+        if ( pPage )
+            SetUsage( pPage->GetPageUsage() );
+    }
+
+    nWhich = pPool->GetWhich( SID_ATTR_PAGE_SIZE );
+
+    if ( rSet.GetItemState( nWhich, false ) == SfxItemState::SET )
+    {
+        // orientation and size from PageItem
+        const SvxSizeItem& rSize = static_cast<const SvxSizeItem&>(rSet.Get( nWhich ));
+        SetSize( rSize.GetSize() );
+    }
+    nWhich = RES_LR_SPACE;
+    if ( rSet.GetItemState( nWhich, false ) == SfxItemState::SET )
+    {
+        // set left and right border
+        const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rSet.Get( nWhich ));
+
+        SetLeft( rLRSpace.GetLeft() );
+        SetRight( rLRSpace.GetRight() );
+    }
+    else
+    {
+        SetLeft( 0 );
+        SetRight( 0 );
+    }
+
+    nWhich = RES_UL_SPACE;
+
+    if ( rSet.GetItemState( nWhich, false ) == SfxItemState::SET )
+    {
+        // set upper and lower border
+        const SvxULSpaceItem& rULSpace = static_cast<const SvxULSpaceItem&>(rSet.Get( nWhich ));
+
+        SetTop( rULSpace.GetUpper() );
+        SetBottom( rULSpace.GetLower() );
+    }
+    else
+    {
+        SetTop( 0 );
+        SetBottom( 0 );
+    }
+
+    // evaluate header-attributes
+    const SfxPoolItem* pItem;
+    if( SfxItemState::SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_HEADERSET),
+            false, &pItem ) )
+    {
+        const SfxItemSet& rHeaderSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet();
+        const SfxBoolItem& rHeaderOn =
+            static_cast<const SfxBoolItem&>(rHeaderSet.Get( pPool->GetWhich( SID_ATTR_PAGE_ON ) ) );
+
+        if ( rHeaderOn.GetValue() )
+        {
+            const SvxSizeItem& rSize =
+                static_cast<const SvxSizeItem&>(rHeaderSet.Get(pPool->GetWhich(SID_ATTR_PAGE_SIZE)));
+
+            const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(rHeaderSet.Get(
+                                        pPool->GetWhich(SID_ATTR_ULSPACE)));
+            const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(rHeaderSet.Get(
+                                        pPool->GetWhich(SID_ATTR_LRSPACE)));
+
+            SetHdHeight( rSize.GetSize().Height() - rUL.GetLower());
+            SetHdDist( rUL.GetLower() );
+            SetHdLeft( rLR.GetLeft() );
+            SetHdRight( rLR.GetRight() );
+            SetHeader( true );
+
+            if(SfxItemState::SET == rHeaderSet.GetItemState(RES_BACKGROUND))
+            {
+                // create FillAttributes from SvxBrushItem //SetHdColor(rItem.GetColor());
+                const SvxBrushItem& rItem = rHeaderSet.Get(RES_BACKGROUND);
+                SfxItemSet aTempSet(*rHeaderSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+
+                setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
+                setHeaderFillAttributes(
+                    std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(
+                            aTempSet));
+            }
+        }
+        else
+            SetHeader( false );
+    }
+
+    if( SfxItemState::SET == rSet.GetItemState( pPool->GetWhich( SID_ATTR_PAGE_FOOTERSET),
+            false, &pItem ) )
+    {
+        const SfxItemSet& rFooterSet = static_cast<const SvxSetItem*>(pItem)->GetItemSet();
+        const SfxBoolItem& rFooterOn = rFooterSet.Get( SID_ATTR_PAGE_ON );
+
+        if ( rFooterOn.GetValue() )
+        {
+            const SvxSizeItem& rSize =
+                static_cast<const SvxSizeItem&>(rFooterSet.Get( pPool->GetWhich( SID_ATTR_PAGE_SIZE ) ));
+
+            const SvxULSpaceItem& rUL = static_cast<const SvxULSpaceItem&>(rFooterSet.Get(
+                                        pPool->GetWhich( SID_ATTR_ULSPACE ) ));
+            const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>(rFooterSet.Get(
+                                        pPool->GetWhich( SID_ATTR_LRSPACE ) ));
+
+            SetFtHeight( rSize.GetSize().Height() - rUL.GetUpper());
+            SetFtDist( rUL.GetUpper() );
+            SetFtLeft( rLR.GetLeft() );
+            SetFtRight( rLR.GetRight() );
+            SetFooter( true );
+
+            if( rFooterSet.GetItemState( RES_BACKGROUND ) == SfxItemState::SET )
+            {
+                // create FillAttributes from SvxBrushItem //SetFtColor(rItem.GetColor());
+                const SvxBrushItem& rItem = rFooterSet.Get(RES_BACKGROUND);
+                SfxItemSet aTempSet(*rFooterSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+
+                setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
+                setFooterFillAttributes(
+                    std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(
+                            aTempSet));
+            }
+        }
+        else
+            SetFooter( false );
+    }
+
+    if(SfxItemState::SET == rSet.GetItemState(RES_BACKGROUND, false, &pItem))
+    {
+        // create FillAttributes from SvxBrushItem
+        const SvxBrushItem& rItem = static_cast< const SvxBrushItem& >(*pItem);
+        SfxItemSet aTempSet(*rSet.GetPool(), svl::Items<XATTR_FILL_FIRST, XATTR_FILL_LAST>{});
+
+        setSvxBrushItemAsFillAttributesToTargetSet(rItem, aTempSet);
+        setPageFillAttributes(
+            std::make_shared<drawinglayer::attribute::SdrAllFillAttributesHelper>(
+                    aTempSet));
+    }
+
+    Invalidate();
+}
+
 void SwColExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOrg,
                             const bool bSecond, const bool bEnabled)
 {
@@ -496,25 +649,15 @@ Size SwColumnOnlyExample::GetOptimalSize() const
     return LogicToPixel(Size(75, 46), MapMode(MapUnit::MapAppFont));
 }
 
-SwPageGridExample::SwPageGridExample(vcl::Window* pPar)
-    : SwPageExample(pPar)
-{}
-
-SwPageGridExample::~SwPageGridExample()
+SwPageGridExample::SwPageGridExample()
+    : pGridItem(nullptr)
 {
-    disposeOnce();
-}
-
-void SwPageGridExample::dispose()
-{
-    pGridItem.reset();
-    SwPageExample::dispose();
 }
 
 void SwPageGridExample::DrawPage(vcl::RenderContext& rRenderContext, const Point& rOrg,
                                  const bool bSecond, const bool bEnabled)
 {
-    SwPageExample::DrawPage(rRenderContext, rOrg, bSecond, bEnabled);
+    PageExample::DrawPage(rRenderContext, rOrg, bSecond, bEnabled);
 
     if (!pGridItem || !pGridItem->GetGridType())
         return;
@@ -617,9 +760,7 @@ void SwPageGridExample::UpdateExample( const SfxItemSet& rSet )
     //get the grid information
     if(SfxItemState::DEFAULT <= rSet.GetItemState(RES_TEXTGRID))
         pGridItem.reset(static_cast<SwTextGridItem*>(rSet.Get(RES_TEXTGRID).Clone()));
-    SwPageExample::UpdateExample(rSet);
+    PageExample::UpdateExample(rSet);
 }
 
-VCL_BUILDER_FACTORY(SwPageGridExample)
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/uibase/inc/colex.hxx

@@ -43,9 +43,23 @@ public:
     void UpdateExample( const SfxItemSet& rSet );
 };
 
+class SW_DLLPUBLIC PageExample : public PageWindow
+{
+protected:
+    bool            m_bVertical;
+public:
+    PageExample()
+        : m_bVertical(false)
+    {
+        SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4));
+    }
+
+    void UpdateExample( const SfxItemSet& rSet );
+};
+
 class SwTextGridItem;
 
-class SW_DLLPUBLIC SwPageGridExample : public SwPageExample
+class SW_DLLPUBLIC SwPageGridExample : public PageExample
 {
     std::unique_ptr<SwTextGridItem> pGridItem;
 protected:
@@ -54,12 +68,12 @@ protected:
                           const bool bSecond,
                           const bool bEnabled) override;
 public:
-    SwPageGridExample(vcl::Window* pPar);
-    virtual ~SwPageGridExample() override;
-    virtual void dispose() override;
+    SwPageGridExample();
+
     void UpdateExample( const SfxItemSet& rSet );
 };
 
+
 class SW_DLLPUBLIC SwColExample : public SwPageExample
 {
     SwColMgr*   pColMgr;

sw/source/uibase/inc/pggrid.hxx

@@ -21,45 +21,13 @@
 
 #include <sfx2/tabdlg.hxx>
 #include "colex.hxx"
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <svtools/ctrlbox.hxx>
+#include <vcl/customweld.hxx>
+#include <vcl/weld.hxx>
 #include <svx/colorbox.hxx>
 
 // TabPage Format/(Styles/)Page/Text grid
 class SwTextGridPage: public SfxTabPage
 {
-    VclPtr<RadioButton>     m_pNoGridRB;
-    VclPtr<RadioButton>     m_pLinesGridRB;
-    VclPtr<RadioButton>     m_pCharsGridRB;
-    VclPtr<CheckBox>        m_pSnapToCharsCB;
-
-    VclPtr<SwPageGridExample>   m_pExampleWN;
-
-    VclPtr<VclFrame>        m_pLayoutFL;
-    VclPtr<NumericField>    m_pLinesPerPageNF;
-    VclPtr<FixedText>       m_pLinesRangeFT;
-
-    VclPtr<MetricField>     m_pTextSizeMF;
-
-    VclPtr<FixedText>       m_pCharsPerLineFT;
-    VclPtr<NumericField>    m_pCharsPerLineNF;
-    VclPtr<FixedText>       m_pCharsRangeFT;
-
-    VclPtr<FixedText>       m_pCharWidthFT;
-    VclPtr<MetricField>     m_pCharWidthMF;
-
-    VclPtr<FixedText>       m_pRubySizeFT;
-    VclPtr<MetricField>     m_pRubySizeMF;
-
-    VclPtr<CheckBox>        m_pRubyBelowCB;
-
-    VclPtr<VclFrame>        m_pDisplayFL;
-
-    VclPtr<CheckBox>        m_pDisplayCB;
-    VclPtr<CheckBox>        m_pPrintCB;
-    VclPtr<SvxColorListBox> m_pColorLB;
-
     sal_Int32       m_nRubyUserValue;
     bool        m_bRubyUserValue;
     Size            m_aPageSize;
@@ -68,26 +36,47 @@ class SwTextGridPage: public SfxTabPage
     bool        m_bHRulerChanged;
     bool        m_bVRulerChanged;
 
+    SwPageGridExample m_aExampleWN;
+    std::unique_ptr<weld::RadioButton> m_xNoGridRB;
+    std::unique_ptr<weld::RadioButton> m_xLinesGridRB;
+    std::unique_ptr<weld::RadioButton> m_xCharsGridRB;
+    std::unique_ptr<weld::CheckButton> m_xSnapToCharsCB;
+    std::unique_ptr<weld::CustomWeld> m_xExampleWN;
+    std::unique_ptr<weld::Widget> m_xLayoutFL;
+    std::unique_ptr<weld::SpinButton> m_xLinesPerPageNF;
+    std::unique_ptr<weld::Label> m_xLinesRangeFT;
+    std::unique_ptr<weld::MetricSpinButton> m_xTextSizeMF;
+    std::unique_ptr<weld::Label> m_xCharsPerLineFT;
+    std::unique_ptr<weld::SpinButton> m_xCharsPerLineNF;
+    std::unique_ptr<weld::Label> m_xCharsRangeFT;
+    std::unique_ptr<weld::Label> m_xCharWidthFT;
+    std::unique_ptr<weld::MetricSpinButton> m_xCharWidthMF;
+    std::unique_ptr<weld::Label> m_xRubySizeFT;
+    std::unique_ptr<weld::MetricSpinButton> m_xRubySizeMF;
+    std::unique_ptr<weld::CheckButton> m_xRubyBelowCB;
+    std::unique_ptr<weld::Widget> m_xDisplayFL;
+    std::unique_ptr<weld::CheckButton> m_xDisplayCB;
+    std::unique_ptr<weld::CheckButton> m_xPrintCB;
+    std::unique_ptr<ColorListBox> m_xColorLB;
+
     void UpdatePageSize(const SfxItemSet& rSet);
     void PutGridItem(SfxItemSet& rSet);
-    static void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue );
+    static void SetLinesOrCharsRanges(weld::Label& rField, const sal_Int32 nValue);
 
     void GridModifyHdl();
 
-    DECL_LINK(GridTypeHdl, Button*, void);
-    DECL_LINK(CharorLineChangedHdl, SpinField&, void);
-    DECL_LINK(CharorLineLoseFocusdHdl, Control&, void);
-    DECL_LINK(TextSizeChangedHdl, SpinField&, void);
-    DECL_LINK(TextSizeLoseFocusHdl, Control&, void);
-    DECL_LINK(ColorModifyHdl, SvxColorListBox&, void);
-    DECL_LINK(GridModifyClickHdl, Button*, void);
-    DECL_LINK(DisplayGridHdl, Button*, void);
+    DECL_LINK(GridTypeHdl, weld::ToggleButton&, void);
+    DECL_LINK(CharorLineChangedHdl, weld::SpinButton&, void);
+    DECL_LINK(TextSizeChangedHdl, weld::MetricSpinButton&, void);
+    DECL_LINK(ColorModifyHdl, ColorListBox&, void);
+    DECL_LINK(GridModifyClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(DisplayGridHdl, weld::ToggleButton&, void);
 
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
 
 public:
-    SwTextGridPage(vcl::Window *pParent, const SfxItemSet &rSet);
+    SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet);
     virtual ~SwTextGridPage() override;
     virtual void dispose() override;
 

sw/uiconfig/swriter/ui/textgridpage.ui

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustmentCHARSPERLINE">
     <property name="lower">1</property>
     <property name="upper">233</property>
@@ -23,6 +22,20 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustmentMetric1">
+    <property name="lower">1</property>
+    <property name="upper">5600</property>
+    <property name="value">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustmentMetric2">
+    <property name="lower">1</property>
+    <property name="upper">5600</property>
+    <property name="value">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkBox" id="TextGridPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -61,7 +74,6 @@
                         <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radioRB_LINESGRID</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -77,7 +89,7 @@
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radioRB_CHARSGRID</property>
+                        <property name="group">radioRB_NOGRID</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -125,7 +137,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="swlo-SwPageGridExample" id="drawingareaWN_EXAMPLE">
+                  <object class="GtkDrawingArea" id="drawingareaWN_EXAMPLE">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
@@ -285,10 +297,11 @@
                         <property name="column_spacing">12</property>
                         <property name="row_homogeneous">True</property>
                         <child>
-                          <object class="GtkSpinButton" id="spinMF_CHARWIDTH:0pt">
+                          <object class="GtkSpinButton" id="spinMF_CHARWIDTH">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">adjustmentMetric</property>
+                            <property name="activates_default">True</property>
+                            <property name="adjustment">adjustmentMetric2</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -302,7 +315,7 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes" context="textgridpage|labelFT_CHARWIDTH">Character _width:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">spinMF_CHARWIDTH:0pt</property>
+                            <property name="mnemonic_widget">spinMF_CHARWIDTH</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -316,7 +329,7 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes" context="textgridpage|labelFT_RUBYSIZE">Max. Ruby text size:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">spinMF_RUBYSIZE:0pt</property>
+                            <property name="mnemonic_widget">spinMF_RUBYSIZE</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -324,10 +337,11 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="spinMF_RUBYSIZE:0pt">
+                          <object class="GtkSpinButton" id="spinMF_RUBYSIZE">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">adjustmentMetric</property>
+                            <property name="activates_default">True</property>
+                            <property name="adjustment">adjustmentMetric1</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -341,7 +355,7 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes" context="textgridpage|labelFT_TEXTSIZE">Max. base text size:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">spinMF_TEXTSIZE:0pt</property>
+                            <property name="mnemonic_widget">spinMF_TEXTSIZE</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -349,9 +363,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="spinMF_TEXTSIZE:0pt">
+                          <object class="GtkSpinButton" id="spinMF_TEXTSIZE">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustmentMetric</property>
                           </object>
                           <packing>
@@ -378,9 +393,9 @@
                     <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="halign">start</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>
@@ -435,8 +450,8 @@
                     <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="halign">start</property>
+                    <property name="use_underline">True</property>
                     <property name="xalign">0.14000000059604645</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -451,9 +466,9 @@
                     <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="halign">start</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>
@@ -477,11 +492,15 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxcorelo-SvxColorListBox" id="listLB_COLOR">
+                  <object class="GtkMenuButton" id="listLB_COLOR">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="receives_default">False</property>
                     <property name="halign">start</property>
                     <property name="valign">center</property>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>

vcl/source/app/salvtables.cxx

@@ -2472,6 +2472,13 @@ weld::Builder* SalInstance::CreateInterimBuilder(vcl::Window* pParent, const OUS
     return new SalInstanceBuilder(pParent, rUIRoot, rUIFile);
 }
 
+weld::Builder* Application::CreateInterimBuilder(weld::Widget* pParent, const OUString &rUIFile)
+{
+    SalInstanceWidget* pParentInstance = dynamic_cast<SalInstanceWidget*>(pParent);
+    vcl::Window* pParentWidget = pParentInstance ? pParentInstance->getWidget() : nullptr;
+    return Application::CreateInterimBuilder(pParentWidget, rUIFile);
+}
+
 weld::MessageDialog* SalInstance::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonsType, const OUString& rPrimaryMessage)
 {
     SalInstanceWidget* pParentInstance = dynamic_cast<SalInstanceWidget*>(pParent);