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

matteocam matteo.campanelli at gmail.com
Thu Jul 23 10:06:04 PDT 2015


 .gitignore                      |    9 +++++++++
 include/svx/textchain.hxx       |    8 ++++++++
 svx/source/svdraw/textchain.cxx |   22 ++++++++++++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)

New commits:
commit 6c4e8f7c160986fef5c8c2ccd1c0c22a6b620dd8
Author: matteocam <matteo.campanelli at gmail.com>
Date:   Thu Jul 23 19:04:44 2015 +0200

    Declare link accessors in TextChain
    
    Change-Id: I2c8cc929a667f9cc59c5ec5217a2c27ca15beb2d

diff --git a/.gitignore b/.gitignore
index 6f7b854..72e65e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,3 +129,12 @@ DerivedData
 # gdb config
 /.gdbinit
 /.gdb_history
+
+# Personal scripts and text
+bpoints
+core
+makeWithDebug.sh
+papercuts.txt
+startDbg.sh
+startTest.sh
+
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 91fdef8..ad929ed 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -139,7 +139,9 @@ class TextChain {
 
     void AppendLink(SdrTextObj *);
     bool IsLinkInChain(SdrTextObj *) const;
+
     SdrTextObj *GetNextLink(SdrTextObj *) const;
+    SdrTextObj *GetPrevLink(SdrTextObj *) const;
 
     ChainLinkId GetId(const SdrTextObj *) const;
     ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *);
@@ -156,6 +158,12 @@ class TextChain {
 
     protected:
     LinkPropertiesMap maLinkPropertiesMap;
+
+    private:
+    SdrTextObj *impGetNextLink(SdrTextObj *) const;
+    SdrTextObj *impGetPrevLink(SdrTextObj *) const;
+
+
 };
 
 #endif // INCLUDED_SVX_TEXTCHAIN_HXX
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 25b75ae..787b298 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -55,11 +55,29 @@ void TextChain::AppendLink(SdrTextObj *)
     // XXX
 }
 
-SdrTextObj *TextChain::GetNextLink(SdrTextObj *) const
+SdrTextObj *TextChain::GetNextLink(SdrTextObj *pTextObj) const
 {
-    return NULL; // XXX: To be changed. It'd be a mess to implement now
+    return impGetNextLink(pTextObj);
 }
 
+SdrTextObj *TextChain::GetPrevLink(SdrTextObj *pTextObj) const
+{
+    return impGetPrevLink(pTextObj);
+}
+
+SdrTextObj *TextChain::impGetNextLink(SdrTextObj *pTextObj) const
+{
+    // XXX: To be implemented
+    return NULL;
+}
+
+SdrTextObj *TextChain::impGetPrevLink(SdrTextObj *pTextObj) const
+{
+    // XXX: To be implemented
+    return NULL;
+}
+
+
 ImpChainLinkProperties *TextChain::GetLinkProperties(const SdrTextObj *pLink)
 {
     // if the guy does not already have properties in the map make them


More information about the Libreoffice-commits mailing list