summaryrefslogtreecommitdiff
path: root/include/sfx2/lnkbase.hxx
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 /include/sfx2/lnkbase.hxx
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 'include/sfx2/lnkbase.hxx')
-rw-r--r--include/sfx2/lnkbase.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index d88e53da59d7..0613a297246d 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -96,7 +96,7 @@ protected:
m_xInputStreamToLoadFrom;
SvBaseLink();
- SvBaseLink( sal_uInt16 nLinkType, sal_uIntPtr nContentType = FORMAT_STRING );
+ SvBaseLink( sal_uInt16 nLinkType, SotClipboardFormatId nContentType = SotClipboardFormatId::STRING );
virtual ~SvBaseLink();
void _GetRealObject( bool bConnect = true );
@@ -136,8 +136,8 @@ public:
void SetUpdateMode( sal_uInt16 );
sal_uInt16 GetUpdateMode() const;
- sal_uIntPtr GetContentType() const;
- bool SetContentType( sal_uIntPtr nType );
+ SotClipboardFormatId GetContentType() const;
+ bool SetContentType( SotClipboardFormatId nType );
LinkManager* GetLinkManager();
const LinkManager* GetLinkManager() const;