diff options
| author | Eike Rathke <erack@redhat.com> | 2017-11-10 23:18:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-11-11 01:18:47 +0100 |
| commit | 38f4d4ca02cdc2fd4656e3a72def94da1df89650 (patch) | |
| tree | b142aceae633b3ff8f8d92f69f6b33ddb38f2e32 /sc | |
| parent | 12434a33c1c153c375d2e02e0ae26f471ff15b68 (diff) | |
A user object id is *NOT* a SotClipboardFormatId
Do not try to squeeze it into such.. especially if
SotClipboardFormatId::... enum identifiers are used in a user
object id context that is completely not related to the identifier
name this is totally confusing.
commit fb14be5f8f74f83ba89e15f891ddf1f753dcc62f
Date: Thu Mar 12 14:53:28 2015 +0200
create new 'enum class' SotClipboardFormatId to unify types
overdid with that.
Change-Id: I34b570be9f52b7b94ca8af6b23983393ac3a3a55
Reviewed-on: https://gerrit.libreoffice.org/44612
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/drwtrans.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/app/transobj.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/inc/drwtrans.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/transobj.hxx | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 520a5996292d..9a1bf0532027 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -69,9 +69,9 @@ using namespace com::sun::star; -#define SCDRAWTRANS_TYPE_EMBOBJ SotClipboardFormatId::STRING -#define SCDRAWTRANS_TYPE_DRAWMODEL SotClipboardFormatId::BITMAP -#define SCDRAWTRANS_TYPE_DOCUMENT SotClipboardFormatId::GDIMETAFILE +constexpr sal_uInt32 SCDRAWTRANS_TYPE_EMBOBJ = 1; +constexpr sal_uInt32 SCDRAWTRANS_TYPE_DRAWMODEL = 2; +constexpr sal_uInt32 SCDRAWTRANS_TYPE_DOCUMENT = 3; ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, const TransferableObjectDescriptor& rDesc ) : @@ -444,7 +444,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c return bOK; } -bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, +bool ScDrawTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& /* rFlavor */ ) { // called from SetObject, put data into stream diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 24c41ed1d538..0b2075084e4d 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -68,11 +68,11 @@ using namespace com::sun::star; -#define SCTRANS_TYPE_IMPEX SotClipboardFormatId::STRING -#define SCTRANS_TYPE_EDIT_RTF SotClipboardFormatId::BITMAP -#define SCTRANS_TYPE_EDIT_BIN SotClipboardFormatId::GDIMETAFILE -#define SCTRANS_TYPE_EMBOBJ SotClipboardFormatId::PRIVATE -#define SCTRANS_TYPE_EDIT_ODF_TEXT_FLAT SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT +constexpr sal_uInt32 SCTRANS_TYPE_IMPEX = 1; +constexpr sal_uInt32 SCTRANS_TYPE_EDIT_RTF = 2; +constexpr sal_uInt32 SCTRANS_TYPE_EDIT_BIN = 3; +constexpr sal_uInt32 SCTRANS_TYPE_EMBOBJ = 4; +constexpr sal_uInt32 SCTRANS_TYPE_EDIT_ODF_TEXT_FLAT = 5; void ScTransferObj::GetAreaSize( const ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol ) { @@ -405,7 +405,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt return bOK; } -bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, +bool ScTransferObj::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const datatransfer::DataFlavor& rFlavor ) { // called from SetObject, put data into stream diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index b1d4e52da626..2567e6d552a8 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -75,7 +75,7 @@ public: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; virtual void DragFinished( sal_Int8 nDropAction ) override; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 9905e7e67ebc..62d50ca4f712 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -74,7 +74,7 @@ public: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; virtual void ObjectReleased() override; virtual void DragFinished( sal_Int8 nDropAction ) override; |