[Libreoffice-commits] .: 3 commits - writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/OdtGenerator.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a8afa224362619387cc87928d8a0392396eb8bb2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 26 09:39:32 2012 +0100

    Revert "TEMP"
    
    Sorry, for this one, pushed by mistake :(
    
    This reverts commit 31c02baa10f7da947aa073f8af3f8e370acabd90.

diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 6e5ae54..7691c4b 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-#include <stdio.h>
+
 
 #include "xmlstyli.hxx"
 #include <xmloff/nmspmap.hxx>
@@ -173,13 +173,9 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
                 table::BorderLine2 aBorderLineWidth;
                 pBorderWidths[i]->maValue >>= aBorderLineWidth;
                 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
-				printf("OuterLineWidth %f\n", aBorderLineWidth.OuterLineWidth);
                 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
-				printf("InnerLineWidth %f\n", aBorderLineWidth.InnerLineWidth);
                 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-				printf("LineDistance %f\n", aBorderLineWidth.LineDistance);
                 aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
-				printf("LineWidth %f\n", aBorderLineWidth.LineWidth);
                 pBorders[i]->maValue <<= aBorderLine;
             }
         }
commit 79299dcae534943f6107afc99542ddf028d20117
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 26 08:57:13 2012 +0100

    Fix crashes due to inexisting attribute

diff --git a/writerperfect/source/filter/OdtGenerator.cxx b/writerperfect/source/filter/OdtGenerator.cxx
index 94e46c9..ecb29bb 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -1264,7 +1264,7 @@ void OdtGenerator::insertBinaryObject(const WPXPropertyList &propList, const WPX
     else
         // assuming we have a binary image or a object_ole that we can just insert as it is
     {
-        if (propList["libwpg:mime-type"]->getStr() == "object/ole")
+        if (propList["libwpd:mimetype"]->getStr() == "object/ole")
             mpImpl->mpCurrentContentElements->push_back(new TagOpenElement("draw:object-ole"));
         else
             mpImpl->mpCurrentContentElements->push_back(new TagOpenElement("draw:image"));
@@ -1277,7 +1277,7 @@ void OdtGenerator::insertBinaryObject(const WPXPropertyList &propList, const WPX
 
         mpImpl->mpCurrentContentElements->push_back(new TagCloseElement("office:binary-data"));
 
-        if (propList["libwpg:mime-type"]->getStr() == "object/ole")
+        if (propList["libwpd:mimetype"]->getStr() == "object/ole")
             mpImpl->mpCurrentContentElements->push_back(new TagCloseElement("draw:object-ole"));
         else
             mpImpl->mpCurrentContentElements->push_back(new TagCloseElement("draw:image"));
commit 31c02baa10f7da947aa073f8af3f8e370acabd90
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jan 25 11:02:31 2012 +0100

    TEMP

diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 7691c4b..6e5ae54 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -26,7 +26,7 @@
  *
  ************************************************************************/
 
-
+#include <stdio.h>
 
 #include "xmlstyli.hxx"
 #include <xmloff/nmspmap.hxx>
@@ -173,9 +173,13 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
                 table::BorderLine2 aBorderLineWidth;
                 pBorderWidths[i]->maValue >>= aBorderLineWidth;
                 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
+				printf("OuterLineWidth %f\n", aBorderLineWidth.OuterLineWidth);
                 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
+				printf("InnerLineWidth %f\n", aBorderLineWidth.InnerLineWidth);
                 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
+				printf("LineDistance %f\n", aBorderLineWidth.LineDistance);
                 aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
+				printf("LineWidth %f\n", aBorderLineWidth.LineWidth);
                 pBorders[i]->maValue <<= aBorderLine;
             }
         }