diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-09-08 21:22:24 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-09-08 23:51:40 +0300 |
commit | c5ab14cbaf02ec42e587475d0f77b2b13f7c6068 (patch) | |
tree | 6b334e17bbebbfcfa99430bd80d8798c71b08e9f /framework | |
parent | a16c38f74e48402b39d478b3b4c9a9b91bbc2cba (diff) |
Use SAL_INFO instead of framework's own LOG_EXCEPTION
Change-Id: If1976d235f82267a85598d5d59d8ed332a39c792
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/macros/debug/assertion.hxx | 18 | ||||
-rw-r--r-- | framework/source/classes/framecontainer.cxx | 4 |
2 files changed, 2 insertions, 20 deletions
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx index 4f2a413f9941..a1a620e2a8c6 100644 --- a/framework/inc/macros/debug/assertion.hxx +++ b/framework/inc/macros/debug/assertion.hxx @@ -37,7 +37,6 @@ // 4a) LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) same like 4) + additional location of error // 5) LOG_ERROR( SMETHOD, STEXT ) show errors without any condition // active for debug only! -// 6) LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) show/log an exception for easier debug // 7) LOG_WARNING( SMETHOD, STEXT ) should be used to detect leaks in algorithm, mechanism or operation handling //***************************************************************************************************************** @@ -175,22 +174,6 @@ #endif /*_____________________________________________________________________________________________________________ - LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) - - Show some exception info by using current set output mode by define LOGTYPE! - We use a separated scope {} do protect us against multiple variable definitions. - _____________________________________________________________________________________________________________*/ - - #define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) \ - { \ - OStringBuffer _sAssertBuffer2( 256 ); \ - _sAssertBuffer2.append( SOWNMESSAGE ); \ - _sAssertBuffer2.append( "\n" ); \ - _sAssertBuffer2.append( U2B(SEXCEPTIONMESSAGE) ); \ - LOG_ERROR( SMETHOD, _sAssertBuffer2.getStr() ) \ - } - - /*_____________________________________________________________________________________________________________ LOG_WARNING( SMETHOD, STEXT ) Use it to show/log warnings for programmer for follow reasons: @@ -206,7 +189,6 @@ // If right testmode is'nt set - implements these macros empty! #undef LOGFILE_WARNINGS - #define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE ) #define LOG_WARNING( SMETHOD, STEXT ) #endif // ENABLE_WARNINGS diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 9ca00ea7ae44..d4a8a03663dd 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -180,7 +180,7 @@ sal_uInt32 FrameContainer::getCount() const @descr - @deprecated This value can't be guaranteed for multithreading environments. - So it will be marked as deprecated and should be replaced by "getAllElements()". + So it will be marked as deprecatedf and should be replaced by "getAllElements()". @param nIndex a valud between 0 and (getCount()-1) to address one container item @@ -207,7 +207,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::operator[]( sal_uInt32 { // The index is not valid for current container-content - we must handle this case! // We can return the default value ... - LOG_EXCEPTION( "FrameContainer::operator[]", "Exception catched ...", DECLARE_ASCII("::std::out_of_range") ) + SAL_INFO( "fwk", "FrameContainer::operator[]: Exception caught: std::out_of_range" ); } return xFrame; } |