mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SAL_INFO instead of framework's own LOG_EXCEPTION

Browse Source 
Change-Id: If1976d235f82267a85598d5d59d8ed332a39c792
This commit is contained in:
Tor Lillqvist
2013-09-08 21:22:24 +03:00
parent a16c38f74e
commit c5ab14cbaf
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/inc/macros/debug/assertion.hxx
View File

@@ -37,7 +37,6 @@
// 4a) LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) same like 4) + additional location of error // 4a) LOG_ASSERT2( BCONDITION, SMETHOD, STEXT ) same like 4) + additional location of error
// 5) LOG_ERROR( SMETHOD, STEXT ) show errors without any condition // 5) LOG_ERROR( SMETHOD, STEXT ) show errors without any condition
// active for debug only! // 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 // 7) LOG_WARNING( SMETHOD, STEXT ) should be used to detect leaks in algorithm, mechanism or operation handling
//***************************************************************************************************************** //*****************************************************************************************************************
@@ -174,22 +173,6 @@
#define LOGFILE_WARNINGS "_framework_warnings.log" #define LOGFILE_WARNINGS "_framework_warnings.log"
#endif #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 ) LOG_WARNING( SMETHOD, STEXT )
@@ -206,7 +189,6 @@
// If right testmode is'nt set - implements these macros empty! // If right testmode is'nt set - implements these macros empty!
#undef LOGFILE_WARNINGS #undef LOGFILE_WARNINGS
#define LOG_EXCEPTION( SMETHOD, SOWNMESSAGE, SEXCEPTIONMESSAGE )
#define LOG_WARNING( SMETHOD, STEXT ) #define LOG_WARNING( SMETHOD, STEXT )
#endif // ENABLE_WARNINGS #endif // ENABLE_WARNINGS

4
framework/source/classes/framecontainer.cxx
View File

@@ -180,7 +180,7 @@ sal_uInt32 FrameContainer::getCount() const
@descr - @descr -
@deprecated This value can't be guaranteed for multithreading environments. @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 @param nIndex
a valud between 0 and (getCount()-1) to address one container item 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! // The index is not valid for current container-content - we must handle this case!
// We can return the default value ... // 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; return xFrame;
} }