summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-06-04 16:09:58 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-06-04 16:11:44 +0200
commita96f593b415390f7f218e5772930d127a832eb43 (patch)
treea4cf5bcc44e67fe503fb399d36276d82fee1866e /svl
parent424e936fc095c676a24c04acdd1eb1fbb6a27bed (diff)
Some more sal_IntPtr dance, but enough for today
Change-Id: Ic772181321e74713244223cc3d4542bd4cd2dc88
Diffstat (limited to 'svl')
-rw-r--r--svl/source/svdde/ddecli.cxx4
-rw-r--r--svl/source/svdde/ddesvr.cxx18
2 files changed, 8 insertions, 14 deletions
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 5928211f00f8..168881144d35 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -243,9 +243,9 @@ const String& DdeConnection::GetTopicName()
// --- DdeConnection::GetConvId() ----------------------------------
-long DdeConnection::GetConvId()
+sal_IntPtr DdeConnection::GetConvId()
{
- return (long)pImp->hConv;
+ return (sal_IntPtr)pImp->hConv;
}
const std::vector<DdeConnection*>& DdeConnection::GetConnections()
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 202d26d9f18f..d4b8aeed43a2 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -45,12 +45,7 @@ class DdeItemImp : public std::vector<DdeItemImpData> {};
// --- DdeInternat::SvrCallback() ----------------------------------
-#ifdef WNT
-HDDEDATA CALLBACK DdeInternal::SvrCallback(
- WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
- HDDEDATA hData, DWORD, DWORD )
-#else
-#if defined( ICC )
+#if defined( WNT ) || defined( ICC )
HDDEDATA CALLBACK DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
@@ -59,7 +54,6 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2,
HDDEDATA hData, DWORD, DWORD )
#endif
-#endif
{
DdeServices& rAll = DdeService::GetServices();
DdeService* pService;
@@ -169,7 +163,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
pTopic = FindTopic( *pService, hText1 );
if ( pTopic )
{
- pTopic->Connect( (long) hConv );
+ pTopic->Connect( (sal_IntPtr) hConv );
pC = new Conversation;
pC->hConv = hConv;
pC->pTopic = pTopic;
@@ -195,7 +189,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback(
found:
if ( nCode == XTYP_DISCONNECT)
{
- pC->pTopic->_Disconnect( (long) hConv );
+ pC->pTopic->_Disconnect( (sal_IntPtr) hConv );
for ( ConvList::iterator it = pService->pConv->begin();
it != pService->pConv->end();
++it
@@ -227,7 +221,7 @@ found:
pTopic->aItem = OUString();
sal_Bool bRes = sal_False;
- pInst->hCurConvSvr = (long)hConv;
+ pInst->hCurConvSvr = (sal_IntPtr)hConv;
switch( nCode )
{
case XTYP_REQUEST:
@@ -324,14 +318,14 @@ found:
if (pItem)
{
- pItem->IncMonitor( (long)hConv );
+ pItem->IncMonitor( (sal_IntPtr)hConv );
pInst->hCurConvSvr = 0;
}
}
return (HDDEDATA)sal_True;
case XTYP_ADVSTOP:
- pItem->DecMonitor( (long)hConv );
+ pItem->DecMonitor( (sal_IntPtr)hConv );
if( !pItem->pImpData )
pTopic->StopAdviseLoop();
pInst->hCurConvSvr = 0;