diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-11 19:23:29 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-11 19:25:54 +0300 |
commit | 08e18bf35786ee3861df80d92d7337f065824dd0 (patch) | |
tree | fca9ad31df5ffaffb56106afaec07ae1a4bc6be6 /svl | |
parent | 28247969bd4d2efd299a08ec319fcfafabe765ee (diff) |
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.
Diffstat (limited to 'svl')
-rw-r--r-- | svl/inc/svl/svdde.hxx | 2 | ||||
-rw-r--r-- | svl/source/svdde/ddesvr.cxx | 4 | ||||
-rw-r--r-- | svl/unx/source/svdde/ddedummy.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 66b04f1866ad..8fb7b2f06f8d 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 2c7439225ef6..df99f4552837 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 16a2904d01e3..7ec1a3b929ac 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& ) { } |