[Libreoffice-commits] core.git: include/svx svx/source

[Noel Grandin (via logerrit)]

 include/svx/svdmodel.hxx       |    5 -----
 svx/source/svdraw/svdmodel.cxx |   24 ++++++++----------------
 2 files changed, 8 insertions(+), 21 deletions(-)

New commits:
commit 17bf458c86a9130cc56fad035f81558fd91ed974
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed May 5 10:02:06 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed May 5 11:24:39 2021 +0200

    inline SdrModel::ImpCtor
    
    since it is only called from one spot
    
    Change-Id: Ib94bc364c57ed0d36dc99f56f026cd44f27258ae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115123
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 0cf3828f5bf1..f525614c6b49 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -252,11 +252,6 @@ private:
     SVX_DLLPRIVATE void ImpReformatAllEdgeObjects();
     SVX_DLLPRIVATE void ImpCreateTables(bool bDisablePropertyFiles);
 
-    SVX_DLLPRIVATE void ImpCtor(
-        SfxItemPool* pPool,
-        ::comphelper::IEmbeddedHelper* pPers,
-        bool bDisablePropertyFiles);
-
     // this is a weak reference to a possible living api wrapper for this model
     css::uno::Reference< css::uno::XInterface > mxUnoModel;
 
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e200899ee1a8..d60789ba3569 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -87,10 +87,17 @@ struct SdrModelImpl
 };
 
 
-void SdrModel::ImpCtor(
+SdrModel::SdrModel(
     SfxItemPool* pPool,
     ::comphelper::IEmbeddedHelper* _pEmbeddedHelper,
     bool bDisablePropertyFiles)
+:
+#ifdef DBG_UTIL
+    // SdrObjectLifetimeWatchDog:
+    maAllIncarnatedObjects(),
+#endif
+    maMaPag(),
+    maPages()
 {
     mpImpl.reset(new SdrModelImpl);
     mpImpl->mpUndoManager=nullptr;
@@ -189,21 +196,6 @@ void SdrModel::ImpCtor(
     ImpCreateTables(bDisablePropertyFiles || utl::ConfigManager::IsFuzzing());
 }
 
-SdrModel::SdrModel(
-    SfxItemPool* pPool,
-    ::comphelper::IEmbeddedHelper* pPers,
-    bool bDisablePropertyFiles)
-:
-#ifdef DBG_UTIL
-    // SdrObjectLifetimeWatchDog:
-    maAllIncarnatedObjects(),
-#endif
-    maMaPag(),
-    maPages()
-{
-    ImpCtor(pPool,pPers,bDisablePropertyFiles);
-}
-
 SdrModel::~SdrModel()
 {