This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new f1e62f6c05 Port main/svl's DDE to Win64.
f1e62f6c05 is described below
commit f1e62f6c059647072d0ac0286addecf1784c15e5
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Thu Feb 7 02:11:15 2019 +0000
Port main/svl's DDE to Win64.
Patch by: me
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1853099
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit c4c57a27ee8e6f34b479211e64f843c073c00763)
---
main/svl/inc/svl/svdde.hxx | 4 ++--
main/svl/source/svdde/ddecli.cxx | 4 ++--
main/svl/source/svdde/ddedata.cxx | 2 +-
main/svl/source/svdde/ddeimp.hxx | 6 +++---
main/svl/source/svdde/ddesvr.cxx | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/main/svl/inc/svl/svdde.hxx b/main/svl/inc/svl/svdde.hxx
index 6a444542a7..af3b8b062e 100644
--- a/main/svl/inc/svl/svdde.hxx
+++ b/main/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/main/svl/source/svdde/ddecli.cxx b/main/svl/source/svdde/ddecli.cxx
index 71e719f0c9..c3c0ec0d7f 100644
--- a/main/svl/source/svdde/ddecli.cxx
+++ b/main/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/main/svl/source/svdde/ddedata.cxx
b/main/svl/source/svdde/ddedata.cxx
index 62c8150aec..3e13e83553 100644
--- a/main/svl/source/svdde/ddedata.cxx
+++ b/main/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/main/svl/source/svdde/ddeimp.hxx b/main/svl/source/svdde/ddeimp.hxx
index b0cc275154..92d576efc9 100644
--- a/main/svl/source/svdde/ddeimp.hxx
+++ b/main/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/main/svl/source/svdde/ddesvr.cxx b/main/svl/source/svdde/ddesvr.cxx
index 0335c7af21..788eb7c93c 100644
--- a/main/svl/source/svdde/ddesvr.cxx
+++ b/main/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() ---------------------------------
