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

[matteocam]

 editeng/source/outliner/overflowingtxt.cxx |    3 ++-
 include/editeng/overflowingtxt.hxx         |   12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit fc30b3010ebcb57a0b2142d15360a55712f6f787
Author: matteocam <matteo.campane...@gmail.com>
Date:   Tue Jun 30 10:21:56 2015 -0400

    Changed to specialized OFlowChainedText class
    
    Change-Id: Iad2b98f5793bc4b8a49012811718a65ab2fbade0

diff --git a/editeng/source/outliner/overflowingtxt.cxx 
b/editeng/source/outliner/overflowingtxt.cxx
index 8ecd05c..ca0af38 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -39,7 +39,8 @@ OUString OverflowingText::GetHeadingLines() const
 }
 
 
-ChainedText::ChainedText(Outliner *pOutl)
+OFlowChainedText::OFlowChainedText(Outliner *pOutl, OutlinerParaObject* 
pTextToBeMerged)
+  : mpTextToBeMerged(pTextToBeMerged)
 {
     // Initialize stuff here
 }
diff --git a/include/editeng/overflowingtxt.hxx 
b/include/editeng/overflowingtxt.hxx
index 5399f4b..0c42d53 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -83,13 +83,21 @@ class EDITENG_DLLPUBLIC NonOverflowingText {
  * contains and handles the state of a text broken _after_ a flow event.
  *
 */
-class EDITENG_DLLPUBLIC ChainedText {
+class EDITENG_DLLPUBLIC OFlowChainedText {
     public:
-    ChainedText(Outliner *);
+    OFlowChainedText(Outliner *, OutlinerParaObject *);
+
+    OutlinerParaObject *CreateOverflowingParaObject(Outliner *);
+    OutlinerParaObject *CreateNonOverflowingParaObject(Outliner *);
+
+    OutlinerParaObject *GetTextToBeMerged() const { return mpTextToBeMerged; }
 
     private:
     NonOverflowingText *mpNonOverflowingTxt;
     OverflowingText *mpOverflowingTxt;
+
+    OutlinerParaObject *mpTextToBeMerged;
+
 };
 
 #endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits