From fb14be5f8f74f83ba89e15f891ddf1f753dcc62f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 12 Mar 2015 14:53:28 +0200 Subject: 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 --- filter/source/msfilter/viscache.hxx | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'filter/source/msfilter/viscache.hxx') diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx index a52ca4a0b2de..84e7c978f3b5 100644 --- a/filter/source/msfilter/viscache.hxx +++ b/filter/source/msfilter/viscache.hxx @@ -26,17 +26,17 @@ class Impl_OlePres { - sal_uLong nFormat; - sal_uInt16 nAspect; + SotClipboardFormatId nFormat; + sal_uInt16 nAspect; Bitmap * pBmp; GDIMetaFile * pMtf; - sal_uInt32 nAdvFlags; - sal_Int32 nJobLen; - sal_uInt8* pJob; - Size aSize; // Groesse in 100TH_MM + sal_uInt32 nAdvFlags; + sal_Int32 nJobLen; + sal_uInt8* pJob; + Size aSize; // Groesse in 100TH_MM public: - Impl_OlePres( sal_uLong nF ) + Impl_OlePres( SotClipboardFormatId nF ) : nFormat( nF ) , nAspect( ASPECT_CONTENT ) , pBmp( NULL ) @@ -57,14 +57,14 @@ public: delete pMtf; pMtf = new GDIMetaFile( rMtf ); } - Bitmap *GetBitmap() const { return pBmp; } - GDIMetaFile *GetMetaFile() const { return pMtf; } - sal_uLong GetFormat() const { return nFormat; } - void SetAspect( sal_uInt16 nAsp ) { nAspect = nAsp; } - sal_uLong GetAdviseFlags() const { return nAdvFlags; } - void SetAdviseFlags( sal_uLong nAdv ) { nAdvFlags = nAdv; } - void SetSize( const Size & rSize ) { aSize = rSize; } - void Write( SvStream & rStm ); + Bitmap *GetBitmap() const { return pBmp; } + GDIMetaFile *GetMetaFile() const { return pMtf; } + SotClipboardFormatId GetFormat() const { return nFormat; } + void SetAspect( sal_uInt16 nAsp ) { nAspect = nAsp; } + sal_uLong GetAdviseFlags() const { return nAdvFlags; } + void SetAdviseFlags( sal_uLong nAdv ) { nAdvFlags = nAdv; } + void SetSize( const Size & rSize ) { aSize = rSize; } + void Write( SvStream & rStm ); }; #endif // INCLUDED_FILTER_SOURCE_MSFILTER_VISCACHE_HXX -- cgit v1.2.3