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 /reportdesign | |
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 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 1319f3be33fc..c0288eb92de6 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3146,6 +3146,8 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co _nObjectId, SdrInventor::ReportDesign, OBJ_DLG_FIXEDTEXT, + nullptr, + pSectionWindow->getReportSection().getPage(), // tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing // m_aReportModel seems pretty safe, it's done in other places, initialized @@ -3453,6 +3455,8 @@ 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 |