From eba4d5b2b76cefde90cb3d6638c736f435023a45 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Fri, 6 Apr 2018 22:32:24 +0200 Subject: Revert "SOSAW080: Added first bunch of basic changes to helpers" This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91. --- svx/source/inc/fmobj.hxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'svx/source/inc/fmobj.hxx') diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index da9f7c6fbfd7..6b9adf61c548 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -27,7 +27,7 @@ // FmFormObj -class SVX_DLLPUBLIC FmFormObj : public SdrUnoObj +class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj { FmFormObj( const FmFormObj& ) = delete; @@ -47,10 +47,9 @@ class SVX_DLLPUBLIC FmFormObj : public SdrUnoObj // only to be used for comparison with the current ref device! public: - FmFormObj( - SdrModel& rSdrModel, - const OUString& rModelName); - FmFormObj(SdrModel& rSdrModel); + FmFormObj(const OUString& rModelName); + FmFormObj(); + SAL_DLLPRIVATE const css::uno::Reference< css::container::XIndexContainer>& GetOriginalParent() const { return m_xParent; } @@ -73,10 +72,12 @@ public: SAL_DLLPRIVATE virtual sal_uInt16 GetObjIdentifier() const override; SAL_DLLPRIVATE virtual void NbcReformatText() override; - SAL_DLLPRIVATE virtual FmFormObj* Clone(SdrModel* pTargetModel = nullptr) const override; + SAL_DLLPRIVATE virtual FmFormObj* Clone() const override; // #116235# virtual SdrObject* Clone(SdrPage* pPage, SdrModel* pModel) const; SAL_DLLPRIVATE FmFormObj& operator= (const FmFormObj& rObj); + SAL_DLLPRIVATE virtual void SetModel(SdrModel* pNewModel) override; + SAL_DLLPRIVATE void clonedFrom(const FmFormObj* _pSource); SAL_DLLPRIVATE static css::uno::Reference< css::uno::XInterface> ensureModelEnv( -- cgit