diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-14 10:01:26 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-14 10:01:26 +0200 |
commit | bc397ac8265186531e4e3de17fc9bcb71fd46f2e (patch) | |
tree | e43bdcb5313372242f6412358cbc4759663f3f26 | |
parent | 4a695946468a6cf80ee1bef52e08608920ed39f2 (diff) |
fix windows build, partial revert of my commit
adbc556c91ea4afaf3e952aa0a8329e004add63e
"make Link<> instances typed"
Change-Id: Ia8dd0d755e1c1ccf15938fc9f29bc83759d724a5
-rw-r--r-- | include/svl/svdde.hxx | 4 | ||||
-rw-r--r-- | svl/source/svdde/ddesvr.cxx | 10 | ||||
-rw-r--r-- | svl/unx/source/svdde/ddedummy.cxx | 8 |
3 files changed, 22 insertions, 0 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 9889774f3226..43f4618aeba3 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -288,6 +288,8 @@ class SVL_DLLPUBLIC DdeTopic SVL_DLLPRIVATE void _Disconnect( sal_IntPtr ); public: + void Connect( sal_IntPtr ); + void Disconnect( sal_IntPtr ); virtual DdeData* Get(SotClipboardFormatId); virtual bool Put( const DdeData* ); virtual bool Execute( const OUString* ); @@ -307,6 +309,8 @@ private: DdeString* pName; OUString aItem; std::vector<DdeItem*> aItems; + Link<> aConnectLink; + Link<> aDisconnectLink; public: DdeTopic( SAL_UNUSED_PARAMETER const OUString& ); diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 9af669bfbf53..7f09c429719f 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -678,6 +678,16 @@ void DdeTopic::NotifyClient( const OUString& rItem ) } } +void DdeTopic::Connect( sal_IntPtr nId ) +{ + aConnectLink.Call( (void*)nId ); +} + +void DdeTopic::Disconnect( sal_IntPtr nId ) +{ + aDisconnectLink.Call( (void*)nId ); +} + void DdeTopic::_Disconnect( sal_IntPtr nId ) { std::vector<DdeItem*>::iterator iter; diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index b504b5fe38fd..4813dc36b5da 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -145,6 +145,14 @@ DdeTopic::~DdeTopic() { } +void DdeTopic::Connect( SAL_UNUSED_PARAMETER long ) +{ +} + +void DdeTopic::Disconnect( SAL_UNUSED_PARAMETER long ) +{ +} + void DdeTopic::InsertItem( SAL_UNUSED_PARAMETER DdeItem* ) { } |