summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2019-06-27 17:26:34 +0200
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2019-06-28 12:38:03 +0200
commit7ac1a9f5b0903af5d7ef1e14aa49f9b7ed3fda48 (patch)
treeaf72f8ab567fb2e3a9a476513e6d2d00186bd066 /svx
parent91f86a51ed6f01e9c75999e8c1a42eaa47ff3ccb (diff)
tdf#126137: Do not dereference non-existing Object
Regression from dfefe448c41921f2f1e54d3f69b8b9e89031d055 Use same logic as in c28ec6d9fbb21b363102faac0171de2754ea5d75 Change-Id: Ia489eb61873d38c31729fedb853b11570e562123 Reviewed-on: https://gerrit.libreoffice.org/74811 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit b653f21313f3b8ff9da99897e3a0c2df4a685b60) Reviewed-on: https://gerrit.libreoffice.org/74827 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdotext.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index da6a4280a1eb..814b7a9e4f17 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1044,7 +1044,7 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
{
pNewOutlinerParaObject = pEO->CreateParaObject();
}
- else
+ else if (nullptr != rObj.getActiveText()->GetOutlinerParaObject())
{
pNewOutlinerParaObject.reset( new OutlinerParaObject(*rObj.getActiveText()->GetOutlinerParaObject()) );
}