diff options
author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-07-25 14:10:08 +0200 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-07-30 17:52:22 +0200 |
commit | 90c11ceeb32e8c2fd59028befd726e807a8188cf (patch) | |
tree | 1590f1f0c446d8ba91a1b335eaee0528cb24e783 /reportdesign/inc | |
parent | 15f8f0be29c42ac0c10af679ff5bb51b29bb3bd1 (diff) |
tdf#118730 Correct ReportDesigner Object creation
This is a follow up problem to removing the old stuff
that first a SdrPage* at the SdrObjects was set *without*
the SdrObject being inserted to any SdrObjList. It works
no longer - the SdrPage which you can get now is the one
the SdrObject *is* inserted at.
Solution is to move that stuff - plus other initializations
which were done in OUnoObject::EndCreate before - to where
it belongs. This gets rid of OUnoObject::EndCreate
completely.
It makes OUnoObject::impl_setReportComponent_nothrow no
longer needed due to being used only in one place. All
initializations move to OUnoObject::CreateMediator which
anyways needs to be done when a OUnoObject got created.
Change-Id: I86f968dc6e867c5752d3c8cee1b3b2af57e467c8
Reviewed-on: https://gerrit.libreoffice.org/57976
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit 96b338e62c422ccd23cd33b3f87a463730221514)
Reviewed-on: https://gerrit.libreoffice.org/58321
Diffstat (limited to 'reportdesign/inc')
-rw-r--r-- | reportdesign/inc/RptObject.hxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index b078e1f7d143..3a4c6cbe35de 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -246,7 +246,6 @@ protected: virtual void NbcMove( const Size& rSize ) override; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) override; virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override; - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override; virtual SdrPage* GetImplPage() const override; @@ -272,7 +271,6 @@ public: private: virtual void impl_setUnoShape( const css::uno::Reference< css::uno::XInterface >& rxUnoShape ) override; - void impl_setReportComponent_nothrow(); void impl_initializeModel_nothrow(); }; |