chart2/source/controller/main/ChartTransferable.cxx | 8 +++++---
chart2/source/controller/main/ChartTransferable.hxx | 2 +-
dbaccess/source/ui/browser/dbexchange.cxx | 11 +++++++----
dbaccess/source/ui/inc/TableRowExchange.hxx | 2 +-
dbaccess/source/ui/inc/dbexchange.hxx | 2 +-
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 8 +++++---
include/svtools/transfer.hxx | 4 ++--
include/svx/galmisc.hxx | 2 +-
sc/source/ui/app/drwtrans.cxx | 8 ++++----
sc/source/ui/app/transobj.cxx | 12 ++++++------
sc/source/ui/inc/drwtrans.hxx | 2 +-
sc/source/ui/inc/transobj.hxx | 2 +-
sd/source/ui/app/sdxfer.cxx | 6 +++---
sd/source/ui/inc/sdxfer.hxx | 2 +-
svtools/source/misc/transfer.cxx | 4 ++--
svx/source/gallery2/galmisc.cxx | 4 ++--
svx/source/tbxctrls/colrctrl.cxx | 6 +++---
sw/source/uibase/dochdl/swdtflvr.cxx | 16 ++++++++--------
sw/source/uibase/inc/swdtflvr.hxx | 2 +-
19 files changed, 55 insertions(+), 48 deletions(-)
New commits:
commit 38f4d4ca02cdc2fd4656e3a72def94da1df89650
Author: Eike Rathke <er...@redhat.com>
Date: Fri Nov 10 23:18:52 2017 +0100
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 <er...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/chart2/source/controller/main/ChartTransferable.cxx
b/chart2/source/controller/main/ChartTransferable.cxx
index ee92dfa591cb..8fb95fa29de6 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -37,6 +37,8 @@
#include <svx/unomodel.hxx>
#include <svx/svdview.hxx>
+constexpr sal_uInt32 CHARTTRANSFER_OBJECTTYPE_DRAWMODEL = 1;
+
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
@@ -85,7 +87,7 @@ bool ChartTransferable::GetData( const
css::datatransfer::DataFlavor& rFlavor, c
{
if ( nFormat == SotClipboardFormatId::DRAWING )
{
- bResult = SetObject( m_pMarkedObjModel,
SotClipboardFormatId::STRING, rFlavor );
+ bResult = SetObject( m_pMarkedObjModel,
CHARTTRANSFER_OBJECTTYPE_DRAWMODEL, rFlavor );
}
else if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
{
@@ -102,7 +104,7 @@ bool ChartTransferable::GetData( const
css::datatransfer::DataFlavor& rFlavor, c
return bResult;
}
-bool ChartTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm,
void* pUserObject, SotClipboardFormatId nUserObjectId,
+bool ChartTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm,
void* pUserObject, sal_uInt32 nUserObjectId,
const datatransfer::DataFlavor& /* rFlavor */ )
{
// called from SetObject, put data into stream
@@ -110,7 +112,7 @@ bool ChartTransferable::WriteObject(
tools::SvRef<SotStorageStream>& rxOStm, voi
bool bRet = false;
switch ( nUserObjectId )
{
- case SotClipboardFormatId::STRING:
+ case CHARTTRANSFER_OBJECTTYPE_DRAWMODEL:
{
SdrModel* pMarkedObjModel = static_cast< SdrModel* >(
pUserObject );
if ( pMarkedObjModel )
diff --git a/chart2/source/controller/main/ChartTransferable.hxx
b/chart2/source/controller/main/ChartTransferable.hxx
index 282c7ad94c24..1e950e236d34 100644
--- a/chart2/source/controller/main/ChartTransferable.hxx
+++ b/chart2/source/controller/main/ChartTransferable.hxx
@@ -44,7 +44,7 @@ protected:
// implementation of TransferableHelper methods
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;
private:
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx
b/dbaccess/source/ui/browser/dbexchange.cxx
index e089c269c8c8..8b1bf8af97eb 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -32,6 +32,9 @@
namespace dbaui
{
+ constexpr sal_uInt32 FORMAT_OBJECT_ID_RTF = 1;
+ constexpr sal_uInt32 FORMAT_OBJECT_ID_HTML = 2;
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdb;
@@ -134,9 +137,9 @@ namespace dbaui
osl_atomic_decrement( &m_refCount );
}
- bool ODataClipboard::WriteObject( ::tools::SvRef<SotStorageStream>&
rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const
css::datatransfer::DataFlavor& /*rFlavor*/ )
+ bool ODataClipboard::WriteObject( ::tools::SvRef<SotStorageStream>&
rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const
css::datatransfer::DataFlavor& /*rFlavor*/ )
{
- if (nUserObjectId == SotClipboardFormatId::RTF || nUserObjectId ==
SotClipboardFormatId::HTML )
+ if (nUserObjectId == FORMAT_OBJECT_ID_RTF || nUserObjectId ==
FORMAT_OBJECT_ID_HTML )
{
ODatabaseImportExport* pExport =
static_cast<ODatabaseImportExport*>(pUserObject);
if ( pExport && rxOStm.is() )
@@ -167,12 +170,12 @@ namespace dbaui
case SotClipboardFormatId::RTF:
if ( m_pRtf.is() )
m_pRtf->initialize(getDescriptor());
- return m_pRtf.is() && SetObject( m_pRtf.get(),
SotClipboardFormatId::RTF, rFlavor );
+ return m_pRtf.is() && SetObject( m_pRtf.get(),
FORMAT_OBJECT_ID_RTF, rFlavor );
case SotClipboardFormatId::HTML:
if ( m_pHtml.is() )
m_pHtml->initialize(getDescriptor());
- return m_pHtml.is() && SetObject( m_pHtml.get(),
SotClipboardFormatId::HTML, rFlavor );
+ return m_pHtml.is() && SetObject( m_pHtml.get(),
FORMAT_OBJECT_ID_HTML, rFlavor );
default: break;
}
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx
b/dbaccess/source/ui/inc/TableRowExchange.hxx
index ee86c291cdad..1b8d4e3bf8ca 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.hxx
@@ -34,7 +34,7 @@ namespace dbaui
protected:
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 ObjectReleased() override;
};
}
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx
b/dbaccess/source/ui/inc/dbexchange.hxx
index e757caf2af2b..ba6c6d3d819f 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -78,7 +78,7 @@ namespace dbaui
virtual void AddSupportedFormats() override;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor,
const OUString& rDestDoc ) override;
virtual void ObjectReleased() 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;
};
}
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index afee985228e5..559a500302fe 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -24,15 +24,17 @@
namespace dbaui
{
+ constexpr sal_uInt32 FORMAT_OBJECT_ID_SBA_TABED = 1;
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
OTableRowExchange::OTableRowExchange(const std::vector<
std::shared_ptr<OTableRow> >& _rvTableRow)
: m_vTableRow(_rvTableRow)
{
}
- bool OTableRowExchange::WriteObject( tools::SvRef<SotStorageStream>&
rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const
css::datatransfer::DataFlavor& /*rFlavor*/ )
+ bool OTableRowExchange::WriteObject( tools::SvRef<SotStorageStream>&
rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const
css::datatransfer::DataFlavor& /*rFlavor*/ )
{
- if(nUserObjectId == SotClipboardFormatId::SBA_TABED)
+ if(nUserObjectId == FORMAT_OBJECT_ID_SBA_TABED)
{
std::vector< std::shared_ptr<OTableRow> >* pRows = static_cast<
std::vector< std::shared_ptr<OTableRow> >* >(pUserObject);
if(pRows)
@@ -56,7 +58,7 @@ namespace dbaui
{
SotClipboardFormatId nFormat = SotExchange::GetFormat(rFlavor);
if(nFormat == SotClipboardFormatId::SBA_TABED)
- return
SetObject(&m_vTableRow,SotClipboardFormatId::SBA_TABED,rFlavor);
+ return SetObject(&m_vTableRow,FORMAT_OBJECT_ID_SBA_TABED,rFlavor);
return false;
}
void OTableRowExchange::ObjectReleased()
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;
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;
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;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index c062f768f5a5..54661ba96992 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -106,7 +106,7 @@ protected:
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 ObjectReleased() override;
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& rId ) override;
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 17c7983401dc..899263af6e7a 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -851,7 +851,7 @@ bool TransferableHelper::SetINetImage( const INetImage&
rINtImg,
}
-bool TransferableHelper::SetObject( void* pUserObject, SotClipboardFormatId
nUserObjectId, const DataFlavor& rFlavor )
+bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32
nUserObjectId, const DataFlavor& rFlavor )
{
tools::SvRef<SotStorageStream> xStm( new SotStorageStream( OUString() ) );
@@ -881,7 +881,7 @@ bool TransferableHelper::SetObject( void* pUserObject,
SotClipboardFormatId nUse
}
-bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*,
SotClipboardFormatId, const DataFlavor& )
+bool TransferableHelper::WriteObject( tools::SvRef<SotStorageStream>&, void*,
sal_uInt32, const DataFlavor& )
{
OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" );
return false;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index a92204122ea5..a410aa30d8f2 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -495,7 +495,7 @@ bool GalleryTransferable::GetData( const
datatransfer::DataFlavor& rFlavor, cons
if( ( SotClipboardFormatId::DRAWING == nFormat ) && ( SgaObjKind::SvDraw
== meObjectKind ) )
{
- bRet = ( mxModelStream.is() && SetObject( mxModelStream.get(),
SotClipboardFormatId::NONE, rFlavor ) );
+ bRet = ( mxModelStream.is() && SetObject( mxModelStream.get(), 0,
rFlavor ) );
}
else if( ( SotClipboardFormatId::SVIM == nFormat ) && mpImageMap )
{
@@ -523,7 +523,7 @@ bool GalleryTransferable::GetData( const
datatransfer::DataFlavor& rFlavor, cons
}
bool GalleryTransferable::WriteObject( tools::SvRef<SotStorageStream>& rxOStm,
void* pUserObject,
- SotClipboardFormatId, const
datatransfer::DataFlavor& )
+ sal_uInt32, const
datatransfer::DataFlavor& )
{
bool bRet = false;
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 7cd9995beb87..b56cab644fe2 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -54,7 +54,7 @@ protected:
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;
public:
@@ -73,14 +73,14 @@ bool SvxColorValueSetData::GetData( const
css::datatransfer::DataFlavor& rFlavor
if( SotExchange::GetFormat( rFlavor ) == SotClipboardFormatId::XFA )
{
- SetObject( &maData, SotClipboardFormatId::NONE, rFlavor );
+ SetObject( &maData, 0, rFlavor );
bRet = true;
}
return bRet;
}
-bool SvxColorValueSetData::WriteObject( tools::SvRef<SotStorageStream>&
rxOStm, void*, SotClipboardFormatId, const css::datatransfer::DataFlavor& )
+bool SvxColorValueSetData::WriteObject( tools::SvRef<SotStorageStream>&
rxOStm, void*, sal_uInt32, const css::datatransfer::DataFlavor& )
{
WriteXFillExchangeData( *rxOStm, maData );
return( rxOStm->GetError() == ERRCODE_NONE );
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index f46c7767e5b8..0c5493e41331 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -134,13 +134,13 @@
#define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50
-#define SWTRANSFER_OBJECTTYPE_DRAWMODEL
static_cast<SotClipboardFormatId>(0x00000001)
-#define SWTRANSFER_OBJECTTYPE_HTML
static_cast<SotClipboardFormatId>(0x00000002)
-#define SWTRANSFER_OBJECTTYPE_RTF
static_cast<SotClipboardFormatId>(0x00000004)
-#define SWTRANSFER_OBJECTTYPE_STRING
static_cast<SotClipboardFormatId>(0x00000008)
-#define SWTRANSFER_OBJECTTYPE_SWOLE
static_cast<SotClipboardFormatId>(0x00000010)
-#define SWTRANSFER_OBJECTTYPE_DDE
static_cast<SotClipboardFormatId>(0x00000020)
-#define SWTRANSFER_OBJECTTYPE_RICHTEXT
static_cast<SotClipboardFormatId>(0x00000040)
+constexpr sal_uInt32 SWTRANSFER_OBJECTTYPE_DRAWMODEL = 0x00000001;
+constexpr sal_uInt32 SWTRANSFER_OBJECTTYPE_HTML = 0x00000002;
+constexpr sal_uInt32 SWTRANSFER_OBJECTTYPE_RTF = 0x00000004;
+constexpr sal_uInt32 SWTRANSFER_OBJECTTYPE_STRING = 0x00000008;
+constexpr sal_uInt32 SWTRANSFER_OBJECTTYPE_SWOLE = 0x00000010;
+constexpr sal_uInt32 SWTRANSFER_OBJECTTYPE_DDE = 0x00000020;
+constexpr sal_uInt32 SWTRANSFER_OBJECTTYPE_RICHTEXT = 0x00000040;
using namespace ::svx;
using namespace ::com::sun::star;
@@ -609,7 +609,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor,
const OUString& rDestDo
}
bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream,
- void* pObject, SotClipboardFormatId
nObjectType,
+ void* pObject, sal_uInt32 nObjectType,
const DataFlavor& /*rFlavor*/ )
{
bool bRet = false;
diff --git a/sw/source/uibase/inc/swdtflvr.hxx
b/sw/source/uibase/inc/swdtflvr.hxx
index 91ee9d659ee8..6f9248551c92 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -140,7 +140,7 @@ protected:
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const
OUString& rDestDoc ) override;
virtual bool WriteObject( tools::SvRef<SotStorageStream>& rxOStm,
void* pUserObject,
- SotClipboardFormatId nUserObjectId,
+ sal_uInt32 nUserObjectId,
const css::datatransfer::DataFlavor&
rFlavor ) override;
virtual void DragFinished( sal_Int8 nDropAction ) override;
virtual void ObjectReleased() override;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
