strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "More blind fix for --enable-pch Windows builds"

Browse source 
This reverts commit 1b613450f8.
This commit is contained in:
Michael Stahl 2016-10-07 17:47:35 +02:00
parent 1b613450f8
commit ce650fc1cd
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,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:

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

@ -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 )
{