diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 11:30:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 11:30:37 +0000 |
| commit | f2ee603ba6e6d1852986f44cece469556945d65b (patch) | |
| tree | d28f1ae4334bcbff7ea93c480a05169c80066bed /sot/source/base/exchange.cxx | |
| parent | 9347a2f7493cdec47a1c4d192d436207deb29287 (diff) | |
INTEGRATION: CWS ooo20031216 (1.27.44); FILE MERGED
2003/12/24 11:45:55 waratah 1.27.44.1: #i1858# remove trailing text after #else
Diffstat (limited to 'sot/source/base/exchange.cxx')
| -rw-r--r-- | sot/source/base/exchange.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index c3b7f8a97669..6fd798f9f7be 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -2,9 +2,9 @@ * * $RCSfile: exchange.cxx,v $ * - * $Revision: 1.27 $ + * $Revision: 1.28 $ * - * last change: $Author: vg $ $Date: 2003-05-26 08:35:33 $ + * last change: $Author: hr $ $Date: 2004-02-04 12:30:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -192,7 +192,7 @@ static const DataFlavorRepresentation aFormatArray_Impl[] = /* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/ { "application/x-openoffice-embed-source;windows_formatname=\"Star EMBS\"", "Star EMBS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 86 SOT_FORMATSTR_ID_LINK_SOURCE*/ { "application/x-openoffice-link-source;windows_formatname=\"Star LNKS\"", "Star LNKS", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 87 SOT_FORMATSTR_ID_EMBEDDED_OBJ*/ { "application/x-openoffice-embedded-obj;windows_formatname=\"Star EMBO\"", "Star EMBO", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, -#else ;; +#else /* 83 SOT_FORMATSTR_ID_OBJECTDESCRIPTOR*/ { "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\"", "Star Object Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 84 SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR*/ { "application/x-openoffice-linksrcdescriptor-xml;windows_formatname=\"Star Link Source Descriptor (XML)\"", "Star Link Source Descriptor (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, /* 85 SOT_FORMATSTR_ID_EMBED_SOURCE*/ { "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\"", "Star Embed Source (XML)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, |