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

[Fridrich Štrba]

 src/lib/CDRContentCollector.cpp |    4 +++-
 src/lib/CMXParser.cpp           |   12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 8a131e5f479607274ec635b9a5b956cf9bee15a5
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date:   Thu Jul 14 08:49:21 2016 +0200

    Best solution before we implement Stlt for graphics
    
    Change-Id: I8ac1a2da7fba7894733e0c264017628e653fcd16

diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 80d52a0..4b24cdf 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -996,7 +996,9 @@ void libcdr::CDRContentCollector::_lineProperties(librevenge::RVNGPropertyList &
 {
   if (m_currentLineStyle.lineType == (unsigned short)-1)
   {
-    propList.insert("draw:stroke", "none");
+    propList.insert("draw:stroke", "solid");
+    propList.insert("svg:stroke-width", 0.0);
+    propList.insert("svg:stroke-color", "#000000");
   }
   else
   {
diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
index bf3f818..324ca0c 100644
--- a/src/lib/CMXParser.cpp
+++ b/src/lib/CMXParser.cpp
@@ -1411,9 +1411,9 @@ bool libcdr::CMXParser::readRenderingAttributes(librevenge::RVNGInputStream *inp
         return false;
     }
   }
+  CDRLineStyle lineStyle;
   if (bitMask & 0x02) // outline
   {
-    CDRLineStyle lineStyle;
     if (m_precision == libcdr::PRECISION_32BIT)
     {
       do
@@ -1444,11 +1444,13 @@ bool libcdr::CMXParser::readRenderingAttributes(librevenge::RVNGInputStream *inp
       CDR_DEBUG_MSG(("  Outline specification\n"));
       lineStyle = getLineStyle(readU16(input, m_bigEndian));
     }
-    m_collector->collectLineStyle(lineStyle.lineType, lineStyle.capsType, lineStyle.joinType,
-                                  lineStyle.lineWidth, lineStyle.stretch, lineStyle.angle,
-                                  lineStyle.color, lineStyle.dashArray,
-                                  lineStyle.startMarker, lineStyle.endMarker);
   }
+  else
+    lineStyle.lineType = 1;
+  m_collector->collectLineStyle(lineStyle.lineType, lineStyle.capsType, lineStyle.joinType,
+                                lineStyle.lineWidth, lineStyle.stretch, lineStyle.angle,
+                                lineStyle.color, lineStyle.dashArray,
+                                lineStyle.startMarker, lineStyle.endMarker);
   if (bitMask & 0x04) // lens
   {
     if (m_precision == libcdr::PRECISION_32BIT)