Author: damjan
Date: Thu Feb 7 02:11:15 2019
New Revision: 1853099
URL: http://svn.apache.org/viewvc?rev=1853099&view=rev
Log:
Port main/svl's DDE to Win64.
Patch by: me
Modified:
openoffice/trunk/main/svl/inc/svl/svdde.hxx
openoffice/trunk/main/svl/source/svdde/ddecli.cxx
openoffice/trunk/main/svl/source/svdde/ddedata.cxx
openoffice/trunk/main/svl/source/svdde/ddeimp.hxx
openoffice/trunk/main/svl/source/svdde/ddesvr.cxx
Modified: openoffice/trunk/main/svl/inc/svl/svdde.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/inc/svl/svdde.hxx?rev=1853099&r1=1853098&r2=1853099&view=diff
==============================================================================
--- openoffice/trunk/main/svl/inc/svl/svdde.hxx (original)
+++ openoffice/trunk/main/svl/inc/svl/svdde.hxx Thu Feb 7 02:11:15 2019
@@ -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; }
Modified: openoffice/trunk/main/svl/source/svdde/ddecli.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/svdde/ddecli.cxx?rev=1853099&r1=1853098&r2=1853099&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/svdde/ddecli.cxx (original)
+++ openoffice/trunk/main/svl/source/svdde/ddecli.cxx Thu Feb 7 02:11:15 2019
@@ -253,9 +253,9 @@ const String& DdeConnection::GetTopicNam
// --- DdeConnection::GetConvId() ----------------------------------
-long DdeConnection::GetConvId()
+sal_uIntPtr DdeConnection::GetConvId()
{
- return (long)pImp->hConv;
+ return (sal_uIntPtr)pImp->hConv;
}
const DdeConnections& DdeConnection::GetConnections()
Modified: openoffice/trunk/main/svl/source/svdde/ddedata.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/svdde/ddedata.cxx?rev=1853099&r1=1853098&r2=1853099&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/svdde/ddedata.cxx (original)
+++ openoffice/trunk/main/svl/source/svdde/ddedata.cxx Thu Feb 7 02:11:15 2019
@@ -200,7 +200,7 @@ sal_uLong DdeData::GetInternalFormat( sa
{
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
Modified: openoffice/trunk/main/svl/source/svdde/ddeimp.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/svdde/ddeimp.hxx?rev=1853099&r1=1853098&r2=1853099&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/svdde/ddeimp.hxx (original)
+++ openoffice/trunk/main/svl/source/svdde/ddeimp.hxx Thu Feb 7 02:11:15 2019
@@ -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;
};
Modified: openoffice/trunk/main/svl/source/svdde/ddesvr.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/svdde/ddesvr.cxx?rev=1853099&r1=1853098&r2=1853099&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/svdde/ddesvr.cxx (original)
+++ openoffice/trunk/main/svl/source/svdde/ddesvr.cxx Thu Feb 7 02:11:15 2019
@@ -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( con
// --- 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() ---------------------------------
