diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2018-09-30 01:25:48 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2018-10-07 21:19:52 +0200 |
| commit | f2bd68c33c13b94cf844227d04a7eba9fe3723f8 (patch) | |
| tree | fcb89611ad4b3571b488f759014a2cf9ef7893a5 /svx | |
| parent | 45385a532b2d4bd227d6771e54b2b8a9faca939c (diff) | |
tdf#120152: fix adding labels in reportdesign
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=4b4942224b550235da228655677b5c068a053254
Change-Id: I7935f11e82410574e64cf3d50ea4e2e3791f0487
Reviewed-on: https://gerrit.libreoffice.org/61146
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, 9 insertions, 3 deletions
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index e4670a1fb714..5f93b1750b85 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -566,7 +566,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, - SdrModel& _rModel, + SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel& _rModel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl ) { @@ -574,7 +574,7 @@ void FmFormView::createControlLabelPair( OutputDevice const * _pOutDev, sal_Int3 *_pOutDev, _nXOffsetMM, _nYOffsetMM, _rxField, _rxNumberFormats, _nControlObjectID, "", _nInventor, _nLabelObjectID, - _rModel, + _pLabelPage, _pControlPage, _rModel, _rpLabel, _rpControl ); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index ec0df8ee71a7..aa953fa13616 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1526,6 +1526,8 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _rFieldPostfix, SdrInventor::FmForm, OBJ_FM_FIXEDTEXT, + nullptr, + nullptr, // 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 @@ -1557,7 +1559,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, - SdrModel& _rModel, + SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel& _rModel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpLabel, std::unique_ptr<SdrUnoObj, SdrObjectFreeOp>& _rpControl) { sal_Int32 nDataType = 0; @@ -1604,6 +1606,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _rModel, _nInventor, _nLabelObjectID))); + _pLabelPage->NbcInsertObject(pLabel.get()); OSL_ENSURE( pLabel.get(), "FmXFormView::createControlLabelPair: could not create the label!" ); @@ -1636,6 +1639,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice const & _rOutDev, sal_Int _rModel, _nInventor, _nControlObjectID))); + _pControlPage->NbcInsertObject(pControl.get()); OSL_ENSURE( pControl.get(), "FmXFormView::createControlLabelPair: could not create the control!" ); diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index f56a70e5db25..13749dedf391 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -263,6 +263,8 @@ 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, |