From 96e3776c1ad226e5f7e8765ae6d9e4b3205429fa Mon Sep 17 00:00:00 2001
From: sj <sj@openoffice.org>
Date: Fri, 15 Oct 2010 08:12:17 +0200
Subject: impress212: #i114750# fixed odf import problem, (using correct word
 wrap default for shapes)

---
 xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'xmloff')

diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
index 4b8bcf429057..e30b44345d59 100644
--- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
+++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx
@@ -104,6 +104,16 @@ void XMLGraphicsDefaultStyle::SetDefaults()
     Reference< XPropertySet > xDefaults( xFact->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults") ) ), UNO_QUERY );
     if( !xDefaults.is() )
         return;
+                                            // SJ: #i114750#
+    sal_Bool bWordWrapDefault = sal_True;   // initializing with correct odf fo:wrap-option default
+    sal_Int32 nUPD( 0 );
+    sal_Int32 nBuild( 0 );
+    const bool bBuildIdFound = GetImport().getBuildIds( nUPD, nBuild );
+    if ( bBuildIdFound && (
+        ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD == 310 )  || ( nUPD == 320 ) || ( nUPD == 330 )
+        || ( ( nUPD == 300 ) && ( nBuild <= 9535 ) ) ) )
+        bWordWrapDefault = sal_False;
+    xDefaults->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextWordWrap" ) ), Any( bWordWrapDefault ) );
 
     FillPropertySet( xDefaults );
 }
-- 
cgit