summaryrefslogtreecommitdiffstats
path: root/sot/source/sdstor/stgole.cxx
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 /sot/source/sdstor/stgole.cxx
parentconvert AccessibleStates to enum class (diff)
downloadcore-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/stgole.cxx')
-rw-r--r--sot/source/sdstor/stgole.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index f52dff841cd8..2fcbffabf1e5 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -23,6 +23,7 @@
#include "stgole.hxx"
#include "sot/storinfo.hxx"
#include <boost/scoped_array.hpp>
+#include <sot/exchange.hxx>
#ifdef _MSC_VER
#pragma warning(disable: 4342)
@@ -97,13 +98,13 @@ StgCompObjStream::StgCompObjStream( BaseStorage& rStg, bool bWr )
: StgInternalStream( rStg, OUString("\1CompObj"), bWr )
{
memset( &aClsId, 0, sizeof( ClsId ) );
- nCbFormat = 0;
+ nCbFormat = SotClipboardFormatId::NONE;
}
bool StgCompObjStream::Load()
{
memset( &aClsId, 0, sizeof( ClsId ) );
- nCbFormat = 0;
+ nCbFormat = SotClipboardFormatId::NONE;
aUserName.clear();
if( GetError() != SVSTREAM_OK )
return false;