summaryrefslogtreecommitdiff
path: root/sw/source/uibase/globdoc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-12 14:53:28 +0200
committerNoel Grandin <noel@peralex.com>2015-03-18 14:23:50 +0200
commitfb14be5f8f74f83ba89e15f891ddf1f753dcc62f (patch)
treebeaa4af08b0c3d75bf6e40b21b96c55e0ac1c60a /sw/source/uibase/globdoc
parentb8ce52aab9459773544f1696cfe6b7b6f171a389 (diff)
create new 'enum class' SotClipboardFormatId to unify types
of which there are several. There are some issues here I am unsure of - the SW and SC and CHART2 modules essentially ignore the enum values and assign their own ids Perhaps I should change them to use the common values and create new enum values where necessary? - the sc/qa/ and sq/qa/ and starmath/qa/ code was doing some dodgy stuff. I translated the code to pass down the stuff numeric values to the underlying code, but perhaps further fixing is necessary? Change-Id: Ic06d723e404481e3f1bca67c43b70321b764d923
Diffstat (limited to 'sw/source/uibase/globdoc')
-rw-r--r--sw/source/uibase/globdoc/globdoc.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index 23caf617c53a..22684610461c 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -44,7 +44,7 @@ SwGlobalDocShell::~SwGlobalDocShell()
}
void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
- sal_uInt32 * pClipFormat,
+ SotClipboardFormatId * pClipFormat,
OUString * /*pAppName*/,
OUString * pLongUserName,
OUString * pUserName,
@@ -54,14 +54,14 @@ void SwGlobalDocShell::FillClass( SvGlobalName * pClassName,
if (nVersion == SOFFICE_FILEFORMAT_60)
{
*pClassName = SvGlobalName( SO3_SWGLOB_CLASSID_60 );
- *pClipFormat = SOT_FORMATSTR_ID_STARWRITERGLOB_60;
+ *pClipFormat = SotClipboardFormatId::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 = bTemplate ? SOT_FORMATSTR_ID_STARWRITERGLOB_8_TEMPLATE : SOT_FORMATSTR_ID_STARWRITERGLOB_8;
+ *pClipFormat = bTemplate ? SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE : SotClipboardFormatId::STARWRITERGLOB_8;
*pLongUserName = SW_RESSTR(STR_WRITER_GLOBALDOC_FULLTYPE);
}