mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More blind fix for --enable-pch Windows builds

Browse Source 
Change-Id: I8e7c79a4d3a9d6c226f9d112c59ada5a7f76c7a4
This commit is contained in:
Stephan Bergmann 2016-10-07 17:20:32 +02:00
parent 6e98009240
commit 1b613450f8
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/svl/svdde.hxx
View File

@ -28,13 +28,6 @@
#include <tools/link.hxx> #include <tools/link.hxx>
#include <vector> #include <vector>
#if defined _WIN32
#include <prewin.h>
#include <windows.h>
#include <postwin.h>
#include <ddeml.h>
#endif
class DdeString; class DdeString;
class DdeData; class DdeData;
class DdeConnection; class DdeConnection;
@ -56,6 +49,13 @@ typedef ::std::vector< DdeService* > DdeServices;
typedef ::std::vector< long > DdeFormats; typedef ::std::vector< long > DdeFormats;
typedef ::std::vector< Conversation* > ConvList; 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 class SVL_DLLPUBLIC DdeData
{ {
@ -214,8 +214,8 @@ class SVL_DLLPUBLIC DdeItem
DdeItemImp* pImpData; DdeItemImp* pImpData;
#if defined _WIN32 #if defined _WIN32
void IncMonitor( HCONV ); void IncMonitor( svl_dde::HCONV );
void DecMonitor( HCONV ); void DecMonitor( svl_dde::HCONV );
#endif #endif
protected: protected:
@ -249,7 +249,7 @@ public:
class SVL_DLLPUBLIC DdeTopic class SVL_DLLPUBLIC DdeTopic
{ {
#if defined _WIN32 #if defined _WIN32
SVL_DLLPRIVATE void Disconnect( HCONV ); SVL_DLLPRIVATE void Disconnect( svl_dde::HCONV );
#endif #endif
public: public:

8
svl/source/svdde/ddesvr.cxx
View File

@ -669,7 +669,7 @@ void DdeTopic::NotifyClient( const OUString& rItem )
} }
} }
void DdeTopic::Disconnect( HCONV nId ) void DdeTopic::Disconnect( svl_dde::HCONV nId )
{ {
std::vector<DdeItem*>::iterator iter; std::vector<DdeItem*>::iterator iter;
for (iter = aItems.begin(); iter != aItems.end(); ++iter) for (iter = aItems.begin(); iter != aItems.end(); ++iter)
@ -750,7 +750,7 @@ void DdeItem::NotifyClient()
} }
} }
void DdeItem::IncMonitor( HCONV nHCnv ) void DdeItem::IncMonitor( svl_dde::HCONV nHCnv )
{ {
if( !pImpData ) if( !pImpData )
{ {
@ -768,10 +768,10 @@ void DdeItem::IncMonitor( HCONV nHCnv )
} }
} }
pImpData->push_back( DdeItemImpData( nHCnv ) ); pImpData->push_back( DdeItemImpData( static_cast<HCONV>(nHCnv) ) );
} }
void DdeItem::DecMonitor( HCONV nHCnv ) void DdeItem::DecMonitor( svl_dde::HCONV nHCnv )
{ {
if( pImpData ) if( pImpData )
{ {