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

[matteocam]

 editeng/source/editeng/editeng.cxx          |    1 +
 editeng/source/outliner/outliner.cxx        |    1 +
 svx/source/svdraw/svdotextdecomposition.cxx |   18 +-----------------
 3 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 80150428de1867ae4bafd61b32c79b8dcc587885
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Mon Jun 1 16:58:05 2015 -0400

    Created header for OverflowingText
    
    Change-Id: I98cd9c8ea91ce065efc242a9302ca59976f5bb20

diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 35e6515..6193b98 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -59,6 +59,7 @@
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/charreliefitem.hxx>
+#include <editeng/overflowingtxt.hxx>
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 52a0f18..909e821 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -37,6 +37,7 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/scripttypeitem.hxx>
+#include <editeng/overflowingtxt.hxx>
 #include <editeng/editobj.hxx>
 #include <svl/itemset.hxx>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index bf81c09..30f1fcc 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -49,6 +49,7 @@
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
+#include <editeng/overflowingtxt.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 
@@ -744,23 +745,6 @@ void SdrTextObj::impCopyTextInTextObj2(SdrTextObj *pNextTextObj) const
 
     rOutliner.SetStatusEventHdl1(LINK(this,SdrTextObj,ImpDecomposeChainedText));
 
-    struct OverflowingText {
-        OUString mHeadTxt;
-        const OutlinerParaObject *mpMidParas;
-        OUString mTailTxt;
-        // NOTE: mpMidParas and mTailTxt might be empty
-
-        // Constructor
-        OverflowingText(
-            const OUString &headTxt,
-            const OutlinerParaObject *pMidParas = NULL,
-            const OUString &tailTxt = "")
-                : mHeadTxt(headTxt),
-                  mpMidParas(pMidParas),
-                  mTailTxt(tailTxt)
-                { }
-    };
-
     OverflowingText aOverflowingTxt =
         OverflowingText("headTxt (On its own)", NULL, "I'm Appended to #");