diff options
| author | Armin Le Grand <alg@apache.org> | 2013-07-27 11:40:32 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-07-27 11:40:32 +0000 |
| commit | 8a6f84ce896f41a7a1f97b06d1e053c51cbba95e (patch) | |
| tree | 0865afbfa9eb147e0a5be9759f932954cfb59e32 /sot/source | |
| parent | 59ee09f905e86724a2ba5cdccab9210d16686820 (diff) | |
resync to trunk (close to AOO400)
Diffstat (limited to 'sot/source')
| -rw-r--r-- | sot/source/base/exchange.cxx | 1 | ||||
| -rw-r--r-- | sot/source/base/formats.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 61e7ce04b5f0..6636b28f40de 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -207,6 +207,7 @@ namespace /*138 SOT_FORMATSTR_ID_STARMATH_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII, "Math 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*139 SOT_FORMATSTR_ID_STARBASE_8*/ { MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, "StarBase 8", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*140 SOT_FORMAT_GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, + /*141 SOT_FORMATSTR_ID_PNG*/ { "image/png", "Windows Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, }; return &aInstance[0]; } diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 32d4faa24c63..231d61653397 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -1590,7 +1590,7 @@ sal_uInt16 SotExchange::GetExchangeAction( aVector.push_back( aFlavorEx ); - if( ( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) && + if( (( SOT_FORMATSTR_ID_BMP == aFlavorEx.mnSotId ) || (SOT_FORMATSTR_ID_PNG == aFlavorEx.mnSotId)) && !IsFormatSupported( aVector, SOT_FORMAT_BITMAP ) ) { if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavorEx ) ) |