diff options
Diffstat (limited to 'svl/source/svdde/ddecli.cxx')
-rw-r--r-- | svl/source/svdde/ddecli.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index da8b6998f2b2..6e8fe7662e05 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -87,7 +87,7 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( if( self ) { DdeTransaction* t; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; for( t = self->aTransactions.First(); t; t = self->aTransactions.Next() ) { switch( nCode ) @@ -96,9 +96,9 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( if( (DWORD)t->nId == nInfo1 ) { nCode = t->nType & (XCLASS_MASK | XTYP_MASK); - t->bBusy = FALSE; + t->bBusy = sal_False; t->Done( 0 != hData ); - bFound = TRUE; + bFound = sal_True; } break; @@ -109,11 +109,11 @@ HDDEDATA CALLBACK DdeInternal::CliCallback( : DdeGetLastError( pInst->hDdeInstCli ); t = 0; nRet = 0; - bFound = TRUE; + bFound = sal_True; break; case XTYP_ADVDATA: - bFound = BOOL( *t->pName == hText2 ); + bFound = sal_Bool( *t->pName == hText2 ); break; } if( bFound ) @@ -223,7 +223,7 @@ DdeConnection::~DdeConnection() // --- DdeConnection::IsConnected() -------------------------------- -BOOL DdeConnection::IsConnected() +sal_Bool DdeConnection::IsConnected() { CONVINFO c; #ifdef OS2 @@ -232,13 +232,13 @@ BOOL DdeConnection::IsConnected() c.cb = sizeof( c ); #endif if ( DdeQueryConvInfo( pImp->hConv, QID_SYNC, &c ) ) - return TRUE; + return sal_True; else { DdeInstData* pInst = ImpGetInstData(); pImp->hConv = DdeReconnect( pImp->hConv ); pImp->nStatus = pImp->hConv ? DMLERR_NO_ERROR : DdeGetLastError( pInst->hDdeInstCli ); - return BOOL( pImp->nStatus == DMLERR_NO_ERROR ); + return sal_Bool( pImp->nStatus == DMLERR_NO_ERROR ); } } @@ -281,7 +281,7 @@ DdeTransaction::DdeTransaction( DdeConnection& d, const String& rItemName, nTime = n; nId = 0; nType = 0; - bBusy = FALSE; + bBusy = sal_False; rDde.aTransactions.Insert( this ); } @@ -307,7 +307,7 @@ void DdeTransaction::Execute() HSZ hItem = *pName; void* pData = (void*)(const void *)aDdeData; DWORD nData = (DWORD)(long)aDdeData; - ULONG nIntFmt = aDdeData.pImp->nFmt; + sal_uLong nIntFmt = aDdeData.pImp->nFmt; UINT nExtFmt = DdeData::GetExternalFormat( nIntFmt ); DdeInstData* pInst = ImpGetInstData(); @@ -343,7 +343,7 @@ void DdeTransaction::Execute() if ( nId && rDde.pImp->hConv ) DdeAbandonTransaction( pInst->hDdeInstCli, rDde.pImp->hConv, nId); nId = 0; - bBusy = TRUE; + bBusy = sal_True; HDDEDATA hRet = DdeClientTransaction( (unsigned char*)pData, nData, rDde.pImp->hConv, hItem, nExtFmt, (UINT)nType, TIMEOUT_ASYNC, @@ -374,7 +374,7 @@ void DdeTransaction::Data( const DdeData* p ) // --- DdeTransaction::Done() -------------------------------------- -void DdeTransaction::Done( BOOL bDataValid ) +void DdeTransaction::Done( sal_Bool bDataValid ) { aDone.Call( (void*)bDataValid ); } @@ -390,7 +390,7 @@ DdeLink::DdeLink( DdeConnection& d, const String& aItemName, long n ) : DdeLink::~DdeLink() { - nType = (USHORT)XTYP_ADVSTOP; + nType = (sal_uInt16)XTYP_ADVSTOP; nTime = 0; } @@ -428,7 +428,7 @@ DdeHotLink::DdeHotLink( DdeConnection& d, const String& i, long n ) : // --- DdePoke::DdePoke() ------------------------------------------ DdePoke::DdePoke( DdeConnection& d, const String& i, const char* p, - long l, ULONG f, long n ) : + long l, sal_uLong f, long n ) : DdeTransaction( d, i, n ) { aDdeData = DdeData( p, l, f ); |