[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerperfect/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Thu Jan 26 02:27:51 PST 2012


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

New commits:
commit a169b1d67447183b83fd5e8f165c99493c114125
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jan 26 08:57:13 2012 +0100

    Fix crashes due to inexisting attribute
    (cherry picked from commit 79299dcae534943f6107afc99542ddf028d20117)
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

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"));


More information about the Libreoffice-commits mailing list