[Libreoffice-commits] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdgGenerator.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4d564758097fee84cb531b6f6b754c5724b24587
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 6 18:29:38 2011 +0200

    Some more ODG style mappings that LO understands and displays properly

diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index 2c7f7ee..5edb71a 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1056,7 +1056,9 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
 
     TagOpenElement *pStyleGraphicsPropertiesElement = new TagOpenElement("style:graphic-properties");
 
-    if((mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "none") || (mxStyle["svg:stroke-width"] && mxStyle["svg:stroke-width"]->getDouble() == 0.0))
+    if((mxStyle["draw:stroke"] && mxStyle["draw:stroke"]->getStr() == "none") ||
+       (mxStyle["svg:stroke-width"] && mxStyle["svg:stroke-width"]->getDouble() == 0.0) ||
+       (mxStyle["svg:stroke-color"] && mxStyle["svg:stroke-color"]->getStr() == "none"))
         pStyleGraphicsPropertiesElement->addAttribute("draw:stroke", "none");
     else
     {
@@ -1065,6 +1067,7 @@ void OdgGeneratorPrivate::_writeGraphicsStyle()
 
         if (mxStyle["svg:stroke-color"])
             pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-color", mxStyle["svg:stroke-color"]->getStr());
+
         if (mxStyle["svg:stroke-opacity"] && mxStyle["svg:stroke-opacity"]->getDouble() != 1.0)
             pStyleGraphicsPropertiesElement->addAttribute("svg:stroke-opacity", mxStyle["svg:stroke-opacity"]->getStr());