summaryrefslogtreecommitdiff
path: root/include/svl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-12 14:53:28 +0200
committerNoel Grandin <noel@peralex.com>2015-03-18 14:23:50 +0200
commitfb14be5f8f74f83ba89e15f891ddf1f753dcc62f (patch)
treebeaa4af08b0c3d75bf6e40b21b96c55e0ac1c60a /include/svl
parentb8ce52aab9459773544f1696cfe6b7b6f171a389 (diff)
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
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/svdde.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 74e1c9637377..b3b5c50ed3c4 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -62,11 +62,11 @@ class SVL_DLLPUBLIC DdeData
SVL_DLLPRIVATE void Lock();
- void SetFormat( sal_uLong nFmt );
+ void SetFormat( SotClipboardFormatId nFmt );
public:
DdeData();
- DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER sal_uLong = FORMAT_STRING );
+ DdeData( SAL_UNUSED_PARAMETER const void*, SAL_UNUSED_PARAMETER long, SAL_UNUSED_PARAMETER SotClipboardFormatId = SotClipboardFormatId::STRING );
DdeData( SAL_UNUSED_PARAMETER const OUString& );
DdeData( const DdeData& );
~DdeData();
@@ -74,7 +74,7 @@ public:
operator const void*() const;
operator long() const;
- sal_uLong GetFormat() const;
+ SotClipboardFormatId GetFormat() const;
DdeData& operator = ( const DdeData& );
@@ -118,8 +118,8 @@ public:
void SetDoneHdl( const Link& rLink ) { aDone = rLink; }
const Link& GetDoneHdl() const { return aDone; }
- void SetFormat( sal_uLong nFmt ) { aDdeData.SetFormat( nFmt ); }
- sal_uLong GetFormat() const { return aDdeData.GetFormat(); }
+ void SetFormat( SotClipboardFormatId nFmt ) { aDdeData.SetFormat( nFmt ); }
+ SotClipboardFormatId GetFormat() const { return aDdeData.GetFormat(); }
long GetError();
@@ -187,7 +187,7 @@ class SVL_DLLPUBLIC DdePoke : public DdeTransaction
{
public:
DdePoke( DdeConnection&, const OUString&, const char*, long,
- sal_uLong = FORMAT_STRING, long = 0 );
+ SotClipboardFormatId = SotClipboardFormatId::STRING, long = 0 );
DdePoke( DdeConnection&, const OUString&, SAL_UNUSED_PARAMETER const DdeData&, long = 0 );
DdePoke( DdeConnection&, const OUString&, const OUString&, long = 0 );
};
@@ -274,7 +274,7 @@ public:
DdeGetPutItem( const OUString& rStr );
DdeGetPutItem( const DdeItem& rItem );
- virtual DdeData* Get( sal_uLong );
+ virtual DdeData* Get( SotClipboardFormatId );
virtual bool Put( const DdeData* );
virtual void AdviseLoop( bool ); // Start / Stop AdviseLoop
};