[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svl/inc svl/source

[Libreoffice Gerrit user]

 svl/inc/svl/svdde.hxx        |    4 ++--
 svl/source/svdde/ddecli.cxx  |    4 ++--
 svl/source/svdde/ddedata.cxx |    2 +-
 svl/source/svdde/ddeimp.hxx  |    6 +++---
 svl/source/svdde/ddesvr.cxx  |    6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 9227da7e52144a3106341c1c224ac290f315b715
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Thu Feb 7 02:11:15 2019 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Thu Feb 7 02:11:15 2019 +0000

    Port main/svl's DDE to Win64.
    
    Patch by: me

diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index d3e501fd0517..c161e7443a98 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -282,7 +282,7 @@ public:
                     ~DdeConnection();
 
     long            GetError();
-    long            GetConvId();
+    sal_uIntPtr     GetConvId();
 
     static const DdeConnections& GetConnections();
 
@@ -383,7 +383,7 @@ public:
     virtual        ~DdeTopic();
 
     const String&   GetName() const;
-    long            GetConvId();
+    sal_uIntPtr     GetConvId();
 
     void            SetConnectHdl( const Link& rLink ) { aConnectLink = rLink; }
     const Link&     GetConnectHdl() const { return aConnectLink;  }
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 86576477eab8..5d87b9d143db 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -253,9 +253,9 @@ const String& DdeConnection::GetTopicName()
 
 // --- DdeConnection::GetConvId() ----------------------------------
 
-long DdeConnection::GetConvId()
+sal_uIntPtr DdeConnection::GetConvId()
 {
-    return (long)pImp->hConv;
+    return (sal_uIntPtr)pImp->hConv;
 }
 
 const DdeConnections& DdeConnection::GetConnections()
diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index 0e1c758a058b..d332bde1b737 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -200,7 +200,7 @@ sal_uLong DdeData::GetInternalFormat( sal_uLong nFmt )
         {
             TCHAR szName[ 256 ];
 
-            if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) )
+            if( GetClipboardFormatName( (UINT)nFmt, szName, sizeof(szName) ) )
                 nFmt = SotExchange::RegisterFormatName( String(reinterpret_cast<const sal_Unicode*>(szName)) );
         }
 #endif
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index d69458541a85..48df4eaeb8c9 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -150,12 +150,12 @@ struct DdeInstData
     sal_uInt16          nRefCount;
     DdeConnections* pConnections;
     // Server
-    long            hCurConvSvr;
-    sal_uLong           hDdeInstSvr;
+    HCONV           hCurConvSvr;
+    DWORD           hDdeInstSvr;
     short           nInstanceSvr;
     DdeServices*    pServicesSvr;
     // Client
-    sal_uLong           hDdeInstCli;
+    DWORD           hDdeInstCli;
     short           nInstanceCli;
 };
 
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 0be7157f6869..4235fa2a9258 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -253,7 +253,7 @@ found:
         pTopic->aItem.Erase();
 
     sal_Bool bRes = sal_False;
-    pInst->hCurConvSvr = (long)hConv;
+    pInst->hCurConvSvr = hConv;
     switch( nCode )
     {
         case XTYP_REQUEST:
@@ -767,11 +767,11 @@ sal_Bool __EXPORT DdeTopic::Execute( const String* r )
 
 // --- DdeTopic::GetConvId() ---------------------------------------
 
-long DdeTopic::GetConvId()
+sal_uIntPtr DdeTopic::GetConvId()
 {
     DdeInstData* pInst = ImpGetInstData();
     DBG_ASSERT(pInst,"SVDDE:No instance data");
-    return pInst->hCurConvSvr;
+    return (sal_uIntPtr)pInst->hCurConvSvr;
 }
 
 // --- DdeTopic::StartAdviseLoop() ---------------------------------