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

[Fridrich Å trba]

 src/lib/VSDContentCollector.cpp  |    6 +++---
 src/lib/VSDOutputElementList.cpp |   15 +++++++--------
 src/lib/VSDOutputElementList.h   |    2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit d78e0a2a8e3793caf7888c1424e6ec1f3a202ed9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Nov 23 14:07:59 2013 +0100

    Fold in the gradient
    
    Change-Id: Ifc74553823509f1c4978e9e38d13bbafb855eff8

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 5c81986..d0553d9 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -311,7 +311,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
       librevenge::RVNGPropertyListVector path;
       for (unsigned i = 0; i < tmpPath.size(); ++i)
         path.append(tmpPath[i]);
-      m_shapeOutputDrawing->addStyle(fillPathProps, librevenge::RVNGPropertyListVector());
+      m_shapeOutputDrawing->addStyle(fillPathProps);
       librevenge::RVNGPropertyList propList;
       propList.insert("svg:d", path);
       m_shapeOutputDrawing->addPath(propList);
@@ -394,7 +394,7 @@ void libvisio::VSDContentCollector::_flushCurrentPath()
       librevenge::RVNGPropertyListVector path;
       for (unsigned i = 0; i < tmpPath.size(); ++i)
         path.append(tmpPath[i]);
-      m_shapeOutputDrawing->addStyle(linePathProps, librevenge::RVNGPropertyListVector());
+      m_shapeOutputDrawing->addStyle(linePathProps);
       librevenge::RVNGPropertyList propList;
       propList.insert("svg:d", path);
       m_shapeOutputDrawing->addPath(propList);
@@ -710,7 +710,7 @@ void libvisio::VSDContentCollector::_flushCurrentForeignData()
 
   if (m_currentForeignData.size() && m_currentForeignProps["librevenge:mime-type"] && m_foreignWidth != 0.0 && m_foreignHeight != 0.0)
   {
-    m_shapeOutputDrawing->addStyle(styleProps, librevenge::RVNGPropertyListVector());
+    m_shapeOutputDrawing->addStyle(styleProps);
     m_currentForeignProps.insert("office:binary-data", m_currentForeignData);
     m_shapeOutputDrawing->addGraphicObject(m_currentForeignProps);
   }
diff --git a/src/lib/VSDOutputElementList.cpp b/src/lib/VSDOutputElementList.cpp
index 42ef287..b7047f7 100644
--- a/src/lib/VSDOutputElementList.cpp
+++ b/src/lib/VSDOutputElementList.cpp
@@ -46,16 +46,15 @@ public:
 class VSDStyleOutputElement : public VSDOutputElement
 {
 public:
-  VSDStyleOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+  VSDStyleOutputElement(const librevenge::RVNGPropertyList &propList);
   virtual ~VSDStyleOutputElement() {}
   virtual void draw(librevenge::RVNGDrawingInterface *painter);
   virtual VSDOutputElement *clone()
   {
-    return new VSDStyleOutputElement(m_propList, m_propListVec);
+    return new VSDStyleOutputElement(m_propList);
   }
 private:
   librevenge::RVNGPropertyList m_propList;
-  librevenge::RVNGPropertyListVector m_propListVec;
 };
 
 
@@ -217,13 +216,13 @@ public:
 
 } // namespace libvisio
 
-libvisio::VSDStyleOutputElement::VSDStyleOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec) :
-  m_propList(propList), m_propListVec(propListVec) {}
+libvisio::VSDStyleOutputElement::VSDStyleOutputElement(const librevenge::RVNGPropertyList &propList) :
+  m_propList(propList) {}
 
 void libvisio::VSDStyleOutputElement::draw(librevenge::RVNGDrawingInterface *painter)
 {
   if (painter)
-    painter->setStyle(m_propList, m_propListVec);
+    painter->setStyle(m_propList);
 }
 
 
@@ -376,9 +375,9 @@ void libvisio::VSDOutputElementList::draw(librevenge::RVNGDrawingInterface *pain
     (*iter)->draw(painter);
 }
 
-void libvisio::VSDOutputElementList::addStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec)
+void libvisio::VSDOutputElementList::addStyle(const librevenge::RVNGPropertyList &propList)
 {
-  m_elements.push_back(new VSDStyleOutputElement(propList, propListVec));
+  m_elements.push_back(new VSDStyleOutputElement(propList));
 }
 
 void libvisio::VSDOutputElementList::addPath(const librevenge::RVNGPropertyList &propList)
diff --git a/src/lib/VSDOutputElementList.h b/src/lib/VSDOutputElementList.h
index 37e3cdb..d197f1e 100644
--- a/src/lib/VSDOutputElementList.h
+++ b/src/lib/VSDOutputElementList.h
@@ -50,7 +50,7 @@ public:
   virtual ~VSDOutputElementList();
   void append(const VSDOutputElementList &elementList);
   void draw(librevenge::RVNGDrawingInterface *painter) const;
-  void addStyle(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+  void addStyle(const librevenge::RVNGPropertyList &propList);
   void addPath(const librevenge::RVNGPropertyList &propList);
   void addGraphicObject(const librevenge::RVNGPropertyList &propList);
   void addStartTextObject(const librevenge::RVNGPropertyList &propList);