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 : 

19 files changed, 123 insertions, 123 deletions

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" );
 }