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 /sot/source/sdstor/stg.cxx | |
parent | convert AccessibleStates to enum class (diff) | |
download | core-fb14be5f8f74f83ba89e15f891ddf1f753dcc62f.tar.gz core-fb14be5f8f74f83ba89e15f891ddf1f753dcc62f.zip |
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 'sot/source/sdstor/stg.cxx')
-rw-r--r-- | sot/source/sdstor/stg.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index a199f2e7989b..eb708bc82136 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -19,6 +19,7 @@ #include <sot/storinfo.hxx> +#include <sot/exchange.hxx> #include <osl/file.hxx> #include <unotools/tempfile.hxx> #include <tools/stream.hxx> @@ -932,7 +933,7 @@ bool Storage::Revert() // Set the storage type void Storage::SetClass( const SvGlobalName & rClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) { if( Validate( true ) ) @@ -959,7 +960,7 @@ void Storage::SetClass( const SvGlobalName & rClass, } void Storage::SetConvertClass( const SvGlobalName & rConvertClass, - sal_uLong nOriginalClipFormat, + SotClipboardFormatId nOriginalClipFormat, const OUString & rUserTypeName ) { if( Validate( true ) ) @@ -986,13 +987,13 @@ SvGlobalName Storage::GetClassName() return SvGlobalName(); } -sal_uLong Storage::GetFormat() +SotClipboardFormatId Storage::GetFormat() { StgCompObjStream aCompObj( *this, false ); if( aCompObj.Load() ) return aCompObj.GetCbFormat(); pIo->ResetError(); - return 0; + return SotClipboardFormatId::NONE; } OUString Storage::GetUserName() |