diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 12:24:31 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 12:24:31 +0000 |
| commit | ef934836242c2accecc02b22b29364dd98330749 (patch) | |
| tree | 1b1cf5df11284ce00f0c61184715cbb3deeced4e /xmloff/source/draw/ximpshap.cxx | |
| parent | c8589e11ee9664e5de04438726dfa0e3440f210b (diff) | |
INTEGRATION: CWS impress144 (1.126.46); FILE MERGED
2008/06/09 13:34:37 cl 1.126.46.1: #i86057# fixed udp usage
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 6fcc627cad37..8c644a0de44d 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ximpshap.cxx,v $ - * $Revision: 1.126 $ + * $Revision: 1.127 $ * * This file is part of OpenOffice.org. * @@ -3412,8 +3412,7 @@ void SdXMLCustomShapeContext::EndElement() sal_Int32 nUPD( 0 ); sal_Int32 nBuild( 0 ); GetImport().getBuildIds( nUPD, nBuild ); - if ( nUPD < 680 || - ( nUPD == 680 && nBuild <= 9221 ) ) + if( ((nUPD >= 640 && nUPD <= 645) || (nUPD == 680)) && (nBuild <= 9221) ) { Reference< drawing::XEnhancedCustomShapeDefaulter > xDefaulter( mxShape, UNO_QUERY ); if( xDefaulter.is() ) |