remove one of the pimpls in SvBaseLink

two pimpl's and some internal fields seems a little messy

Change-Id: I24f5a8e264dd98f8f74ab904ace85be1e9ff7acb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120939
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 8 insertions, 6 deletions

diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 332702b8893f..38b1ef57dfe2 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -69,21 +69,25 @@ constexpr bool isClientFileType(SvBaseLinkObjectType t)
     return (static_cast<int>(t) & check) == check;
 }
 
-struct BaseLink_Impl;
-
 class SFX2_DLLPUBLIC SvBaseLink : public SvRefBase
 {
 private:
     friend class LinkManager;
     friend class SvLinkSource;
 
+    Link<SvBaseLink&,void>  m_aEndEditLink;
+    LinkManager*            m_pLinkMgr;
+    weld::Window*           m_pParentWin;
+    std::unique_ptr<FileDialogHelper>
+                            m_pFileDlg;
     SvLinkSourceRef         xObj;
     OUString                aLinkName;
-    std::unique_ptr<BaseLink_Impl>  pImpl;
+    std::unique_ptr<ImplBaseLinkData> pImplData;
     SvBaseLinkObjectType    mnObjType;
     bool                    bVisible : 1;
     bool                    bSynchron : 1;
     bool                    bWasLastEditOK : 1;
+    bool                    m_bIsConnect : 1;
 
     DECL_LINK( EndEditHdl, const OUString&, void );
 
@@ -95,8 +99,6 @@ protected:
     // Set LinkSourceName without action
     void            SetName( const OUString & rLn );
 
-    std::unique_ptr<ImplBaseLinkData> pImplData;
-
     bool            m_bIsReadOnly;
     css::uno::Reference<css::io::XInputStream>
                     m_xInputStreamToLoadFrom;
@@ -169,7 +171,7 @@ public:
     void            clearStreamToLoadFrom();
 
     bool     WasLastEditOK() const       { return bWasLastEditOK; }
-    FileDialogHelper & GetInsertFileDialog(const OUString& rFactory) const;
+    FileDialogHelper & GetInsertFileDialog(const OUString& rFactory);
 };
 
 }