diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-08 15:31:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-11 09:38:21 +0000 |
| commit | ed00d0ddd663085a5fd180301cdc82af80bc8077 (patch) | |
| tree | e9949eddf99b907a06ab99f248e81831a1505699 /sot | |
| parent | 4b758c52955e1931850938bf70764ee6376616a0 (diff) | |
create a master document template type
of application/vnd.oasis.opendocument.text-master-template with
suffic otm
https://lists.oasis-open.org/archives/office-comment/201002/msg00042.html
desktop/icons/oasis-master-document-template.icns is just a copy
of
desktop/icons/oasis-master-document.icns
because I can't draw
Change-Id: I0d18c79c4c893e97505052884ee8be97d0f117a1
Reviewed-on: https://gerrit.libreoffice.org/11350
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/base/exchange.cxx | 5 | ||||
| -rw-r--r-- | sot/source/sdstor/storage.cxx | 1 | ||||
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 084b1b57c1e9..ff79cb642b4a 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -50,8 +50,6 @@ struct DataFlavorRepresentation const ::com::sun::star::uno::Type* pType; }; - - namespace { struct ImplFormatArray_Impl @@ -202,6 +200,7 @@ namespace /*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", "PNG Bitmap", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, + /*142 SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) }, }; return &aInstance[0]; } @@ -212,8 +211,6 @@ namespace const DataFlavorRepresentation, ImplFormatArray_Impl > {}; } - - static tDataFlavorList& InitFormats_Impl() { SotData_Impl * pSotData = SOTDATA(); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 87fe013bfbe7..9cc42045f21f 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -975,6 +975,7 @@ sal_Int32 SotStorage::GetVersion( const com::sun::star::uno::Reference < com::su case SOT_FORMATSTR_ID_STARWRITER_8_TEMPLATE: case SOT_FORMATSTR_ID_STARWRITERWEB_8: case SOT_FORMATSTR_ID_STARWRITERGLOB_8: + case SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE: case SOT_FORMATSTR_ID_STARDRAW_8: case SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE: case SOT_FORMATSTR_ID_STARIMPRESS_8: diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 879d372ac169..e95a9b4fe007 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -355,6 +355,7 @@ SvGlobalName GetClassId_Impl( sal_Int32 nFormat ) case SOT_FORMATSTR_ID_STARWRITERWEB_8 : return SvGlobalName( SO3_SWWEB_CLASSID_60 ); case SOT_FORMATSTR_ID_STARWRITERGLOB_8 : + case SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE : return SvGlobalName( SO3_SWGLOB_CLASSID_60 ); case SOT_FORMATSTR_ID_STARDRAW_8 : case SOT_FORMATSTR_ID_STARDRAW_8_TEMPLATE : |