[Libreoffice-commits] core.git: include/svl svl/source svl/unx

[Noel Grandin]

 include/svl/svdde.hxx             |    4 ++++
 svl/source/svdde/ddesvr.cxx       |   10 ++++++++++
 svl/unx/source/svdde/ddedummy.cxx |    8 ++++++++
 3 files changed, 22 insertions(+)

New commits:
commit bc397ac8265186531e4e3de17fc9bcb71fd46f2e
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Aug 14 10:01:26 2015 +0200

    fix windows build, partial revert of my commit
    
    adbc556c91ea4afaf3e952aa0a8329e004add63e
    "make Link<> instances typed"
    
    Change-Id: Ia8dd0d755e1c1ccf15938fc9f29bc83759d724a5

diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 9889774..43f4618 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 9af669b..7f09c42 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 b504b5f..4813dc3 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* )
 {
 }