[Libreoffice-commits] .: svl/inc svl/source svl/unx

[Tor Lillqvist]

 svl/inc/svl/svdde.hxx             |    2 +-
 svl/source/svdde/ddesvr.cxx       |    4 ++--
 svl/unx/source/svdde/ddedummy.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 282dd57dd05a1d7044dc577b224ea3096f579576
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed May 11 19:23:29 2011 +0300

    Nah, make the AddTopic() prototype like it was, too many problems otherwise
    
    Just use a cast in ddesvr.cxx, as there was originally before the
    DECLARE_LIST removal and the fixup of that.

diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index d3b6969..d739c51 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -406,7 +406,7 @@ public:
     static DdeServices& GetServices();
     std::vector<DdeTopic*>& GetTopics() { return aTopics; }
 
-    void            AddTopic( DdeTopic& );
+    void            AddTopic( const DdeTopic& );
     void            RemoveTopic( const DdeTopic& );
 
     void            AddFormat( sal_uLong );
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 6754062..acedb95 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -570,10 +570,10 @@ DdeServices& DdeService::GetServices()
 
 // --- DdeService::AddTopic() --------------------------------------
 
-void DdeService::AddTopic( DdeTopic& rTopic )
+void DdeService::AddTopic( const DdeTopic& rTopic )
 {
     RemoveTopic( rTopic );
-    aTopics.push_back(&rTopic);
+    aTopics.push_back((DdeTopic *) &rTopic);
 }
 
 // --- DdeService::RemoveTopic() -----------------------------------
diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index a34eedb..088e8b2 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -251,7 +251,7 @@ void DdeService::AddFormat( sal_uLong )
 {
 }
 
-void DdeService::AddTopic( DdeTopic& )
+void DdeService::AddTopic( const DdeTopic& )
 {
 }