diff options
Diffstat (limited to 'svl/source/svdde/ddesvr.cxx')
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index c361f259d610..3d3c5029c6a7 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -48,10 +48,10 @@ enum DdeItemType struct DdeItemImpData { - ULONG nHCnv; - USHORT nCnt; + sal_uLong nHCnv; + sal_uInt16 nCnt; - DdeItemImpData( ULONG nH ) : nHCnv( nH ), nCnt( 1 ) {} + DdeItemImpData( sal_uLong nH ) : nHCnv( nH ), nCnt( 1 ) {} }; SV_DECL_VARARR( DdeItemImp, DdeItemImpData, 1, 1 ) @@ -106,7 +106,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( { if( hText1 ) { - USHORT n = 0; + sal_uInt16 n = 0; while( STRING_NOTFOUND != n ) { String s( sTopics.GetToken( 0, '\t', n )); @@ -159,7 +159,7 @@ HDDEDATA CALLBACK _export DdeInternal::SvrCallback( } #else String sTopics( pService->Topics() ); - USHORT n = 0; + sal_uInt16 n = 0; while( STRING_NOTFOUND != n ) { String s( sTopics.GetToken( 0, '\t', n )); @@ -240,7 +240,7 @@ found: return (HDDEDATA)NULL; } - BOOL bExec = BOOL(nCode == XTYP_EXECUTE); + sal_Bool bExec = sal_Bool(nCode == XTYP_EXECUTE); pTopic = pC->pTopic; if ( pTopic && !bExec ) pItem = FindItem( *pTopic, hText2 ); @@ -256,7 +256,7 @@ found: else pTopic->aItem.Erase(); - BOOL bRes = FALSE; + sal_Bool bRes = sal_False; pInst->hCurConvSvr = (long)hConv; switch( nCode ) { @@ -345,14 +345,14 @@ found: pItem->IncMonitor( (long)hConv ); pInst->hCurConvSvr = NULL; } - return (HDDEDATA)TRUE; + return (HDDEDATA)sal_True; case XTYP_ADVSTOP: pItem->DecMonitor( (long)hConv ); if( !pItem->pImpData ) pTopic->StopAdviseLoop(); pInst->hCurConvSvr = NULL; - return (HDDEDATA)TRUE; + return (HDDEDATA)sal_True; case XTYP_EXECUTE: { @@ -400,7 +400,7 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic ) { DdeTopic* s; DdeTopics& rTopics = rService.aTopics; - int bWeiter = FALSE; + int bWeiter = sal_False; DdeInstData* pInst = ImpGetInstData(); DBG_ASSERT(pInst,"SVDDE:No instance data"); @@ -433,7 +433,7 @@ DdeItem* DdeInternal::FindItem( DdeTopic& rTopic, HSZ hItem ) DdeItems& rItems = rTopic.aItems; DdeInstData* pInst = ImpGetInstData(); DBG_ASSERT(pInst,"SVDDE:No instance data"); - int bWeiter = FALSE; + int bWeiter = sal_False; do { // middle check loop @@ -569,7 +569,7 @@ void DdeService::RemoveTopic( const DdeTopic& rTopic ) aTopics.Remove( t ); // JP 27.07.95: und alle Conversions loeschen !!! // (sonst wird auf geloeschten Topics gearbeitet!!) - for( ULONG n = pConv->Count(); n; ) + for( sal_uLong n = pConv->Count(); n; ) { Conversation* pC = pConv->GetObject( --n ); if( pC->pTopic == &rTopic ) @@ -585,21 +585,21 @@ void DdeService::RemoveTopic( const DdeTopic& rTopic ) // --- DdeService::HasCbFormat() ----------------------------------- -BOOL DdeService::HasCbFormat( USHORT nFmt ) +sal_Bool DdeService::HasCbFormat( sal_uInt16 nFmt ) { - return BOOL( aFormats.GetPos( nFmt ) != LIST_ENTRY_NOTFOUND ); + return sal_Bool( aFormats.GetPos( nFmt ) != LIST_ENTRY_NOTFOUND ); } // --- DdeService::HasFormat() ------------------------------------- -BOOL DdeService::HasFormat( ULONG nFmt ) +sal_Bool DdeService::HasFormat( sal_uLong nFmt ) { - return HasCbFormat( (USHORT)DdeData::GetExternalFormat( nFmt )); + return HasCbFormat( (sal_uInt16)DdeData::GetExternalFormat( nFmt )); } // --- DdeService::AddFormat() ------------------------------------- -void DdeService::AddFormat( ULONG nFmt ) +void DdeService::AddFormat( sal_uLong nFmt ) { nFmt = DdeData::GetExternalFormat( nFmt ); aFormats.Remove( nFmt ); @@ -608,7 +608,7 @@ void DdeService::AddFormat( ULONG nFmt ) // --- DdeService::RemoveFormat() ---------------------------------- -void DdeService::RemoveFormat( ULONG nFmt ) +void DdeService::RemoveFormat( sal_uLong nFmt ) { aFormats.Remove( DdeData::GetExternalFormat( nFmt ) ); } @@ -645,9 +645,9 @@ const String& DdeTopic::GetName() const // --- DdeTopic::IsSystemTopic() ----------------------------------- -BOOL DdeTopic::IsSystemTopic() +sal_Bool DdeTopic::IsSystemTopic() { - return BOOL (GetName() == reinterpret_cast<const sal_Unicode*>(SZDDESYS_TOPIC)); + return sal_Bool (GetName() == reinterpret_cast<const sal_Unicode*>(SZDDESYS_TOPIC)); } // --- DdeTopic::AddItem() ----------------------------------------- @@ -741,7 +741,7 @@ void __EXPORT DdeTopic::_Disconnect( long nId ) // --- DdeTopic::Get() --------------------------------------------- -DdeData* __EXPORT DdeTopic::Get( ULONG nFmt ) +DdeData* __EXPORT DdeTopic::Get( sal_uLong nFmt ) { if ( aGetLink.IsSet() ) return (DdeData*)aGetLink.Call( (void*)nFmt ); @@ -751,22 +751,22 @@ DdeData* __EXPORT DdeTopic::Get( ULONG nFmt ) // --- DdeTopic::Put() --------------------------------------------- -BOOL __EXPORT DdeTopic::Put( const DdeData* r ) +sal_Bool __EXPORT DdeTopic::Put( const DdeData* r ) { if ( aPutLink.IsSet() ) - return (BOOL)aPutLink.Call( (void*) r ); + return (sal_Bool)aPutLink.Call( (void*) r ); else - return FALSE; + return sal_False; } // --- DdeTopic::Execute() ----------------------------------------- -BOOL __EXPORT DdeTopic::Execute( const String* r ) +sal_Bool __EXPORT DdeTopic::Execute( const String* r ) { if ( aExecLink.IsSet() ) - return (BOOL)aExecLink.Call( (void*)r ); + return (sal_Bool)aExecLink.Call( (void*)r ); else - return FALSE; + return sal_False; } // --- DdeTopic::GetConvId() --------------------------------------- @@ -780,16 +780,16 @@ long DdeTopic::GetConvId() // --- DdeTopic::StartAdviseLoop() --------------------------------- -BOOL DdeTopic::StartAdviseLoop() +sal_Bool DdeTopic::StartAdviseLoop() { - return FALSE; + return sal_False; } // --- DdeTopic::StopAdviseLoop() ---------------------------------- -BOOL DdeTopic::StopAdviseLoop() +sal_Bool DdeTopic::StopAdviseLoop() { - return FALSE; + return sal_False; } // --- DdeItem::DdeItem() ------------------------------------------ @@ -859,17 +859,17 @@ void DdeItem::NotifyClient() // --- DdeItem::IncMonitor() ------------------------------------------ -void DdeItem::IncMonitor( ULONG nHCnv ) +void DdeItem::IncMonitor( sal_uLong nHCnv ) { if( !pImpData ) { pImpData = new DdeItemImp; if( DDEGETPUTITEM == nType ) - ((DdeGetPutItem*)this)->AdviseLoop( TRUE ); + ((DdeGetPutItem*)this)->AdviseLoop( sal_True ); } else { - for( USHORT n = pImpData->Count(); n; ) + for( sal_uInt16 n = pImpData->Count(); n; ) if( (*pImpData)[ --n ].nHCnv == nHCnv ) { ++(*pImpData)[ n ].nHCnv; @@ -882,12 +882,12 @@ void DdeItem::IncMonitor( ULONG nHCnv ) // --- DdeItem::DecMonitor() ------------------------------------------ -void DdeItem::DecMonitor( ULONG nHCnv ) +void DdeItem::DecMonitor( sal_uLong nHCnv ) { if( pImpData ) { DdeItemImpData* pData = (DdeItemImpData*)pImpData->GetData(); - for( USHORT n = pImpData->Count(); n; --n, ++pData ) + for( sal_uInt16 n = pImpData->Count(); n; --n, ++pData ) if( pData->nHCnv == nHCnv ) { if( !pData->nCnt || !--pData->nCnt ) @@ -898,7 +898,7 @@ void DdeItem::DecMonitor( ULONG nHCnv ) { delete pImpData, pImpData = 0; if( DDEGETPUTITEM == nType ) - ((DdeGetPutItem*)this)->AdviseLoop( FALSE ); + ((DdeGetPutItem*)this)->AdviseLoop( sal_False ); } } return ; @@ -912,7 +912,7 @@ short DdeItem::GetLinks() { short nCnt = 0; if( pImpData ) - for( USHORT n = pImpData->Count(); n; ) + for( sal_uInt16 n = pImpData->Count(); n; ) nCnt = nCnt + (*pImpData)[ --n ].nCnt; return nCnt; } @@ -944,21 +944,21 @@ DdeGetPutItem::DdeGetPutItem( const DdeItem& rItem ) // --- DdeGetPutData::Get() ---------------------------------------- -DdeData* DdeGetPutItem::Get( ULONG ) +DdeData* DdeGetPutItem::Get( sal_uLong ) { return 0; } // --- DdeGetPutData::Put() ---------------------------------------- -BOOL DdeGetPutItem::Put( const DdeData* ) +sal_Bool DdeGetPutItem::Put( const DdeData* ) { - return FALSE; + return sal_False; } // --- DdeGetPutData::AdviseLoop() --------------------------------- -void DdeGetPutItem::AdviseLoop( BOOL ) +void DdeGetPutItem::AdviseLoop( sal_Bool ) { } @@ -1023,7 +1023,7 @@ String DdeService::Formats() s += '\t'; p = buf; - switch( (USHORT)f ) + switch( (sal_uInt16)f ) { case CF_TEXT: p = reinterpret_cast<LPCTSTR>(String::CreateFromAscii("TEXT").GetBuffer()); @@ -1070,9 +1070,9 @@ String DdeService::Status() // --- DdeService::IsBusy() ---------------------------------------- -BOOL __EXPORT DdeService::IsBusy() +sal_Bool __EXPORT DdeService::IsBusy() { - return FALSE; + return sal_False; } // --- DdeService::GetHelp() ---------------------------------------- @@ -1082,14 +1082,14 @@ String __EXPORT DdeService::GetHelp() return String(); } -BOOL DdeTopic::MakeItem( const String& ) +sal_Bool DdeTopic::MakeItem( const String& ) { - return FALSE; + return sal_False; } -BOOL DdeService::MakeTopic( const String& ) +sal_Bool DdeService::MakeTopic( const String& ) { - return FALSE; + return sal_False; } String DdeService::SysTopicGet( const String& ) @@ -1097,8 +1097,8 @@ String DdeService::SysTopicGet( const String& ) return String(); } -BOOL DdeService::SysTopicExecute( const String* ) +sal_Bool DdeService::SysTopicExecute( const String* ) { - return FALSE; + return sal_False; } |