diff options
| -rw-r--r-- | include/svl/svdde.hxx | 20 | ||||
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 3ea9f68906f0..0e8b96074230 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -28,6 +28,13 @@ #include <tools/link.hxx> #include <vector> +#if defined _WIN32 +#include <prewin.h> +#include <windows.h> +#include <postwin.h> +#include <ddeml.h> +#endif + class DdeString; class DdeData; class DdeConnection; @@ -49,13 +56,6 @@ typedef ::std::vector< DdeService* > DdeServices; typedef ::std::vector< long > DdeFormats; typedef ::std::vector< Conversation* > ConvList; -#if defined _WIN32 -namespace svl_dde { - -using HCONV = void *; // avoid including windows.h/ddeml.h - -} -#endif class SVL_DLLPUBLIC DdeData { @@ -214,8 +214,8 @@ class SVL_DLLPUBLIC DdeItem DdeItemImp* pImpData; #if defined _WIN32 - void IncMonitor( svl_dde::HCONV ); - void DecMonitor( svl_dde::HCONV ); + void IncMonitor( HCONV ); + void DecMonitor( HCONV ); #endif protected: @@ -249,7 +249,7 @@ public: class SVL_DLLPUBLIC DdeTopic { #if defined _WIN32 - SVL_DLLPRIVATE void Disconnect( svl_dde::HCONV ); + SVL_DLLPRIVATE void Disconnect( HCONV ); #endif public: diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 3cf115fa514a..36070360ea8f 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -669,7 +669,7 @@ void DdeTopic::NotifyClient( const OUString& rItem ) } } -void DdeTopic::Disconnect( svl_dde::HCONV nId ) +void DdeTopic::Disconnect( HCONV nId ) { std::vector<DdeItem*>::iterator iter; for (iter = aItems.begin(); iter != aItems.end(); ++iter) @@ -750,7 +750,7 @@ void DdeItem::NotifyClient() } } -void DdeItem::IncMonitor( svl_dde::HCONV nHCnv ) +void DdeItem::IncMonitor( HCONV nHCnv ) { if( !pImpData ) { @@ -768,10 +768,10 @@ void DdeItem::IncMonitor( svl_dde::HCONV nHCnv ) } } - pImpData->push_back( DdeItemImpData( static_cast<HCONV>(nHCnv) ) ); + pImpData->push_back( DdeItemImpData( nHCnv ) ); } -void DdeItem::DecMonitor( svl_dde::HCONV nHCnv ) +void DdeItem::DecMonitor( HCONV nHCnv ) { if( pImpData ) { |