summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-03 13:01:35 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-11 23:41:05 +0100
commit5c3d61abf9167c095b821f4f492316a9cae1e3f0 (patch)
tree24a62b69400c703fa0bf4e7df57d3dba5ee5caba
parent95ceadd4174967187190ae1801aec3deb73536a5 (diff)
Move DBG_ERROR to OSL_FAIL for strings GetBuffer()
-rw-r--r--tools/source/rc/resmgr.cxx4
-rw-r--r--tools/source/ref/errinf.cxx4
-rw-r--r--tools/source/ref/pstm.cxx4
-rw-r--r--vcl/source/gdi/cvtsvm.cxx2
-rw-r--r--vcl/source/window/dialog.cxx4
-rw-r--r--vcl/source/window/window.cxx14
6 files changed, 16 insertions, 16 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index ab8fbe585432..d0b63c9ab027 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -831,7 +831,7 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
// clean up
delete pNewResMgr;
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
@@ -951,7 +951,7 @@ void ResMgr::Init( const OUString& rFileName )
#ifdef DBG_UTIL
ByteString aStr( "Resourcefile not found:\n" );
aStr += ByteString( OUStringToOString( rFileName, RTL_TEXTENCODING_UTF8 ) );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
#endif
RscException_Impl();
}
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index ce2e3f7fa36f..35cf67d3b905 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.cxx
@@ -217,7 +217,7 @@ static void aDspFunc(const String &rErr, const String &rAction)
aErr+= ByteString( rAction, RTL_TEXTENCODING_ASCII_US );
aErr+=" Fehler: ";
aErr+= ByteString( rErr, RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR(aErr.GetBuffer());
+ OSL_FAIL(aErr.GetBuffer());
}
@@ -347,7 +347,7 @@ USHORT ErrorHandler::HandleError_Impl(
aStr += ByteString( aAction, RTL_TEXTENCODING_ASCII_US );
aStr += ByteString("\nFehler: ");
aStr += ByteString( aErr, RTL_TEXTENCODING_ASCII_US );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
else
{
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 31c37b3086b6..84b21433d3da 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -156,7 +156,7 @@ SvPersistStream& operator >> ( SvPersistStream & rStm,
aStr += ByteString::CreateFromInt32( (long)(rStm.Tell() - nObjPos) );
aStr += ", should = ";
aStr += ByteString::CreateFromInt64(nObjLen);
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#else
(void)nObjLen;
@@ -792,7 +792,7 @@ UINT32 SvPersistStream::ReadObj
aStr += ByteString::CreateFromInt32( (long)(Tell() - nObjPos) );
aStr += ", should = ";
aStr += ByteString::CreateFromInt32( nObjLen );
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
#endif
rpObj->RestoreNoDelete();
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index df6dcd58545f..93883f8b5839 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -2434,7 +2434,7 @@ ULONG SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
ByteString aStr( "Missing implementation for Action#: " );
aStr += ByteString::CreateFromInt32( pAction->GetType() );
aStr += '!';
- DBG_ERROR( aStr.GetBuffer() );
+ OSL_FAIL( aStr.GetBuffer() );
}
break;
#endif
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b50fd4f17a9a..63da028e82d2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -622,7 +622,7 @@ BOOL Dialog::ImplStartExecuteModal()
#ifdef DBG_UTIL
ByteString aErrorStr( "Dialog::StartExecuteModal() is called in Dialog::StartExecuteModal(): " );
aErrorStr += ImplGetDialogText( this );
- DBG_ERROR( aErrorStr.GetBuffer() );
+ OSL_FAIL( aErrorStr.GetBuffer() );
#endif
return FALSE;
}
@@ -632,7 +632,7 @@ BOOL Dialog::ImplStartExecuteModal()
#ifdef DBG_UTIL
ByteString aErrorStr( "Dialog::StartExecuteModal() is called in a none UI application: " );
aErrorStr += ImplGetDialogText( this );
- DBG_ERROR( aErrorStr.GetBuffer() );
+ OSL_FAIL( aErrorStr.GetBuffer() );
#endif
return FALSE;
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 62607d238367..b20a82d1dc7b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4382,7 +4382,7 @@ Window::~Window()
aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
aTempStr += ") with living SystemWindow(s) destroyed: ";
aTempStr += aErrorStr;
- DBG_ERROR( aTempStr.GetBuffer() );
+ OSL_FAIL( aTempStr.GetBuffer() );
GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed!
}
@@ -4403,7 +4403,7 @@ Window::~Window()
aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
aTempStr += ") with living SystemWindow(s) destroyed: ";
aTempStr += aErrorStr;
- DBG_ERROR( aTempStr.GetBuffer() );
+ OSL_FAIL( aTempStr.GetBuffer() );
GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed!
}
@@ -4418,7 +4418,7 @@ Window::~Window()
lcl_appendWindowInfo( aTempStr, *pTempWin );
pTempWin = pTempWin->mpWindowImpl->mpNext;
}
- DBG_ERROR( aTempStr.GetBuffer() );
+ OSL_FAIL( aTempStr.GetBuffer() );
GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed!
}
@@ -4433,7 +4433,7 @@ Window::~Window()
lcl_appendWindowInfo( aTempStr, *pTempWin );
pTempWin = pTempWin->mpWindowImpl->mpNext;
}
- DBG_ERROR( aTempStr.GetBuffer() );
+ OSL_FAIL( aTempStr.GetBuffer() );
GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed!
}
@@ -4451,7 +4451,7 @@ Window::~Window()
ByteString aTempStr( "Window (" );
aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
aTempStr += ") still in TaskPanelList!";
- DBG_ERROR( aTempStr.GetBuffer() );
+ OSL_FAIL( aTempStr.GetBuffer() );
GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed!
}
}
@@ -4477,7 +4477,7 @@ Window::~Window()
ByteString aTempStr( "Window (" );
aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
aTempStr += ") not found in TaskPanelList!";
- DBG_ERROR( aTempStr.GetBuffer() );
+ OSL_FAIL( aTempStr.GetBuffer() );
}
}
@@ -4508,7 +4508,7 @@ Window::~Window()
ByteString aTempStr( "Window (" );
aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
aTempStr += ") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !";
- DBG_ERROR( aTempStr.GetBuffer() );
+ OSL_FAIL( aTempStr.GetBuffer() );
GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed!
#endif
}