diff options
| author | sj <sj@openoffice.org> | 2010-10-15 08:12:17 +0200 |
|---|---|---|
| committer | sj <sj@openoffice.org> | 2010-10-15 08:12:17 +0200 |
| commit | 96e3776c1ad226e5f7e8765ae6d9e4b3205429fa (patch) | |
| tree | ca545af31e03891d6b27ea60cc517519d7e544c3 /xmloff | |
| parent | bd1092ebc0b329883d1c079d598a73f3af4cd548 (diff) | |
impress212: #i114750# fixed odf import problem, (using correct word wrap default for shapes)
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
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 ); } |