Revert tdf#120782, tdf#120728, tdf#120152, tdf#120151
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>
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 853a6bc..cdba288 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -95,8 +95,6 @@ public:
sal_uInt16 _nControlObjectID,
SdrInventor _nInventor,
sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage,
SdrPage* _pControlPage,
// tdf#118963 Need a SdrModel for SdrObject creation. To make the
// demand clear, hand over a SdrMldel&
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index dba6965..c47521e 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3147,8 +3147,6 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
_nObjectId,
SdrInventor::ReportDesign,
OBJ_DLG_FIXEDTEXT,
pSectionWindow->getReportSection().getPage(),
pSectionWindow->getReportSection().getPage(),
// tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing
// m_aReportModel seems pretty safe, it's done in other places, initialized
@@ -3456,8 +3454,6 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
nOBJID,
SdrInventor::ReportDesign,
OBJ_DLG_FIXEDTEXT,
pSectionWindow[1]->getReportSection().getPage(),
pSectionWindow[0]->getReportSection().getPage(),
// tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing
// m_aReportModel seems pretty safe, it's done in other places, initialized
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 08cd7e2..25f8209d 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -353,7 +353,6 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
try
{
SdrObject* pNewObj(pSdrObject->CloneSdrObject(pSdrObject->getSdrModelFromSdrObject()));
m_pPage->NbcInsertObject(pNewObj);
aCopies.emplace_back(pNewObj->getUnoShape(),uno::UNO_QUERY);
if ( _bEraseAnddNoClone )
{
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index c69812f..0931b00 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 5994c4e..508a506 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 f10068d..59f8647 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,
