[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source svx/source

[matteocam]

 editeng/source/editeng/impedit3.cxx         |    2 +-
 svx/source/svdraw/svdotextdecomposition.cxx |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 64dad97fcac516bc83f31ffb79763f55948292d0
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Mon Jul 21 22:33:56 2014 +0300

    Removed outdated comments. Set para obj in impCopyTextInTextObj
    
    Change-Id: I8789403e99f7847f937ead12cd16f34e1ed164f9

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index ce30d8e..196d0ee 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -544,7 +544,7 @@ void ImpEditEngine::CheckAutoPageSize()
     // FIXME(matteocam)
     fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
                         ? "YES Overflow!\n"  : "NO Overflow!\n" );
-    // setting overflow status // XXX: Is status reset somewhere?
+    // setting overflow status
     if ( IsPageOverflow( aPaperSize, aPrevPaperSize ) )
         aStatus.SetPageOverflow(true);
 
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 9253a9a..d9ed3e6 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -780,7 +780,7 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
     if( pText!=NULL && pText->GetOutlinerParaObject() && pModel!=NULL)
     {
         Rectangle &aNextRect = pNextTextObj->aRect;
-        SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner(); // XXX: shit seems to happen in here
+        SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner();
         rOutliner.SetPaperSize(
             Size(
                 aNextRect.Right()-aNextRect.Left(),
@@ -801,6 +801,10 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
         if (aNewRect!=aNextRect) {
             pNextTextObj->SetLogicRect(aNewRect);
         }
+
+        // Set text object's string
+        pNextTextObj->SetOutlinerParaObject(*pText->GetOutlinerParaObject());
+
     }
 }