[libreoffice/f20] fix patch

[Caolán McNamara]

commit bebc316a73e74b9a59177170dc8005571ad29c93
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 17 15:31:20 2014 +0100

    fix patch

 ...z-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch |   37 +++++++------------
 1 files changed, 14 insertions(+), 23 deletions(-)
---
diff --git a/0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch b/0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch
index c23fa6f..4af2864 100644
--- a/0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch
+++ b/0001-Related-rhbz-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch
@@ -1,4 +1,4 @@
-From fdb1d62a09f7320ee5c2828aa4ce84248a6e3e4e Mon Sep 17 00:00:00 2001
+From 48ff16650348b44ae3d78d7cc7b2dc2d92309de7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
 Date: Thu, 17 Jul 2014 13:48:30 +0100
 Subject: [PATCH] Related: rhbz#1117853 nStartPara of EE_PARA_NOT_FOUND
@@ -8,23 +8,15 @@ returned that, but we don't know the circumstances that lead to that yet.
 
 Change-Id: I53a488317d154b4a3c050248b8737da0a611ca43
 ---
- editeng/source/outliner/outliner.cxx | 3 +--
- sd/source/ui/view/outlnvsh.cxx       | 5 ++---
- 2 files changed, 3 insertions(+), 5 deletions(-)
+ editeng/source/outliner/outliner.cxx | 2 +-
+ sd/source/ui/view/outlnvsh.cxx       | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
-index 4d7214b..aaa843d 100644
+index a8e3d66..6aaa3fe 100644
 --- a/editeng/source/outliner/outliner.cxx
 +++ b/editeng/source/outliner/outliner.cxx
-@@ -384,7 +384,6 @@ sal_Int32 Outliner::GetBulletsNumberingStatus() const
- 
- OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32 nCount ) const
- {
--
-     if ( static_cast<sal_uLong>(nStartPara) + nCount >
-             static_cast<sal_uLong>(pParaList->GetParagraphCount()) )
-         nCount = pParaList->GetParagraphCount() - nStartPara;
-@@ -394,7 +393,7 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32
+@@ -399,7 +399,7 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara, sal_Int32
      if ( ( nStartPara + nCount ) > pEditEngine->GetParagraphCount() )
          nCount = pEditEngine->GetParagraphCount() - nStartPara;
  
@@ -34,26 +26,25 @@ index 4d7214b..aaa843d 100644
  
      EditTextObject* pText = pEditEngine->CreateTextObject( nStartPara, nCount );
 diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
-index 03e899d..e3b4aa7 100644
+index f787857..8ff50d1 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 )
+@@ -1674,7 +1674,6 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
  
-     ::Outliner&         rOutliner = pOlView->GetOutliner();
+     ::Outliner*             pOutliner = pOlView->GetOutliner();
      SdrTextObj*         pTO  = pOlView->GetTitleTextObject( pPage );
 -    OutlinerParaObject* pOPO = NULL;
  
-     OUString aTest = rOutliner.GetText(pPara);
+     OUString aTest = pOutliner->GetText(pPara);
      bool    bText = !aTest.isEmpty();
-@@ -1675,9 +1674,9 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage, Paragraph* pPara )
+@@ -1691,9 +1690,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)
++        OutlinerParaObject* pOPO = pTO ? pOutliner->CreateParaObject(pOutliner->GetAbsPos(pPara), 1) : NULL;
+         if( pTO )
          {
--            pOPO = rOutliner.CreateParaObject( rOutliner.GetAbsPos( pPara ), 1 );
+-            pOPO = pOutliner->CreateParaObject( pOutliner->GetAbsPos( pPara ), 1 );
              pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT );
              pOPO->SetVertical( pTO->IsVerticalWriting() );
              if( pTO->GetOutlinerParaObject() && (pOPO->GetTextObject() == pTO->GetOutlinerParaObject()->GetTextObject()) )