diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-01 17:55:09 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-02 15:00:30 +0100 |
commit | fdeb50167836803f1a79082ddd25e4ae8ac20611 (patch) | |
tree | 3e9ff2e3cba72052ce97b0b16575791d2cdbdf6f /automation | |
parent | 096b61aa08ee37c6d6818791a7c5fb94d2f1ef7d (diff) |
Move DBG_ERROR to OSL_FAIL
Diffstat (limited to 'automation')
-rw-r--r-- | automation/source/communi/communi.cxx | 2 | ||||
-rw-r--r-- | automation/source/server/XMLParser.cxx | 2 | ||||
-rw-r--r-- | automation/source/server/cmdbasestream.cxx | 8 | ||||
-rw-r--r-- | automation/source/server/recorder.cxx | 6 | ||||
-rw-r--r-- | automation/source/server/server.cxx | 4 | ||||
-rw-r--r-- | automation/source/server/statemnt.cxx | 14 | ||||
-rw-r--r-- | automation/source/simplecm/packethandler.cxx | 4 | ||||
-rw-r--r-- | automation/source/simplecm/simplecm.cxx | 4 | ||||
-rw-r--r-- | automation/source/testtool/objtest.cxx | 24 |
9 files changed, 34 insertions, 34 deletions
diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx index f19b095449ff..7f44e1cf032f 100644 --- a/automation/source/communi/communi.cxx +++ b/automation/source/communi/communi.cxx @@ -56,7 +56,7 @@ _SV_IMPL_SORTAR_ALG( nm,AE )\ if( nL ) {\ DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\ for( USHORT n=nP; n < nP + nL; n++ ) \ - DBG_ERROR("Das Element der Liste wurde nicht gelscht"); \ + OSL_FAIL("Das Element der Liste wurde nicht gelscht"); \ SvPtrarr::Remove( nP, nL ); \ } \ } \ diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx index 059c173a3c82..8de072898297 100644 --- a/automation/source/server/XMLParser.cxx +++ b/automation/source/server/XMLParser.cxx @@ -178,7 +178,7 @@ ElementNode::ElementNode( const String& aName, Reference < XAttributeList > xAtt xAttributeList = Reference < XAttributeList > ( xAttributeCloner->createClone() , UNO_QUERY ); else { - DBG_ERROR("Unable to clone AttributeList"); + OSL_FAIL("Unable to clone AttributeList"); } } }; diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 1e670a6e4d6a..ce280607cc3b 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -281,23 +281,23 @@ 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"); + OSL_FAIL("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"); + OSL_FAIL("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"); + OSL_FAIL("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"); + OSL_FAIL("Write( SmartId* pId ) Not Implemented"); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index aebbfb40d9a8..d233dede5164 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -236,7 +236,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case STATE_NOCHECK: nMethod = M_UnCheck; aMethod = CUniString("UnCheck"); break; case STATE_DONTKNOW: nMethod = M_TriState; aMethod = CUniString("TriState"); break; default: nMethod = M_Check; - DBG_ERROR( "Unknown state in TriStateBox::GetState()" ); + OSL_FAIL( "Unknown state in TriStateBox::GetState()" ); } if ( m_bRecord ) { @@ -395,7 +395,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case WINDOW_CANCELBUTTON: nMethod = M_Cancel; aMethod = CUniString("Cancel"); break; case WINDOW_HELPBUTTON: nMethod = M_Help; aMethod = CUniString("Help"); break; default: nMethod = M_Default;aMethod = CUniString("Unknown Button"); - DBG_ERROR( "Unknown Button" ); + OSL_FAIL( "Unknown Button" ); } if ( m_bRecord ) { @@ -452,7 +452,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_SPINFIELD_FIRST: nMethod = M_ToMin; aMethod = CUniString("ToMin"); break; case VCLEVENT_SPINFIELD_LAST: nMethod = M_ToMax; aMethod = CUniString("ToMax"); break; default: nMethod = M_ToMin; aMethod = CUniString("Unknown"); - DBG_ERROR( "Unknown EventID in Spinfield" ); + OSL_FAIL( "Unknown EventID in Spinfield" ); } if ( m_bRecord ) { diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 62d5f13ba897..322d70522fe3 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -637,7 +637,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG ) pDlg->SetOutputSizePixel(Size(150,0)); pDlg->SetText( String ( TTProperties::GetSvtResId( TT_GPF ) ) ); pDlg->Show(); - DBG_ERROR("GPF"); + OSL_FAIL("GPF"); pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) ); StatementList::bDying = TRUE; while ( StatementList::pFirst ) // Kommandos werden bersprungen @@ -744,7 +744,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn ) if( !pIn->IsEof() ) pCmdStream->Read( nId ); else { - DBG_ERROR( "truncated input stream" ); + OSL_FAIL( "truncated input stream" ); } } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index e2e868a1cd31..e363f83c5195 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -187,7 +187,7 @@ void StatementFlow::SendViaSocket() #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "SendViaSocket called recursively. Aborted!!!\n" ); #endif - DBG_ERROR("SendViaSocket called recursively. Aborted!!!"); + OSL_FAIL("SendViaSocket called recursively. Aborted!!!"); return; } bSending = TRUE; @@ -199,7 +199,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"); + OSL_FAIL("Cannot send results to TestTool"); } pRet->Reset(); @@ -263,7 +263,7 @@ BOOL StatementFlow::Execute() break; default: - DBG_ERROR( "Unknown Flowcontrol" ); + OSL_FAIL( "Unknown Flowcontrol" ); break; } @@ -2417,7 +2417,7 @@ BOOL StatementCommand::Execute() break; } default: - DBG_ERROR( "Unknown Windowtype" ); + OSL_FAIL( "Unknown Windowtype" ); REPORT_WIN_CLOSEDc(pControl, "Unknown Windowtype"); ReportError( GEN_RES_STR0( S_RESETAPPLICATION_FAILED_UNKNOWN ), pControl->GetType() ); #if OSL_DEBUG_LEVEL > 1 @@ -3448,7 +3448,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) } else { - DBG_ERROR( "Wrong ControlType" ); + OSL_FAIL( "Wrong ControlType" ); } pCmdIn->Read( nMethodId ); @@ -6029,7 +6029,7 @@ BOOL StatementControl::Execute() pFloat = pControl->GET_REAL_PARENT(); else { - DBG_ERROR("FloatingMode set but Parent is no FloatingWindow"); + OSL_FAIL("FloatingMode set but Parent is no FloatingWindow"); } } if ( pFloat && pFloat->GetType() == WINDOW_FLOATINGWINDOW ) @@ -6375,7 +6375,7 @@ BOOL StatementControl::Execute() break; } default: - DBG_ERROR( "Unknown Objekttype from UId or Method not suported" ); + OSL_FAIL( "Unknown Objekttype from UId or Method not suported" ); ReportError( aUId, GEN_RES_STR2( S_UNKNOWN_TYPE, UniString::CreateFromInt32( nRT ), MethodString(nMethodId) ) ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( " Unknown Objekttype from UId or Method not suported" ); diff --git a/automation/source/simplecm/packethandler.cxx b/automation/source/simplecm/packethandler.cxx index 034143d2cba6..572c79b9e1a0 100644 --- a/automation/source/simplecm/packethandler.cxx +++ b/automation/source/simplecm/packethandler.cxx @@ -143,7 +143,7 @@ comm_BOOL PacketHandler::ReceiveData( void* &pData, comm_UINT32 &nLen ) break; default: { - DBG_ERROR("Unbekannter Headertyp in der Kommunikation"); + OSL_FAIL("Unbekannter Headertyp in der Kommunikation"); bWasError = TRUE; } @@ -285,7 +285,7 @@ comm_BOOL PacketHandler::SendHandshake( HandshakeType aHandshakeType, const void nBuffer += 0 ; // one word extradata for options break; default: - DBG_ERROR("Unknown HandshakeType"); + OSL_FAIL("Unknown HandshakeType"); } if ( pData ) diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index 0e51768361c5..638813de9b40 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -336,7 +336,7 @@ BOOL SimpleCommunicationLinkViaSocket::SendHandshake( HandshakeType aHandshakeTy case CH_SetApplication: break; default: - DBG_ERROR("Unknown HandshakeType"); + OSL_FAIL("Unknown HandshakeType"); } } return !bWasError; @@ -484,7 +484,7 @@ void CommunicationManager::CallDataReceived( CommunicationLink* pCL ) // should be impossible but happens for mysterious reasons if ( !pCL->pServiceData ) { - DBG_ERROR( "Datastream is NULL" ); + OSL_FAIL( "Datastream is NULL" ); pCL->FinishCallback(); return; } diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index dd4d78fbdeb6..c8e948f834b8 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -202,7 +202,7 @@ ControlDef::ControlDef(const String &aOldName, const String &aNewName, ControlDe pNewDef = new ControlDef( aOldName, aNewName, pOriginal->SonGetObject(i) ,TRUE ); if (! SonInsert(pNewDef)) { - DBG_ERROR("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!"); + OSL_FAIL("Name Doppelt im CopyConstructor. Neuer Name = Controlname!!"); delete pNewDef; } } @@ -233,7 +233,7 @@ void CRevNames::Insert( String aName, SmartId aUId, ULONG nSeq ) if ( !CNames::C40_PTR_INSERT( ControlItem, pRN) ) { - DBG_ERROR("Interner Fehler beim Speichern der Lokalen KurzNamen"); + OSL_FAIL("Interner Fehler beim Speichern der Lokalen KurzNamen"); delete pRN; } @@ -541,7 +541,7 @@ void TestToolObj::InitTestToolObj() } else { - DBG_ERROR("Testtool: Could not replace Wait method"); + OSL_FAIL("Testtool: Could not replace Wait method"); } MAKE_TT_KEYWORD( "Kontext", SbxCLASS_METHOD, SbxNULL, ID_Kontext ); @@ -927,7 +927,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B aUId = SmartId( aLongname ); else { - DBG_ERROR("Unknown URL schema"); + OSL_FAIL("Unknown URL schema"); } } @@ -948,7 +948,7 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B if (!pNewDef->SonInsert( pNewDef2 )) // Dialog in eigenen Namespace eintragen { delete pNewDef2; - DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!"); + OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!"); } } @@ -1215,7 +1215,7 @@ void TestToolObj::SendViaSocket() { if ( !pCommunicationManager ) { - DBG_ERROR("Kein CommunicationManager vorhanden!!"); + OSL_FAIL("Kein CommunicationManager vorhanden!!"); return; } @@ -1300,7 +1300,7 @@ void TestToolObj::EndBlock() } else { - DBG_ERROR("EndBlock au�erhalb eines Blockes"); + OSL_FAIL("EndBlock au�erhalb eines Blockes"); } } @@ -1415,14 +1415,14 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr if (!pNewDef->SonInsert(pNewDef2)) // Dialog in eigenen Namespace eintragen { delete pNewDef2; - DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!"); + OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen in leere Liste!"); } } const ControlItem *pItem = pNewDef; if (! pNames->Insert(pItem)) { - DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!"); + OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!"); delete pNewDef; pFatherDef = NULL; } @@ -1435,7 +1435,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { if (!pFatherDef) { - DBG_ERROR( "Internal Error: Erster Kurzname mu� mit * beginnen. �berspringe." ); + OSL_FAIL( "Internal Error: Erster Kurzname mu� mit * beginnen. �berspringe." ); } else { @@ -1443,7 +1443,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr if (! pFatherDef->SonInsert(pNewDef)) { delete pNewDef; - DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!"); + OSL_FAIL(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!"); } } } @@ -3759,7 +3759,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) pRetStream->Read( nId ); else { - DBG_ERROR( "truncated input stream" ); + OSL_FAIL( "truncated input stream" ); } } |