diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-12 14:53:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-18 14:23:50 +0200 |
| commit | fb14be5f8f74f83ba89e15f891ddf1f753dcc62f (patch) | |
| tree | beaa4af08b0c3d75bf6e40b21b96c55e0ac1c60a /include/sot/stg.hxx | |
| parent | b8ce52aab9459773544f1696cfe6b7b6f171a389 (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/sot/stg.hxx')
| -rw-r--r-- | include/sot/stg.hxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index 2d8b1d1d1186..27bb26a40f70 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -84,6 +84,8 @@ public: virtual bool Equals( const BaseStorageStream& rStream ) const = 0; }; +enum class SotClipboardFormatId : sal_uLong; + class BaseStorage : public StorageBase { public: @@ -94,13 +96,13 @@ public: virtual const ClsId& GetClassId() const = 0; virtual void SetDirty() = 0; virtual void SetClass( const SvGlobalName & rClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) = 0; virtual void SetConvertClass( const SvGlobalName & rConvertClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) = 0; virtual SvGlobalName GetClassName() = 0; - virtual sal_uLong GetFormat() = 0; + virtual SotClipboardFormatId GetFormat() = 0; virtual OUString GetUserName() = 0; virtual bool ShouldConvert() = 0; virtual void FillInfoList( SvStorageInfoList* ) const = 0; @@ -194,13 +196,13 @@ public: virtual const ClsId& GetClassId() const SAL_OVERRIDE; virtual void SetDirty() SAL_OVERRIDE; virtual void SetClass( const SvGlobalName & rClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) SAL_OVERRIDE; virtual void SetConvertClass( const SvGlobalName & rConvertClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) SAL_OVERRIDE; virtual SvGlobalName GetClassName() SAL_OVERRIDE; - virtual sal_uLong GetFormat() SAL_OVERRIDE; + virtual SotClipboardFormatId GetFormat() SAL_OVERRIDE; virtual OUString GetUserName() SAL_OVERRIDE; virtual bool ShouldConvert() SAL_OVERRIDE; virtual void FillInfoList( SvStorageInfoList* ) const SAL_OVERRIDE; @@ -310,13 +312,13 @@ public: virtual const ClsId& GetClassId() const SAL_OVERRIDE; virtual void SetDirty() SAL_OVERRIDE; virtual void SetClass( const SvGlobalName & rClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) SAL_OVERRIDE; virtual void SetConvertClass( const SvGlobalName & rConvertClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) SAL_OVERRIDE; virtual SvGlobalName GetClassName() SAL_OVERRIDE; - virtual sal_uLong GetFormat() SAL_OVERRIDE; + virtual SotClipboardFormatId GetFormat() SAL_OVERRIDE; virtual OUString GetUserName() SAL_OVERRIDE; virtual bool ShouldConvert() SAL_OVERRIDE; virtual void FillInfoList( SvStorageInfoList* ) const SAL_OVERRIDE; |