diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
commit | 7f5f6b548d071d412efb78e9fee21d68ad6700bc (patch) | |
tree | 49c7255c440b542ccffd5af0f72387afa34eaa43 /svtools/source/items1 | |
parent | f00cc0b3ee98e5213707c04fe4e84bc8e4fa9932 (diff) |
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc r263311 :
Diffstat (limited to 'svtools/source/items1')
-rw-r--r-- | svtools/source/items1/itempool.cxx | 2 | ||||
-rw-r--r-- | svtools/source/items1/slstitm.cxx | 18 |
2 files changed, 10 insertions, 10 deletions
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; |