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

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |   44 ++++++----------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

New commits:
commit 6245235e4af04b4e2f0e5878874146c73dd5a75b
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Wed May 27 18:22:14 2015 -0400

    Insert fixed string live
    
    Change-Id: I3c3bb5a30546409863b09207cd97dc59aea34b04

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index c9149e1..06f1c27 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -742,41 +742,17 @@ void SdrTextObj::impCopyTextInTextObj(SdrTextObj *pNextTextObj) const
     // trying to copy text in obj 1
     //SdrText* pText = getActiveText();
 
-    Rectangle &aNextRect = pNextTextObj->aRect;
     SdrOutliner& rOutliner = pNextTextObj->ImpGetDrawOutliner();
-    rOutliner.SetPaperSize(
-        Size(
-            aNextRect.Right()-aNextRect.Left(),
-            aNextRect.Bottom()-aNextRect.Top()
-            )
-     );
-    rOutliner.SetUpdateMode(true);
-    rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
-
+    //rOutliner.SetUpdateMode(true);
+    //rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
     // XXX: experimental code 27/5/15
-    OutlinerParaObject *someText = rOutliner.CreateParaObject();
+    //OutlinerParaObject *someText = rOutliner.CreateParaObject(0,1); // only first para
+    //pNextTextObj->SetOutlinerParaObject(*someText);
+    pNextTextObj->SetText("Bukowski, were are thou?");
+    //rOutliner.Insert("Bukowski, were are thou?");
+    //rOutliner.Clear();
+    //rOutliner.SetStatusEventHdl1(Link());
 
-    rOutliner.SetText(*someText);  // XXX: copies overflown text
-
-    // clean up code and such
-    Size aNewSize(rOutliner.CalcTextSize());
-    // create OutlinerParaObject for pNextTextObj
-    OutlinerParaObject* pNewParaObject=rOutliner.CreateParaObject();
-    rOutliner.Clear();
-    rOutliner.SetStatusEventHdl1(Link());
-
-    aNewSize.Width()++; // because of possible rounding errors
-    aNewSize.Width()+=GetTextLeftDistance()+GetTextRightDistance();
-    aNewSize.Height()+=GetTextUpperDistance()+GetTextLowerDistance();
-
-    Rectangle aNewRect(aNextRect);
-    aNewRect.SetSize(aNewSize);
-    pNextTextObj->ImpJustifyRect(aNewRect);
-    if (aNewRect!=aNextRect) {
-        pNextTextObj->SetLogicRect(aNewRect);
-    }
-    // Set text object's string
-    pNextTextObj->SetOutlinerParaObject( pNewParaObject );
 
 }
 
@@ -1475,8 +1451,8 @@ void SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
 
 void SdrTextObj::impDecomposeChainedTextPrimitive(
         drawinglayer::primitive2d::Primitive2DSequence& rTarget,
-        const drawinglayer::primitive2d::SdrChainedTextPrimitive2D& rSdrChainedTextPrimitive,
-        const drawinglayer::geometry::ViewInformation2D& aViewInformation) const
+        const drawinglayer::primitive2d::SdrChainedTextPrimitive2D& /*rSdrChainedTextPrimitive*/,
+        const drawinglayer::geometry::ViewInformation2D& /*aViewInformation*/) const
 {
     // FIXME(matteocam)
     /* fprintf(stderr, "Object #0 = %p, Object #1 = %p\n",