summaryrefslogtreecommitdiff
path: root/sw/source/uibase/globdoc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-08 15:31:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-09-11 09:38:21 +0000
commited00d0ddd663085a5fd180301cdc82af80bc8077 (patch)
treee9949eddf99b907a06ab99f248e81831a1505699 /sw/source/uibase/globdoc
parent4b758c52955e1931850938bf70764ee6376616a0 (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 'sw/source/uibase/globdoc')
-rw-r--r--sw/source/uibase/globdoc/globdoc.cxx5
1 files changed, 2 insertions, 3 deletions
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);
}