diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-07 13:51:50 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-07 13:52:47 +0200 |
| commit | 7e68c64c1ed2cd14ccb4cf259831089c1aeb43b2 (patch) | |
| tree | 697d2162fde229d6bc4fa8fba113b878ec019cf2 /include | |
| parent | 98ecb80ad8601b03509cb791b2db845350ac8d2d (diff) | |
Make _WIN32-only DDE code use proper HCONV
...instead of various integer types. Revealed that the GetConvId functions were
unused.
Change-Id: I6c6427bd8c14166e58bed3405084e3919bdc97f9
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/svdde.hxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index fca3dfd66bb3..97301f4a22af 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -20,12 +20,18 @@ #ifndef INCLUDED_SVL_SVDDE_HXX #define INCLUDED_SVL_SVDDE_HXX +#include <sal/config.h> + #include <svl/svldllapi.h> #include <sot/exchange.hxx> #include <tools/solar.h> #include <tools/link.hxx> #include <vector> +#if defined _WIN32 +#include <ddeml.h> +#endif + class DdeString; class DdeData; class DdeConnection; @@ -182,7 +188,6 @@ public: ~DdeConnection(); long GetError(); - sal_IntPtr GetConvId(); static const std::vector<DdeConnection*>& GetConnections(); @@ -205,8 +210,10 @@ class SVL_DLLPUBLIC DdeItem DdeTopic* pMyTopic; DdeItemImp* pImpData; - void IncMonitor( sal_uLong ); - void DecMonitor( sal_uLong ); +#if defined _WIN32 + void IncMonitor( HCONV ); + void DecMonitor( HCONV ); +#endif protected: sal_uInt8 nType; @@ -238,7 +245,9 @@ public: class SVL_DLLPUBLIC DdeTopic { - SVL_DLLPRIVATE void Disconnect( sal_IntPtr ); +#if defined _WIN32 + SVL_DLLPRIVATE void Disconnect( HCONV ); +#endif public: virtual DdeData* Get(SotClipboardFormatId); @@ -265,7 +274,6 @@ public: virtual ~DdeTopic(); const OUString GetName() const; - long GetConvId(); void NotifyClient( const OUString& ); bool IsSystemTopic(); |