summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@cib.de>2018-10-19 14:01:18 +0200
committerArmin Le Grand <Armin.Le.Grand@cib.de>2018-10-22 10:28:03 +0200
commit92b849b9297cbf78bddf5e48bdbd44303a7021db (patch)
treef009f4bc7c09f384be689c7c2076e16970b7265d /basctl
parent0b92d04ab61b4d39d714df6210d6f6bf8fdec5bf (diff)
tdf#120674 set DlgEdForm early in DlgEdObj::EndCreate
Change-Id: I5ba0504265f5692614a8db0117883528bd4bfc0b Reviewed-on: https://gerrit.libreoffice.org/62000 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/dlged/dlgedobj.cxx19
1 files changed, 16 insertions, 3 deletions
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 359f9aab9587..2ef4ff99a78f 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -948,6 +948,22 @@ bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
+ // tdf#120674 after interactive creation, the SdrObject (this) has no SdrPage yet
+ // due to not being inserted. Usually this should be handled in a ::handlePageChange
+ // implementation. For historical reasons, the SdrPage (which is the DlgEdPage) was
+ // already set. For now, get it from the SdrDragStat and use it to access and set
+ // the local pDlgEdForm
+ if(nullptr == pDlgEdForm && nullptr != rStat.GetPageView())
+ {
+ const DlgEdPage* pDlgEdPage(dynamic_cast<const DlgEdPage*>(rStat.GetPageView()->GetPage()));
+
+ if(nullptr != pDlgEdPage)
+ {
+ // set parent form
+ pDlgEdForm = pDlgEdPage->GetDlgEdForm();
+ }
+ }
+
SetDefaults();
StartListening();
@@ -956,9 +972,6 @@ bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
void DlgEdObj::SetDefaults()
{
- // set parent form
- pDlgEdForm = static_cast<DlgEdPage*>(getSdrPageFromSdrObject())->GetDlgEdForm();
-
if ( pDlgEdForm )
{
// add child to parent form