diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2018-10-29 23:40:38 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2018-10-30 10:22:35 +0100 |
commit | f88b95032262c434647475b6af7e33068635b6c4 (patch) | |
tree | 774d606c88b23c5edad632e4717439030e74f12e /svx | |
parent | db7f8a8ec077269535b5e5231db81d38c91d06c5 (diff) |
The first fixes were wrong and only brought some regression
Change-Id: I5e47393b454ca9dc73d87ac4277fa48a3d8bf38d
Reviewed-on: https://gerrit.libreoffice.org/62530
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/form/fmview.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/fmvwimp.cxx | 6 | ||||
-rw-r--r-- | svx/source/inc/fmvwimp.hxx | 2 |
3 files changed, 3 insertions, 9 deletions
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index c69812fd717b..0931b0003de7 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -565,7 +565,7 @@ FmFormObj* FmFormView::getMarkedGrid() const void FmFormView::createControlLabelPair( OutputDevice const * _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, - SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel& _rModel, + SdrModel& _rModel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl ) { @@ -573,7 +573,7 @@ void FmFormView::createControlLabelPair( OutputDevice const * _pOutDev, sal_Int3 *_pOutDev, _nXOffsetMM, _nYOffsetMM, _rxField, _rxNumberFormats, _nControlObjectID, "", _nInventor, _nLabelObjectID, - _pLabelPage, _pControlPage, _rModel, + _rModel, _rpLabel, _rpControl ); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 5994c4e46d70..508a5067b393 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1526,8 +1526,6 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _rFieldPostfix, SdrInventor::FmForm, OBJ_FM_FIXEDTEXT, - getView()->GetSdrPageView()->GetPage(), - getView()->GetSdrPageView()->GetPage(), // tdf#118963 Hand over a SdrModel to SdrObject-creation. It uses the local m_pView // and already returning false when nullptr == getView() could be done, but m_pView @@ -1559,7 +1557,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrInventor _nInventor, sal_uInt16 _nLabelObjectID, - SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel& _rModel, + SdrModel& _rModel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl) { sal_Int32 nDataType = 0; @@ -1606,7 +1604,6 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _rModel, _nInventor, _nLabelObjectID))); - _pLabelPage->NbcInsertObject(pLabel.get()); OSL_ENSURE(pLabel, "FmXFormView::createControlLabelPair: could not create the label!"); @@ -1639,7 +1636,6 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _rModel, _nInventor, _nControlObjectID))); - _pControlPage->NbcInsertObject(pControl.get()); OSL_ENSURE(pControl, "FmXFormView::createControlLabelPair: could not create the control!"); diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index f10068daee90..59f8647b102e 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -263,8 +263,6 @@ private: // tdf#118963 Need a SdrModel for SdrObject creation. To make the // demand clear, hand over a SdrMldel& - SdrPage* _pLabelPage, - SdrPage* _pControlPage, SdrModel& _rModel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel, |