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

[matteocam]

 editeng/source/outliner/overflowingtxt.cxx  |    5 +++++
 include/editeng/overflowingtxt.hxx          |    1 +
 svx/source/svdraw/svdotextdecomposition.cxx |    7 +++++--
 svx/source/svdraw/textchain.cxx             |    3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 2565e304894e0b0e85a82cd858f0b78a72748b04
Author: matteocam <matteo.campane...@gmail.com>
Date:   Tue Jun 16 16:58:21 2015 -0400

    Uses GetHeadingLines() to check before introducing the same text twice
    
    Change-Id: Iddb38eb05a7848adb8890003a2af95ffc4b1778d

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index f591dac..99b2250 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -33,5 +33,10 @@ OUString OverflowingText::GetEndingLines() const
     return mTailTxt;
 }
 
+OUString OverflowingText::GetHeadingLines() const
+{
+    return mHeadTxt;
+}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 40eaa28..baec920 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -48,6 +48,7 @@ public:
                   mTailTxt(tailTxt)
                 { }
 
+        OUString GetHeadingLines() const;
         OUString GetEndingLines() const;
 };
 
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 6d1a0c4..b5f70fc 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -832,8 +832,11 @@ OutlinerParaObject 
*SdrTextObj::impGetOverflowingParaObject(SdrOutliner *pOutlin
     impSetOutlinerToEmptyTxt(pOutliner);
 
     // Set headText at the beginning of box
-    Paragraph *pNewPara0 = pOutliner->GetParagraph(0);
-    pOutliner->SetText(mpOverflowingText->mHeadTxt, pNewPara0);
+    OUString aHeadTxt = mpOverflowingText->GetHeadingLines();
+    if (aHeadTxt != "") {
+        Paragraph *pNewPara0 = pOutliner->GetParagraph(0);
+        pOutliner->SetText(aHeadTxt, pNewPara0);
+    }
 
     // Set all the intermediate Paras
     if (mpOverflowingText->mpMidParas)
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 28daf86..a4495b0 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -35,6 +35,7 @@ SdrTextObj *TextChain::GetNextLink(SdrTextObj *)
 
 bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj *pPrevLink, 
SdrTextObj *pNextLink)
 {
-
+    // XXX
+    return false;
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits