rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweak patch to apply

Browse Source
This commit is contained in:
David Tardon 2014-07-19 10:20:48 +02:00
parent 85552cf731
commit 611aa43a35
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch
View File

@ -39,21 +39,21 @@ index 03e899d..e3b4aa7 100644
+++ b/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1658,7 +1658,6 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) @@ -1658,7 +1658,6 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
::Outliner& rOutliner = pOlView->GetOutliner(); ::Outliner* pOutliner = pOlView->GetOutliner();
SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage );
- OutlinerParaObject* pOPO = NULL; - OutlinerParaObject* pOPO = NULL;
OUString aTest = rOutliner.GetText(pPara); OUString aTest = pOutliner->GetText(pPara);
bool bText = !aTest.isEmpty(); bool bText = !aTest.isEmpty();
@@ -1675,9 +1674,9 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara ) @@ -1675,9 +1674,9 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
} }
// if we have a title object and a text, set the text // if we have a title object and a text, set the text
- if( pTO ) - if( pTO )
+ OutlinerParaObject* pOPO = pTO ? rOutliner.CreateParaObject(rOutliner.GetAbsPos(pPara), 1) : NULL; + OutlinerParaObject* pOPO = pTO ? pOutliner->CreateParaObject(rOutliner.GetAbsPos(pPara), 1) : NULL;
+ if (pOPO) + if (pOPO)
{ {
- pOPO = rOutliner.CreateParaObject( rOutliner.GetAbsPos( pPara ), 1 ); - pOPO = pOutliner->CreateParaObject( pOutliner->GetAbsPos( pPara ), 1 );
pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT ); pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT );
pOPO->SetVertical( pTO->IsVerticalWriting() ); pOPO->SetVertical( pTO->IsVerticalWriting() );
if( pTO->GetOutlinerParaObject() && (pOPO->GetTextObject() == pTO->GetOutlinerParaObject()->GetTextObject()) ) if( pTO->GetOutlinerParaObject() && (pOPO->GetTextObject() == pTO->GetOutlinerParaObject()->GetTextObject()) )