diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-04-26 13:10:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-04-26 13:10:26 +0000 |
| commit | 53af91e3717351395fb6b1e63e17b80bb82ebea6 (patch) | |
| tree | acf323258ee893117d58a15a58f7efdd554c9d6c /xmloff/source/draw/shapeexport2.cxx | |
| parent | 7650afa721a498138313eb2cddc38c271f562b48 (diff) | |
INTEGRATION: CWS fwk37 (1.49.74); FILE MERGED
2006/03/22 09:35:15 mav 1.49.74.1: #i58560# let the MSOLE object contain the replacement image in non-Oasis formats
Diffstat (limited to 'xmloff/source/draw/shapeexport2.cxx')
| -rw-r--r-- | xmloff/source/draw/shapeexport2.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 4ae8773b97c6..26cd0100bb2e 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shapeexport2.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: rt $ $Date: 2005-10-19 12:22:05 $ + * last change: $Author: kz $ $Date: 2006-04-26 14:10:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1623,7 +1623,13 @@ void XMLShapeExport::ImpExportOLE2Shape( else { // embed as Base64 - rExport.AddEmbeddedObjectAsBase64( sURL ); + // this is an alien object ( currently MSOLE is the only supported type of such objects ) + // in case it is not an OASIS format the object should be asked to store replacement image if possible + + ::rtl::OUString sURLRequest( sURL ); + if ( ( rExport.getExportFlags() & EXPORT_OASIS ) == 0 ) + sURLRequest += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "?oasis=false" ) ); + rExport.AddEmbeddedObjectAsBase64( sURLRequest ); } } } |