mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Related: rhbz#1117853 nStartPara of EE_PARA_NOT_FOUND

Browse Source 
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
This commit is contained in:
Caolán McNamara
2014-07-17 13:48:30 +01:00
parent 8416a65af1
commit fdb1d62a09
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editeng/source/outliner/outliner.cxx
View File

@@ -384,7 +384,6 @@ sal_Int32 Outliner::GetBulletsNumberingStatus() const
OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 nCount ) const OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 nCount ) const
{ {
if ( static_cast<sal_uLong>(nStartPara) + nCount > if ( static_cast<sal_uLong>(nStartPara) + nCount >
static_cast<sal_uLong>(pParaList->GetParagraphCount()) ) static_cast<sal_uLong>(pParaList->GetParagraphCount()) )
nCount = pParaList->GetParagraphCount() - nStartPara; nCount = pParaList->GetParagraphCount() - nStartPara;
@@ -394,7 +393,7 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32
if ( ( nStartPara + nCount ) > pEditEngine->GetParagraphCount() ) if ( ( nStartPara + nCount ) > pEditEngine->GetParagraphCount() )
nCount = pEditEngine->GetParagraphCount() - nStartPara; nCount = pEditEngine->GetParagraphCount() - nStartPara;
if( !nCount ) if (nCount <= 0)
return NULL; return NULL;
EditTextObject* pText = pEditEngine->CreateTextObject( nStartPara, nCount ); EditTextObject* pText = pEditEngine->CreateTextObject( nStartPara, nCount );

5
sd/source/ui/view/outlnvsh.cxx
View File

@@ -1658,7 +1658,6 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
::Outliner& rOutliner = pOlView->GetOutliner(); ::Outliner& rOutliner = pOlView->GetOutliner();
SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage ); SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage );
OutlinerParaObject* pOPO = NULL;
OUString aTest = rOutliner.GetText(pPara); OUString aTest = rOutliner.GetText(pPara);
bool bText = !aTest.isEmpty(); 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 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->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()) )