diff options
50 files changed, 515 insertions, 402 deletions
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 22157b1e0e4d..90c5e7b4cc0e 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -1207,6 +1207,7 @@ void BitmapDevice::drawPolygon( const basegfx::B2DPolygon& rPoly, const sal_uInt32 numVertices( rPoly.count() ); if( numVertices ) + { if( isCompatibleClipMask( rClip ) ) drawPolygon_i( rPoly, mpImpl->maLineClipRect, @@ -1214,6 +1215,7 @@ void BitmapDevice::drawPolygon( const basegfx::B2DPolygon& rPoly, else getGenericRenderer()->drawPolygon( rPoly, lineColor, drawMode, rClip ); + } } void BitmapDevice::fillPolyPolygon( const basegfx::B2DPolyPolygon& rPoly, diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index fd9e15fb783d..9be52cdd24c3 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -1030,9 +1030,9 @@ sal_Int32 SAXWriter::getIndentPrefixLength( sal_Int32 nFirstLineBreakOccurence ) sal_Int32 nLength =-1; if (mp_SaxWriterHelper) { - if( m_bForceLineBreak || - m_bAllowLineBreak && - ((nFirstLineBreakOccurence + mp_SaxWriterHelper->GetLastColumnCount()) > MAXCOLUMNCOUNT) ) + if ( m_bForceLineBreak || + (m_bAllowLineBreak && + ((nFirstLineBreakOccurence + mp_SaxWriterHelper->GetLastColumnCount()) > MAXCOLUMNCOUNT)) ) nLength = m_nLevel; } m_bForceLineBreak = sal_False; diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx index 1f71e5bed1da..31afe62efd09 100644 --- a/sot/source/base/factory.cxx +++ b/sot/source/base/factory.cxx @@ -84,7 +84,7 @@ void SotFactory::DeInit() #ifdef DBG_UTIL ByteString aStr( "Objects alive: " ); aStr.Append( ByteString::CreateFromInt32( pSotData->nSvObjCount ) ); - DBG_WARNING( aStr.GetBuffer() ) + DBG_WARNING( aStr.GetBuffer() ); /* SotObjectList *pObjList = pSotData->pObjectList; @@ -163,7 +163,7 @@ SotFactory::SotFactory( const SvGlobalName & rName, SvGlobalName aEmptyName; if( aEmptyName != *this ) { // wegen Sfx-BasicFactories - DBG_ASSERT( aEmptyName != *this, "create factory without SvGlobalName" ) + DBG_ASSERT( aEmptyName != *this, "create factory without SvGlobalName" ); if( Find( *this ) ) { /* diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 768a6076742f..0062b7a7fb1c 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -172,7 +172,7 @@ BOOL SotObject::ShouldDelete() for( i = pAggList->Count() -1; i > 0; i-- ) { // Referenzen aufloesen - DBG_ASSERT( !pAggList->GetObject( i ).bMainObj, "main object reference is opened" ) + DBG_ASSERT( !pAggList->GetObject( i ).bMainObj, "main object reference is opened" ); RemoveInterface( i ); } delete pAggList; @@ -220,9 +220,9 @@ void SotObject::RemoveInterface( ULONG nPos ) SvAggregate & rAgg = pAggList->GetObject( nPos ); if( !rAgg.bFactory ) { - DBG_ASSERT( rAgg.pObj->pAggList, "no aggregation list" ) + DBG_ASSERT( rAgg.pObj->pAggList, "no aggregation list" ); DBG_ASSERT( rAgg.pObj->pAggList->GetObject( 0 ).pObj == this, - "not owner of aggregated object" ) + "not owner of aggregated object" ); // sich selbst als Cast-Verwalter austragen rAgg.pObj->pAggList->GetObject( 0 ) = SvAggregate(); // Referenz aufloesen @@ -239,8 +239,8 @@ void SotObject::RemoveInterface( ULONG nPos ) *************************************************************************/ void SotObject::RemoveInterface( SotObject * pObjP ) { - DBG_ASSERT( pObjP, "null pointer" ) - DBG_ASSERT( pAggList, "no aggregation list" ) + DBG_ASSERT( pObjP, "null pointer" ); + DBG_ASSERT( pAggList, "no aggregation list" ); ULONG i; for( i = 0; i < pAggList->Count(); i++ ) { @@ -248,7 +248,7 @@ void SotObject::RemoveInterface( SotObject * pObjP ) if( !rAgg.bFactory && pObjP == rAgg.pObj ) RemoveInterface( i ); } - DBG_ASSERT( i < pAggList->Count(), "object not found" ) + DBG_ASSERT( i < pAggList->Count(), "object not found" ); } /************************************************************************* @@ -264,7 +264,7 @@ void SotObject::AddInterface( SotObject * pObjP ) // sich selbst als Typecast-Verwalter eintragen SvAggregateMemberList & rAList = pObjP->GetAggList(); - DBG_ASSERT( !rAList.GetObject( 0 ).bMainObj, "try to aggregate twice" ) + DBG_ASSERT( !rAList.GetObject( 0 ).bMainObj, "try to aggregate twice" ); rAList[ 0 ] = SvAggregate( this, TRUE ); } @@ -316,7 +316,7 @@ void * SotObject::DownAggCast( const SotFactory * pFact ) // sich selbst als Typecast-Verwalter eintragen SvAggregateMemberList & rAList = rAgg.pObj->GetAggList(); - DBG_ASSERT( !rAList.GetObject( 0 ).bMainObj, "try to aggregate twice" ) + DBG_ASSERT( !rAList.GetObject( 0 ).bMainObj, "try to aggregate twice" ); rAList[ 0 ] = SvAggregate( this, TRUE ); } } diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index f4adbbba8fc4..26ad41285251 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -123,7 +123,7 @@ SotStorageStream::SotStorageStream( const String & rName, StreamMode nMode, else bIsWritable = FALSE; - DBG_ASSERT( !nStorageMode,"StorageModes ignored" ) + DBG_ASSERT( !nStorageMode,"StorageModes ignored" ); } SotStorageStream::SotStorageStream( BaseStorageStream * pStm ) @@ -395,7 +395,7 @@ BOOL SotStorageStream::SetProperty( const String& rName, const ::com::sun::star: } else { - DBG_ERROR("Not implemented!") + DBG_ERROR("Not implemented!"); return FALSE; } } @@ -409,7 +409,7 @@ BOOL SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno:: } else { - DBG_ERROR("Not implemented!") + DBG_ERROR("Not implemented!"); return FALSE; } } @@ -423,7 +423,7 @@ BOOL SotStorageStream::GetProperty( const String& rName, ::com::sun::star::uno:: } else { - DBG_ERROR("Not implemented!") + DBG_ERROR("Not implemented!"); return ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >(); } } @@ -746,7 +746,7 @@ void SotStorage::RemoveUNOStorageHolder( UNOStorageHolder* pHolder ) } else { - DBG_ERROR("Not implemented!") + DBG_ERROR("Not implemented!"); } } @@ -941,7 +941,7 @@ const String & SotStorage::GetName() const { if( !m_aName.Len() ) { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) ((SotStorage *)this)->m_aName = m_pOwnStg->GetName(); } @@ -979,7 +979,7 @@ void SotStorage::SetClass( const SvGlobalName & rName, ULONG nOriginalClipFormat, const String & rUserTypeName ) { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) m_pOwnStg->SetClass( rName, nOriginalClipFormat, rUserTypeName ); else @@ -990,7 +990,7 @@ void SotStorage::SetConvertClass( const SvGlobalName & rName, ULONG nOriginalClipFormat, const String & rUserTypeName ) { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) m_pOwnStg->SetConvertClass( rName, nOriginalClipFormat, rUserTypeName ); else @@ -1008,7 +1008,7 @@ void SotStorage::SetConvertClass( const SvGlobalName & rName, SvGlobalName SotStorage::GetClassName() { SvGlobalName aGN; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) aGN = m_pOwnStg->GetClassName(); else @@ -1019,7 +1019,7 @@ SvGlobalName SotStorage::GetClassName() ULONG SotStorage::GetFormat() { ULONG nFormat = 0; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) nFormat = m_pOwnStg->GetFormat(); else @@ -1030,7 +1030,7 @@ ULONG SotStorage::GetFormat() String SotStorage::GetUserName() { String aName; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) aName = m_pOwnStg->GetUserName(); else @@ -1040,7 +1040,7 @@ String SotStorage::GetUserName() BOOL SotStorage::ShouldConvert() { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) return m_pOwnStg->ShouldConvert(); else @@ -1055,7 +1055,7 @@ BOOL SotStorage::ShouldConvert() *************************************************************************/ void SotStorage::FillInfoList( SvStorageInfoList * pFillList ) const { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) m_pOwnStg->FillInfoList( pFillList ); } @@ -1067,8 +1067,8 @@ void SotStorage::FillInfoList( SvStorageInfoList * pFillList ) const *************************************************************************/ BOOL SotStorage::CopyTo( SotStorage * pDestStg ) { - DBG_ASSERT( Owner(), "must be owner" ) - DBG_ASSERT( pDestStg->Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); + DBG_ASSERT( pDestStg->Owner(), "must be owner" ); if( m_pOwnStg && pDestStg->m_pOwnStg ) { m_pOwnStg->CopyTo( pDestStg->m_pOwnStg ); @@ -1088,7 +1088,7 @@ BOOL SotStorage::CopyTo( SotStorage * pDestStg ) *************************************************************************/ BOOL SotStorage::Commit() { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { if( !m_pOwnStg->Commit() ) @@ -1106,7 +1106,7 @@ BOOL SotStorage::Commit() *************************************************************************/ BOOL SotStorage::Revert() { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { if( !m_pOwnStg->Revert() ) @@ -1126,9 +1126,9 @@ SotStorageStream * SotStorage::OpenEncryptedSotStream( const String & rEleName, StreamMode nMode, StorageMode nStorageMode ) { - DBG_ASSERT( !nStorageMode, "StorageModes ignored" ) + DBG_ASSERT( !nStorageMode, "StorageModes ignored" ); SotStorageStream * pStm = NULL; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { // volle Ole-Patches einschalten @@ -1153,9 +1153,9 @@ SotStorageStream * SotStorage::OpenSotStream( const String & rEleName, StreamMode nMode, StorageMode nStorageMode ) { - DBG_ASSERT( !nStorageMode, "StorageModes ignored" ) + DBG_ASSERT( !nStorageMode, "StorageModes ignored" ); SotStorageStream * pStm = NULL; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { // volle Ole-Patches einschalten @@ -1186,7 +1186,7 @@ SotStorage * SotStorage::OpenSotStorage( const String & rEleName, StorageMode nStorageMode ) { SotStorage * pStor = NULL; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { nMode |= STREAM_SHARE_DENYALL; @@ -1213,7 +1213,7 @@ SotStorage * SotStorage::OpenUCBStorage( const String & rEleName, StorageMode nStorageMode ) { SotStorage * pStor = NULL; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { nMode |= STREAM_SHARE_DENYALL; @@ -1234,7 +1234,7 @@ SotStorage * SotStorage::OpenOLEStorage( const String & rEleName, StorageMode nStorageMode ) { SotStorage * pStor = NULL; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { nMode |= STREAM_SHARE_DENYALL; @@ -1259,7 +1259,7 @@ SotStorage * SotStorage::OpenOLEStorage( const String & rEleName, *************************************************************************/ BOOL SotStorage::IsStorage( const String & rEleName ) const { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); // ein bisschen schneller if( m_pOwnStg ) return m_pOwnStg->IsStorage( rEleName ); @@ -1268,7 +1268,7 @@ BOOL SotStorage::IsStorage( const String & rEleName ) const BOOL SotStorage::IsStream( const String & rEleName ) const { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); // ein bisschen schneller if( m_pOwnStg ) return m_pOwnStg->IsStream( rEleName ); @@ -1277,7 +1277,7 @@ BOOL SotStorage::IsStream( const String & rEleName ) const BOOL SotStorage::IsContained( const String & rEleName ) const { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); // ein bisschen schneller if( m_pOwnStg ) return m_pOwnStg->IsContained( rEleName ); @@ -1291,7 +1291,7 @@ BOOL SotStorage::IsContained( const String & rEleName ) const *************************************************************************/ BOOL SotStorage::Remove( const String & rEleName ) { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { m_pOwnStg->Remove( rEleName ); @@ -1309,7 +1309,7 @@ BOOL SotStorage::Remove( const String & rEleName ) *************************************************************************/ BOOL SotStorage::Rename( const String & rEleName, const String & rNewName ) { - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) { m_pOwnStg->Rename( rEleName, rNewName ); @@ -1328,8 +1328,8 @@ BOOL SotStorage::Rename( const String & rEleName, const String & rNewName ) BOOL SotStorage::CopyTo( const String & rEleName, SotStorage * pNewSt, const String & rNewName ) { - DBG_ASSERT( Owner(), "must be owner" ) - DBG_ASSERT( pNewSt->Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); + DBG_ASSERT( pNewSt->Owner(), "must be owner" ); if( m_pOwnStg ) { m_pOwnStg->CopyTo( rEleName, pNewSt->m_pOwnStg, rNewName ); @@ -1349,8 +1349,8 @@ BOOL SotStorage::CopyTo( const String & rEleName, BOOL SotStorage::MoveTo( const String & rEleName, SotStorage * pNewSt, const String & rNewName ) { - DBG_ASSERT( Owner(), "must be owner" ) - DBG_ASSERT( pNewSt->Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); + DBG_ASSERT( pNewSt->Owner(), "must be owner" ); if( m_pOwnStg ) { m_pOwnStg->MoveTo( rEleName, pNewSt->m_pOwnStg, rNewName ); @@ -1365,7 +1365,7 @@ BOOL SotStorage::MoveTo( const String & rEleName, const SvStream* SotStorage::GetSvStream() { const SvStream* pResult = 0; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) pResult = m_pOwnStg->GetSvStream(); return pResult; @@ -1374,7 +1374,7 @@ const SvStream* SotStorage::GetSvStream() SvStream* SotStorage::GetTargetSvStream() const { SvStream* pResult = 0; - DBG_ASSERT( Owner(), "must be owner" ) + DBG_ASSERT( Owner(), "must be owner" ); if( m_pOwnStg ) pResult = (SvStream*)(m_pOwnStg->GetSvStream()); return pResult; @@ -1399,7 +1399,7 @@ BOOL SotStorage::SetProperty( const String& rName, const ::com::sun::star::uno:: } else { - DBG_WARNING("W1:Not implemented!") + DBG_WARNING("W1:Not implemented!"); return FALSE; } } @@ -1422,7 +1422,7 @@ BOOL SotStorage::GetProperty( const String& rName, ::com::sun::star::uno::Any& r } else { - DBG_WARNING("W1:Not implemented!") + DBG_WARNING("W1:Not implemented!"); return FALSE; } } @@ -1436,7 +1436,7 @@ BOOL SotStorage::GetProperty( const String& rEleName, const String& rName, ::com } else { - DBG_WARNING("W1:Not implemented!") + DBG_WARNING("W1:Not implemented!"); return FALSE; } } diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 4af0d2b24350..d7e797c681f3 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1294,7 +1294,7 @@ BOOL UCBStorageStream_Impl::Revert() // if an OLEStorage is created on this stream, no "revert" is neccessary because OLEStorages do nothing on "Revert" ! if ( m_bCommited ) { - DBG_ERROR("Revert while commit is in progress!" ) + DBG_ERROR("Revert while commit is in progress!" ); return FALSE; // ??? } @@ -1442,7 +1442,7 @@ ULONG UCBStorageStream::Write( const void* pData, ULONG nSize ) // mba: does occur in writer ! if ( pImp->m_bCommited ) { - DBG_ERROR("Writing while commit is in progress!" ) + DBG_ERROR("Writing while commit is in progress!" ); return 0; } */ @@ -1475,7 +1475,7 @@ BOOL UCBStorageStream::SetSize( ULONG nNewSize ) /* if ( pImp->m_bCommited ) { - DBG_ERROR("Changing stream size while commit is in progress!" ) + DBG_ERROR("Changing stream size while commit is in progress!" ); return FALSE; } */ diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index 455a25dd14c7..ba119263eff8 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -655,8 +655,8 @@ inline SvViewDataItem* SvLBox::GetViewDataItem( SvListEntry* pEntry, { SvViewDataEntry* pEntryData = (SvViewDataEntry*)SvListView::GetViewData(pEntry); - DBG_ASSERT(pEntryData,"Entry not in View") - DBG_ASSERT(pEntryData->pItemData,"No ItemData") + DBG_ASSERT(pEntryData,"Entry not in View"); + DBG_ASSERT(pEntryData->pItemData,"No ItemData"); USHORT nItemPos = ((SvLBoxEntry*)pEntry)->GetPos( pItem ); return (pEntryData->pItemData+nItemPos); } diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index 9c0b6ff0e7da..f1cfb7289bbd 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -398,30 +398,30 @@ public: inline BOOL SvListView::IsExpanded( SvListEntry* pEntry ) const { - DBG_ASSERT(pEntry,"IsExpanded:No Entry") + DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); - DBG_ASSERT(pData,"Entry not in Table") + DBG_ASSERT(pData,"Entry not in Table"); return pData->IsExpanded(); } inline BOOL SvListView::IsSelected( SvListEntry* pEntry ) const { - DBG_ASSERT(pEntry,"IsExpanded:No Entry") + DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); - DBG_ASSERT(pData,"Entry not in Table") + DBG_ASSERT(pData,"Entry not in Table"); return pData->IsSelected(); } inline BOOL SvListView::HasEntryFocus( SvListEntry* pEntry ) const { - DBG_ASSERT(pEntry,"IsExpanded:No Entry") + DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); - DBG_ASSERT(pData,"Entry not in Table") + DBG_ASSERT(pData,"Entry not in Table"); return pData->HasFocus(); } inline void SvListView::SetEntryFocus( SvListEntry* pEntry, BOOL bFocus ) const { - DBG_ASSERT(pEntry,"SetEntryFocus:No Entry") + DBG_ASSERT(pEntry,"SetEntryFocus:No Entry"); SvViewData* pData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); - DBG_ASSERT(pData,"Entry not in Table") + DBG_ASSERT(pData,"Entry not in Table"); pData->SetFocus(bFocus); } @@ -431,7 +431,7 @@ inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const return (SvViewData*)aDataTable.Get( (ULONG)pEntry ); #else SvViewData* pResult = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); - DBG_ASSERT(pResult,"Entry not in model or wrong view") + DBG_ASSERT(pResult,"Entry not in model or wrong view"); return pResult; #endif } diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 390e240e9fa7..35a07a715dd5 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -80,7 +80,7 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg() const Sequence<OUString>& rNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(rNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed"); if(aValues.getLength() == rNames.getLength()) { diff --git a/svtools/source/config/cjkoptions.cxx b/svtools/source/config/cjkoptions.cxx index a7849ec1e206..66d70cd1e2a3 100644 --- a/svtools/source/config/cjkoptions.cxx +++ b/svtools/source/config/cjkoptions.cxx @@ -432,55 +432,55 @@ SvtCJKOptions::~SvtCJKOptions() // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsCJKFontEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsCJKFontEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsVerticalTextEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsVerticalTextEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsAsianTypographyEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsAsianTypographyEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsJapaneseFindEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsJapaneseFindEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsRubyEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsRubyEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsChangeCaseMapEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsChangeCaseMapEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsDoubleLinesEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsDoubleLinesEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsEmphasisMarksEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsEmphasisMarksEnabled(); } // ----------------------------------------------------------------------- sal_Bool SvtCJKOptions::IsVerticalCallOutEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsVerticalCallOutEnabled(); } /*-- 20.04.01 14:32:04--------------------------------------------------- @@ -488,7 +488,7 @@ sal_Bool SvtCJKOptions::IsVerticalCallOutEnabled() const -----------------------------------------------------------------------*/ void SvtCJKOptions::SetAll(sal_Bool bSet) { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); pCJKOptions->SetAll(bSet); } /*-- 20.04.01 14:32:06--------------------------------------------------- @@ -496,7 +496,7 @@ void SvtCJKOptions::SetAll(sal_Bool bSet) -----------------------------------------------------------------------*/ sal_Bool SvtCJKOptions::IsAnyEnabled() const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsAnyEnabled(); } /*-- 13.02.2003 12:11--------------------------------------------------- @@ -504,7 +504,7 @@ sal_Bool SvtCJKOptions::IsAnyEnabled() const -----------------------------------------------------------------------*/ sal_Bool SvtCJKOptions::IsReadOnly(EOption eOption) const { - DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded") + DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded"); return pCJKOptions->IsReadOnly(eOption); } diff --git a/svtools/source/config/fltrcfg.cxx b/svtools/source/config/fltrcfg.cxx index 0958e9b01dad..056826bf62ba 100644 --- a/svtools/source/config/fltrcfg.cxx +++ b/svtools/source/config/fltrcfg.cxx @@ -378,7 +378,7 @@ void SvtFilterOptions::Load() const Sequence<OUString>& rNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(rNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed"); if(aValues.getLength() == rNames.getLength()) { for(int nProp = 0; nProp < rNames.getLength(); nProp++) diff --git a/svtools/source/config/misccfg.cxx b/svtools/source/config/misccfg.cxx index 332583ebb4db..06cc9b7446c0 100644 --- a/svtools/source/config/misccfg.cxx +++ b/svtools/source/config/misccfg.cxx @@ -145,7 +145,7 @@ void SfxMiscCfg::Load() Sequence<Any> aValues = GetProperties(aNames); EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed") + DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) diff --git a/svtools/source/config/securityoptions.cxx b/svtools/source/config/securityoptions.cxx index ebd9898b43cd..6fdb314f9c74 100644 --- a/svtools/source/config/securityoptions.cxx +++ b/svtools/source/config/securityoptions.cxx @@ -881,7 +881,7 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetSecureURLs() const void SvtSecurityOptions_Impl::SetSecureURLs( const Sequence< OUString >& seqURLList ) { - DBG_ASSERT(!m_bROSecureURLs, "SvtSecurityOptions_Impl::SetSecureURLs()\nYou tried to write on a readonly value!\n") + DBG_ASSERT(!m_bROSecureURLs, "SvtSecurityOptions_Impl::SetSecureURLs()\nYou tried to write on a readonly value!\n"); if (!m_bROSecureURLs && m_seqSecureURLs!=seqURLList) { m_seqSecureURLs = seqURLList; @@ -970,7 +970,7 @@ Sequence< SvtSecurityOptions::Certificate > SvtSecurityOptions_Impl::GetTrustedA void SvtSecurityOptions_Impl::SetTrustedAuthors( const Sequence< SvtSecurityOptions::Certificate >& rAuthors ) { - DBG_ASSERT(!m_bROTrustedAuthors, "SvtSecurityOptions_Impl::SetTrustedAuthors()\nYou tried to write on a readonly value!\n") + DBG_ASSERT(!m_bROTrustedAuthors, "SvtSecurityOptions_Impl::SetTrustedAuthors()\nYou tried to write on a readonly value!\n"); if( !m_bROTrustedAuthors && rAuthors != m_seqTrustedAuthors ) { m_seqTrustedAuthors = rAuthors; @@ -1208,7 +1208,7 @@ EBasicSecurityMode SvtSecurityOptions_Impl::GetBasicMode() const void SvtSecurityOptions_Impl::SetBasicMode( EBasicSecurityMode eMode ) { - DBG_ASSERT(!m_bROBasicMode, "SvtSecurityOptions_Impl::SetBasicMode()\nYou tried to write on a readonly value!\n") + DBG_ASSERT(!m_bROBasicMode, "SvtSecurityOptions_Impl::SetBasicMode()\nYou tried to write on a readonly value!\n"); if (!m_bROBasicMode && m_eBasicMode!=eMode) { m_eBasicMode = eMode; @@ -1223,7 +1223,7 @@ sal_Bool SvtSecurityOptions_Impl::IsExecutePlugins() const void SvtSecurityOptions_Impl::SetExecutePlugins( sal_Bool bSet ) { - DBG_ASSERT(!m_bROExecutePlugins, "SvtSecurityOptions_Impl::SetExecutePlugins()\nYou tried to write on a readonly value!\n") + DBG_ASSERT(!m_bROExecutePlugins, "SvtSecurityOptions_Impl::SetExecutePlugins()\nYou tried to write on a readonly value!\n"); if (!m_bROExecutePlugins && m_bExecutePlugins!=bSet) { m_bExecutePlugins = bSet; @@ -1238,7 +1238,7 @@ sal_Bool SvtSecurityOptions_Impl::IsWarningEnabled() const void SvtSecurityOptions_Impl::SetWarningEnabled( sal_Bool bSet ) { - DBG_ASSERT(!m_bROWarning, "SvtSecurityOptions_Impl::SetWarningEnabled()\nYou tried to write on a readonly value!\n") + DBG_ASSERT(!m_bROWarning, "SvtSecurityOptions_Impl::SetWarningEnabled()\nYou tried to write on a readonly value!\n"); if (!m_bROWarning && m_bWarning!=bSet) { m_bWarning = bSet; @@ -1253,7 +1253,7 @@ sal_Bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const void SvtSecurityOptions_Impl::SetConfirmationEnabled( sal_Bool bSet ) { - DBG_ASSERT(!m_bROConfirmation, "SvtSecurityOptions_Impl::SetConfirmationEnabled()\nYou tried to write on a readonly value!\n") + DBG_ASSERT(!m_bROConfirmation, "SvtSecurityOptions_Impl::SetConfirmationEnabled()\nYou tried to write on a readonly value!\n"); if (!m_bROConfirmation && m_bConfirmation!=bSet) { m_bConfirmation = bSet; diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index c00af7312e1d..978a50395e8e 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -538,7 +538,7 @@ void SvIconView::EditingRequest( SvLBoxEntry* pEntry, SvLBoxItem* pItem, void SvIconView::EditItemText( SvLBoxEntry* pEntry, SvLBoxItem* pItem, const Selection& rSel ) { - DBG_ASSERT(pEntry&&pItem,"EditItemText:Params?") + DBG_ASSERT(pEntry&&pItem,"EditItemText:Params?"); pCurEdEntry = pEntry; pCurEdItem = pItem; Rectangle aRect( pImp->CalcTextRect( pEntry, (SvLBoxString*)pItem,0,TRUE )); diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 796a154d0585..32b37d3fdf7f 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -681,7 +681,7 @@ void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, BOOL bForceNoSelect ) if( pAnchor ) { - DBG_ASSERT(aSelEng.GetSelectionMode() != SINGLE_SELECTION,"Mode?") + DBG_ASSERT(aSelEng.GetSelectionMode() != SINGLE_SELECTION,"Mode?"); SetAnchorSelection( pOldCursor, pCursor ); } } @@ -1097,7 +1097,7 @@ void SvImpLBox::DrawNet() long nY = 0; nY -= ( nOffs * nEntryHeight ); - DBG_ASSERT(pFirstDynamicTab,"No Tree!") + DBG_ASSERT(pFirstDynamicTab,"No Tree!"); Color aOldLineColor = pView->GetLineColor(); const StyleSettings& rStyleSettings = pView->GetSettings().GetStyleSettings(); @@ -1126,7 +1126,7 @@ void SvImpLBox::DrawNet() aPos1.Y() += nEntryHeightDIV2; pChild = pView->FirstChild( pEntry ); - DBG_ASSERT(pChild,"Child?") + DBG_ASSERT(pChild,"Child?"); pChild = pTree->LastSibling( pChild ); nDistance = (USHORT)(pView->GetVisiblePos(pChild) - pView->GetVisiblePos(pEntry)); @@ -1697,7 +1697,7 @@ void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, BOOL bSelect ) pEntry != pCursor ) { SetCursor( pEntry ); - DBG_ASSERT(pView->GetSelectionCount()==1,"selection count?") + DBG_ASSERT(pView->GetSelectionCount()==1,"selection count?"); } if( GetUpdateMode() && pView->IsEntryVisible(pEntry) ) @@ -2430,7 +2430,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( nDelta ) { - DBG_ASSERT(pNewCursor&&(ULONG)pNewCursor!=(ULONG)pCursor,"Cursor?") + DBG_ASSERT(pNewCursor&&(ULONG)pNewCursor!=(ULONG)pCursor,"Cursor?"); aSelEng.CursorPosChanging( bShift, bMod1 ); if( IsEntryInView( pNewCursor ) ) SetCursor( pNewCursor ); @@ -2458,7 +2458,7 @@ BOOL SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( nDelta ) { - DBG_ASSERT(pNewCursor&&(ULONG)pNewCursor!=(ULONG)pCursor,"Cursor?") + DBG_ASSERT(pNewCursor&&(ULONG)pNewCursor!=(ULONG)pCursor,"Cursor?"); aSelEng.CursorPosChanging( bShift, bMod1 ); if( IsEntryInView( pNewCursor ) ) SetCursor( pNewCursor ); diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index e2d7bf551b82..37ee096dc6d9 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -1029,7 +1029,7 @@ void SvImpIconView::EntrySelected( SvLBoxEntry* pEntry, BOOL bSelect ) pEntry != pCursor ) { SetCursor( pEntry ); - DBG_ASSERT(pView->GetSelectionCount()==1,"selection count?") + DBG_ASSERT(pView->GetSelectionCount()==1,"selection count?"); } // bei Gummibandselektion ist uns das zu teuer if( !(nFlags & F_RUBBERING )) @@ -2301,7 +2301,7 @@ SvLBoxEntry* SvImpIconView::GetPrevEntry( const Point& rDocPos, SvLBoxEntry* pCu Point SvImpIconView::GetEntryPosition( SvLBoxEntry* pEntry ) { SvIcnVwDataEntry* pViewData = ICNVIEWDATA(pEntry); - DBG_ASSERT(pViewData,"Entry not in model") + DBG_ASSERT(pViewData,"Entry not in model"); return pViewData->aRect.TopLeft(); } @@ -2309,7 +2309,7 @@ const Rectangle& SvImpIconView::GetBoundingRect( SvLBoxEntry* pEntry, SvIcnVwDat { if( !pViewData ) pViewData = ICNVIEWDATA(pEntry); - DBG_ASSERT(pViewData,"Entry not in model") + DBG_ASSERT(pViewData,"Entry not in model"); if( !IsBoundingRectValid( pViewData->aRect )) FindBoundingRect( pEntry, pViewData ); return pViewData->aRect; @@ -2430,8 +2430,8 @@ Rectangle SvImpIconView::CalcTextRect( SvLBoxEntry* pEntry, long SvImpIconView::CalcBoundingWidth( SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData ) const { - DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP),"No Bitmaps") - DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING),"No Text") + DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP),"No Bitmaps"); + DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING),"No Text"); long nStringWidth = GetItemSize( pView, pEntry, pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING),pViewData).Width(); nStringWidth += 2*LROFFS_TEXT; long nBmpWidth = pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)->GetSize(pView,pEntry).Width(); @@ -2460,8 +2460,8 @@ long SvImpIconView::CalcBoundingWidth( SvLBoxEntry* pEntry, long SvImpIconView::CalcBoundingHeight( SvLBoxEntry* pEntry, const SvIcnVwDataEntry* pViewData ) const { - DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP),"No Bitmaps") - DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING),"No Text") + DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP),"No Bitmaps"); + DBG_ASSERT(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING),"No Text"); long nStringHeight = GetItemSize(pView,pEntry,pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING),pViewData).Height(); long nBmpHeight = pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)->GetSize(pView,pEntry).Height(); long nHeight = 0; @@ -3785,7 +3785,7 @@ void SvImpIconView::SelectRect( const Rectangle& rRect, BOOL bAdd, SvLBoxEntry* pEntry = (SvLBoxEntry*)(pZOrderList->GetObject(nPos )); SvIcnVwDataEntry* pViewData = ICNVIEWDATA(pEntry); - DBG_ASSERT(pViewData,"Entry not in model") + DBG_ASSERT(pViewData,"Entry not in model"); if( !IsBoundingRectValid( pViewData->aRect )) FindBoundingRect( pEntry, pViewData ); const Rectangle& rBoundRect = pViewData->aRect; diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index 6056a200e598..1c81343cd84f 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -636,7 +636,7 @@ void SvLBoxEntry::EnableChildsOnDemand( BOOL bEnable ) void SvLBoxEntry::ReplaceItem( SvLBoxItem* pNewItem, USHORT nPos ) { DBG_CHKTHIS(SvLBoxEntry,0); - DBG_ASSERT(pNewItem,"ReplaceItem:No Item") + DBG_ASSERT(pNewItem,"ReplaceItem:No Item"); SvLBoxItem* pOld = GetItem( nPos ); if ( pOld ) { @@ -939,7 +939,7 @@ BOOL SvLBox::NotifyMoving( #endif { DBG_CHKTHIS(SvLBox,0); - DBG_ASSERT(pEntry,"NotifyMoving:SoureEntry?") + DBG_ASSERT(pEntry,"NotifyMoving:SoureEntry?"); if( !pTarget ) { rpNewParent = 0; @@ -976,7 +976,7 @@ BOOL SvLBox::NotifyCopying( DBG_CHKTHIS(SvLBox,0); return NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos); /* - DBG_ASSERT(pEntry,"NotifyCopying:SourceEntry?") + DBG_ASSERT(pEntry,"NotifyCopying:SourceEntry?"); if( !pTarget ) { rpNewParent = 0; @@ -1176,7 +1176,7 @@ SvLBox* SvLBox::GetTargetView() const void SvLBox::RequestingChilds( SvLBoxEntry* ) { DBG_CHKTHIS(SvLBox,0); - DBG_ERROR("Child-Request-Hdl not implemented!") + DBG_ERROR("Child-Request-Hdl not implemented!"); } void SvLBox::RecalcViewData() diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index d281c5fbb026..200dd30eda1a 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -344,16 +344,16 @@ void SvTreeListBox::InitEntry( SvLBoxEntry* pEntry, String SvTreeListBox::GetEntryText(SvLBoxEntry* pEntry) const { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): no entry" ) + DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): no entry" ); SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); - DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): item not found" ) + DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): item not found" ); return pItem->GetText(); } String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" ) + DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" ); String sRet; USHORT nCount = pEntry->ItemCount(); USHORT nCur = 0; @@ -375,18 +375,18 @@ String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const const Image& SvTreeListBox::GetExpandedEntryBmp(SvLBoxEntry* pEntry, BmpColorMode _eMode) const { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT(pEntry,"Entry?") + DBG_ASSERT(pEntry,"Entry?"); SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)); - DBG_ASSERT(pItem,"GetContextBmp:Item not found") + DBG_ASSERT(pItem,"GetContextBmp:Item not found"); return pItem->GetBitmap2( _eMode ); } const Image& SvTreeListBox::GetCollapsedEntryBmp( SvLBoxEntry* pEntry, BmpColorMode _eMode ) const { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT(pEntry,"Entry?") + DBG_ASSERT(pEntry,"Entry?"); SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)); - DBG_ASSERT(pItem,"GetContextBmp:Item not found") + DBG_ASSERT(pItem,"GetContextBmp:Item not found"); return pItem->GetBitmap1( _eMode ); } @@ -494,7 +494,7 @@ void SvTreeListBox::SetEntryText( SvLBoxEntry* pEntry, const XubString& aStr) { DBG_CHKTHIS(SvTreeListBox,0); SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); - DBG_ASSERT(pItem,"SetText:Item not found") + DBG_ASSERT(pItem,"SetText:Item not found"); pItem->SetText( pEntry, aStr ); pItem->InitViewData( this, pEntry, 0 ); GetModel()->InvalidateEntry( pEntry ); @@ -1065,7 +1065,7 @@ BOOL SvTreeListBox::Collapse( SvLBoxEntry* pParent ) BOOL SvTreeListBox::Select( SvLBoxEntry* pEntry, BOOL bSelect ) { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT(pEntry,"Select: Null-Ptr") + DBG_ASSERT(pEntry,"Select: Null-Ptr"); BOOL bRetVal = SvListView::Select( pEntry, bSelect ); DBG_ASSERT(IsSelected(pEntry)==bSelect,"Select failed"); if( bRetVal ) @@ -1526,7 +1526,7 @@ void SvTreeListBox::SetWindowBits( WinBits nWinStyle ) void SvTreeListBox::PaintEntry( SvLBoxEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT(pEntry,"PaintEntry:No Entry") + DBG_ASSERT(pEntry,"PaintEntry:No Entry"); if( pEntry ) pImp->PaintEntry( pEntry ); } @@ -1534,7 +1534,7 @@ void SvTreeListBox::PaintEntry( SvLBoxEntry* pEntry ) void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry ) { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT(pEntry,"InvalidateEntry:No Entry") + DBG_ASSERT(pEntry,"InvalidateEntry:No Entry"); if( pEntry ) { GetModel()->InvalidateEntry( pEntry ); @@ -1959,7 +1959,7 @@ Rectangle SvTreeListBox::GetFocusRect( SvLBoxEntry* pEntry, long nLine ) long SvTreeListBox::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) { DBG_CHKTHIS(SvTreeListBox,0); - DBG_ASSERT(pTab,"No Tab") + DBG_ASSERT(pTab,"No Tab"); long nPos = pTab->GetPos(); if( pTab->IsDynamic() ) { diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 88a83ac389a6..eb4e533b628c 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -237,7 +237,7 @@ void SvTreeList::RemoveView( SvListView* pView ) // Ein Entry ist sichtbar, wenn alle Parents expandiert sind BOOL SvTreeList::IsEntryVisible( const SvListView* pView, SvListEntry* pEntry ) const { - DBG_ASSERT(pView&&pEntry,"IsVisible:Invalid Params") + DBG_ASSERT(pView&&pEntry,"IsVisible:Invalid Params"); BOOL bRetVal=FALSE; do { @@ -253,7 +253,7 @@ BOOL SvTreeList::IsEntryVisible( const SvListView* pView, SvListEntry* pEntry ) USHORT SvTreeList::GetDepth( SvListEntry* pEntry ) const { - DBG_ASSERT(pEntry&&pEntry!=pRootItem,"GetDepth:Bad Entry") + DBG_ASSERT(pEntry&&pEntry!=pRootItem,"GetDepth:Bad Entry"); USHORT nDepth = 0; while( pEntry->pParent != pRootItem ) { @@ -330,10 +330,10 @@ BOOL SvTreeList::IsChild( SvListEntry* pParent, SvListEntry* pChild ) const ULONG SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,ULONG nListPos) { // pDest darf Null sein! - DBG_ASSERT(pSrcEntry,"Entry?") + DBG_ASSERT(pSrcEntry,"Entry?"); if ( !pTargetParent ) pTargetParent = pRootItem; - DBG_ASSERT(pSrcEntry!=pTargetParent,"Move:Source=Target") + DBG_ASSERT(pSrcEntry!=pTargetParent,"Move:Source=Target"); Broadcast( LISTACTION_MOVING, pSrcEntry, pTargetParent, nListPos ); @@ -379,7 +379,7 @@ CheckIntegrity(); #endif ULONG nRetVal = pDstList->GetPos( pSrcEntry ); - DBG_ASSERT(nRetVal==pSrcEntry->GetChildListPos(),"ListPos not valid") + DBG_ASSERT(nRetVal==pSrcEntry->GetChildListPos(),"ListPos not valid"); Broadcast( LISTACTION_MOVED,pSrcEntry,pTargetParent,nRetVal); return nRetVal; } @@ -387,7 +387,7 @@ CheckIntegrity(); ULONG SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,ULONG nListPos) { // pDest darf Null sein! - DBG_ASSERT(pSrcEntry,"Entry?") + DBG_ASSERT(pSrcEntry,"Entry?"); if ( !pTargetParent ) pTargetParent = pRootItem; if ( !pTargetParent->pChilds ) @@ -502,7 +502,7 @@ void SvTreeList::InsertTree( SvListEntry* pSrcEntry, SvListEntry* pDstEntry) void SvTreeList::InsertTree(SvListEntry* pSrcEntry, SvListEntry* pTargetParent,ULONG nListPos) { - DBG_ASSERT(pSrcEntry,"InsertTree:Entry?") + DBG_ASSERT(pSrcEntry,"InsertTree:Entry?"); if ( !pSrcEntry ) return; @@ -577,7 +577,7 @@ SvTreeEntryList* SvTreeList::CloneChilds( SvTreeEntryList* pChilds, SvListEntry* pNewParent, ULONG& nCloneCount ) const { - DBG_ASSERT(pChilds->Count(),"Childs?") + DBG_ASSERT(pChilds->Count(),"Childs?"); SvTreeEntryList* pClonedChilds = new SvTreeEntryList; SvListEntry* pChild = (SvListEntry*)pChilds->First(); while ( pChild ) @@ -640,7 +640,7 @@ ULONG SvTreeList::GetChildCount( SvListEntry* pParent ) const ULONG SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry* pParent) const { - DBG_ASSERT(pView,"GetVisChildCount:No View") + DBG_ASSERT(pView,"GetVisChildCount:No View"); if ( !pParent ) pParent = pRootItem; if ( !pParent || !pView->IsExpanded(pParent) || !pParent->pChilds ) @@ -659,7 +659,7 @@ ULONG SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry* pPa ULONG SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry* pParent) const { - DBG_ASSERT(pView,"GetChildSelCount:No View") + DBG_ASSERT(pView,"GetChildSelCount:No View"); if ( !pParent ) pParent = pRootItem; if ( !pParent || !pParent->pChilds) @@ -745,7 +745,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, USHORT* pDepth ) const { DBG_ASSERT(pParent!=0,"TreeData corrupt!"); pActualList = pParent->pParent->pChilds; - DBG_ASSERT(pActualList,"TreeData corrupt!") + DBG_ASSERT(pActualList,"TreeData corrupt!"); nActualPos = pParent->GetChildListPos(); if ( pActualList->Count() > ( nActualPos + 1 ) ) { @@ -771,7 +771,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, USHORT* pDepth ) const *************************************************************************/ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, USHORT* pDepth ) const { - DBG_ASSERT(pActEntry!=0,"Entry?") + DBG_ASSERT(pActEntry!=0,"Entry?"); USHORT nDepth = 0; int bWithDepth = FALSE; @@ -850,7 +850,7 @@ SvListEntry* SvTreeList::Last( USHORT* /* nDepth */ ) const ULONG SvTreeList::GetVisiblePos( const SvListView* pView, SvListEntry* pEntry ) const { - DBG_ASSERT(pView&&pEntry,"View/Entry?") + DBG_ASSERT(pView&&pEntry,"View/Entry?"); if ( !pView->bVisPositionsValid ) { @@ -874,7 +874,7 @@ ULONG SvTreeList::GetVisiblePos( const SvListView* pView, SvListEntry* pEntry ) ULONG SvTreeList::GetVisibleCount( const SvListView* pView ) const { - DBG_ASSERT(pView,"GetVisCount:No View") + DBG_ASSERT(pView,"GetVisCount:No View"); if( !pView->HasViewData() ) return 0; if ( pView->nVisibleCount ) @@ -916,7 +916,7 @@ ULONG SvTreeList::GetVisibleCount( const SvListView* pView ) const SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEntry,USHORT* pActDepth) const { - DBG_ASSERT(pView,"NextVisible:No View") + DBG_ASSERT(pView,"NextVisible:No View"); if ( !pActEntry ) return 0; @@ -933,7 +933,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn if ( pView->IsExpanded(pActEntry) ) { - DBG_ASSERT(pActEntry->pChilds,"Childs?") + DBG_ASSERT(pActEntry->pChilds,"Childs?"); nDepth++; pActEntry = (SvListEntry*)(pActEntry->pChilds->GetObject(0)); if ( bWithDepth ) @@ -986,7 +986,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActEntry, USHORT* pActDepth) const { - DBG_ASSERT(pView&&pActEntry,"PrevVis:View/Entry?") + DBG_ASSERT(pView&&pActEntry,"PrevVis:View/Entry?"); USHORT nDepth = 0; int bWithDepth = FALSE; @@ -1039,7 +1039,7 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE SvListEntry* SvTreeList::LastVisible( const SvListView* pView, USHORT* pDepth) const { - DBG_ASSERT(pView,"LastVis:No View") + DBG_ASSERT(pView,"LastVis:No View"); SvListEntry* pEntry = Last(); while( pEntry && !IsEntryVisible( pView, pEntry ) ) pEntry = PrevVisible( pView, pEntry ); @@ -1060,7 +1060,7 @@ SvListEntry* SvTreeList::LastVisible( const SvListView* pView, USHORT* pDepth) c SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry,USHORT& nDelta) const { - DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"NextVis:Wrong Prms/!Vis") + DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"NextVis:Wrong Prms/!Vis"); ULONG nVisPos = GetVisiblePos( pView, pEntry ); // nDelta Eintraege vorhanden ? @@ -1076,7 +1076,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry { pEntry = NextVisible( pView, pEntry ); nDeltaTmp--; - DBG_ASSERT(pEntry,"Entry?") + DBG_ASSERT(pEntry,"Entry?"); } return pEntry; } @@ -1093,7 +1093,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEntry, USHORT& nDelta ) const { - DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"PrevVis:Parms/!Vis") + DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"PrevVis:Parms/!Vis"); ULONG nVisPos = GetVisiblePos( pView, pEntry ); // nDelta Eintraege vorhanden ? @@ -1106,7 +1106,7 @@ SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEnt { pEntry = PrevVisible( pView, pEntry ); nDeltaTmp--; - DBG_ASSERT(pEntry,"Entry?") + DBG_ASSERT(pEntry,"Entry?"); } return pEntry; } @@ -1123,7 +1123,7 @@ SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEnt SvListEntry* SvTreeList::FirstSelected( const SvListView* pView) const { - DBG_ASSERT(pView,"FirstSel:No View") + DBG_ASSERT(pView,"FirstSel:No View"); if( !pView ) return 0; SvListEntry* pActSelEntry = First(); @@ -1147,7 +1147,7 @@ SvListEntry* SvTreeList::FirstChild( SvListEntry* pParent ) const SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const { - DBG_ASSERT(pEntry,"Entry?") + DBG_ASSERT(pEntry,"Entry?"); if( !pEntry ) return 0; SvTreeEntryList* pList = pEntry->pParent->pChilds; @@ -1160,7 +1160,7 @@ SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const SvListEntry* SvTreeList::PrevSibling( SvListEntry* pEntry ) const { - DBG_ASSERT(pEntry,"Entry?") + DBG_ASSERT(pEntry,"Entry?"); if( !pEntry ) return 0; @@ -1201,7 +1201,7 @@ SvListEntry* SvTreeList::LastSibling( SvListEntry* pEntry ) const SvListEntry* SvTreeList::NextSelected( const SvListView* pView, SvListEntry* pEntry ) const { - DBG_ASSERT(pView&&pEntry,"NextSel:View/Entry?") + DBG_ASSERT(pView&&pEntry,"NextSel:View/Entry?"); pEntry = Next( pEntry ); while( pEntry && !pView->IsSelected(pEntry) ) pEntry = Next( pEntry ); @@ -1220,7 +1220,7 @@ SvListEntry* SvTreeList::NextSelected( const SvListView* pView, SvListEntry* pEn SvListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvListEntry* pEntry) const { - DBG_ASSERT(pView&&pEntry,"PrevSel:View/Entry?") + DBG_ASSERT(pView&&pEntry,"PrevSel:View/Entry?"); pEntry = Prev( pEntry ); while( pEntry && !pView->IsSelected(pEntry) ) pEntry = Prev( pEntry ); @@ -1240,7 +1240,7 @@ SvListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvListEntry* pEn SvListEntry* SvTreeList::LastSelected( const SvListView* pView ) const { - DBG_ASSERT(pView,"LastSel:No View") + DBG_ASSERT(pView,"LastSel:No View"); SvListEntry* pEntry = Last(); while( pEntry && !pView->IsSelected(pEntry) ) pEntry = Prev( pEntry ); @@ -1258,7 +1258,7 @@ SvListEntry* SvTreeList::LastSelected( const SvListView* pView ) const *************************************************************************/ ULONG SvTreeList::Insert( SvListEntry* pEntry,SvListEntry* pParent,ULONG nPos ) { - DBG_ASSERT( pEntry,"Entry?") + DBG_ASSERT( pEntry,"Entry?"); if ( !pParent ) pParent = pRootItem; @@ -1348,11 +1348,11 @@ CheckIntegrity(); void SvTreeList::Expand( SvListView* pView, SvListEntry* pEntry ) { - DBG_ASSERT(pEntry&&pView,"Expand:View/Entry?") + DBG_ASSERT(pEntry&&pView,"Expand:View/Entry?"); if ( pView->IsExpanded(pEntry) ) return; - DBG_ASSERT(pEntry->pChilds,"Expand:No Childs!") + DBG_ASSERT(pEntry->pChilds,"Expand:No Childs!"); SvViewData* pViewData = pView->GetViewData(pEntry); pViewData->nFlags |= SVLISTENTRYFLAG_EXPANDED; @@ -1380,11 +1380,11 @@ CheckIntegrity(); void SvTreeList::Collapse( SvListView* pView, SvListEntry* pEntry ) { - DBG_ASSERT(pView&&pEntry,"Collapse:View/Entry?") + DBG_ASSERT(pView&&pEntry,"Collapse:View/Entry?"); if ( !pView->IsExpanded(pEntry) ) return; - DBG_ASSERT(pEntry->pChilds,"Collapse:No Childs!") + DBG_ASSERT(pEntry->pChilds,"Collapse:No Childs!"); SvViewData* pViewData = pView->GetViewData( pEntry ); pViewData->nFlags &=(~SVLISTENTRYFLAG_EXPANDED); @@ -1413,7 +1413,7 @@ CheckIntegrity(); BOOL SvTreeList::Select( SvListView* pView, SvListEntry* pEntry, BOOL bSelect ) { - DBG_ASSERT(pView&&pEntry,"Select:View/Entry?") + DBG_ASSERT(pView&&pEntry,"Select:View/Entry?"); SvViewData* pViewData = pView->GetViewData( pEntry ); if ( bSelect ) { @@ -1452,7 +1452,7 @@ CheckIntegrity(); *************************************************************************/ BOOL SvTreeList::Remove( SvListEntry* pEntry ) { - DBG_ASSERT(pEntry,"Cannot remove root, use clear") + DBG_ASSERT(pEntry,"Cannot remove root, use clear"); if( !pEntry->pParent ) { @@ -1470,7 +1470,7 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry ) SvListEntry* pParent = pEntry->pParent; SvTreeEntryList* pList = pParent->pChilds; - DBG_ASSERT(pList,"Remove:No Childlist") + DBG_ASSERT(pList,"Remove:No Childlist"); BOOL bLastEntry = FALSE; if ( pEntry->HasChildListPos() ) @@ -1521,7 +1521,7 @@ CheckIntegrity(); ULONG SvTreeList::SelectChilds(SvListView* pView, SvListEntry* pParent,BOOL bSelect ) { - DBG_ASSERT(pView&&pParent,"SelChilds:View/Parent?") + DBG_ASSERT(pView&&pParent,"SelChilds:View/Parent?"); if ( !pParent->pChilds ) return 0; if ( pParent->pChilds->Count() == 0 ) @@ -1546,7 +1546,7 @@ CheckIntegrity(); void SvTreeList::SelectAll( SvListView* pView, BOOL bSelect ) { - DBG_ASSERT(pView,"SelectAll:NoView") + DBG_ASSERT(pView,"SelectAll:NoView"); SvListEntry* pEntry = First(); while ( pEntry ) { @@ -1581,7 +1581,7 @@ SvListEntry* SvTreeList::GetEntryAtAbsPos( ULONG nAbsPos ) const SvListEntry* SvTreeList::GetEntryAtVisPos( const SvListView* pView, ULONG nVisPos ) const { - DBG_ASSERT(pView,"GetEntryAtVisPos:No View") + DBG_ASSERT(pView,"GetEntryAtVisPos:No View"); SvListEntry* pEntry = First(); while ( nVisPos && pEntry ) { @@ -1634,7 +1634,7 @@ void lcl_CheckList( SvTreeEntryList* pList ) ULONG nPos = 0; while ( pEntry ) { - DBG_ASSERT(pEntry->GetChildListPos()==nPos,"Wrong ListPos") + DBG_ASSERT(pEntry->GetChildListPos()==nPos,"Wrong ListPos"); pEntry = (SvListEntry*)(pList->Next()); nPos++; } @@ -1655,12 +1655,12 @@ void SvTreeList::CheckIntegrity() const pEntry = Next( pEntry ); } } - DBG_ASSERT(nMyEntryCount==GetEntryCount(),"Entry count invalid") + DBG_ASSERT(nMyEntryCount==GetEntryCount(),"Entry count invalid"); } SvListEntry* SvTreeList::GetRootLevelParent( SvListEntry* pEntry ) const { - DBG_ASSERT(pEntry,"GetRootLevelParent:No Entry") + DBG_ASSERT(pEntry,"GetRootLevelParent:No Entry"); SvListEntry* pCurParent = 0; if ( pEntry ) { @@ -1716,7 +1716,7 @@ SvListView::~SvListView() void SvListView::InitTable() { DBG_CHKTHIS(SvListView,0); - DBG_ASSERT(pModel,"InitTable:No Model") + DBG_ASSERT(pModel,"InitTable:No Model"); DBG_ASSERT(!nSelectionCount&&!nVisibleCount&&!bVisPositionsValid,"InitTable: Not cleared!"); if( aDataTable.Count() ) @@ -1743,7 +1743,7 @@ void SvListView::InitTable() while( pEntry ) { pViewData = CreateViewData( pEntry ); - DBG_ASSERT(pViewData,"InitTable:No ViewData") + DBG_ASSERT(pViewData,"InitTable:No ViewData"); InitViewData( pViewData, pEntry ); aDataTable.Insert( (ULONG)pEntry, pViewData ); pEntry = pModel->Next( pEntry ); @@ -1850,7 +1850,7 @@ void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,ULONG) { DBG_CHKTHIS(SvListView,0); SvListEntry* pParent = pEntry->pParent; - DBG_ASSERT(pParent,"Model not consistent") + DBG_ASSERT(pParent,"Model not consistent"); if( pParent != pModel->pRootItem && pParent->pChilds->Count() == 1 ) { SvViewData* pViewData = (SvViewData*)aDataTable.Get( (ULONG)pParent ); @@ -1873,14 +1873,14 @@ void SvListView::ActionMoved( SvListEntry* /* pEntry */ , void SvListView::ActionInserted( SvListEntry* pEntry ) { DBG_CHKTHIS(SvListView,0); - DBG_ASSERT(pEntry,"Insert:No Entry") + DBG_ASSERT(pEntry,"Insert:No Entry"); SvViewData* pData = CreateViewData( pEntry ); InitViewData( pData, pEntry ); #ifdef DBG_UTIL BOOL bSuccess = #endif aDataTable.Insert( (ULONG)pEntry, pData ); - DBG_ASSERT(bSuccess,"Entry already in View") + DBG_ASSERT(bSuccess,"Entry already in View"); if ( nVisibleCount && pModel->IsEntryVisible( this, pEntry )) { nVisibleCount = 0; @@ -1901,9 +1901,9 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry ) USHORT nRefDepth = pModel->GetDepth( pCurEntry ); while( pCurEntry ) { - DBG_ASSERT(aDataTable.Get((ULONG)pCurEntry)==0,"Entry already in Table") + DBG_ASSERT(aDataTable.Get((ULONG)pCurEntry)==0,"Entry already in Table"); SvViewData* pViewData = CreateViewData( pCurEntry ); - DBG_ASSERT(pViewData,"No ViewData") + DBG_ASSERT(pViewData,"No ViewData"); InitViewData( pViewData, pEntry ); aDataTable.Insert( (ULONG)pCurEntry, pViewData ); pCurEntry = pModel->Next( pCurEntry ); @@ -1935,7 +1935,7 @@ void SvListView::RemoveViewData( SvListEntry* pParent ) void SvListView::ActionRemoving( SvListEntry* pEntry ) { DBG_CHKTHIS(SvListView,0); - DBG_ASSERT(pEntry,"Remove:No Entry") + DBG_ASSERT(pEntry,"Remove:No Entry"); SvViewData* pViewData = (SvViewData*)aDataTable.Get( (ULONG)pEntry ); ULONG nSelRemoved = 0; @@ -2081,7 +2081,7 @@ void SvTreeList::ResortChilds( SvListEntry* pParent ) void SvTreeList::GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent, ULONG& rPos ) { - DBG_ASSERT(pEntry,"No Entry") + DBG_ASSERT(pEntry,"No Entry"); if( eSortMode == SortNone ) return; diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index a3654832814b..b0fff49e5e8d 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -337,7 +337,7 @@ namespace svt if ( aActivePathPos != m_pImpl->aPaths.end() ) { DBG_ASSERT( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) > nCurrentStatePathIndex, - "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ) + "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); } #endif diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 4f0ff7974372..11069e61821f 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -634,8 +634,8 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel ) CursorMoved( aStartPaM.GetPara() ); // nur damit neu eingestellte Attribute verschwinden... CursorMoved( aEndPaM.GetPara() ); // nur damit neu eingestellte Attribute verschwinden... - DBG_ASSERT( mpDoc->IsValidPaM( aStartPaM ), "Index im Wald in ImpDeleteText" ) - DBG_ASSERT( mpDoc->IsValidPaM( aEndPaM ), "Index im Wald in ImpDeleteText" ) + DBG_ASSERT( mpDoc->IsValidPaM( aStartPaM ), "Index im Wald in ImpDeleteText" ); + DBG_ASSERT( mpDoc->IsValidPaM( aEndPaM ), "Index im Wald in ImpDeleteText" ); ULONG nStartNode = aStartPaM.GetPara(); ULONG nEndNode = aEndPaM.GetPara(); diff --git a/svtools/source/items1/itempool.cxx b/svtools/source/items1/itempool.cxx index 71eaefcf12cb..f6a48b51019f 100644 --- a/svtools/source/items1/itempool.cxx +++ b/svtools/source/items1/itempool.cxx @@ -1128,7 +1128,7 @@ void SfxItemPool::SetFileFormatVersion( USHORT nFileFormatVersion ) { DBG_ASSERT( this == pMaster, - "SfxItemPool::SetFileFormatVersion() but not a master pool" ) + "SfxItemPool::SetFileFormatVersion() but not a master pool" ); for ( SfxItemPool *pPool = this; pPool; pPool = pPool->pSecondary ) pPool->_nFileFormatVersion = nFileFormatVersion; } diff --git a/svtools/source/items1/slstitm.cxx b/svtools/source/items1/slstitm.cxx index ad0931540ec5..87163d41e033 100644 --- a/svtools/source/items1/slstitm.cxx +++ b/svtools/source/items1/slstitm.cxx @@ -60,7 +60,7 @@ public: SfxImpStringList::~SfxImpStringList() { - DBG_ASSERT(nRefCount!=0xffff,"ImpList already deleted") + DBG_ASSERT(nRefCount!=0xffff,"ImpList already deleted"); String* pStr = (String*)aList.First(); while( pStr ) { @@ -179,7 +179,7 @@ SfxStringListItem::SfxStringListItem( const SfxStringListItem& rItem ) : if( pImp ) { - DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid") + DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid"); pImp->nRefCount++; } } @@ -190,7 +190,7 @@ SfxStringListItem::~SfxStringListItem() { if( pImp ) { - DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid") + DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid"); if( pImp->nRefCount > 1 ) pImp->nRefCount--; else @@ -204,7 +204,7 @@ List* SfxStringListItem::GetList() { if( !pImp ) pImp = new SfxImpStringList; - DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid") + DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid"); return &(pImp->aList); } @@ -268,7 +268,7 @@ SvStream& SfxStringListItem::Store( SvStream & rStream, USHORT ) const return rStream; } - DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid") + DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid"); long nCount = pImp->aList.Count(); rStream << nCount; @@ -288,7 +288,7 @@ SvStream& SfxStringListItem::Store( SvStream & rStream, USHORT ) const void SfxStringListItem::SetString( const XubString& rStr ) { - DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0") + DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0"); if ( pImp && (pImp->nRefCount == 1) ) delete pImp; @@ -330,7 +330,7 @@ XubString SfxStringListItem::GetString() XubString aStr; if ( pImp ) { - DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid") + DBG_ASSERT(pImp->nRefCount!=0xffff,"ImpList not valid"); XubString* pStr = (XubString*)(pImp->aList.First()); while( pStr ) { @@ -359,7 +359,7 @@ int SfxStringListItem::IsPoolable() const void SfxStringListItem::Sort( BOOL bAscending, List* pParallelList ) { - DBG_ASSERT(GetRefCount()==0,"Sort:RefCount!=0") + DBG_ASSERT(GetRefCount()==0,"Sort:RefCount!=0"); if( pImp ) pImp->Sort( bAscending, pParallelList ); } @@ -367,7 +367,7 @@ void SfxStringListItem::Sort( BOOL bAscending, List* pParallelList ) //---------------------------------------------------------------------------- void SfxStringListItem::SetStringList( const com::sun::star::uno::Sequence< rtl::OUString >& rList ) { - DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0") + DBG_ASSERT(GetRefCount()==0,"SetString:RefCount!=0"); if ( pImp && (pImp->nRefCount == 1) ) delete pImp; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 9de8a0e4f33f..0d688befddd8 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1790,11 +1790,11 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( !nLen && aString.GetChar( 0 ) != '0' ) { - DBG_WARNING( "SOLK: 1. len=0" ) + DBG_WARNING( "SOLK: 1. len=0" ); } if( nStart == STRING_NOTFOUND || nLen > aString.Len() - nStart - 3 ) { - DBG_WARNING( "SOLK: 1. illegal start or wrong len" ) + DBG_WARNING( "SOLK: 1. illegal start or wrong len" ); } aURL = aString.Copy( nStart + 1, nLen ); @@ -1804,11 +1804,11 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( !nLen && aString.GetChar( 0 ) != '0' ) { - DBG_WARNING( "SOLK: 2. len=0" ) + DBG_WARNING( "SOLK: 2. len=0" ); } if( nStart == STRING_NOTFOUND || nLen > aString.Len() - nStart - 1 ) { - DBG_WARNING( "SOLK: 2. illegal start or wrong len" ) + DBG_WARNING( "SOLK: 2. illegal start or wrong len" ); } aDesc = aString.Copy( nStart+1, nLen ); diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 4982beaf3e08..6b6e0b34a975 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -629,7 +629,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream, eDestEnc = gsl_getSystemTextEncoding(); const String& rOutName = rName.Len() ? rName : rIMap.GetName(); - DBG_ASSERT( rOutName.Len(), "Kein ImageMap-Name" ) + DBG_ASSERT( rOutName.Len(), "Kein ImageMap-Name" ); if( !rOutName.Len() ) return rStream; diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index fd3130b6e3cb..f58a5d11a3c6 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -281,7 +281,7 @@ sal_Unicode SvParser::GetNextChar() else { DBG_ASSERT( pImplData && pImplData->hConv, - "no text converter!" ) + "no text converter!" ); sal_Unicode cUC; sal_uInt32 nInfo = 0; diff --git a/svtools/source/undo/undo.cxx b/svtools/source/undo/undo.cxx index 18c5ea15f084..76ed0a0a8e09 100644 --- a/svtools/source/undo/undo.cxx +++ b/svtools/source/undo/undo.cxx @@ -72,7 +72,7 @@ void SfxUndoAction::SetLinked( BOOL bIsLinked ) SfxUndoAction::~SfxUndoAction() { DBG_DTOR(SfxUndoAction, 0); - DBG_ASSERT( !IsLinked(), "Gelinkte Action geloescht" ) + DBG_ASSERT( !IsLinked(), "Gelinkte Action geloescht" ); } diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx index dfe86daac73e..7e3ebe207964 100644 --- a/tools/bootstrp/prj.cxx +++ b/tools/bootstrp/prj.cxx @@ -131,6 +131,7 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments ) aFileStream.ReadLine ( aTmpStr ); if ( aTmpStr.Search( "#" ) == 0 ) + { if (bReadComments ) return aTmpStr; else @@ -138,6 +139,7 @@ ByteString SimpleConfig::GetCleanedNextLine( BOOL bReadComments ) { aFileStream.ReadLine ( aTmpStr ); } + } aTmpStr = aTmpStr.EraseLeadingChars(); aTmpStr = aTmpStr.EraseTrailingChars(); diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx index 775ec73d3286..843f620649a2 100644 --- a/tools/inc/tools/debug.hxx +++ b/tools/inc/tools/debug.hxx @@ -38,16 +38,6 @@ #endif #include <tools/solar.h> -#ifdef HPUX -// Workaround aCC-Compiler (v1.04, v1.06) dtor bug: -// A single ";" as first statement in a dtor -// results in wrong code (check for delete with a -// NULL-pointer missing or unreliable) -#define HPUX_DTOR_BUG (1==1) -#else -#define HPUX_DTOR_BUG -#endif - // ------------ // - DBG_UITL - // ------------ @@ -448,8 +438,6 @@ public: #define DBG_MEMTEST() DbgMemTest() #define DBG_MEMTEST_PTR( p ) DbgMemTest( (void*)p ) -#define DBG_COREDUMP() DbgCoreDump() - #define DBG_PROFSTART( aName ) \ DbgProf( DBG_PROF_START, DBG_FUNC( aName ) ) @@ -485,6 +473,8 @@ public: (const void*)pObj, (DbgUsr)fTest ) #define DBG_ASSERTWARNING( sCon, aWarning ) \ +do \ +{ \ if ( DbgIsAssertWarning() ) \ { \ if ( !( sCon ) ) \ @@ -492,9 +482,12 @@ public: DbgWarning( aWarning, __FILE__, \ __LINE__ ); \ } \ - } + } \ +} while(0) #define DBG_ASSERT( sCon, aError ) \ +do \ +{ \ if ( DbgIsAssert() ) \ { \ if ( !( sCon ) ) \ @@ -502,190 +495,222 @@ public: DbgError( aError, \ __FILE__, __LINE__ ); \ } \ - } + } \ +} while(0) #ifdef DBG_BINFILTER -#define DBG_BF_ASSERT( sCon, aError ) \ +#define DBG_BF_ASSERT( sCon, aError ) \ +do \ +{ \ if ( !( sCon ) ) \ { \ DbgError( aError, \ __FILE__, __LINE__ ); \ - } + } \ +} while(0) #else -#define DBG_BF_ASSERT( sCon, aError ) +#define DBG_BF_ASSERT( sCon, aError ) ((void)0) #endif #define DBG_TRACE( aTrace ) \ +do \ { \ if ( DbgIsTraceOut() ) \ DbgTrace( aTrace ); \ -} +} while(0) #define DBG_TRACE1( aTrace, x1 ) \ +do \ { \ if ( DbgIsTraceOut() ) \ { \ DbgOutTypef( DBG_OUT_TRACE, aTrace, \ x1 ); \ } \ -} +} while(0) #define DBG_TRACE2( aTrace, x1, x2 ) \ +do \ { \ if ( DbgIsTraceOut() ) \ { \ DbgOutTypef( DBG_OUT_TRACE, aTrace, \ x1, x2 ); \ } \ -} +} while(0) #define DBG_TRACE3( aTrace, x1, x2, x3 ) \ +do \ { \ if ( DbgIsTraceOut() ) \ { \ DbgOutTypef( DBG_OUT_TRACE, aTrace, \ x1, x2, x3 ); \ } \ -} +} while(0) #define DBG_TRACE4( aTrace, x1, x2, x3, x4 ) \ +do \ { \ if ( DbgIsTraceOut() ) \ { \ DbgOutTypef( DBG_OUT_TRACE, aTrace, \ x1, x2, x3, x4 ); \ } \ -} +} while(0) #define DBG_TRACE5( aTrace, x1, x2, x3, x4, x5 ) \ +do \ { \ if ( DbgIsTraceOut() ) \ { \ DbgOutTypef( DBG_OUT_TRACE, aTrace, \ x1, x2, x3, x4, x5 ); \ } \ -} +} while(0) #define DBG_TRACEFILE( aTrace ) \ +do \ { \ if ( DbgIsTraceOut() ) \ DbgTrace( aTrace, __FILE__, __LINE__ ); \ -} +} while(0) #define DBG_WARNING( aWarning ) \ +do \ { \ if ( DbgIsWarningOut() ) \ DbgWarning( aWarning ); \ -} +} while(0) #define DBG_WARNING1( aWarning, x1 ) \ +do \ { \ if ( DbgIsWarningOut() ) \ { \ DbgOutTypef( DBG_OUT_WARNING, aWarning, \ x1 ); \ } \ -} +} while(0) #define DBG_WARNING2( aWarning, x1, x2 ) \ +do \ { \ if ( DbgIsWarningOut() ) \ { \ DbgOutTypef( DBG_OUT_WARNING, aWarning, \ x1, x2 ); \ } \ -} +} while(0) #define DBG_WARNING3( aWarning, x1, x2, x3 ) \ +do \ { \ if ( DbgIsWarningOut() ) \ { \ DbgOutTypef( DBG_OUT_WARNING, aWarning, \ x1, x2, x3 ); \ } \ -} +} while(0) #define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) \ +do \ { \ if ( DbgIsWarningOut() ) \ { \ DbgOutTypef( DBG_OUT_WARNING, aWarning, \ x1, x2, x3, x4 ); \ } \ -} +} while(0) #define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 )\ +do \ { \ if ( DbgIsWarningOut() ) \ { \ DbgOutTypef( DBG_OUT_WARNING, aWarning, \ x1, x2, x3, x4, x5 ); \ } \ -} +} while(0) #define DBG_WARNINGFILE( aWarning ) \ +do \ { \ if ( DbgIsWarningOut() ) \ DbgWarning( aWarning, __FILE__, __LINE__ ); \ -} +} while(0) #define DBG_ERROR( aError ) \ +do \ { \ if ( DbgIsErrorOut() ) \ DbgError( aError ); \ -} +} while(0) #define DBG_ERROR1( aError, x1 ) \ +do \ { \ if ( DbgIsErrorOut() ) \ { \ DbgOutTypef( DBG_OUT_ERROR, aError, \ x1 ); \ } \ -} +} while(0) #define DBG_ERROR2( aError, x1, x2 ) \ +do \ { \ if ( DbgIsErrorOut() ) \ { \ DbgOutTypef( DBG_OUT_ERROR, aError, \ x1, x2 ); \ } \ -} +} while(0) #define DBG_ERROR3( aError, x1, x2, x3 ) \ +do \ { \ if ( DbgIsErrorOut() ) \ { \ DbgOutTypef( DBG_OUT_ERROR, aError, \ x1, x2, x3 ); \ } \ -} +} while(0) #define DBG_ERROR4( aError, x1, x2, x3, x4 ) \ +do \ { \ if ( DbgIsErrorOut() ) \ { \ DbgOutTypef( DBG_OUT_ERROR, aError, \ x1, x2, x3, x4 ); \ } \ -} +} while(0) #define DBG_ERROR5( aError, x1, x2, x3, x4, x5 ) \ +do \ { \ if ( DbgIsErrorOut() ) \ { \ DbgOutTypef( DBG_OUT_ERROR, aError, \ x1, x2, x3, x4, x5 ); \ } \ -} +} while(0) #define DBG_ERRORFILE( aError ) \ +do \ { \ if ( DbgIsErrorOut() ) \ DbgError( aError, __FILE__, __LINE__ ); \ -} +} while(0) -#define DBG_TESTSOLARMUTEX() { DbgTestSolarMutex(); } +#define DBG_TESTSOLARMUTEX() \ +do \ +{ \ + DbgTestSolarMutex(); \ +} while(0) // --- Dbg-Defines (An/Ausschlaten) --- #define DBG_INSTOUTTRACE( nOut ) \ +do \ { \ DbgGetData()->nTraceOut = nOut; \ -} +} while(0) #define DBG_INSTOUTWARNING( nOut ) \ +do \ { \ DbgGetData()->nWarningOut = nOut; \ -} +} while(0) #define DBG_INSTOUTERROR( nOut ) \ +do \ { \ DbgGetData()->nErrorOut = nOut; \ -} +} while(0) #else @@ -700,62 +725,60 @@ struct DbgDataType; typedef void (*DbgPrintLine)( const sal_Char* pLine ); typedef const sal_Char* (*DbgUsr)(const void* pThis ); -#define DBG_DEBUGSTART() -#define DBG_DEBUGEND() -#define DBG_GLOBALDEBUGEND() - -#define DBG_STARTAPPEXECUTE() -#define DBG_ENDAPPEXECUTE() +#define DBG_DEBUGSTART() ((void)0) +#define DBG_DEBUGEND() ((void)0) +#define DBG_GLOBALDEBUGEND() ((void)0) -#define DBG_MEMTEST() HPUX_DTOR_BUG -#define DBG_MEMTEST_PTR( p ) HPUX_DTOR_BUG +#define DBG_STARTAPPEXECUTE() ((void)0) +#define DBG_ENDAPPEXECUTE() ((void)0) -#define DBG_COREDUMP() +#define DBG_MEMTEST() ((void)0) +#define DBG_MEMTEST_PTR( p ) ((void)0) #define DBG_NAME( aName ) #define DBG_NAMEEX( aName ) #define DBG_NAMEEX_VISIBILITY( aName, vis ) -#define DBG_PROFSTART( aName ) -#define DBG_PROFSTOP( aName ) -#define DBG_PROFCONTINUE( aName ) -#define DBG_PROFPAUSE( aName ) - -#define DBG_CTOR( aName, fTest ) -#define DBG_DTOR( aName, fTest ) HPUX_DTOR_BUG -#define DBG_CHKTHIS( aName, fTest ) HPUX_DTOR_BUG -#define DBG_CHKOBJ( pObj, aName, fTest ) HPUX_DTOR_BUG - -#define DBG_ASSERTWARNING( sCon, aWarning ) -#define DBG_ASSERT( sCon, aError ) -#define DBG_BF_ASSERT( sCon, aError ) -#define DBG_TRACE( aTrace ) -#define DBG_TRACE1( aTrace, x1 ) -#define DBG_TRACE2( aTrace, x1, x2 ) -#define DBG_TRACE3( aTrace, x1, x2, x3 ) -#define DBG_TRACE4( aTrace, x1, x2, x3, x4 ) -#define DBG_TRACE5( aTrace, x1, x2, x3, x4, x5 ) -#define DBG_TRACEFILE( aTrace ) -#define DBG_WARNING( aWarning ) -#define DBG_WARNING1( aWarning, x1 ) -#define DBG_WARNING2( aWarning, x1, x2 ) -#define DBG_WARNING3( aWarning, x1, x2, x3 ) -#define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) -#define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) -#define DBG_WARNINGFILE( aWarning ) -#define DBG_ERROR( aError ) -#define DBG_ERROR1( aError, x1 ) -#define DBG_ERROR2( aError, x1, x2 ) -#define DBG_ERROR3( aError, x1, x2, x3 ) -#define DBG_ERROR4( aError, x1, x2, x3, x4 ) -#define DBG_ERROR5( aError, x1, x2, x3, x4, x5 ) -#define DBG_ERRORFILE( aError ) - -#define DBG_TESTSOLARMUTEX() - -#define DBG_INSTOUTTRACE( nOut ) -#define DBG_INSTOUTWARNING( nOut ) -#define DBG_INSTOUTERROR( nOut ) +#define DBG_PROFSTART( aName ) ((void)0) +#define DBG_PROFSTOP( aName ) ((void)0) +#define DBG_PROFCONTINUE( aName ) ((void)0) +#define DBG_PROFPAUSE( aName ) ((void)0) + +#define DBG_CTOR( aName, fTest ) ((void)0) +#define DBG_DTOR( aName, fTest ) ((void)0) +#define DBG_CHKTHIS( aName, fTest ) ((void)0) +#define DBG_CHKOBJ( pObj, aName, fTest ) ((void)0) + +#define DBG_ASSERTWARNING( sCon, aWarning ) ((void)0) +#define DBG_ASSERT( sCon, aError ) ((void)0) +#define DBG_BF_ASSERT( sCon, aError ) ((void)0) +#define DBG_TRACE( aTrace ) ((void)0) +#define DBG_TRACE1( aTrace, x1 ) ((void)0) +#define DBG_TRACE2( aTrace, x1, x2 ) ((void)0) +#define DBG_TRACE3( aTrace, x1, x2, x3 ) ((void)0) +#define DBG_TRACE4( aTrace, x1, x2, x3, x4 ) ((void)0) +#define DBG_TRACE5( aTrace, x1, x2, x3, x4, x5 ) ((void)0) +#define DBG_TRACEFILE( aTrace ) ((void)0) +#define DBG_WARNING( aWarning ) ((void)0) +#define DBG_WARNING1( aWarning, x1 ) ((void)0) +#define DBG_WARNING2( aWarning, x1, x2 ) ((void)0) +#define DBG_WARNING3( aWarning, x1, x2, x3 ) ((void)0) +#define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) ((void)0) +#define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) ((void)0) +#define DBG_WARNINGFILE( aWarning ) ((void)0) +#define DBG_ERROR( aError ) ((void)0) +#define DBG_ERROR1( aError, x1 ) ((void)0) +#define DBG_ERROR2( aError, x1, x2 ) ((void)0) +#define DBG_ERROR3( aError, x1, x2, x3 ) ((void)0) +#define DBG_ERROR4( aError, x1, x2, x3, x4 ) ((void)0) +#define DBG_ERROR5( aError, x1, x2, x3, x4, x5 ) ((void)0) +#define DBG_ERRORFILE( aError ) ((void)0) + +#define DBG_TESTSOLARMUTEX() ((void)0) + +#define DBG_INSTOUTTRACE( nOut ) ((void)0) +#define DBG_INSTOUTWARNING( nOut ) ((void)0) +#define DBG_INSTOUTERROR( nOut ) ((void)0) #endif diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx index 2b1cfc3cd567..16bbd348a28b 100644 --- a/tools/inc/tools/inetmime.hxx +++ b/tools/inc/tools/inetmime.hxx @@ -694,13 +694,13 @@ inline bool INetMIME::isDigit(sal_uInt32 nChar) // static inline bool INetMIME::isCanonicHexDigit(sal_uInt32 nChar) { - return isDigit(nChar) || nChar >= 'A' && nChar <= 'F'; + return isDigit(nChar) || (nChar >= 'A' && nChar <= 'F'); } // static inline bool INetMIME::isHexDigit(sal_uInt32 nChar) { - return isCanonicHexDigit(nChar) || nChar >= 'a' && nChar <= 'f'; + return isCanonicHexDigit(nChar) || (nChar >= 'a' && nChar <= 'f'); } // static @@ -790,8 +790,8 @@ inline sal_uInt32 INetMIME::toUTF32(sal_Unicode cHighSurrogate, DBG_ASSERT(isHighSurrogate(cHighSurrogate) && isLowSurrogate(cLowSurrogate), "INetMIME::toUTF32(): Bad chars"); - return (sal_uInt32(cHighSurrogate) & 0x3FF) << 10 - | sal_uInt32(cLowSurrogate) & 0x3FF; + return ((sal_uInt32(cHighSurrogate) & 0x3FF) << 10) + | (sal_uInt32(cLowSurrogate) & 0x3FF); } // static @@ -930,8 +930,8 @@ inline sal_Unicode * INetMIME::putUTF32Character(sal_Unicode * pBuffer, else { nUTF32 -= 0x10000; - *pBuffer++ = sal_Unicode(0xD800 | nUTF32 >> 10); - *pBuffer++ = sal_Unicode(0xDC00 | nUTF32 & 0x3FF); + *pBuffer++ = sal_Unicode(0xD800 | (nUTF32 >> 10)); + *pBuffer++ = sal_Unicode(0xDC00 | (nUTF32 & 0x3FF)); } return pBuffer; } diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx index 9820918cfdf6..7f204d5e46da 100644 --- a/tools/source/datetime/tdate.cxx +++ b/tools/source/datetime/tdate.cxx @@ -65,7 +65,10 @@ static USHORT aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30, inline BOOL ImpIsLeapYear( USHORT nYear ) { - return (((nYear % 4) == 0) && ((nYear % 100) != 0) || ((nYear % 400) == 0)); + return ( + ( ((nYear % 4) == 0) && ((nYear % 100) != 0) ) || + ( (nYear % 400) == 0 ) + ); } // ----------------------------------------------------------------------- @@ -76,8 +79,7 @@ inline USHORT DaysInMonth( USHORT nMonth, USHORT nYear ) return aDaysInMonth[nMonth-1]; else { - if ( ((nYear % 4) == 0) && ((nYear % 100) != 0) || - ((nYear % 400) == 0) ) + if (ImpIsLeapYear(nYear)) return aDaysInMonth[nMonth-1] + 1; else return aDaysInMonth[nMonth-1]; diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 935ab4db9ecc..cb08d2df6c1e 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -2462,9 +2462,13 @@ BOOL IsValidEntry_Impl( const DirEntry &rPath, // Pfad-Trenner sind nicht erlaubt (bei ungek"urzten auch nicht FSYS_SHORTNAME_DELIMITER) char cDelim = bUseDelim == 2 ? FSYS_SHORTNAME_DELIMITER : char(0); - if ( rLongName.Search( DirEntry::GetAccessDelimiter() ) != STRING_NOTFOUND || - !bIsShortened && rLongName.Search(cDelim) != STRING_NOTFOUND ) + if ( + rLongName.Search(DirEntry::GetAccessDelimiter()) != STRING_NOTFOUND || + (!bIsShortened && rLongName.Search(cDelim) != STRING_NOTFOUND) + ) + { return FALSE; + } // MI: Abfrage nach 'CON:' etc. wird jetzt in Exists() mitgemacht if ( aPath.Exists() ) diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index dc487c561919..30b1db33904d 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -736,14 +736,15 @@ Dir& Dir::operator+=( const Dir& rDir ) } while ( !bStat && pSortLst->Next() ); } FileStat * stat = NULL; - for ( USHORT nNr = 0; nNr < rDir.Count(); nNr++ ) { + for ( USHORT nNr = 0; nNr < rDir.Count(); nNr++ ) + { if ( bStat ) + { if ( rDir.pStatLst ) - { stat = new FileStat( *rDir.pStatLst->GetObject(nNr) ); - } else stat = new FileStat( rDir[nNr] ); + } ImpSortedInsert( new DirEntry( rDir[nNr] ), stat ); } return *this; diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index f8c30ec21aa3..e3484aee4e2d 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -808,10 +808,12 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, sal_Int32 n = rtl_ustr_indexOfChar_WithLength( p1, pEnd - p1, '\\'); sal_Unicode const * pe = n == -1 ? pEnd : p1 + n; - if (parseHostOrNetBiosName( + if ( + parseHostOrNetBiosName( p1, pe, bOctets, ENCODE_ALL, RTL_TEXTENCODING_DONTKNOW, true, NULL) || - scanDomain(p1, pe) > 0 && p1 == pe) + (scanDomain(p1, pe) > 0 && p1 == pe) + ) { m_eScheme = INET_PROT_FILE; // 7th eMechanism = ENCODE_ALL; @@ -1020,12 +1022,16 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/') { sal_Unicode const * p1 = pPos + 2; - if (p1 == pEnd || *p1 == nFragmentDelimiter - || *p1 == '/' - || (scanDomain(p1, pEnd) > 0 - || scanIPv6reference(p1, pEnd)) - && (p1 == pEnd || *p1 == nFragmentDelimiter - || *p1 == '/')) + if ( + p1 == pEnd || *p1 == nFragmentDelimiter || *p1 == '/' || + ( + ( + scanDomain(p1, pEnd) > 0 || + scanIPv6reference(p1, pEnd) + ) && + (p1 == pEnd || *p1 == nFragmentDelimiter || *p1 == '/') + ) + ) { aSynAbsURIRef. appendAscii(RTL_CONSTASCII_STRINGPARAM("//")); @@ -1096,10 +1102,12 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, { ++pe; } - if (parseHostOrNetBiosName( + if ( + parseHostOrNetBiosName( p1, pe, bOctets, ENCODE_ALL, RTL_TEXTENCODING_DONTKNOW, true, NULL) || - scanDomain(p1, pe) > 0 && p1 == pe) + (scanDomain(p1, pe) > 0 && p1 == pe) + ) { aSynAbsURIRef. appendAscii(RTL_CONSTASCII_STRINGPARAM("//")); @@ -1261,6 +1269,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, cEscapePrefix, eMechanism, eCharset, eEscapeType); if (eEscapeType == ESCAPE_NO) + { if (nUTF32 == ':' && bSupportsPassword) { bHasAuth = true; @@ -1278,12 +1287,14 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, bHasAuth = true; break; } + } appendUCS4(aSynUser, nUTF32, eEscapeType, bOctets, ePart, cEscapePrefix, eCharset, false); } m_aUser.set(aSynAbsURIRef, aSynUser.makeStringAndClear(), aSynAbsURIRef.getLength()); if (bHasAuth) + { if (bSupportsPassword) { aSynAbsURIRef.append(sal_Unicode(':')); @@ -1324,6 +1335,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, m_aAuth.set(aSynAbsURIRef, aSynAuth.makeStringAndClear(), aSynAbsURIRef.getLength()); } + } if (pHostPortBegin) aSynAbsURIRef.append(sal_Unicode('@')); } @@ -1604,6 +1616,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, bool bSameDoc = true; if (getSchemeInfo().m_bAuthority) + { if (pEnd - p >= 2 && p[0] == '/' && p[1] == '/') { aSynAbsURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("//")); @@ -1617,6 +1630,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, = getUTF32(p, pEnd, bOctets, cEscapePrefix, eMechanism, eCharset, eEscapeType); if (eEscapeType == ESCAPE_NO) + { if (nUTF32 == nSegmentDelimiter) break; else if (nUTF32 == nFragmentDelimiter) @@ -1624,6 +1638,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, eState = STATE_FRAGMENT; break; } + } appendUCS4(aSynAbsURIRef, nUTF32, eEscapeType, bOctets, PART_VISIBLE, cEscapePrefix, eCharset, true); } @@ -1635,8 +1650,10 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, + aAuthority.getBegin(), aAuthority.getLength()); } + } if (eState == STATE_AUTH) + { if (p == pEnd) eState = STATE_DONE; else if (*p == nFragmentDelimiter) @@ -1655,6 +1672,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, eState = STATE_REL_PATH; bSameDoc = false; } + } if (eState == STATE_ABS_PATH) { @@ -1667,6 +1685,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, = getUTF32(p, pEnd, bOctets, cEscapePrefix, eMechanism, eCharset, eEscapeType); if (eEscapeType == ESCAPE_NO) + { if (nUTF32 == nFragmentDelimiter) { eState = STATE_FRAGMENT; @@ -1674,6 +1693,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, } else if (nUTF32 == nSegmentDelimiter) nUTF32 = '/'; + } appendUCS4(aSynAbsURIRef, nUTF32, eEscapeType, bOctets, ePart, cEscapePrefix, eCharset, true); } @@ -1710,6 +1730,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, while (p != pEnd && *p != nQueryDelimiter && *p != nFragmentDelimiter) { if (*p == '.') + { if (pEnd - p == 1 || p[1] == nSegmentDelimiter || p[1] == nQueryDelimiter @@ -1743,6 +1764,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, "INetURLObject::convertRelToAbs(): Bad base path"); continue; } + } while (p != pEnd && *p != nSegmentDelimiter @@ -1942,19 +1964,27 @@ bool INetURLObject::convertAbsToRel(rtl::OUString const & rTheAbsURIRef, // with <1*rseg> (i.e., it could be mistaken for an absolute URL starting // with a scheme part), then the new relative URL is prefixed with "./": if (aSynRelURIRef.getLength() == 0) + { if (pSubjectPathEnd - pSubjectPathBegin >= nMatch + 2 && pSubjectPathBegin[nMatch] == '/' && pSubjectPathBegin[nMatch + 1] == '/') + { aSynRelURIRef.appendAscii(RTL_CONSTASCII_STRINGPARAM("./")); + } else + { for (sal_Unicode const * p = pSubjectPathBegin + nMatch; p != pSubjectPathEnd && *p != '/'; ++p) + { if (mustEncode(*p, PART_REL_SEGMENT_EXTRA)) { aSynRelURIRef. appendAscii(RTL_CONSTASCII_STRINGPARAM("./")); break; } + } + } + } // The remainder of the subject path, starting at nMatch, is appended to // the new relative URL: @@ -2211,9 +2241,14 @@ bool INetURLObject::setUser(rtl::OUString const & rTheUser, bool bOctets, EncodeMechanism eMechanism, rtl_TextEncoding eCharset) { - if (!getSchemeInfo().m_bUser - || m_eScheme == INET_PROT_IMAP && rTheUser.getLength() == 0) + if ( + !getSchemeInfo().m_bUser || + (m_eScheme == INET_PROT_IMAP && rTheUser.getLength() == 0) + ) + { return false; + } + rtl::OUString aNewUser(encodeText(rTheUser, bOctets, m_eScheme == INET_PROT_IMAP ? PART_IMAP_ACHAR : @@ -2766,6 +2801,7 @@ bool INetURLObject::parseHostOrNetBiosName( { sal_Unicode const * p = pBegin; if (!parseHost(p, pEnd, aTheCanonic) || p != pEnd) + { if (bNetBiosName) { rtl::OUStringBuffer buf; @@ -2808,6 +2844,7 @@ bool INetURLObject::parseHostOrNetBiosName( } else return false; + } } if (pCanonic != NULL) { *pCanonic = aTheCanonic; @@ -2961,6 +2998,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, '%', eMechanism, eCharset, eEscapeType); if (eEscapeType == ESCAPE_NO) + { if (nUTF32 == nSegmentDelimiter || nUTF32 == nAltSegmentDelimiter) { @@ -2980,6 +3018,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, aTheSynPath.append(sal_Unicode(':')); continue; } + } appendUCS4(aTheSynPath, nUTF32, eEscapeType, bOctets, PART_PCHAR, '%', eCharset, true); } @@ -3299,10 +3338,12 @@ bool INetURLObject::parsePath(INetProtocol eScheme, case INET_PROT_VND_SUN_STAR_ODMA: if (pPos < pEnd) + { if (*pPos == '/') ++pPos; else return false; + } aTheSynPath.append(sal_Unicode('/')); while (pPos < pEnd && *pPos != nFragmentDelimiter) { @@ -3484,8 +3525,9 @@ bool INetURLObject::insertName(rtl::OUString const & rTheName, bool bOctets, else if (nIndex == 0) { pPrefixEnd = pPathBegin; - bInsertSlash = pPathBegin < pPathEnd && *pPathBegin != '/' || - pPathBegin == pPathEnd && bAppendFinalSlash; + bInsertSlash = + (pPathBegin < pPathEnd && *pPathBegin != '/') || + (pPathBegin == pPathEnd && bAppendFinalSlash); pSuffixBegin = (pPathEnd - pPathBegin == 1 && *pPathBegin == '/' && !bAppendFinalSlash && bIgnoreFinalSlash) @@ -3503,11 +3545,11 @@ bool INetURLObject::insertName(rtl::OUString const & rTheName, bool bOctets, while (nIndex-- > 0) for (;;) { - if (bSkip) { + if (bSkip) ++pPrefixEnd; - } bSkip = true; if (pPrefixEnd >= pEnd) + { if (nIndex == 0) { bInsertSlash = bAppendFinalSlash; @@ -3515,6 +3557,7 @@ bool INetURLObject::insertName(rtl::OUString const & rTheName, bool bOctets, } else return false; + } if (*pPrefixEnd == '/') { pSuffixBegin = pPrefixEnd; @@ -3729,11 +3772,19 @@ rtl::OUString INetURLObject::decode(sal_Unicode const * pBegin, break; case ESCAPE_UTF32: - if (INetMIME::isUSASCII(nUTF32) - && (eMechanism == DECODE_TO_IURI - || eMechanism == DECODE_UNAMBIGUOUS - && mustEncode(nUTF32, PART_UNAMBIGUOUS))) + if ( + INetMIME::isUSASCII(nUTF32) && + ( + eMechanism == DECODE_TO_IURI || + ( + eMechanism == DECODE_UNAMBIGUOUS && + mustEncode(nUTF32, PART_UNAMBIGUOUS) + ) + ) + ) + { appendEscape(aResult, cEscapePrefix, nUTF32); + } else aResult.append(sal_Unicode(nUTF32)); break; @@ -4081,6 +4132,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, return false; } if (rThePassword.getLength() != 0) + { if (getSchemeInfo().m_bPassword) { m_aAbsURIRef.append(sal_Unicode(':')); @@ -4098,6 +4150,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, setInvalid(); return false; } + } if (bUserInfo && getSchemeInfo().m_bHost) m_aAbsURIRef.append(sal_Unicode('@')); if (getSchemeInfo().m_bHost) @@ -4903,9 +4956,9 @@ rtl::OUString INetURLObject::getFSysPath(FSysStyle eStyle, && m_aHost.getLength() > 0 ? FSYS_VOS : hasDosVolume(eStyle) - || (eStyle & FSYS_DOS) != 0 + || ((eStyle & FSYS_DOS) != 0 && m_aHost.isPresent() - && m_aHost.getLength() > 0 ? + && m_aHost.getLength() > 0) ? FSYS_DOS : eStyle & FSYS_UNX && (!m_aHost.isPresent() || m_aHost.getLength() == 0) ? @@ -5050,37 +5103,37 @@ void INetURLObject::appendUCS4Escape(rtl::OUStringBuffer & rTheText, else if (nUCS4 < 0x800) { appendEscape(rTheText, cEscapePrefix, nUCS4 >> 6 | 0xC0); - appendEscape(rTheText, cEscapePrefix, nUCS4 & 0x3F | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 & 0x3F) | 0x80); } else if (nUCS4 < 0x10000) { appendEscape(rTheText, cEscapePrefix, nUCS4 >> 12 | 0xE0); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 6 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 & 0x3F | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 6 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 & 0x3F) | 0x80); } else if (nUCS4 < 0x200000) { appendEscape(rTheText, cEscapePrefix, nUCS4 >> 18 | 0xF0); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 12 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 6 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 & 0x3F | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 12 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 6 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 & 0x3F) | 0x80); } else if (nUCS4 < 0x4000000) { appendEscape(rTheText, cEscapePrefix, nUCS4 >> 24 | 0xF8); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 18 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 12 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 6 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 & 0x3F | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 18 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 12 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 6 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 & 0x3F) | 0x80); } else { appendEscape(rTheText, cEscapePrefix, nUCS4 >> 30 | 0xFC); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 24 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 18 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 12 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 >> 6 & 0x3F | 0x80); - appendEscape(rTheText, cEscapePrefix, nUCS4 & 0x3F | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 24 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 18 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 12 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 >> 6 & 0x3F) | 0x80); + appendEscape(rTheText, cEscapePrefix, (nUCS4 & 0x3F) | 0x80); } } @@ -5313,6 +5366,7 @@ sal_uInt32 INetURLObject::scanDomain(sal_Unicode const *& rBegin, case STATE_LABEL: if (p != pEnd) + { if (INetMIME::isAlphanumeric(*p)) break; else if (*p == '.') @@ -5326,11 +5380,13 @@ sal_uInt32 INetURLObject::scanDomain(sal_Unicode const *& rBegin, eState = STATE_HYPHEN; break; } + } rBegin = p; return nLabels; case STATE_HYPHEN: if (p != pEnd) + { if (INetMIME::isAlphanumeric(*p)) { eState = STATE_LABEL; @@ -5338,6 +5394,7 @@ sal_uInt32 INetURLObject::scanDomain(sal_Unicode const *& rBegin, } else if (*p == '-') break; + } if (bEager) return 0; rBegin = pLastAlphanumeric; @@ -5353,7 +5410,7 @@ bool INetURLObject::scanIPv6reference(sal_Unicode const *& rBegin, if (rBegin != pEnd && *rBegin == '[') { sal_Unicode const * p = rBegin + 1; //TODO: check for valid IPv6address (RFC 2373): - while (p != pEnd && INetMIME::isHexDigit(*p) || *p == ':' || *p == '.') + while (p != pEnd && (INetMIME::isHexDigit(*p) || *p == ':' || *p == '.')) { ++p; } diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 02a2e810d676..9b94464d7949 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -272,6 +272,7 @@ Parameter ** ParameterList::find(ByteString const & rAttribute, if (eCompare == COMPARE_GREATER) break; else if (eCompare == COMPARE_EQUAL) + { if (nSection > (*p)->m_nSection) break; else if (nSection == (*p)->m_nSection) @@ -279,6 +280,7 @@ Parameter ** ParameterList::find(ByteString const & rAttribute, rPresent = true; return p; } + } } rPresent = false; return p; @@ -877,7 +879,7 @@ bool INetMIME::scanUnsigned(const sal_Char *& rBegin, const sal_Char * pEnd, if (nTheValue > std::numeric_limits< sal_uInt32 >::max()) return false; } - if (nTheValue == 0 && (p == rBegin || !bLeadingZeroes && p - rBegin != 1)) + if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1))) return false; rBegin = p; rValue = sal_uInt32(nTheValue); @@ -901,7 +903,7 @@ bool INetMIME::scanUnsigned(const sal_Unicode *& rBegin, if (nTheValue > std::numeric_limits< sal_uInt32 >::max()) return false; } - if (nTheValue == 0 && (p == rBegin || !bLeadingZeroes && p - rBegin != 1)) + if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1))) return false; rBegin = p; rValue = sal_uInt32(nTheValue); @@ -925,7 +927,7 @@ bool INetMIME::scanUnsignedHex(const sal_Char *& rBegin, if (nTheValue > std::numeric_limits< sal_uInt32 >::max()) return false; } - if (nTheValue == 0 && (p == rBegin || !bLeadingZeroes && p - rBegin != 1)) + if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1))) return false; rBegin = p; rValue = sal_uInt32(nTheValue); @@ -949,7 +951,7 @@ bool INetMIME::scanUnsignedHex(const sal_Unicode *& rBegin, if (nTheValue > std::numeric_limits< sal_uInt32 >::max()) return false; } - if (nTheValue == 0 && (p == rBegin || !bLeadingZeroes && p - rBegin != 1)) + if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1))) return false; rBegin = p; rValue = sal_uInt32(nTheValue); @@ -1004,6 +1006,7 @@ const sal_Char * INetMIME::scanQuotedBlock(const sal_Char * pBegin, case '\\': ++rLength; if (pBegin != pEnd) + { if (startsWithLineBreak(pBegin, pEnd) && (pEnd - pBegin < 3 || !isWhiteSpace(pBegin[2]))) @@ -1014,6 +1017,7 @@ const sal_Char * INetMIME::scanQuotedBlock(const sal_Char * pBegin, } else ++pBegin; + } break; default: @@ -1075,6 +1079,7 @@ const sal_Unicode * INetMIME::scanQuotedBlock(const sal_Unicode * pBegin, case '\\': ++rLength; if (pBegin != pEnd) + { if (startsWithLineBreak(pBegin, pEnd) && (pEnd - pBegin < 3 || !isWhiteSpace(pBegin[2]))) @@ -1085,6 +1090,7 @@ const sal_Unicode * INetMIME::scanQuotedBlock(const sal_Unicode * pBegin, } else ++pBegin; + } break; default: @@ -2141,29 +2147,29 @@ void INetMIME::writeUTF8(INetMIMEOutputSink & rSink, sal_uInt32 nChar) rSink << sal_Char(nChar); else if (nChar < 0x800) rSink << sal_Char(nChar >> 6 | 0xC0) - << sal_Char(nChar & 0x3F | 0x80); + << sal_Char((nChar & 0x3F) | 0x80); else if (nChar < 0x10000) rSink << sal_Char(nChar >> 12 | 0xE0) - << sal_Char(nChar >> 6 & 0x3F | 0x80) - << sal_Char(nChar & 0x3F | 0x80); + << sal_Char((nChar >> 6 & 0x3F) | 0x80) + << sal_Char((nChar & 0x3F) | 0x80); else if (nChar < 0x200000) rSink << sal_Char(nChar >> 18 | 0xF0) - << sal_Char(nChar >> 12 & 0x3F | 0x80) - << sal_Char(nChar >> 6 & 0x3F | 0x80) - << sal_Char(nChar & 0x3F | 0x80); + << sal_Char((nChar >> 12 & 0x3F) | 0x80) + << sal_Char((nChar >> 6 & 0x3F) | 0x80) + << sal_Char((nChar & 0x3F) | 0x80); else if (nChar < 0x4000000) rSink << sal_Char(nChar >> 24 | 0xF8) - << sal_Char(nChar >> 18 & 0x3F | 0x80) - << sal_Char(nChar >> 12 & 0x3F | 0x80) - << sal_Char(nChar >> 6 & 0x3F | 0x80) - << sal_Char(nChar & 0x3F | 0x80); + << sal_Char((nChar >> 18 & 0x3F) | 0x80) + << sal_Char((nChar >> 12 & 0x3F) | 0x80) + << sal_Char((nChar >> 6 & 0x3F) | 0x80) + << sal_Char((nChar & 0x3F) | 0x80); else rSink << sal_Char(nChar >> 30 | 0xFC) - << sal_Char(nChar >> 24 & 0x3F | 0x80) - << sal_Char(nChar >> 18 & 0x3F | 0x80) - << sal_Char(nChar >> 12 & 0x3F | 0x80) - << sal_Char(nChar >> 6 & 0x3F | 0x80) - << sal_Char(nChar & 0x3F | 0x80); + << sal_Char((nChar >> 24 & 0x3F) | 0x80) + << sal_Char((nChar >> 18 & 0x3F) | 0x80) + << sal_Char((nChar >> 12 & 0x3F) | 0x80) + << sal_Char((nChar >> 6 & 0x3F) | 0x80) + << sal_Char((nChar & 0x3F) | 0x80); } //============================================================================ @@ -2673,11 +2679,11 @@ void INetMIME::writeHeaderFieldBody(INetMIMEOutputSink & rSink, || *pLookAhead == '[' : *pLookAhead == '.' || *pLookAhead == '@' - || *pLookAhead == '>' + || (*pLookAhead == '>' && eType >= HEADER_FIELD_MESSAGE_ID && eBrackets - == BRACKETS_OPENING)) + == BRACKETS_OPENING))) { bModify = true; pBodyPtr = pLookAhead; @@ -3025,7 +3031,7 @@ bool INetMIME::translateUTF8Char(const sal_Char *& rBegin, for (; nCount-- > 0; ++p) if ((static_cast< unsigned char >(*p) & 0xC0) == 0x80) - nUCS4 = nUCS4 << 6 | static_cast< unsigned char >(*p) & 0x3F; + nUCS4 = (nUCS4 << 6) | (static_cast< unsigned char >(*p) & 0x3F); else return false; @@ -3177,9 +3183,11 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, bool bEncodingB = false; if (bEncodedWord) + { if (q == pEnd) bEncodedWord = false; else + { switch (*q++) { case 'B': @@ -3196,12 +3204,16 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, bEncodedWord = false; break; } + } + } bEncodedWord = bEncodedWord && q != pEnd && *q++ == '?'; ByteString sText; if (bEncodedWord) + { if (bEncodingB) + { for (bool bDone = false; !bDone;) { if (pEnd - q < 4) @@ -3259,6 +3271,7 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, } } } + } else { const sal_Char * pEncodedTextBegin = q; @@ -3333,6 +3346,7 @@ UniString INetMIME::decodeHeaderFieldBody(HeaderFieldType eType, } } } + } bEncodedWord = bEncodedWord && q != pEnd && *q++ == '='; @@ -4180,40 +4194,40 @@ void INetMIMEEncodedWordOutputSink::finish(bool bWriteTrailer) else if (nUTF32 < 0x800) { INetMIME::writeEscapeSequence(m_rSink, - nUTF32 >> 6 + (nUTF32 >> 6) | 0xC0); INetMIME::writeEscapeSequence(m_rSink, - nUTF32 & 0x3F + (nUTF32 & 0x3F) | 0x80); } else if (nUTF32 < 0x10000) { INetMIME::writeEscapeSequence(m_rSink, - nUTF32 >> 12 + (nUTF32 >> 12) | 0xE0); INetMIME::writeEscapeSequence(m_rSink, - nUTF32 >> 6 - & 0x3F + ((nUTF32 >> 6) + & 0x3F) | 0x80); INetMIME::writeEscapeSequence(m_rSink, - nUTF32 & 0x3F + (nUTF32 & 0x3F) | 0x80); } else { INetMIME::writeEscapeSequence(m_rSink, - nUTF32 >> 18 + (nUTF32 >> 18) | 0xF0); INetMIME::writeEscapeSequence(m_rSink, - nUTF32 >> 12 - & 0x3F + ((nUTF32 >> 12) + & 0x3F) | 0x80); INetMIME::writeEscapeSequence(m_rSink, - nUTF32 >> 6 - & 0x3F + ((nUTF32 >> 6) + & 0x3F) | 0x80); INetMIME::writeEscapeSequence(m_rSink, - nUTF32 & 0x3F + (nUTF32 & 0x3F) | 0x80); } } diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index f3eef50fbc4b..31fe804c5140 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -2026,6 +2026,7 @@ sal_uInt32 SimpleResMgr::ReadBlob( sal_uInt32 nId, void** pBuffer ) if( pOldFallback != m_pResImpl ) ResMgrContainer::get().freeResMgr( pOldFallback ); if( pFallback ) + { // handle possible recursion if( pFallback->aLocale.Language != m_pResImpl->aLocale.Language || pFallback->aLocale.Country != m_pResImpl->aLocale.Country || @@ -2038,6 +2039,7 @@ sal_uInt32 SimpleResMgr::ReadBlob( sal_uInt32 nId, void** pBuffer ) ResMgrContainer::get().freeResMgr( pFallback ); pFallback = NULL; } + } } if( ! pResHandle ) // no exception handling, this would require the locking of the solar mutex which isn't allowed within this class diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx index 3694ac38dc5c..a336bbaab360 100644 --- a/tools/source/ref/pstm.cxx +++ b/tools/source/ref/pstm.cxx @@ -45,7 +45,7 @@ void SvClassManager::Register( USHORT nClassId, SvCreateInstancePersist pFunc ) #ifdef DBG_UTIL SvCreateInstancePersist p; p = Get( nClassId ); - DBG_ASSERT( !p || p == pFunc, "register class with same id" ) + DBG_ASSERT( !p || p == pFunc, "register class with same id" ); #endif aAssocTable.insert(Map::value_type(nClassId, pFunc)); } @@ -135,7 +135,7 @@ SvPersistStream& operator >> ( SvPersistStream & rStm, if( (nVer & ~PERSIST_LIST_DBGUTIL) != PERSIST_LIST_VER ) { rStm.SetError( SVSTREAM_GENERALERROR ); - DBG_ERROR( "persist list, false version" ) + DBG_ERROR( "persist list, false version" ); } UINT32 nObjLen(0), nObjPos(0); @@ -158,7 +158,7 @@ SvPersistStream& operator >> ( SvPersistStream & rStm, aStr += ByteString::CreateFromInt32( (long)(rStm.Tell() - nObjPos) ); aStr += ", should = "; aStr += ByteString::CreateFromInt64(nObjLen); - DBG_ERROR( aStr.GetBuffer() ) + DBG_ERROR( aStr.GetBuffer() ); } #endif return rStm; @@ -189,7 +189,7 @@ SvPersistStream::SvPersistStream pStream (siehe <SvPersistStream::SetStream>). */ { - DBG_ASSERT( nStartIdx != 0, "zero index not allowed" ) + DBG_ASSERT( nStartIdx != 0, "zero index not allowed" ); bIsWritable = TRUE; if( pStm ) { @@ -307,7 +307,7 @@ USHORT SvPersistStream::IsA() const void SvPersistStream::ResetError() { SvStream::ResetError(); - DBG_ASSERT( pStm, "stream not set" ) + DBG_ASSERT( pStm, "stream not set" ); pStm->ResetError(); } @@ -316,7 +316,7 @@ void SvPersistStream::ResetError() *************************************************************************/ ULONG SvPersistStream::GetData( void* pData, ULONG nSize ) { - DBG_ASSERT( pStm, "stream not set" ) + DBG_ASSERT( pStm, "stream not set" ); ULONG nRet = pStm->Read( pData, nSize ); SetError( pStm->GetError() ); return nRet; @@ -327,7 +327,7 @@ ULONG SvPersistStream::GetData( void* pData, ULONG nSize ) *************************************************************************/ ULONG SvPersistStream::PutData( const void* pData, ULONG nSize ) { - DBG_ASSERT( pStm, "stream not set" ) + DBG_ASSERT( pStm, "stream not set" ); ULONG nRet = pStm->Write( pData, nSize ); SetError( pStm->GetError() ); return nRet; @@ -338,7 +338,7 @@ ULONG SvPersistStream::PutData( const void* pData, ULONG nSize ) *************************************************************************/ ULONG SvPersistStream::SeekPos( ULONG nPos ) { - DBG_ASSERT( pStm, "stream not set" ) + DBG_ASSERT( pStm, "stream not set" ); ULONG nRet = pStm->Seek( nPos ); SetError( pStm->GetError() ); return nRet; @@ -442,14 +442,14 @@ UINT32 SvPersistStream::ReadCompressed if( nMask & 0x0F ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "format error" ) + DBG_ERROR( "format error" ); } rStm >> nRet; } else { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "format error" ) + DBG_ERROR( "format error" ); } return nRet; } @@ -743,7 +743,7 @@ UINT32 SvPersistStream::ReadObj if( P_VER < (nHdr & P_VER_MASK) ) { SetError( SVSTREAM_FILEFORMAT_ERROR ); - DBG_ERROR( "false version" ) + DBG_ERROR( "false version" ); } if( !(nHdr & P_ID_0) && GetError() == SVSTREAM_OK ) @@ -751,7 +751,7 @@ UINT32 SvPersistStream::ReadObj if( P_OBJ & nHdr ) { // read object, nId nur bei P_DBGUTIL gesetzt DBG_ASSERT( !(nHdr & P_DBGUTIL) || NULL == aPUIdx.Get( nId ), - "object already exist" ) + "object already exist" ); SvCreateInstancePersist pFunc = rClassMgr.Get( nClassId ); UINT32 nObjLen(0), nObjPos(0); @@ -779,7 +779,7 @@ UINT32 SvPersistStream::ReadObj // um den gleichen Zustand, wie nach dem Speichern herzustellen aPTable.Insert( (ULONG)rpObj, (void *)nNewId ); DBG_ASSERT( !(nHdr & P_DBGUTIL) || nId == nNewId, - "read write id conflict: not the same" ) + "read write id conflict: not the same" ); } // und dann Laden rpObj->Load( *this ); @@ -790,7 +790,7 @@ UINT32 SvPersistStream::ReadObj aStr += ByteString::CreateFromInt32( (long)(Tell() - nObjPos) ); aStr += ", should = "; aStr += ByteString::CreateFromInt32( nObjLen ); - DBG_ERROR( aStr.GetBuffer() ) + DBG_ERROR( aStr.GetBuffer() ); } #endif rpObj->RestoreNoDelete(); @@ -799,8 +799,8 @@ UINT32 SvPersistStream::ReadObj else { rpObj = GetObject( nId ); - DBG_ASSERT( rpObj != NULL, "object does not exist" ) - DBG_ASSERT( rpObj->GetClassId() == nClassId, "class mismatch" ) + DBG_ASSERT( rpObj != NULL, "object does not exist" ); + DBG_ASSERT( rpObj->GetClassId() == nClassId, "class mismatch" ); } } return nId; diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index cf22a4f933dc..de802ece9f05 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -1781,7 +1781,7 @@ sal_Size SvStream::Seek( sal_Size nFilePos ) if( !pRWBuf ) { nBufFilePos = SeekPos( nFilePos ); - DBG_ASSERT(Tell()==nBufFilePos,"Out Of Sync!") + DBG_ASSERT(Tell()==nBufFilePos,"Out Of Sync!"); return nBufFilePos; } @@ -1813,7 +1813,7 @@ sal_Size SvStream::Seek( sal_Size nFilePos ) #ifdef OV_DEBUG { sal_Size nDebugTemp = nBufFilePos + nBufActualPos; - DBG_ASSERT(Tell()==nDebugTemp,"Sync?") + DBG_ASSERT(Tell()==nDebugTemp,"Sync?"); } #endif return nBufFilePos + nBufActualPos; @@ -2359,7 +2359,7 @@ sal_Bool SvStream::SetStreamSize( sal_Size nSize ) SetBufferSize( 0 ); SetSize( nSize ); SetBufferSize( nBuf ); - DBG_ASSERT(Tell()==nFPos,"SetStreamSize failed") + DBG_ASSERT(Tell()==nFPos,"SetStreamSize failed"); return (sal_Bool)(nError == 0); } diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index a5518fd7fe2c..538c02e78fde 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -485,12 +485,15 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes ) return sal_False; if ( eStreamMode & STREAM_SHARE_DENYALL ) + { if (bIsWritable) nLockMode = F_WRLCK; else nLockMode = F_RDLCK; + } if ( eStreamMode & STREAM_SHARE_DENYREAD ) + { if (bIsWritable) nLockMode = F_WRLCK; else @@ -498,12 +501,15 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, sal_Size nBytes ) SetError(SVSTREAM_LOCKING_VIOLATION); return sal_False; } + } if ( eStreamMode & STREAM_SHARE_DENYWRITE ) + { if (bIsWritable) nLockMode = F_WRLCK; else nLockMode = F_RDLCK; + } if (!nLockMode) return sal_True; diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index 2838640a128e..71882d66278b 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -106,7 +106,7 @@ inline sal_Bool AccessibleStateSetHelperImpl::IsEmpty () inline sal_Bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) throw (uno::RuntimeException) { - DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is to small") + DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small"); #if 0 return maStates.test(aState); #endif @@ -140,7 +140,7 @@ inline void AccessibleStateSetHelperImpl::AddStates( const sal_Int64 _nStates ) inline void AccessibleStateSetHelperImpl::AddState(sal_Int16 aState) throw (uno::RuntimeException) { - DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is to small") + DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small"); #if 0 maStates.set(aState); #endif @@ -152,7 +152,7 @@ inline void AccessibleStateSetHelperImpl::AddState(sal_Int16 aState) inline void AccessibleStateSetHelperImpl::RemoveState(sal_Int16 aState) throw (uno::RuntimeException) { - DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is to small") + DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small"); #if 0 maStates.set(aState, 0); #endif diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index 66d117eb22cb..42ea2d54f455 100755 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx @@ -795,7 +795,7 @@ bool ATSLayout::InitGIA() const continue; DBG_ASSERT( !(rALR.flags & kATSGlyphInfoTerminatorGlyph), - "ATSLayout::InitGIA(): terminator glyph not marked as deleted!" ) + "ATSLayout::InitGIA(): terminator glyph not marked as deleted!" ); // store details of the visible glyphs nLeftPos = rALR.realPos; diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 3a47cdc22f13..09708eae4e53 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -1032,7 +1032,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap delete pBitmap; } #else - DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from non-layered graphics" ) + DBG_ASSERT( pSrc->mxLayer!=NULL, "AquaSalGraphics::copyBits() from non-layered graphics" ); // in XOR mode the drawing context is redirected to the XOR mask // if source and target are identical then copyBits() paints onto the target context though @@ -1082,7 +1082,7 @@ void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, l delete pBitmap; } #else - DBG_ASSERT( mxLayer!=NULL, "AquaSalGraphics::copyArea() for non-layered graphics" ) + DBG_ASSERT( mxLayer!=NULL, "AquaSalGraphics::copyArea() for non-layered graphics" ); // in XOR mode the drawing context is redirected to the XOR mask // copyArea() always works on the target context though @@ -1190,7 +1190,7 @@ void AquaSalGraphics::drawMask( const SalTwoRect* pPosAry, const SalBitmap& rSal SalBitmap* AquaSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) { - DBG_ASSERT( mxLayer, "AquaSalGraphics::getBitmap() with no layer" ) + DBG_ASSERT( mxLayer, "AquaSalGraphics::getBitmap() with no layer" ); ApplyXorContext(); diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index bc06fcb535d6..e1ca08cfbd65 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -300,7 +300,7 @@ BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XM // SV bei den Tools anmelden InitTools(); - DBG_ASSERT( !pSVData->maAppData.mxMSF.is(), "VCL service factory already set" ) + DBG_ASSERT( !pSVData->maAppData.mxMSF.is(), "VCL service factory already set" ); pSVData->maAppData.mxMSF = rSMgr; // Main-Thread-Id merken diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 550477bbfc6e..5a65aac25d99 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -516,7 +516,7 @@ BOOL Bitmap::ImplMakeMonoDither() BOOL Bitmap::ImplMakeGreyscales( USHORT nGreys ) { - DBG_ASSERT( nGreys == 16 || nGreys == 256, "Only 16 or 256 greyscales are supported!" ) + DBG_ASSERT( nGreys == 16 || nGreys == 256, "Only 16 or 256 greyscales are supported!" ); BitmapReadAccess* pReadAcc = AcquireReadAccess(); BOOL bRet = FALSE; diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 6ff1cf8ac706..dfa346dbab05 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -987,11 +987,11 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) { if ( eOld > MAP_PIXEL ) { - DBG_ERRORFILE( "Not implemented MapUnit" ) + DBG_ERRORFILE( "Not implemented MapUnit" ); } else if ( eNew > MAP_PIXEL ) { - DBG_ERRORFILE( "Not implemented MapUnit" ) + DBG_ERRORFILE( "Not implemented MapUnit" ); } else { diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index fa9cf7d1fa54..fd14b5224206 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -223,7 +223,7 @@ ImplRegion::ImplRegion( const ImplRegion& rImplRegion ) ImplRegion::~ImplRegion() { DBG_ASSERT( (this != &aImplEmptyRegion) && (this != &aImplNullRegion), - "ImplRegion::~ImplRegion() - Empty oder NULL-Region" ) + "ImplRegion::~ImplRegion() - Empty oder NULL-Region" ); ImplRegionBand* pBand = mpFirstBand; while ( pBand ) diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index 3fcf7fcdda06..f18d31890247 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -236,7 +236,7 @@ static BOOL sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) XFree( pInfos ); DBG_ASSERT( rVI.visualid == nVID, - "sal_GetVisualInfo: could not get correct visual by visualId" ) + "sal_GetVisualInfo: could not get correct visual by visualId" ); return TRUE; } @@ -632,7 +632,7 @@ fd , SalX11Display *pDisplay ) { DBG_ASSERT( ConnectionNumber( pDisplay->GetDisplay() ) == fd, - "wrong fd in DisplayHasEvent" ) + "wrong fd in DisplayHasEvent" ); vos::IMutex* pSalInstYieldMutex = GetSalData()->m_pInstance->GetYieldMutex(); ::vos::OGuard aGuard( *pSalInstYieldMutex ); diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx index 8eff0b5d4588..54c4df3f2bb8 100644 --- a/vcl/unx/source/gdi/salgdi.cxx +++ b/vcl/unx/source/gdi/salgdi.cxx @@ -166,7 +166,7 @@ void X11SalGraphics::freeResources() { Display *pDisplay = GetXDisplay(); - DBG_ASSERT( !pPaintRegion_, "pPaintRegion_" ) + DBG_ASSERT( !pPaintRegion_, "pPaintRegion_" ); if( pClipRegion_ ) XDestroyRegion( pClipRegion_ ), pClipRegion_ = None; if( hBrush_ ) XFreePixmap( pDisplay, hBrush_ ), hBrush_ = None; diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index e113ad4b138f..7211431ad4ca 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -3907,7 +3907,7 @@ long X11SalFrame::HandleStateEvent( XPropertyEvent *pEvent ) DBG_ASSERT( actual_type = pEvent->atom && 32 == actual_format && 2 == nitems - && 0 == bytes_after, "HandleStateEvent" ) + && 0 == bytes_after, "HandleStateEvent" ); if( *(unsigned long*)prop == NormalState ) nShowState_ = SHOWSTATE_NORMAL; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index dce8947f49d3..42bfd5d1d77a 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -2504,7 +2504,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, nKeyLen = GetKeyNameTextW( lParam, aKeyBuf, nMaxKeyLen ); // #i12401# the current unicows.dll has a bug in CharUpperBuffW, which corrupts the stack // fall back to the ANSI version instead - DBG_ASSERT( nKeyLen <= nMaxKeyLen, "Invalid key name length!" ) + DBG_ASSERT( nKeyLen <= nMaxKeyLen, "Invalid key name length!" ); if( nKeyLen > nMaxKeyLen ) nKeyLen = 0; else if( nKeyLen > 0 ) @@ -2525,7 +2525,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, { sal_Char aAnsiKeyBuf[ nMaxKeyLen ]; int nAnsiKeyLen = GetKeyNameTextA( lParam, aAnsiKeyBuf, nMaxKeyLen ); - DBG_ASSERT( nAnsiKeyLen <= nMaxKeyLen, "Invalid key name length!" ) + DBG_ASSERT( nAnsiKeyLen <= nMaxKeyLen, "Invalid key name length!" ); if( nAnsiKeyLen > nMaxKeyLen ) nAnsiKeyLen = 0; else if( nAnsiKeyLen > 0 ) |