[libreoffice] tweak patch to apply

David Tardon dtardon at fedoraproject.org
Sat Jul 19 08:21:28 UTC 2014


commit 611aa43a35037ae5483ea9e1c4da8001f5f0a815
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Jul 19 10:20:48 2014 +0200

    tweak patch to apply

 ...z-1117853-nStartPara-of-EE_PARA_NOT_FOUND.patch |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..7ed52d9 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
@@ -39,21 +39,21 @@ index 03e899d..e3b4aa7 100644
 +++ b/sd/source/ui/view/outlnvsh.cxx
 @@ -1658,7 +1658,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 )
          }
  
          // if we have a title object and a text, set the text
 -        if( pTO )
-+        OutlinerParaObject* pOPO = pTO ? rOutliner.CreateParaObject(rOutliner.GetAbsPos(pPara), 1) : NULL;
++        OutlinerParaObject* pOPO = pTO ? pOutliner->CreateParaObject(rOutliner.GetAbsPos(pPara), 1) : NULL;
 +        if (pOPO)
          {
--            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()) )


More information about the scm-commits mailing list