weld SfxDocumentPage

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

include/sfx2/dinfdlg.hxx

@@ -171,50 +171,49 @@ public:
 class SfxDocumentPage : public SfxTabPage
 {
 private:
-    VclPtr<FixedImage>            m_pBmp;
-    VclPtr<SelectableFixedText>   m_pNameED;
-    VclPtr<PushButton>            m_pChangePassBtn;
+    OUString                    m_aUnknownSize;
+    OUString                    m_aMultiSignedStr;
 
-    VclPtr<SelectableFixedText>   m_pShowTypeFT;
-    VclPtr<SelectableFixedText>   m_pFileValEd;
-    VclPtr<SelectableFixedText>   m_pShowSizeFT;
+    bool                        bEnableUseUserData  : 1,
+                                bHandleDelete       : 1;
 
-    VclPtr<SelectableFixedText>   m_pCreateValFt;
-    VclPtr<SelectableFixedText>   m_pChangeValFt;
-    VclPtr<SelectableFixedText>   m_pSignedValFt;
-    VclPtr<PushButton>            m_pSignatureBtn;
-    VclPtr<SelectableFixedText>   m_pPrintValFt;
-    VclPtr<SelectableFixedText>   m_pTimeLogValFt;
-    VclPtr<SelectableFixedText>   m_pDocNoValFt;
+    std::unique_ptr<weld::Image> m_xBmp;
+    std::unique_ptr<weld::Label> m_xNameED;
+    std::unique_ptr<weld::Button> m_xChangePassBtn;
 
-    VclPtr<CheckBox>              m_pUseUserDataCB;
-    VclPtr<PushButton>            m_pDeleteBtn;
-    VclPtr<CheckBox>              m_pUseThumbnailSaveCB;
+    std::unique_ptr<weld::Label> m_xShowTypeFT;
+    std::unique_ptr<weld::Label> m_xFileValEd;
+    std::unique_ptr<weld::Label> m_xShowSizeFT;
 
-    VclPtr<FixedText>             m_pTemplFt;
-    VclPtr<SelectableFixedText>   m_pTemplValFt;
+    std::unique_ptr<weld::Label> m_xCreateValFt;
+    std::unique_ptr<weld::Label> m_xChangeValFt;
+    std::unique_ptr<weld::Label> m_xSignedValFt;
+    std::unique_ptr<weld::Button> m_xSignatureBtn;
+    std::unique_ptr<weld::Label> m_xPrintValFt;
+    std::unique_ptr<weld::Label> m_xTimeLogValFt;
+    std::unique_ptr<weld::Label> m_xDocNoValFt;
 
-    OUString                    m_aUnknownSize;
-    OUString                    m_aMultiSignedStr;
+    std::unique_ptr<weld::CheckButton> m_xUseUserDataCB;
+    std::unique_ptr<weld::Button> m_xDeleteBtn;
+    std::unique_ptr<weld::CheckButton> m_xUseThumbnailSaveCB;
 
-    bool                        bEnableUseUserData  : 1,
-                                bHandleDelete       : 1;
+    std::unique_ptr<weld::Label> m_xTemplFt;
+    std::unique_ptr<weld::Label> m_xTemplValFt;
 
-    DECL_LINK(DeleteHdl, Button*, void);
-    DECL_LINK(SignatureHdl, Button*, void);
-    DECL_LINK(ChangePassHdl, Button*, void);
+    DECL_LINK(DeleteHdl, weld::Button&, void);
+    DECL_LINK(SignatureHdl, weld::Button&, void);
+    DECL_LINK(ChangePassHdl, weld::Button&, void);
     void                ImplUpdateSignatures();
     void                ImplCheckPasswordState();
 
 protected:
     virtual ~SfxDocumentPage() override;
-    virtual void dispose() override;
 
     virtual bool        FillItemSet( SfxItemSet* ) override;
     virtual void        Reset( const SfxItemSet* ) override;
 
 public:
-    SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& );
+    SfxDocumentPage(TabPageParent pParent, const SfxItemSet&);
     static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
 
     void                EnableUseUserData();

