[Libreoffice-commits] libcdr.git: src/lib

[Fridrich Å trba]

 src/lib/CDRContentCollector.cpp  |    2 +-
 src/lib/CDROutputElementList.cpp |   15 +++++++--------
 src/lib/CDROutputElementList.h   |    2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 3bf9405bfccc355b9061a061601c834a46b28c41
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Nov 21 15:24:31 2013 +0100

    Fold tabStops into the propList
    
    Change-Id: Iff95c7d1b24ba6bdf6e5c98e598ce7b35451fa7f

diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 794e72d..b792842 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -453,7 +453,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
 //      paraProps.insert("fo:text-indent", (*m_currentText)[i].m_charStyle.m_firstIndent);
 //      paraProps.insert("fo:margin-left", (*m_currentText)[i].m_charStyle.m_leftIndent);
 //      paraProps.insert("fo:margin-right", (*m_currentText)[i].m_charStyle.m_rightIndent);
-      outputElement.addOpenParagraph(paraProps, librevenge::RVNGPropertyListVector());
+      outputElement.addOpenParagraph(paraProps);
       for (unsigned j = 0; j < (*m_currentText)[i].m_line.size(); ++j)
       {
         librevenge::RVNGPropertyList spanProps;
diff --git a/src/lib/CDROutputElementList.cpp b/src/lib/CDROutputElementList.cpp
index a30b940..f70c57b 100644
--- a/src/lib/CDROutputElementList.cpp
+++ b/src/lib/CDROutputElementList.cpp
@@ -106,16 +106,15 @@ private:
 class CDROpenParagraphOutputElement : public CDROutputElement
 {
 public:
-  CDROpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+  CDROpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList);
   virtual ~CDROpenParagraphOutputElement() {}
   virtual void draw(librevenge::RVNGDrawingInterface *painter);
   virtual CDROutputElement *clone()
   {
-    return new CDROpenParagraphOutputElement(m_propList, m_propListVec);
+    return new CDROpenParagraphOutputElement(m_propList);
   }
 private:
   librevenge::RVNGPropertyList m_propList;
-  librevenge::RVNGPropertyListVector m_propListVec;
 };
 
 
@@ -264,13 +263,13 @@ void libcdr::CDROpenSpanOutputElement::draw(librevenge::RVNGDrawingInterface *pa
 }
 
 
-libcdr::CDROpenParagraphOutputElement::CDROpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec) :
-  m_propList(propList), m_propListVec(propListVec) {}
+libcdr::CDROpenParagraphOutputElement::CDROpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList) :
+  m_propList(propList) {}
 
 void libcdr::CDROpenParagraphOutputElement::draw(librevenge::RVNGDrawingInterface *painter)
 {
   if (painter)
-    painter->openParagraph(m_propList, m_propListVec);
+    painter->openParagraph(m_propList);
 }
 
 
@@ -388,9 +387,9 @@ void libcdr::CDROutputElementList::addStartTextObject(const librevenge::RVNGProp
   m_elements.push_back(new CDRStartTextObjectOutputElement(propList));
 }
 
-void libcdr::CDROutputElementList::addOpenParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec)
+void libcdr::CDROutputElementList::addOpenParagraph(const librevenge::RVNGPropertyList &propList)
 {
-  m_elements.push_back(new CDROpenParagraphOutputElement(propList, propListVec));
+  m_elements.push_back(new CDROpenParagraphOutputElement(propList));
 }
 
 void libcdr::CDROutputElementList::addOpenSpan(const librevenge::RVNGPropertyList &propList)
diff --git a/src/lib/CDROutputElementList.h b/src/lib/CDROutputElementList.h
index 76ac912..06fae1a 100644
--- a/src/lib/CDROutputElementList.h
+++ b/src/lib/CDROutputElementList.h
@@ -53,7 +53,7 @@ public:
   void addPath(const librevenge::RVNGPropertyList &propList);
   void addGraphicObject(const librevenge::RVNGPropertyList &propList);
   void addStartTextObject(const librevenge::RVNGPropertyList &propList);
-  void addOpenParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+  void addOpenParagraph(const librevenge::RVNGPropertyList &propList);
   void addOpenSpan(const librevenge::RVNGPropertyList &propList);
   void addInsertText(const librevenge::RVNGString &text);
   void addCloseSpan();