BIPU support of bullets

Change-Id: If859332ac564522fdad06c081b644fba0759880b

1 files changed, 24 insertions, 13 deletions

diff --git a/src/lib/VSDParagraphList.cpp b/src/lib/VSDParagraphList.cpp
index 9a58695..27c66f0 100644
--- a/src/lib/VSDParagraphList.cpp
+++ b/src/lib/VSDParagraphList.cpp
@@ -30,10 +30,14 @@ class VSDParaIX : public VSDParagraphListElement
 {
 public:
   VSDParaIX(unsigned id, unsigned level, unsigned charCount, const boost::optional<double> &indFirst,
-            const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine,
-            const boost::optional<double> &spBefore, const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align,
-            const boost::optional<unsigned> &flags) : VSDParagraphListElement(id, level),
-    m_style(charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter, align, flags) {}
+            const boost::optional<double> &indLeft, const boost::optional<double> &indRight,
+            const boost::optional<double> &spLine, const boost::optional<double> &spBefore,
+            const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align,
+            const boost::optional<unsigned char> &bullet, const boost::optional<VSDName> &bulletStr,
+            const boost::optional<double> &textPosAfterBullet, const boost::optional<unsigned> &flags) :
+    VSDParagraphListElement(id, level),
+    m_style(charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter,
+            align, bullet, bulletStr, textPosAfterBullet, flags) {}
   ~VSDParaIX() {}
   void handle(VSDCollector *collector) const;
   VSDParagraphListElement *clone();
@@ -54,13 +58,15 @@ public:
 void libvisio::VSDParaIX::handle(VSDCollector *collector) const
 {
   collector->collectParaIX(m_id, m_level, m_style.charCount, m_style.indFirst, m_style.indLeft, m_style.indRight,
-                           m_style.spLine, m_style.spBefore, m_style.spAfter, m_style.align, m_style.flags);
+                           m_style.spLine, m_style.spBefore, m_style.spAfter, m_style.align, m_style.bullet,
+                           m_style.bulletStr, m_style.textPosAfterBullet, m_style.flags);
 }
 
 libvisio::VSDParagraphListElement *libvisio::VSDParaIX::clone()
 {
   return new VSDParaIX(m_id, m_level, m_style.charCount, m_style.indFirst, m_style.indLeft, m_style.indRight,
-                       m_style.spLine, m_style.spBefore, m_style.spAfter, m_style.align, m_style.flags);
+                       m_style.spLine, m_style.spBefore, m_style.spAfter, m_style.align, m_style.bullet,
+                       m_style.bulletStr, m_style.textPosAfterBullet, m_style.flags);
 }
 
 
@@ -95,9 +101,11 @@ libvisio::VSDParagraphList::~VSDParagraphList()
 }
 
 void libvisio::VSDParagraphList::addParaIX(unsigned id, unsigned level, unsigned charCount, const boost::optional<double> &indFirst,
-                                           const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine,
-                                           const boost::optional<double> &spBefore, const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align,
-                                           const boost::optional<unsigned> &flags)
+                                           const boost::optional<double> &indLeft, const boost::optional<double> &indRight,
+                                           const boost::optional<double> &spLine, const boost::optional<double> &spBefore,
+                                           const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align,
+                                           const boost::optional<unsigned char> &bullet, const boost::optional<VSDName> &bulletStr,
+                                           const boost::optional<double> &textPosAfterBullet, const boost::optional<unsigned> &flags)
 {
   VSDParaIX *tmpElement = dynamic_cast<VSDParaIX *>(m_elements[id]);
   if (!tmpElement)
@@ -110,16 +118,19 @@ void libvisio::VSDParagraphList::addParaIX(unsigned id, unsigned level, unsigned
       m_elements.erase(iter);
     }
 
-    m_elements[id] = new VSDParaIX(id, level, charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter, align, flags);
+    m_elements[id] = new VSDParaIX(id, level, charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter,
+                                   align, bullet, bulletStr, textPosAfterBullet, flags);
   }
   else
-    tmpElement->m_style.override(VSDOptionalParaStyle(charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter, align, flags));
+    tmpElement->m_style.override(VSDOptionalParaStyle(charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter,
+                                                      align, bullet, bulletStr, textPosAfterBullet, flags));
 }
 
 void libvisio::VSDParagraphList::addParaIX(unsigned id, unsigned level, const VSDOptionalParaStyle &style)
 {
-  addParaIX(id, level, style.charCount, style.indFirst, style.indLeft, style.indRight, style.spLine,
-            style.spBefore, style.spAfter, style.align, style.flags);
+  addParaIX(id, level, style.charCount, style.indFirst, style.indLeft, style.indRight,
+            style.spLine, style.spBefore, style.spAfter, style.align,
+            style.bullet, style.bulletStr, style.textPosAfterBullet, style.flags);
 }
 
 unsigned libvisio::VSDParagraphList::getCharCount(unsigned id) const