include/svtools/imagemgr.hxx

@@ -118,7 +118,7 @@ private:
     static OUString    GetDescription_Impl( const INetURLObject& rObject, bool bDetectFolder );
 
 public:
-    SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL );
+    SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL, bool bBig = false );
     SVT_DLLPUBLIC static Image  GetImage( const INetURLObject& rURL, bool bBig = false );
     SVT_DLLPUBLIC static OUString GetFileImageId( const INetURLObject& rURL );
     SVT_DLLPUBLIC static Image  GetFileImage( const INetURLObject& rURL );

svtools/source/misc/imagemgr.cxx

@@ -759,11 +759,11 @@ OUString SvFileInformationManager::GetDescription_Impl( const INetURLObject& rOb
     return sDescription;
 }
 
-OUString SvFileInformationManager::GetImageId(const INetURLObject& rObject)
+OUString SvFileInformationManager::GetImageId(const INetURLObject& rObject, bool bBig)
 {
     SvImageId nImage = GetImageId_Impl( rObject, true );
     DBG_ASSERT( nImage != SvImageId::NONE, "invalid ImageId" );
-    return GetImageNameFromList_Impl(nImage, /*bBig*/false);
+    return GetImageNameFromList_Impl(nImage, bBig);
 }
 
 Image SvFileInformationManager::GetImage( const INetURLObject& rObject, bool bBig )

vcl/source/app/salvtables.cxx

@@ -3302,9 +3302,12 @@ public:
 class SalInstanceLabel : public SalInstanceWidget, public virtual weld::Label
 {
 private:
-    VclPtr<FixedText> m_xLabel;
+    // Control instead of FixedText so we can also use this for
+    // SelectableFixedText which is derived from Edit. We just typically need
+    // [G|S]etText which exists in their shared basesclass
+    VclPtr<Control> m_xLabel;
 public:
-    SalInstanceLabel(FixedText* pLabel, SalInstanceBuilder *pBuilder, bool bTakeOwnership)
+    SalInstanceLabel(Control* pLabel, SalInstanceBuilder *pBuilder, bool bTakeOwnership)
         : SalInstanceWidget(pLabel, pBuilder, bTakeOwnership)
         , m_xLabel(pLabel)
     {
@@ -3322,8 +3325,10 @@ public:
 
     virtual void set_mnemonic_widget(Widget* pTarget) override
     {
+        FixedText* pLabel = dynamic_cast<FixedText*>(m_xLabel.get());
+        assert(pLabel && "can't use set_mnemonic_widget on SelectableFixedText");
         SalInstanceWidget* pTargetWidget = dynamic_cast<SalInstanceWidget*>(pTarget);
-        m_xLabel->set_mnemonic_widget(pTargetWidget ? pTargetWidget->getWidget() : nullptr);
+        pLabel->set_mnemonic_widget(pTargetWidget ? pTargetWidget->getWidget() : nullptr);
     }
 };
 
@@ -4356,7 +4361,7 @@ public:
 
     virtual std::unique_ptr<weld::Label> weld_label(const OString &id, bool bTakeOwnership) override
     {
-        FixedText* pLabel = m_xBuilder->get<FixedText>(id);
+        Control* pLabel = m_xBuilder->get<Control>(id);
         return pLabel ? std::make_unique<SalInstanceLabel>(pLabel, this, bTakeOwnership) : nullptr;
     }
 

vcl/unx/gtk3/gtk3gtkinst.cxx

@@ -6823,6 +6823,7 @@ public:
 
     virtual void set_mnemonic_widget(Widget* pTarget) override
     {
+        assert(!gtk_label_get_selectable(m_pLabel) && "don't use set_mnemonic_widget on selectable labels, for consistency with gen backend");
         GtkInstanceWidget* pTargetWidget = dynamic_cast<GtkInstanceWidget*>(pTarget);
         gtk_label_set_mnemonic_widget(m_pLabel, pTargetWidget ? pTargetWidget->getWidget() : nullptr);
     }