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 :

9 files changed, 31 insertions, 31 deletions

diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 2b7a26433a27..d9ef14461a1f 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -182,7 +182,7 @@ ElementNode::ElementNode( const String& aName, Reference < XAttributeList > xAtt
             xAttributeList = Reference < XAttributeList > ( xAttributeCloner->createClone() , UNO_QUERY );
         else
         {
-            DBG_ERROR("Unable to clone AttributeList")
+            DBG_ERROR("Unable to clone AttributeList");
         }
     }
 };
@@ -674,7 +674,7 @@ void StatementCommand::HandleSAXParser()
             break;
         case RC_SAXGetElementPath:
             {
-                DBG_ASSERT( sizeof( ULONG ) == sizeof ( void* ), "Pointertype has different size than ULONG")
+                DBG_ASSERT( sizeof( ULONG ) == sizeof ( void* ), "Pointertype has different size than ULONG");
                 String aPath;
                 aPath.AppendAscii( "*:" );
                 aPath.Append( String::CreateFromInt64( pSAXParser->GetTimestamp() ) );
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index 93cffcdd2a69..1c209053bfb8 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -258,22 +258,22 @@ void CmdBaseStream::Write( comm_BOOL bBool )
 void CmdBaseStream::Read ( comm_String* &pString )
 {
     (void) pString; /* avoid warning about unused parameter */
-    DBG_ERROR("Read ( comm_String* &pString ) Not Implemented")
+    DBG_ERROR("Read ( comm_String* &pString ) Not Implemented");
 }
 void CmdBaseStream::Read ( SmartId* &pId )
 {
     (void) pId; /* avoid warning about unused parameter */
-    DBG_ERROR("Read ( SmartId* &pId ) Not Implemented")
+    DBG_ERROR("Read ( SmartId* &pId ) Not Implemented");
 }
 
 void CmdBaseStream::Write( comm_String *pString )
 {
     (void) pString; /* avoid warning about unused parameter */
-    DBG_ERROR("Write( comm_String *pString ) Not Implemented")
+    DBG_ERROR("Write( comm_String *pString ) Not Implemented");
 }
 void CmdBaseStream::Write( SmartId* pId )
 {
     (void) pId; /* avoid warning about unused parameter */
-    DBG_ERROR("Write( SmartId* pId ) Not Implemented")
+    DBG_ERROR("Write( SmartId* pId ) Not Implemented");
 }
 
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 199ec99822da..9c76533c7758 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -698,7 +698,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                        ( aKeyCode.GetCode() == KEY_EQUAL) ||
                                        ( aKeyCode.GetCode() == 0) ) )
                                 {
-                                    DBG_ASSERT( pKeyEvent->GetCharCode(), "no charcode found" )
+                                    DBG_ASSERT( pKeyEvent->GetCharCode(), "no charcode found" );
                                     aKeyString += pKeyEvent->GetCharCode();
                                 }
                                 else
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index bf039224f031..04b73ac9ebb6 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -98,7 +98,7 @@ void RetStream::Write( SbxValue &aValue )
 
 void RetStream::Write( SmartId* pId )
 {
-    DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." )
+    DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." );
     if ( pId->HasString() )
     {
         String aTmp( pId->GetStr() );
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index cf00161d1b2d..6f114ae57f5b 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -192,7 +192,7 @@ void StatementList::SendProfile( String aText )
 
 void StatementList::QueStatement(StatementList *pAfterThis)
 {
-    DBG_ASSERT(!bStatementInQue,"QueStatement f�r bereits eingetragenes Statement -> Abgebrochen")
+    DBG_ASSERT(!bStatementInQue,"QueStatement f�r bereits eingetragenes Statement -> Abgebrochen");
     if ( bStatementInQue )
         return;
 
@@ -301,7 +301,7 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB
             pBase = Application::GetFocusWindow();
             if ( pBase )
             {
-                DBG_ASSERT( WinPtrValid( pBase ), "GetFocusWindow is no valid WindowPointer" )
+                DBG_ASSERT( WinPtrValid( pBase ), "GetFocusWindow is no valid WindowPointer" );
                 Window *pPParent = pBase;
                 while ( pPParent->GET_REAL_PARENT() )
                     pPParent = pPParent->GET_REAL_PARENT();
@@ -751,7 +751,7 @@ Window* StatementList::GetAnyActive( BOOL MaybeBase )
 
 void StatementList::SetFirstDocFrame( Window* pWin )
 {
-    DBG_ASSERT( IsDocFrame( pWin ), "Non Document Frame set as first Document Frame" )
+    DBG_ASSERT( IsDocFrame( pWin ), "Non Document Frame set as first Document Frame" );
     pFirstDocFrame = pWin;
 }
 
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 9b1d747a0ec7..4219d1d5b099 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -235,7 +235,7 @@ void StatementFlow::SendViaSocket()
     else
     {
         // Macht nix. Wenn das Basic nicht mehr da ist, ist sowiso alles egal
-        DBG_ERROR("Cannot send results to TestTool")
+        DBG_ERROR("Cannot send results to TestTool");
     }
 
     pRet->Reset();
@@ -555,11 +555,11 @@ SlotStatusListener::SlotStatusListener()
 // XStatusListener
 void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
 {
-//    DBG_ERROR1("FeatureURL: %s", ByteString( String( Event.FeatureURL.Complete ), RTL_TEXTENCODING_UTF8 ).GetBuffer() )
-//    DBG_ERROR1("FeatureDescriptor: %s", ByteString( String( Event.FeatureDescriptor ), RTL_TEXTENCODING_UTF8 ).GetBuffer() )
+//    DBG_ERROR1("FeatureURL: %s", ByteString( String( Event.FeatureURL.Complete ), RTL_TEXTENCODING_UTF8 ).GetBuffer() );
+//    DBG_ERROR1("FeatureDescriptor: %s", ByteString( String( Event.FeatureDescriptor ), RTL_TEXTENCODING_UTF8 ).GetBuffer() );
     bEnabled = Event.IsEnabled;
-//    DBG_ASSERT( Event.IsEnabled, "Not enabled" )
-//    DBG_ASSERT( !Event.Requery, "Requery" )
+//    DBG_ASSERT( Event.IsEnabled, "Not enabled" );
+//    DBG_ASSERT( !Event.Requery, "Requery" );
 }
 
 // XEventListener
@@ -2637,8 +2637,8 @@ BOOL StatementCommand::Execute()
             {
                 ByteString aAssertion( "Diese Assertion wurde vom Testtool per Befehl ausgel�st" );
                 aAssertion = ByteString( String( aAssertion, RTL_TEXTENCODING_MS_1252 ), RTL_TEXTENCODING_UTF8 );
-                DBG_ASSERT( !aString1.Len(), ByteString( aString1, RTL_TEXTENCODING_UTF8 ).GetBuffer() )
-                DBG_ASSERT(  aString1.Len(), aAssertion.GetBuffer() )
+                DBG_ASSERT( !aString1.Len(), ByteString( aString1, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
+                DBG_ASSERT(  aString1.Len(), aAssertion.GetBuffer() );
                 OSL_ENSURE( !aString1.Len(), ByteString( aString1, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
                 OSL_ENSURE(  aString1.Len(), aAssertion.GetBuffer() );
             }
@@ -2647,12 +2647,12 @@ BOOL StatementCommand::Execute()
 #ifdef DBG_UTIL
             if( !(nParams & PARAM_BOOL_1) || bBool1 )
             {
-                DBG_INSTOUTERROR( DBG_OUT_TESTTOOL )
+                DBG_INSTOUTERROR( DBG_OUT_TESTTOOL );
                 osl_setDebugMessageFunc( osl_TestToolDebugPrint );
             }
             else
             {
-                DBG_INSTOUTERROR( DBG_OUT_MSGBOX )
+                DBG_INSTOUTERROR( DBG_OUT_MSGBOX );
                 osl_setDebugMessageFunc( pOriginal_osl_DebugMessageFunc );
             }
 #endif
@@ -2878,7 +2878,7 @@ BOOL StatementCommand::Execute()
                                     else
                                         nPhysicalIndex++;
                                 }
-                                DBG_ASSERT( nVisibleCount == nNr1, "Adaption of Index failed: nVisibleCount != nNr1" )
+                                DBG_ASSERT( nVisibleCount == nNr1, "Adaption of Index failed: nVisibleCount != nNr1" );
                             }
                         }
                         break;
@@ -6212,7 +6212,7 @@ protected:
                                         pFloat = pControl->GET_REAL_PARENT();
                                     else
                                     {
-                                        DBG_ERROR("FloatingMode set but Parent is no FloatingWindow")
+                                        DBG_ERROR("FloatingMode set but Parent is no FloatingWindow");
                                     }
                                 }
                                 if ( pFloat && pFloat->GetType() == WINDOW_FLOATINGWINDOW )
diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx
index fa18a4669382..e323fffec45d 100644
--- a/automation/source/simplecm/packethandler.cxx
+++ b/automation/source/simplecm/packethandler.cxx
@@ -84,7 +84,7 @@ unsigned char PacketHandler::CalcCheckByte( comm_UINT32 nBytes )
 
 comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen )
 {
-    DBG_ASSERT( !pData, "pData should be NULL -> memory leak" )
+    DBG_ASSERT( !pData, "pData should be NULL -> memory leak" );
 
     nLen = 0;
     pData = NULL;
diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx
index d2199e221737..6813b4c9b2c7 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -285,10 +285,10 @@ BOOL SimpleCommunicationLinkViaSocket::DoReceiveDataStream()
     if ( !bWasError )
     {
         pReceiveStream = GetBestCommunicationStream();
-        DBG_ASSERT( pReceiveStream->IsA() == ID_MEMORYSTREAM, "CommunicationStream is not an SvMemoryStream. Communication has to be reimplemented here!")
+        DBG_ASSERT( pReceiveStream->IsA() == ID_MEMORYSTREAM, "CommunicationStream is not an SvMemoryStream. Communication has to be reimplemented here!");
         if ( pReceiveStream->IsA() == ID_MEMORYSTREAM )
             ((SvMemoryStream*)pReceiveStream)->SetBuffer( pBuffer, nLen, TRUE, nLen );
-        DBG_ASSERT( pReceiveStream, "Datastream is NULL")
+        DBG_ASSERT( pReceiveStream, "Datastream is NULL");
     }
 
     return !bWasError;
@@ -487,7 +487,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
     // should be impossible but happens for mysterious reasons
     if ( !pCL->pServiceData )
     {
-        DBG_ERROR( "Datastream is NULL" )
+        DBG_ERROR( "Datastream is NULL" );
         pCL->FinishCallback();
         return;
     }
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 9ec57698187d..f1d375c360fe 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -603,7 +603,7 @@ void TestToolObj::InitTestToolObj()
     }
     else
     {
-        DBG_ERROR("Testtool: Could not replace Wait method")
+        DBG_ERROR("Testtool: Could not replace Wait method");
     }
 
     MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext );
@@ -1035,7 +1035,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B
                     aUId = SmartId( aLongname );
                 else
                 {
-                    DBG_ERROR("Unknown URL schema")
+                    DBG_ERROR("Unknown URL schema");
                 }
             }
 
@@ -1320,7 +1320,7 @@ void TestToolObj::BeginBlock()
     if ( IsError() )
         return;
 
-    DBG_ASSERT(!IsBlock,"BeginBlock innerhalb eines Blockes")
+    DBG_ASSERT(!IsBlock,"BeginBlock innerhalb eines Blockes");
     In->Reset(nSequence);
     IsBlock = TRUE;
 }
@@ -1330,7 +1330,7 @@ void TestToolObj::SendViaSocket()
 {
     if ( !pCommunicationManager )
     {
-        DBG_ERROR("Kein CommunicationManager vorhanden!!")
+        DBG_ERROR("Kein CommunicationManager vorhanden!!");
         return;
     }
 
@@ -1416,7 +1416,7 @@ void TestToolObj::EndBlock()
     }
     else
     {
-        DBG_ERROR("EndBlock au�erhalb eines Blockes")
+        DBG_ERROR("EndBlock au�erhalb eines Blockes");
     }
 }