diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-07-17 13:48:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-17 13:52:13 +0100 |
| commit | fdb1d62a09f7320ee5c2828aa4ce84248a6e3e4e (patch) | |
| tree | 1b9e7d06f26ebd6b962e0d36e6eaf7e92ee28e93 /sd | |
| parent | 8416a65af18b7b030dece09f532235b8bb195a2b (diff) | |
Related: rhbz#1117853 nStartPara of EE_PARA_NOT_FOUND
we know that nStartPara is EE_PARA_NOT_FOUND so rOutliner.GetAbsPos must have
returned that, but we don't know the circumstances that lead to that yet.
Change-Id: I53a488317d154b4a3c050248b8737da0a611ca43
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 03e899d280e1..e3b4aa7a7522 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -1658,7 +1658,6 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) ::Outliner& rOutliner = pOlView->GetOutliner(); SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); - OutlinerParaObject* pOPO = NULL; OUString aTest = rOutliner.GetText(pPara); bool bText = !aTest.isEmpty(); @@ -1675,9 +1674,9 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) } // if we have a title object and a text, set the text - if( pTO ) + OutlinerParaObject* pOPO = pTO ? rOutliner.CreateParaObject(rOutliner.GetAbsPos(pPara), 1) : NULL; + if (pOPO) { - pOPO = rOutliner.CreateParaObject( rOutliner.GetAbsPos( pPara ), 1 ); pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT ); pOPO->SetVertical( pTO->IsVerticalWriting() ); if( pTO->GetOutlinerParaObject() && (pOPO->GetTextObject() == pTO->GetOutlinerParaObject()->GetTextObject()) ) |