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 :

4 files changed, 51 insertions, 51 deletions

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;
     }
 */