weld SvxBackgroundTabPage

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

cui/source/inc/backgrnd.hxx

@@ -69,39 +69,10 @@ protected:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 private:
-    SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
+    SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
     virtual ~SvxBackgroundTabPage() override;
     virtual void dispose() override;
 
-    VclPtr<VclContainer>           m_pAsGrid;
-    VclPtr<FixedText>              m_pSelectTxt;
-    VclPtr<ListBox>                m_pLbSelect;
-    VclPtr<FixedText>              m_pTblDesc;
-    VclPtr<ListBox>                m_pTblLBox;
-
-    VclPtr<FixedText>              m_pBackGroundColorLabelFT;
-    VclPtr<VclFrame>               m_pBackGroundColorFrame;
-    VclPtr<SvxColorValueSet>       m_pBackgroundColorSet;
-    VclPtr<BackgroundPreviewImpl>  m_pPreviewWin1;
-
-    VclPtr<CheckBox>               m_pBtnPreview;
-
-    // Background Bitmap ----------------------------------
-    VclPtr<VclContainer>           m_pBitmapContainer;
-    VclPtr<VclContainer>           m_pFileFrame;
-    VclPtr<PushButton>             m_pBtnBrowse;
-    VclPtr<CheckBox>               m_pBtnLink;
-    VclPtr<FixedText>              m_pFtUnlinked;
-    VclPtr<FixedText>              m_pFtFile;
-
-    VclPtr<VclContainer>           m_pTypeFrame;
-    VclPtr<RadioButton>            m_pBtnPosition;
-    VclPtr<RadioButton>            m_pBtnArea;
-    VclPtr<RadioButton>            m_pBtnTile;
-    VclPtr<SvxRectCtl>             m_pWndPosition;
-
-    VclPtr<BackgroundPreviewImpl>  m_pPreviewWin2;
-
     // DDListBox for Writer -------------------------------
 
     Color       aBgdColor;
@@ -121,6 +92,41 @@ private:
     std::unique_ptr<SvxBackgroundTable_Impl> pTableBck_Impl;///< Items for Sw-Table must be corrected
     std::unique_ptr<SvxBrushItem> pHighlighting;
 
+    std::unique_ptr<RectCtl> m_xWndPosition;
+    std::unique_ptr<ColorValueSet> m_xBackgroundColorSet;
+    std::unique_ptr<BackgroundPreviewImpl> m_xPreview1;
+    std::unique_ptr<BackgroundPreviewImpl> m_xPreview2;
+
+    std::unique_ptr<weld::Label> m_xFindGraphicsFt;
+    std::unique_ptr<weld::Widget> m_xAsGrid;
+    std::unique_ptr<weld::Label> m_xSelectTxt;
+    std::unique_ptr<weld::ComboBox> m_xLbSelect;
+    std::unique_ptr<weld::Label> m_xTblDesc;
+    std::unique_ptr<weld::ComboBox> m_xTblLBox;
+
+    std::unique_ptr<weld::Label> m_xBackGroundColorLabelFT;
+    std::unique_ptr<weld::Widget> m_xBackGroundColorFrame;
+
+    std::unique_ptr<weld::CheckButton> m_xBtnPreview;
+
+    // Background Bitmap ----------------------------------
+    std::unique_ptr<weld::Widget> m_xBitmapContainer;
+    std::unique_ptr<weld::Widget> m_xFileFrame;
+    std::unique_ptr<weld::Button> m_xBtnBrowse;
+    std::unique_ptr<weld::CheckButton> m_xBtnLink;
+    std::unique_ptr<weld::Label> m_xFtUnlinked;
+    std::unique_ptr<weld::Label> m_xFtFile;
+
+    std::unique_ptr<weld::Widget> m_xTypeFrame;
+    std::unique_ptr<weld::RadioButton> m_xBtnPosition;
+    std::unique_ptr<weld::RadioButton> m_xBtnArea;
+    std::unique_ptr<weld::RadioButton> m_xBtnTile;
+
+    std::unique_ptr<weld::CustomWeld> m_xWndPositionWin;
+    std::unique_ptr<weld::CustomWeld> m_xBackgroundColorSetWin;
+    std::unique_ptr<weld::CustomWeld> m_xPreviewWin1;
+    std::unique_ptr<weld::CustomWeld> m_xPreviewWin2;
+
     void                FillColorValueSets_Impl();
     void                ShowColorUI_Impl();
     void                HideColorUI_Impl();
@@ -131,15 +137,15 @@ private:
     void                SetGraphicPosition_Impl( SvxGraphicPosition ePos );
     SvxGraphicPosition  GetGraphicPosition_Impl();
     void                FillControls_Impl(const SvxBrushItem& rBgdAttr,
-                                            const OUString& rUserData);
-
-    DECL_LINK( LoadIdleHdl_Impl, Timer*, void );
-    DECL_LINK(SelectHdl_Impl, ListBox&, void );
-    DECL_LINK(BrowseHdl_Impl, Button*, void);
-    DECL_LINK( RadioClickHdl_Impl, Button*, void );
-    DECL_LINK( FileClickHdl_Impl, Button*, void );
-    DECL_LINK(BackgroundColorHdl_Impl, ValueSet*, void);
-    DECL_LINK( TblDestinationHdl_Impl, ListBox&, void );
+                                          const OUString& rUserData);
+
+    DECL_LINK(LoadIdleHdl_Impl, Timer*, void);
+    DECL_LINK(SelectHdl_Impl, weld::ComboBox&, void);
+    DECL_LINK(BrowseHdl_Impl, weld::Button&, void);
+    DECL_LINK(RadioClickHdl_Impl, weld::ToggleButton&, void );
+    DECL_LINK(FileClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(BackgroundColorHdl_Impl, SvtValueSet*, void);
+    DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void);
 };
 
 class SvxBkgTabPage : public SvxAreaTabPage

include/vcl/customweld.hxx

@@ -122,6 +122,7 @@ public:
     void set_margin_top(int nMargin) { m_xDrawingArea->set_margin_top(nMargin); }
     void set_margin_bottom(int nMargin) { m_xDrawingArea->set_margin_bottom(nMargin); }
     void set_sensitive(bool bSensitive) { m_xDrawingArea->set_sensitive(bSensitive); }
+    bool get_sensitive() const { return m_xDrawingArea->get_sensitive(); }
 };
 }
 #endif

solenv/sanitizers/ui/cui.suppr

@@ -418,7 +418,6 @@ cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result7'] button-no-la
 cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result8'] button-no-label
 cui/uiconfig/ui/select_persona_dialog.ui://GtkButton[@id='result9'] button-no-label
 cui/uiconfig/ui/select_persona_dialog.ui://GtkLabel[@id='progress_label'] orphan-label
-cui/uiconfig/ui/shadowtabpage.ui://svxlo-SvxRectCtl[@id='CTL_POSITION'] no-labelled-by
 cui/uiconfig/ui/signsignatureline.ui://GtkTextView[@id='edit_comment'] duplicate-mnemonic
 cui/uiconfig/ui/specialcharacters.ui://GtkLabel[@id='hexulabel'] orphan-label
 cui/uiconfig/ui/specialcharacters.ui://GtkDrawingArea[@id='viewchar2'] no-labelled-by