[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfsdrimport.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 590217ef2848bedeb1ff770adb7dca11a81d8ab2
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Sep 19 21:26:40 2012 +0200

    bnc#823655 writerfilter: try to make clang tinderbox happy
    
    (cherry picked from commit 591e23d03c27e2658889d913626fdcb2837d9064)
    
    Change-Id: If24e8e3e48f8d043fdb48a0637e874743f9247f0

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index ebcd21f..eb9912c 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
+#include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 
 #include <ooxml/resourceids.hxx> // NS_ooxml namespace
@@ -327,7 +328,7 @@ void RTFSdrImport::resolve(RTFShape& rShape)
         if (rShape.nVertOrientRelation != 0)
             xPropertySet->setPropertyValue("VertOrientRelation", uno::makeAny(rShape.nVertOrientRelation));
         if (rShape.nWrap != -1)
-            xPropertySet->setPropertyValue("Surround", uno::makeAny(rShape.nWrap));
+            xPropertySet->setPropertyValue("Surround", uno::makeAny(text::WrapTextMode(rShape.nWrap)));
     }
 
     // Send it to dmapper