diff options
| author | Kai Ahrens <ka@openoffice.org> | 2002-07-20 07:25:59 +0000 |
|---|---|---|
| committer | Kai Ahrens <ka@openoffice.org> | 2002-07-20 07:25:59 +0000 |
| commit | 8e38203e439264e899910b45cf4502d4094851b1 (patch) | |
| tree | a7fa628264bf41862492993cd00c6aaf4147f0a6 /sot | |
| parent | 5430eb1be43e7fb7f47016f16acfe432443ef249 (diff) | |
#101579#: added EMF format
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/base/exchange.cxx | 6 | ||||
| -rw-r--r-- | sot/source/base/formats.cxx | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 848643f2b8e7..fd1bbbcf611e 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -2,9 +2,9 @@ * * $RCSfile: exchange.cxx,v $ * - * $Revision: 1.22 $ + * $Revision: 1.23 $ * - * last change: $Author: ka $ $Date: 2001-09-27 08:14:40 $ + * last change: $Author: ka $ $Date: 2002-07-20 08:25:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -231,7 +231,7 @@ static const DataFlavorRepresentation aFormatArray_Impl[] = /*117 SOT_FORMATSTR_ID_DBACCESS_TABLE*/ { "application/x-openoffice;windows_formatname=\"Data source Table\"", "Data source Table", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*118 SOT_FORMATSTR_ID_DBACCESS_COMMAND*/ { "application/x-openoffice;windows_formatname=\"SQL query\"", "SQL query", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /*119 SOT_FORMATSTR_ID_DIALOG_60*/ { "application/vnd.sun.xml.dialog", "Dialog 6.0", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -/*120 SOT_FORMATSTR_ID_DUMMY7*/ { "application/x-openoffice;windows_formatname=\"SO_DUMMYFORMAT_7\"", "SO_DUMMYFORMAT_7", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) } +/*120 SOT_FORMATSTR_ID_EMF*/ { "application/x-openoffice;windows_formatname=\"Image EMF\"", "Windows Enhanced MetaFile", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, }; //----------------------------------------------------------------------- diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx index 9aa453201bd0..56ae30162d3c 100644 --- a/sot/source/base/formats.cxx +++ b/sot/source/base/formats.cxx @@ -2,9 +2,9 @@ * * $RCSfile: formats.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: dvo $ $Date: 2002-05-27 13:51:57 $ + * last change: $Author: ka $ $Date: 2002-07-20 08:25:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1589,7 +1589,8 @@ USHORT SotExchange::GetExchangeAction( aVector.push_back( aFlavorEx ); - if( ( SOT_FORMATSTR_ID_WMF == aFlavorEx.mnSotId ) && + if( ( ( SOT_FORMATSTR_ID_WMF == aFlavorEx.mnSotId ) || + ( SOT_FORMATSTR_ID_EMF == aFlavorEx.mnSotId ) ) && !IsFormatSupported( aVector, SOT_FORMAT_GDIMETAFILE ) ) { if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_GDIMETAFILE, aFlavorEx ) ) |