summaryrefslogtreecommitdiff
path: root/sd/source/ui/app
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-11-10 23:18:52 +0100
committerEike Rathke <erack@redhat.com>2017-11-11 01:18:47 +0100
commit38f4d4ca02cdc2fd4656e3a72def94da1df89650 (patch)
treeb142aceae633b3ff8f8d92f69f6b33ddb38f2e32 /sd/source/ui/app
parent12434a33c1c153c375d2e02e0ae26f471ff15b68 (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 'sd/source/ui/app')
-rw-r--r--sd/source/ui/app/sdxfer.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index ea6954d07fa8..d2d52f9c8ac6 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -72,8 +72,8 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::datatransfer;
using namespace ::com::sun::star::datatransfer::clipboard;
-#define SDTRANSFER_OBJECTTYPE_DRAWMODEL static_cast<SotClipboardFormatId>(0x00000001)
-#define SDTRANSFER_OBJECTTYPE_DRAWOLE static_cast<SotClipboardFormatId>(0x00000002)
+constexpr sal_uInt32 SDTRANSFER_OBJECTTYPE_DRAWMODEL = 1;
+constexpr sal_uInt32 SDTRANSFER_OBJECTTYPE_DRAWOLE = 2;
SdTransferable::SdTransferable( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, bool bInitOnGetData )
: mpPageDocShell( nullptr )
@@ -587,7 +587,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
return bOK;
}
-bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pObject, SotClipboardFormatId nObjectType, const DataFlavor& )
+bool SdTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& )
{
bool bRet = false;