summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdundo.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-05-28 13:21:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-05-28 13:25:14 +0100
commit90df8be13d8f72e0d431161a864f108e74549aff (patch)
tree4e0ad4d89e18f396c70b8b528ddcb79fa1f726e8 /svx/source/svdraw/svdundo.cxx
parent19caa204bd1a366ff8452c0f4bbb79fd0ef549f2 (diff)
Fix editing text in draw object undo regression
Regression since 6e29f56895cd38aa7dee85112370a7cfc0d24632 and 28d2a0c162b477a013c7c51c19a94fb08b55b276 pText1 can legally be NULL Change-Id: I0d54f4aeaa18834c32daeabad43776bc4f68088b
Diffstat (limited to 'svx/source/svdraw/svdundo.cxx')
-rw-r--r--svx/source/svdraw/svdundo.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 5026435e7d94..82092828cbed 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -1144,10 +1144,10 @@ void SdrUndoObjSetText::Undo()
AfterSetText();
SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText);
- if (pText && pOldText)
+ if (pText)
{
// copy text for Undo, because the original now belongs to SetOutlinerParaObject()
- OutlinerParaObject* pText1 = new OutlinerParaObject(*pOldText);
+ OutlinerParaObject* pText1 = pOldText ? new OutlinerParaObject(*pOldText) : NULL;
pText->SetOutlinerParaObject(pText1);
}
@@ -1158,10 +1158,10 @@ void SdrUndoObjSetText::Undo()
void SdrUndoObjSetText::Redo()
{
SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText);
- if (pText && pNewText)
+ if (pText)
{
// copy text for Undo, because the original now belongs to SetOutlinerParaObject()
- OutlinerParaObject* pText1 = new OutlinerParaObject(*pNewText);
+ OutlinerParaObject* pText1 = pNewText ? new OutlinerParaObject(*pNewText) : NULL;
static_cast< SdrTextObj* >( pObj )->NbcSetOutlinerParaObjectForText( pText1, pText );
}
pObj->ActionChanged();