diff options
34 files changed, 171 insertions, 13 deletions
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index 6f72dc749c71..5ac0a2645dad 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -357,6 +357,7 @@ mimetypes = { 'application/vnd.oasis.opendocument.text-flat-xml': 'fodt', 'application/vnd.oasis.opendocument.text-master': 'odm', 'application/vnd.oasis.opendocument.text-template': 'ott', + 'application/vnd.oasis.opendocument.text-master-template': 'otm', 'application/vnd.oasis.opendocument.text-web': 'oth', # OOo XML 'application/vnd.sun.xml.base': 'odb', diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 51ee8c51762b..67d14c1be631 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -263,6 +263,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat( aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) || aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) || aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) || + aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII ) || aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) || aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII) || aMediaType.equalsIgnoreAsciiCase(MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) || diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index 850ebab0d4f9..d460bc6aa984 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -138,6 +138,7 @@ const char* aMimeType[] = { MIMETYPE_VND_SUN_XML_MATH_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII, + MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII, MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII, diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 0465f1738183..36d758454534 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -488,6 +488,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_global_types.xcu,filter writer_globaldocument_StarOffice_XML_Writer_GlobalDocument \ pdf_Portable_Document_Format \ writerglobal8 \ + writerglobal8_template \ ) $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_global_filters.xcu,filter/source/config/fragments/filters,\ @@ -496,6 +497,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_global_filters.xcu,fi writer_globaldocument_StarOffice_XML_Writer_GlobalDocument \ writer_globaldocument_pdf_Export \ writerglobal8 \ + writerglobal8_template \ writerglobal8_writer \ writerglobal8_HTML \ ) @@ -505,6 +507,7 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr writer_globaldocument_StarOffice_XML_Writer_ui \ writer_globaldocument_StarOffice_XML_Writer_GlobalDocument_ui \ writerglobal8_ui \ + writerglobal8_template_ui \ writerglobal8_writer_ui \ ) diff --git a/filter/source/config/fragments/filters/writerglobal8_template.xcu b/filter/source/config/fragments/filters/writerglobal8_template.xcu new file mode 100644 index 000000000000..9cb8a8dcbae0 --- /dev/null +++ b/filter/source/config/fragments/filters/writerglobal8_template.xcu @@ -0,0 +1,17 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. +--> + <node oor:name="writerglobal8_template" oor:op="replace"> + <prop oor:name="Flags"><value>IMPORT EXPORT TEMPLATE TEMPLATEPATH OWN ENCRYPTION PASSWORDTOMODIFY</value></prop> + <prop oor:name="UIComponent"/> + <prop oor:name="FilterService"/> + <prop oor:name="UserData"><value>CXMLV</value></prop> + <prop oor:name="FileFormatVersion"><value>6800</value></prop> + <prop oor:name="Type"><value>writerglobal8_template</value></prop> + <prop oor:name="TemplateName"/> + <prop oor:name="DocumentService"><value>com.sun.star.text.GlobalDocument</value></prop> + </node> diff --git a/filter/source/config/fragments/filters/writerglobal8_template_ui.xcu b/filter/source/config/fragments/filters/writerglobal8_template_ui.xcu new file mode 100644 index 000000000000..305ae8d860f0 --- /dev/null +++ b/filter/source/config/fragments/filters/writerglobal8_template_ui.xcu @@ -0,0 +1,12 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. +--> +<node oor:name="writerglobal8_template"> + <prop oor:name="UIName"> + <value xml:lang="en-US">ODF Master Document Template</value> + </prop> +</node> diff --git a/filter/source/config/fragments/types/writerglobal8_template.xcu b/filter/source/config/fragments/types/writerglobal8_template.xcu new file mode 100644 index 000000000000..10c866b5f56f --- /dev/null +++ b/filter/source/config/fragments/types/writerglobal8_template.xcu @@ -0,0 +1,19 @@ +<!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. +--> + <node oor:name="writerglobal8_template" oor:op="replace" > + <prop oor:name="DetectService"><value>com.sun.star.comp.filters.StorageFilterDetect</value></prop> + <prop oor:name="URLPattern"><value>private:factory/swriter/GlobalDocument*</value></prop> + <prop oor:name="Extensions"><value>otm</value></prop> + <prop oor:name="MediaType"><value>application/vnd.oasis.opendocument.text-master-template</value></prop> + <prop oor:name="Preferred"><value>true</value></prop> + <prop oor:name="PreferredFilter"><value>writerglobal8_template</value></prop> + <prop oor:name="UIName"> + <value xml:lang="en-US">Writer 8 Master Document Template</value> + </prop> + <prop oor:name="ClipboardFormat"><value>Writer/Global 8 Template</value></prop> + </node> diff --git a/filter/source/storagefilterdetect/filterdetect.cxx b/filter/source/storagefilterdetect/filterdetect.cxx index 591726119bb0..fa10c3c4e77a 100644 --- a/filter/source/storagefilterdetect/filterdetect.cxx +++ b/filter/source/storagefilterdetect/filterdetect.cxx @@ -45,6 +45,7 @@ OUString getInternalFromMediaType(const OUString& aMediaType) else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) return OUString("writer8_template"); else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) return OUString("writerweb8_writer_template"); else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) return OUString("writerglobal8"); + else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII ) return OUString("writerglobal8_template"); else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) return OUString("draw8"); else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) return OUString("draw8_template"); else if ( aMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ) return OUString("impress8"); diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx index 47d31a53609b..940740f71e5d 100644 --- a/include/comphelper/documentconstants.hxx +++ b/include/comphelper/documentconstants.hxx @@ -75,6 +75,7 @@ // template formats of SO8 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII "application/vnd.oasis.opendocument.text-template" +#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII "application/vnd.oasis.opendocument.text-master-template" #define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII "application/vnd.oasis.opendocument.graphics-template" #define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII "application/vnd.oasis.opendocument.presentation-template" #define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII "application/vnd.oasis.opendocument.spreadsheet-template" @@ -82,6 +83,7 @@ #define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII "application/vnd.oasis.opendocument.formula-template" #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) +#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII ) #define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) #define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ) #define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx index dc4feaaee52c..4cfb94bb66e1 100644 --- a/include/sot/formats.hxx +++ b/include/sot/formats.hxx @@ -176,7 +176,8 @@ #define SOT_FORMATSTR_ID_STARBASE_8 ((sal_uLong)139) #define SOT_FORMATSTR_ID_HC_GDIMETAFILE ((sal_uLong)140) #define SOT_FORMATSTR_ID_PNG ((sal_uLong)141) -#define SOT_FORMATSTR_ID_USER_END SOT_FORMATSTR_ID_PNG +#define SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE ((sal_uLong)142) +#define SOT_FORMATSTR_ID_USER_END SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE #endif // INCLUDED_SOT_FORMATS_HXX diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index ca65cc72c602..51ff7c01be99 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -233,7 +233,9 @@ <prop oor:name="ooSetupFactoryActualFilter" oor:finalized="true"> <value>writerglobal8</value> </prop> - <prop oor:name="ooSetupFactoryActualTemplateFilter" oor:finalized="true"/> + <prop oor:name="ooSetupFactoryActualTemplateFilter" oor:finalized="true"> + <value>writerglobal8_template</value> + </prop> <prop oor:name="ooSetupFactoryDefaultFilter"> <value>writerglobal8</value> </prop> diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index 82ce37fd322e..1ced0a6effed 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -147,6 +147,7 @@ ManifestExport::ManifestExport( uno::Reference< xml::sax::XDocumentHandler > xHa || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII + || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII || aDocMediaType == MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index ea38cfa3ed8f..80cbbdd9a4d4 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -1063,6 +1063,14 @@ RegistryItem gid_Regitem_Ott_Contenttype Value = "application/vnd.oasis.opendocument.text-template"; End +RegistryItem gid_Regitem_Otm_Contenttype + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + ModuleID = gid_Module_Prg_Wrt_Bin; + Subkey = ".otm"; + Name = "Content Type"; + Value = "application/vnd.oasis.opendocument.text-master-template"; +End + RegistryItem gid_Regitem_Soffice_Starwritertemplate_1 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "LibreOffice.WriterTemplate.1"; diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index af1469cb012c..f88cfbbbb96f 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -71,7 +71,7 @@ bool RecentDocsView::typeMatchesExtension(ApplicationType type, const OUString & bool bRet = false; if (rExt == "odt" || rExt == "doc" || rExt == "docx" || - rExt == "rtf" || rExt == "txt") + rExt == "rtf" || rExt == "txt" || rExt == "odm" || rExt == "otm") { bRet = type & TYPE_WRITER; } diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx index cbda6e69f991..87be587f1506 100644 --- a/sfx2/source/control/templateabstractview.cxx +++ b/sfx2/source/control/templateabstractview.cxx @@ -40,7 +40,7 @@ bool ViewFilter_Application::isFilteredExtension(FILTER_APPLICATION filter, cons if (filter == FILTER_APP_WRITER) { - bRet = rExt == "ott" || rExt == "stw" || rExt == "oth" || rExt == "dot" || rExt == "dotx"; + bRet = rExt == "ott" || rExt == "stw" || rExt == "oth" || rExt == "dot" || rExt == "dotx" || rExt == "otm"; } else if (filter == FILTER_APP_CALC) { diff --git a/solenv/inc/mime.types b/solenv/inc/mime.types index 7d39a4c10440..e5afd9376a93 100644 --- a/solenv/inc/mime.types +++ b/solenv/inc/mime.types @@ -189,6 +189,7 @@ application/vnd.oasis.opendocument.text odt application/vnd.oasis.opendocument.text-template ott application/vnd.oasis.opendocument.text-web oth application/vnd.oasis.opendocument.text-master odm +application/vnd.oasis.opendocument.text-master-template otm application/vnd.oasis.opendocument.graphics odg application/vnd.oasis.opendocument.graphics-template otg application/vnd.oasis.opendocument.presentation odp 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 : diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 3da955070e6f..9cecce991bd6 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -642,6 +642,7 @@ bool SwDocShell::ConvertTo( SfxMedium& rMedium ) SOT_FORMATSTR_ID_STARWRITERWEB_40 == nSaveClipId ) nSaveType = 1; else if( SOT_FORMATSTR_ID_STARWRITERGLOB_8 == nSaveClipId || + SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE == nSaveClipId || SOT_FORMATSTR_ID_STARWRITERGLOB_60 == nSaveClipId || SOT_FORMATSTR_ID_STARWRITERGLOB_50 == nSaveClipId || SOT_FORMATSTR_ID_STARWRITERGLOB_40 == nSaveClipId ) diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx index 3a6df5093c80..2e1ae47309d4 100644 --- a/sw/source/uibase/globdoc/globdoc.cxx +++ b/sw/source/uibase/globdoc/globdoc.cxx @@ -51,19 +51,18 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName, sal_Int32 nVersion, bool bTemplate /* = false */) const { - (void)bTemplate; - OSL_ENSURE( !bTemplate, "No template for Writer Global" ); - if (nVersion == SOFFICE_FILEFORMAT_60) { *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 ); *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_60; *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE); + OSL_ENSURE( !bTemplate, "No template for Writer Global" ); } else if (nVersion == SOFFICE_FILEFORMAT_8) { *pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 ); *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_8; + *pClipFormat = bTemplate ? SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITERGLOB_8; *pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE); } diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 862e57f51f0a..e4dde6fbaaaf 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -58,6 +58,7 @@ MIMELIST := \ oasis-presentation-flat-xml \ oasis-formula \ oasis-master-document \ + oasis-master-document-template \ oasis-database \ oasis-web-template \ ms-excel-sheet-12 \ @@ -90,6 +91,7 @@ MIMEICONLIST := \ oasis-presentation-template \ oasis-formula \ oasis-master-document \ + oasis-master-document-template \ oasis-database \ oasis-web-template \ text \ diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk index cd8343a6e893..24a699881b68 100644 --- a/sysui/Package_osxicons.mk +++ b/sysui/Package_osxicons.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\ oasis-drawing.icns \ master-document.icns \ oasis-master-document.icns \ + oasis-master-document-template.icns \ formula.icns \ oasis-formula.icns \ text-template.icns \ diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst index 67072de427b9..b9b6f24426f1 100755 --- a/sysui/desktop/debian/postinst +++ b/sysui/desktop/debian/postinst @@ -60,6 +60,7 @@ application/vnd.oasis.opendocument.text-flat-xml fodt application/vnd.oasis.opendocument.text-template ott application/vnd.oasis.opendocument.text-web oth application/vnd.oasis.opendocument.text-master odm +application/vnd.oasis.opendocument.text-master-template otm application/vnd.oasis.opendocument.graphics odg application/vnd.oasis.opendocument.graphics-flat-xml fodg application/vnd.oasis.opendocument.graphics-template otg @@ -123,6 +124,7 @@ application/vnd.oasis.opendocument.text-flat-xml; %PREFIX -view %s application/vnd.oasis.opendocument.text-template; %PREFIX -view %s application/vnd.oasis.opendocument.text-web; %PREFIX -view %s application/vnd.oasis.opendocument.text-master; %PREFIX -view %s +application/vnd.oasis.opendocument.text-master-template; %PREFIX -view %s application/vnd.sun.xml.writer; %PREFIX -view %s application/vnd.sun.xml.writer.template; %PREFIX -view %s application/vnd.sun.xml.writer.global; %PREFIX -view %s diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 09aeaf525162..9c952a50ff01 100755 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -150,6 +150,7 @@ do icon=${link_target_dir}%iconprefix-oasis-drawing-template.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.graphics-template.png icon=${link_target_dir}%iconprefix-oasis-formula.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.formula.png icon=${link_target_dir}%iconprefix-oasis-master-document.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.text-master.png + icon=${link_target_dir}%iconprefix-oasis-master-document-template.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.text-master-template.png icon=${link_target_dir}%iconprefix-oasis-presentation.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.presentation.png icon=${link_target_dir}%iconprefix-oasis-presentation-template.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.presentation-template.png icon=${link_target_dir}%iconprefix-oasis-spreadsheet.png; test -f ${link_dir}/$icon && ln -sf ${icon} ${link_dir}/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png diff --git a/sysui/desktop/icons/oasis-master-document-template.icns b/sysui/desktop/icons/oasis-master-document-template.icns Binary files differnew file mode 100644 index 000000000000..9115dfc4b443 --- /dev/null +++ b/sysui/desktop/icons/oasis-master-document-template.icns diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index f6d1dc83e66d..3dde39444504 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -358,6 +358,30 @@ </dict> </dict> + <!-- Writer master document templates --> + <dict> + <key>UTTypeIdentifier</key> + <string>org.oasis-open.opendocument.text-master-template</string> + <key>UTTypeDescription</key> + <string>OpenDocument Text Master Template</string> + <key>UTTypeConformsTo</key> + <array> + <string>public.data</string> + <string>public.content</string> + </array> + <key>UTTypeTagSpecification</key> + <dict> + <key>public.filename-extension</key> + <array> + <string>otm</string> + </array> + <key>public.mime-type</key> + <array> + <string>application/vnd.oasis.opendocument.text-master-template</string> + </array> + </dict> + </dict> + <!-- Spreadsheet template documents --> <dict> <key>UTTypeIdentifier</key> @@ -1118,6 +1142,24 @@ <dict> <key>CFBundleTypeExtensions</key> <array> + <string>otm</string> + </array> + <key>CFBundleTypeMIMETypes</key> + <array> + <string>application/vnd.oasis.opendocument.text-master-template</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>oasis-master-template.icns</string> + <key>CFBundleTypeName</key> + <string>OpenDocument Master Template</string> + <key>CFBundleTypeRole</key> + <string>Editor</string> + <key>LSIsAppleDefaultForType</key> + <true/> + </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> <string>stc</string> </array> <key>CFBundleTypeMIMETypes</key> @@ -1343,6 +1385,7 @@ <string>org.oasis-open.opendocument.formula</string> <string>org.openoffice.text-template</string> <string>org.oasis-open.opendocument.text-template</string> + <string>org.oasis-open.opendocument.text-master-template</string> <string>org.openoffice.spreadsheet-template</string> <string>org.oasis-open.opendocument.spreadsheet-template</string> <string>org.openoffice.presentation-template</string> diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index c4cea1280e14..e22a7b465fe5 100644 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -22,7 +22,7 @@ Icon=writer Type=Application Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors; Exec=${UNIXBASISROOTNAME} --writer %%FILE%% -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks; +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;application/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks; Name=%PRODUCTNAME Writer GenericName=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. diff --git a/sysui/desktop/mimetypes/oasis-master-document-template.desktop b/sysui/desktop/mimetypes/oasis-master-document-template.desktop new file mode 100644 index 000000000000..a47588c392da --- /dev/null +++ b/sysui/desktop/mimetypes/oasis-master-document-template.desktop @@ -0,0 +1,26 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Hidden=false +Icon=oasis-master-document-template +Type=MimeType +Patterns=*.otm +MimeType=application/vnd.oasis.opendocument.text-master-template +Comment=OpenDocument Master Document Template diff --git a/sysui/desktop/mimetypes/oasis-master-document-template.keys b/sysui/desktop/mimetypes/oasis-master-document-template.keys new file mode 100644 index 000000000000..3cd4d5efdd00 --- /dev/null +++ b/sysui/desktop/mimetypes/oasis-master-document-template.keys @@ -0,0 +1,9 @@ +application/vnd.oasis.opendocument.text-master-template + description=OpenDocument Master Document Template + default_action_type=application + short_list_application_ids_for_novice_user_level= + short_list_application_ids_for_intermediate_user_level= + short_list_application_ids_for_advanced_user_level= + category=Documents/Word Processor + use_category_default=yes + icon_filename=oasis-master-document-template diff --git a/sysui/desktop/mimetypes/openoffice.applications b/sysui/desktop/mimetypes/openoffice.applications index 26a34947b09c..8af25f65bf07 100755 --- a/sysui/desktop/mimetypes/openoffice.applications +++ b/sysui/desktop/mimetypes/openoffice.applications @@ -5,5 +5,5 @@ OFFICENAME expects_uris=true requires_terminal=false uses_gnomevfs=true - mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;application/x-hwp;text/spreadsheet; + mime_types=application/vnd.oasis.opendocument.text,application/vnd.oasis.opendocument.text-flat-xml,application/vnd.oasis.opendocument.text-template,application/vnd.oasis.opendocument.text-web,application/vnd.oasis.opendocument.text-master,application/vnd.oasis.opendocument.text-master-master,application/vnd.oasis.opendocument.graphics,application/vnd.oasis.opendocument.graphics-flat-xml,application/vnd.oasis.opendocument.graphics-template,application/vnd.oasis.opendocument.presentation,application/vnd.oasis.opendocument.presentation-flat-xml,application/vnd.oasis.opendocument.presentation-template,application/vnd.oasis.opendocument.spreadsheet,application/vnd.oasis.opendocument.spreadsheet-flat-xml,application/vnd.oasis.opendocument.spreadsheet-template,application/vnd.oasis.opendocument.formula,application/vnd.oasis.opendocument.database,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,application/vnd.sun.xml.base,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict;application/vnd.wordperfect;application/vnd.lotus-wordpro;application/vnd.openofficeorg.extension;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;application/x-hwp;text/spreadsheet; diff --git a/sysui/desktop/share/documents.ulf b/sysui/desktop/share/documents.ulf index cff942286f99..2073c17c3647 100644 --- a/sysui/desktop/share/documents.ulf +++ b/sysui/desktop/share/documents.ulf @@ -40,6 +40,9 @@ en-US = "OpenDocument Text Template" [oasis-master-document] en-US = "OpenDocument Master Document" +[oasis-master-document-template] +en-US = "OpenDocument Master Document Template" + [oasis-formula] en-US = "OpenDocument Formula" diff --git a/sysui/desktop/solaris/mailcap b/sysui/desktop/solaris/mailcap index 43c020761704..910fcbeb89cd 100755 --- a/sysui/desktop/solaris/mailcap +++ b/sysui/desktop/solaris/mailcap @@ -40,6 +40,7 @@ cat << END application/vnd.oasis.opendocument.text; %PREFIX -view %s application/vnd.oasis.opendocument.text-flat-xml; %PREFIX -view %s application/vnd.oasis.opendocument.text-template; %PREFIX -view %s +application/vnd.oasis.opendocument.text-master-template; %PREFIX -view %s application/vnd.oasis.opendocument.text-web; %PREFIX -view %s application/vnd.oasis.opendocument.text-master; %PREFIX -view %s application/vnd.sun.xml.writer; %PREFIX -view %s diff --git a/sysui/desktop/solaris/mime.types b/sysui/desktop/solaris/mime.types index 4758d47c1f2f..a5ee6838a9a9 100755 --- a/sysui/desktop/solaris/mime.types +++ b/sysui/desktop/solaris/mime.types @@ -32,6 +32,7 @@ application/vnd.oasis.opendocument.text-flat-xml fodt application/vnd.oasis.opendocument.text-template ott application/vnd.oasis.opendocument.text-web oth application/vnd.oasis.opendocument.text-master odm +application/vnd.oasis.opendocument.text-master-template otm application/vnd.oasis.opendocument.graphics odg application/vnd.oasis.opendocument.graphics-flat-xml fodg application/vnd.oasis.opendocument.graphics-template otg |