[Libreoffice-commits] core.git: include/svl svl/source

[Stephan Bergmann]

 include/svl/svdde.hxx       |   20 ++++++++++----------
 svl/source/svdde/ddesvr.cxx |    8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 1b613450f85d052b7343eacefd79abbfe4f35e2f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 7 17:20:32 2016 +0200

    More blind fix for --enable-pch Windows builds
    
    Change-Id: I8e7c79a4d3a9d6c226f9d112c59ada5a7f76c7a4

diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 0e8b960..3ea9f68 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -28,13 +28,6 @@
 #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;
@@ -56,6 +49,13 @@ 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( HCONV );
-    void            DecMonitor( HCONV );
+    void            IncMonitor( svl_dde::HCONV );
+    void            DecMonitor( svl_dde::HCONV );
 #endif
 
 protected:
@@ -249,7 +249,7 @@ public:
 class SVL_DLLPUBLIC DdeTopic
 {
 #if defined _WIN32
-    SVL_DLLPRIVATE void Disconnect( HCONV );
+    SVL_DLLPRIVATE void Disconnect( svl_dde::HCONV );
 #endif
 
 public:
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 3607036..3cf115f 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( HCONV nId )
+void DdeTopic::Disconnect( svl_dde::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( HCONV nHCnv )
+void DdeItem::IncMonitor( svl_dde::HCONV nHCnv )
 {
     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 )
     {