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

[Fridrich Å trba]

 src/lib/CDRContentCollector.cpp  |    7 ++++---
 src/lib/CDROutputElementList.cpp |   31 +++++++++++++++----------------
 src/lib/CDROutputElementList.h   |    4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 73e56f4fc9f9346c56873c04dedcad8e17d31388
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Nov 20 16:45:36 2013 +0100

    Folding paths into propLists
    
    Change-Id: I1abc8e69ef452f22c0f464126bc72c2a28c03fb5

diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 4dd59ee..794e72d 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -286,8 +286,9 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
       librevenge::RVNGPropertyListVector outputPath;
       for (std::vector<librevenge::RVNGPropertyList>::const_iterator iter = tmpPath.begin(); iter != tmpPath.end(); ++iter)
         outputPath.append(*iter);
-
-      outputElement.addPath(outputPath);
+      librevenge::RVNGPropertyList propList;
+      propList.insert("svg:d", outputPath);
+      outputElement.addPath(propList);
 
     }
     m_currentPath.clear();
@@ -417,7 +418,7 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
     textFrameProps.insert("fo:padding-bottom", 0.0);
     textFrameProps.insert("fo:padding-left", 0.0);
     textFrameProps.insert("fo:padding-right", 0.0);
-    outputElement.addStartTextObject(textFrameProps, librevenge::RVNGPropertyListVector());
+    outputElement.addStartTextObject(textFrameProps);
     for (unsigned i = 0; i < m_currentText->size(); ++i)
     {
       librevenge::RVNGPropertyList paraProps;
diff --git a/src/lib/CDROutputElementList.cpp b/src/lib/CDROutputElementList.cpp
index 9773ef2..a30b940 100644
--- a/src/lib/CDROutputElementList.cpp
+++ b/src/lib/CDROutputElementList.cpp
@@ -61,15 +61,15 @@ private:
 class CDRPathOutputElement : public CDROutputElement
 {
 public:
-  CDRPathOutputElement(const librevenge::RVNGPropertyListVector &propListVec);
+  CDRPathOutputElement(const librevenge::RVNGPropertyList &propList);
   virtual ~CDRPathOutputElement() {}
   virtual void draw(librevenge::RVNGDrawingInterface *painter);
   virtual CDROutputElement *clone()
   {
-    return new CDRPathOutputElement(m_propListVec);
+    return new CDRPathOutputElement(m_propList);
   }
 private:
-  librevenge::RVNGPropertyListVector m_propListVec;
+  librevenge::RVNGPropertyList m_propList;
 };
 
 
@@ -91,16 +91,15 @@ private:
 class CDRStartTextObjectOutputElement : public CDROutputElement
 {
 public:
-  CDRStartTextObjectOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+  CDRStartTextObjectOutputElement(const librevenge::RVNGPropertyList &propList);
   virtual ~CDRStartTextObjectOutputElement() {}
   virtual void draw(librevenge::RVNGDrawingInterface *painter);
   virtual CDROutputElement *clone()
   {
-    return new CDRStartTextObjectOutputElement(m_propList, m_propListVec);
+    return new CDRStartTextObjectOutputElement(m_propList);
   }
 private:
   librevenge::RVNGPropertyList m_propList;
-  librevenge::RVNGPropertyListVector m_propListVec;
 };
 
 
@@ -226,13 +225,13 @@ void libcdr::CDRStyleOutputElement::draw(librevenge::RVNGDrawingInterface *paint
 }
 
 
-libcdr::CDRPathOutputElement::CDRPathOutputElement(const librevenge::RVNGPropertyListVector &propListVec) :
-  m_propListVec(propListVec) {}
+libcdr::CDRPathOutputElement::CDRPathOutputElement(const librevenge::RVNGPropertyList &propList) :
+  m_propList(propList) {}
 
 void libcdr::CDRPathOutputElement::draw(librevenge::RVNGDrawingInterface *painter)
 {
   if (painter)
-    painter->drawPath(m_propListVec);
+    painter->drawPath(m_propList);
 }
 
 
@@ -246,13 +245,13 @@ void libcdr::CDRGraphicObjectOutputElement::draw(librevenge::RVNGDrawingInterfac
 }
 
 
-libcdr::CDRStartTextObjectOutputElement::CDRStartTextObjectOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec) :
-  m_propList(propList), m_propListVec(propListVec) {}
+libcdr::CDRStartTextObjectOutputElement::CDRStartTextObjectOutputElement(const librevenge::RVNGPropertyList &propList) :
+  m_propList(propList) {}
 
 void libcdr::CDRStartTextObjectOutputElement::draw(librevenge::RVNGDrawingInterface *painter)
 {
   if (painter)
-    painter->startTextObject(m_propList, m_propListVec);
+    painter->startTextObject(m_propList);
 }
 
 libcdr::CDROpenSpanOutputElement::CDROpenSpanOutputElement(const librevenge::RVNGPropertyList &propList) :
@@ -374,9 +373,9 @@ void libcdr::CDROutputElementList::addStyle(const librevenge::RVNGPropertyList &
   m_elements.push_back(new CDRStyleOutputElement(propList, propListVec));
 }
 
-void libcdr::CDROutputElementList::addPath(const librevenge::RVNGPropertyListVector &propListVec)
+void libcdr::CDROutputElementList::addPath(const librevenge::RVNGPropertyList &propList)
 {
-  m_elements.push_back(new CDRPathOutputElement(propListVec));
+  m_elements.push_back(new CDRPathOutputElement(propList));
 }
 
 void libcdr::CDROutputElementList::addGraphicObject(const librevenge::RVNGPropertyList &propList)
@@ -384,9 +383,9 @@ void libcdr::CDROutputElementList::addGraphicObject(const librevenge::RVNGProper
   m_elements.push_back(new CDRGraphicObjectOutputElement(propList));
 }
 
-void libcdr::CDROutputElementList::addStartTextObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec)
+void libcdr::CDROutputElementList::addStartTextObject(const librevenge::RVNGPropertyList &propList)
 {
-  m_elements.push_back(new CDRStartTextObjectOutputElement(propList, propListVec));
+  m_elements.push_back(new CDRStartTextObjectOutputElement(propList));
 }
 
 void libcdr::CDROutputElementList::addOpenParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec)
diff --git a/src/lib/CDROutputElementList.h b/src/lib/CDROutputElementList.h
index 1289aa0..76ac912 100644
--- a/src/lib/CDROutputElementList.h
+++ b/src/lib/CDROutputElementList.h
@@ -50,9 +50,9 @@ public:
   virtual ~CDROutputElementList();
   void draw(librevenge::RVNGDrawingInterface *painter) const;
   void addStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
-  void addPath(const librevenge::RVNGPropertyListVector &propListVec);
+  void addPath(const librevenge::RVNGPropertyList &propList);
   void addGraphicObject(const librevenge::RVNGPropertyList &propList);
-  void addStartTextObject(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+  void addStartTextObject(const librevenge::RVNGPropertyList &propList);
   void addOpenParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
   void addOpenSpan(const librevenge::RVNGPropertyList &propList);
   void addInsertText(const librevenge::RVNGString &text);