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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index dba6965a84df..c47521e6d318 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 08cd7e27e2d1..25f8209d7d5d 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 ) { |