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 /include | |
| 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 'include')
| -rw-r--r-- | include/svtools/transfer.hxx | 4 | ||||
| -rw-r--r-- | include/svx/galmisc.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 61d76c174636..a1881149522f 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -230,13 +230,13 @@ protected: bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc ); bool SetINetBookmark( const INetBookmark& rBmk, const css::datatransfer::DataFlavor& rFlavor ); bool SetINetImage( const INetImage& rINtImg, const css::datatransfer::DataFlavor& rFlavor ); - bool SetObject( void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ); + bool SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ); protected: virtual void AddSupportedFormats() = 0; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) = 0; - virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ); + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ); virtual void DragFinished( sal_Int8 nDropAction ); virtual void ObjectReleased(); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 82deef1c70c0..513c36bd1478 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -155,7 +155,7 @@ using TransferableHelper::CopyToClipboard; // TransferableHelper 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, const css::datatransfer::DataFlavor& rFlavor ) override; + virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; virtual void DragFinished( sal_Int8 nDropAction ) override; virtual void ObjectReleased() override; |