summaryrefslogtreecommitdiff
path: root/include/svx/clipfmtitem.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/svx/clipfmtitem.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/svx/clipfmtitem.hxx')
-rw-r--r--include/svx/clipfmtitem.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 63daf82b7bb3..8119650ca8ab 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SVX_CLIPFMTITEM_HXX
#include <rtl/ustring.hxx>
+#include <sot/formats.hxx>
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
@@ -42,12 +43,12 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
- void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX );
- void AddClipbrdFormat( sal_uIntPtr nId, const OUString& rName,
+ void AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos = USHRT_MAX );
+ void AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
sal_uInt16 nPos = USHRT_MAX );
sal_uInt16 Count() const;
- sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const;
+ SotClipboardFormatId GetClipbrdFormatId( sal_uInt16 nPos ) const;
const OUString GetClipbrdFormatName( sal_uInt16 nPos ) const;
};