diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 14:21:56 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 14:21:56 +0000 |
| commit | 2cb2e4f7caf600d2a68ce387f99fe021dd1d19ba (patch) | |
| tree | 9795cab0ca227b8120b3a170aaf0e14b7256097a /xmloff | |
| parent | 355c0f5d58162588403e55550cf301fdc08a6ee1 (diff) | |
INTEGRATION: CWS impress131_SRC680 (1.121.58); FILE MERGED
2007/09/20 11:34:13 sj 1.121.58.1: #i81609# fixed fontwork display
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 8200cc8c3a06..76d7a364ee4c 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ximpshap.cxx,v $ * - * $Revision: 1.121 $ + * $Revision: 1.122 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:33:18 $ + * last change: $Author: hr $ $Date: 2007-11-01 15:21:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -224,6 +224,10 @@ #include <tools/string.hxx> #endif +#ifndef _COM_SUN_STAR_DRAWING_XENHANCEDCUSTOMSHAPEDEFAULTER_HPP_ +#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> +#endif + // --> OD 2006-02-22 #b6382898# #ifndef _COM_SUN_STAR_TEXT_XTEXTDOCUMENT_HPP_ #include <com/sun/star/text/XTextDocument.hpp> @@ -3542,6 +3546,20 @@ void SdXMLCustomShapeContext::EndElement() { DBG_ERROR( "could not set enhanced customshape geometry" ); } + + sal_Int32 nUPD( 0 ); + sal_Int32 nBuild( 0 ); + GetImport().getBuildIds( nUPD, nBuild ); + if ( nUPD < 680 || + ( nUPD == 680 && nBuild <= 9221 ) ) + { + Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( mxShape, UNO_QUERY ); + if( xDefaulter.is() ) + { + rtl::OUString aEmptyType; + xDefaulter->createCustomShapeDefaults( aEmptyType ); + } + } } SdXMLShapeContext::EndElement(); |