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

[matteocam]

 svx/source/svdraw/svdotextdecomposition.cxx |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 99466aa1d749a822758d38f7b7b6c38c61b24744
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Sat Jul 12 01:39:40 2014 +0200

    Created impHandleTruncatedPortion
    
    Change-Id: Iad36d1d0887761cec72cb1890be329778358e49f

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index e044d39..510652a 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -523,16 +523,11 @@ namespace
 
         bool bTruncateText = rInfo.mbEndOfParagraph; // arbitrary property
 
+        // truncate text
         if ( bTruncateText )
-        {
-            // truncate it at 4
-            int nTruncationPoint = 4;
-            rInfo.mnTextLen = std::min( rInfo.mnTextLen, nTruncationPoint );
-        }
-
-        // END FIXME
-
-        impCreateTextPortionPrimitive(rInfo);
+            impHandleTruncatedPortion(rInfo)
+        else // no chaining or truncating
+            impCreateTextPortionPrimitive(rInfo);
 
         if(rInfo.mbEndOfLine || rInfo.mbEndOfParagraph)
         {
@@ -545,6 +540,15 @@ namespace
         }
     }
 
+    void impTextBreakupHandler::impHandleTruncatedPortion(const DrawPortionInfo& rInfo)
+    {
+        // truncate it at 4
+        int nTruncationPoint = 4;
+        DrawPortionInfo rInfoNonConst = rInfo;
+        rInfoNonConst.mnTextLen = std::min( rInfo.mnTextLen, nTruncationPoint );
+        impCreateTextPortionPrimitive(rInfoNonConst);
+    }
+
     void impTextBreakupHandler::impHandleDrawBulletInfo(const DrawBulletInfo& rInfo)
     {
         basegfx::B2DHomMatrix aNewTransform;