summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx10
-rw-r--r--comphelper/source/misc/logging.cxx4
-rw-r--r--connectivity/source/inc/java/sql/ConnectionLog.hxx24
-rw-r--r--include/comphelper/logging.hxx127
-rw-r--r--include/tools/b3dtrans.hxx2
-rw-r--r--include/tools/stream.hxx2
-rw-r--r--include/tools/urlobj.hxx11
-rw-r--r--include/unotools/lingucfg.hxx2
-rw-r--r--tools/source/fsys/urlobj.cxx5
-rw-r--r--tools/source/generic/b3dtrans.cxx6
-rw-r--r--tools/source/stream/stream.cxx3
-rw-r--r--unotools/source/config/lingucfg.cxx3
12 files changed, 84 insertions, 115 deletions
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index dce41b6a9de4..252b11d130af 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -115,12 +115,10 @@ DrawViewWrapper::DrawViewWrapper(
{
SvtLinguConfig aLinguConfig;
SvtLinguOptions aLinguOptions;
- if ( aLinguConfig.GetOptions( aLinguOptions ) )
- {
- pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage, EE_CHAR_LANGUAGE ) );
- pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CJK, EE_CHAR_LANGUAGE_CJK ) );
- pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CTL, EE_CHAR_LANGUAGE_CTL ) );
- }
+ aLinguConfig.GetOptions( aLinguOptions );
+ pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage, EE_CHAR_LANGUAGE ) );
+ pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CJK, EE_CHAR_LANGUAGE_CJK ) );
+ pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CTL, EE_CHAR_LANGUAGE_CTL ) );
// set font height without changing SdrEngineDefaults
pOutlinerPool->SetPoolDefaultItem( SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT ) ); // 12pt
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 55bfefef4bbe..c6863539a116 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -110,7 +110,7 @@ namespace comphelper
}
- bool EventLogger::impl_log( const sal_Int32 _nLogLevel,
+ void EventLogger::impl_log( const sal_Int32 _nLogLevel,
const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage,
const OptionalString& _rArgument1, const OptionalString& _rArgument2,
const OptionalString& _rArgument3, const OptionalString& _rArgument4,
@@ -157,8 +157,6 @@ namespace comphelper
{
OSL_FAIL( "EventLogger::impl_log: caught an exception!" );
}
-
- return false;
}
} // namespace comphelper
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 416c17014971..ea3033e81612 100644
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
@@ -85,39 +85,39 @@ namespace connectivity { namespace java { namespace sql {
sal_Int32 getObjectID() const { return m_nObjectID; }
/// logs a given message, without any arguments, or source class/method names
- bool log( const sal_Int32 _nLogLevel, const OUString& rMessage )
+ void log( const sal_Int32 _nLogLevel, const OUString& rMessage )
{
- return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID );
+ ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID );
}
template< typename ARGTYPE1 >
- bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1 ) const
{
- return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1 );
+ ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1 );
}
template< typename ARGTYPE1, typename ARGTYPE2 >
- bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
- return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2 );
+ ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2 );
}
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
- bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
- return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3 );
+ ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3 );
}
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
- bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
- return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4 );
+ ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4 );
}
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
- bool log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
- return ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4, _argument5 );
+ ConnectionLog_Base::log( _nLogLevel, rMessage, m_nObjectID, _argument1, _argument2, _argument3, _argument4, _argument5 );
}
};
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 0d71620e136d..69d6c9a354ec 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -119,11 +119,10 @@ namespace comphelper
//- string messages
/// logs a given message, without any arguments, or source class/method names
- bool log( const sal_Int32 _nLogLevel, const OUString& rMessage ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& rMessage ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log(_nLogLevel, nullptr, nullptr, rMessage);
- return false;
+ impl_log(_nLogLevel, nullptr, nullptr, rMessage);
}
/** logs a given message, replacing a placeholder in the message with an argument
@@ -134,77 +133,71 @@ namespace comphelper
is searched in the message string, and replaced with the argument string.
*/
template< typename ARGTYPE1 >
- bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
+ impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
- return false;
}
/// logs a given message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 >
- bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
+ impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
- return false;
}
/// logs a given message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
- bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
+ impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
- return false;
}
/// logs a given message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
- bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
+ impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ) );
- return false;
}
/// logs a given message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
- bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
+ impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ) );
- return false;
}
/// logs a given message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
- bool log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+ void log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
+ impl_log( _nLogLevel, nullptr, nullptr, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ),
OptionalString( log::convert::convertLogArgToString( _argument6 ) ) );
- return false;
}
@@ -219,77 +212,71 @@ namespace comphelper
is searched in the message string, and replaced with the argument string.
*/
template< typename ARGTYPE1 >
- bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const
+ void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
+ impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
- return false;
}
/// logs a given message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 >
- bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+ void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
+ impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
- return false;
}
/// logs a given message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
- bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+ void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
+ impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
- return false;
}
/// logs a given message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
- bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+ void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
+ impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ) );
- return false;
}
/// logs a given message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
- bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+ void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
+ impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ) );
- return false;
}
/// logs a given message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
- bool log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+ void log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
+ impl_log( _nLogLevel, nullptr, nullptr, OUString::createFromAscii( _pMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ),
OptionalString( log::convert::convertLogArgToString( _argument6 ) ) );
- return false;
}
@@ -304,77 +291,71 @@ namespace comphelper
is searched in the message string, and replaced with the argument string.
*/
template< typename ARGTYPE1 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
- return false;
}
/// logs a given message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
- return false;
}
/// logs a given message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
- return false;
}
/// logs a given message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ) );
- return false;
}
/// logs a given message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ) );
- return false;
}
/// logs a given message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ),
OptionalString( log::convert::convertLogArgToString( _argument6 ) ) );
- return false;
}
@@ -389,81 +370,75 @@ namespace comphelper
is searched in the message string, and replaced with the argument string.
*/
template< typename ARGTYPE1 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
- return false;
}
/// logs a given ASCII message, replacing 2 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
- return false;
}
/// logs a given ASCII message, replacing 3 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
- return false;
}
/// logs a given ASCII message, replacing 4 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ) );
- return false;
}
/// logs a given ASCII message, replacing 5 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ) );
- return false;
}
/// logs a given ASCII message, replacing 6 placeholders in the message with respective values
template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
- bool logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+ void logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
{
if ( isLoggable( _nLogLevel ) )
- return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
+ impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
OptionalString( log::convert::convertLogArgToString( _argument4 ) ),
OptionalString( log::convert::convertLogArgToString( _argument5 ) ),
OptionalString( log::convert::convertLogArgToString( _argument6 ) ) );
- return false;
}
protected:
- bool impl_log(
+ void impl_log(
const sal_Int32 _nLogLevel,
const sal_Char* _pSourceClass,
const sal_Char* _pSourceMethod,
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index 9f71d7d87750..c57d7ce24abd 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -190,7 +190,7 @@ public:
private:
void CalcNewViewportValues();
- bool CalcFocalLength();
+ void CalcFocalLength();
virtual void DeviceRectangleChange() override;
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index bcc22137174a..9b28c6a46f65 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -195,7 +195,7 @@ protected:
// encrypt and write in blocks
std::size_t CryptAndWriteBuffer( const void* pStart, std::size_t nLen );
- bool EncryptBuffer( void* pStart, std::size_t nLen ) const;
+ void EncryptBuffer( void* pStart, std::size_t nLen ) const;
public:
SvStream();
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 309690048a49..94e22af5a159 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -1102,7 +1102,7 @@ private:
// Query:
- bool clearQuery();
+ void clearQuery();
bool setQuery(
OUString const & rTheQuery,
@@ -1298,9 +1298,12 @@ inline bool INetURLObject::SetParam(OUString const & rTheQuery,
EncodeMechanism eMechanism,
rtl_TextEncoding eCharset)
{
- return rTheQuery.isEmpty() ?
- clearQuery() :
- setQuery(rTheQuery, eMechanism, eCharset);
+ if (rTheQuery.isEmpty())
+ {
+ clearQuery();
+ return false;
+ }
+ return setQuery(rTheQuery, eMechanism, eCharset);
}
inline bool INetURLObject::SetMark(OUString const & rTheFragment,
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index cb66cb3aaf34..922e00ea5cd0 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -179,7 +179,7 @@ public:
bool SetProperty( sal_Int32 nPropertyHandle,
const css::uno::Any &rValue );
- bool GetOptions( SvtLinguOptions &rOptions ) const;
+ void GetOptions( SvtLinguOptions &rOptions ) const;
bool IsReadOnly( const OUString &rPropertyName ) const;
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index c8719b6732b3..7c326a601911 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3304,17 +3304,16 @@ bool INetURLObject::insertName(OUString const & rTheName,
RTL_TEXTENCODING_UTF8);
}
-bool INetURLObject::clearQuery()
+void INetURLObject::clearQuery()
{
if (HasError())
- return false;
+ return;
if (m_aQuery.isPresent())
{
lcl_Erase(m_aAbsURIRef, m_aQuery.getBegin() - 1,
m_aQuery.getLength() + 1);
m_aFragment += m_aQuery.clear() - 1;
}
- return false;
}
bool INetURLObject::setQuery(OUString const & rTheQuery,
diff --git a/tools/source/generic/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index f2210705112a..184b6a1ff8bc 100644
--- a/tools/source/generic/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.cxx
@@ -429,8 +429,7 @@ void B3dCamera::CalcNewViewportValues()
aNewVUV.normalize();
SetViewportValues(aPosition, aNewVPN, aNewVUV);
- if(CalcFocalLength())
- SetViewportValues(aCorrectedPosition, aNewVPN, aNewVUV);
+ CalcFocalLength();
if(fBankAngle != 0.0)
{
@@ -444,7 +443,7 @@ void B3dCamera::CalcNewViewportValues()
}
}
-bool B3dCamera::CalcFocalLength()
+void B3dCamera::CalcFocalLength()
{
double fWidth = GetDeviceRectangleWidth();
@@ -455,7 +454,6 @@ bool B3dCamera::CalcFocalLength()
fFocalLength = aOldPosition.getZ() / fWidth * 35.0;
if(fFocalLength < 5.0)
fFocalLength = 5.0;
- return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index a51a25dff991..e5a36ac893c5 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1500,7 +1500,7 @@ std::size_t SvStream::CryptAndWriteBuffer( const void* pStart, std::size_t nLen)
return nCount;
}
-bool SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const
+void SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const
{
unsigned char* pTemp = static_cast<unsigned char*>(pStart);
unsigned char nMask = m_nCryptMask;
@@ -1512,7 +1512,6 @@ bool SvStream::EncryptBuffer(void* pStart, std::size_t nLen) const
aCh ^= nMask;
*pTemp = aCh;
}
- return true;
}
static unsigned char implGetCryptMask(const sal_Char* pStr, sal_Int32 nLen, long nVersion)
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 5858ad8105fc..e1a035f91b08 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -867,10 +867,9 @@ bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rVa
return GetConfigItem().SetProperty( nPropertyHandle, rValue );
}
-bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
+void SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const
{
rOptions = GetConfigItem().GetOptions();
- return true;
}
bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const
generated by cgit (git 2.34.1) at 2025-01-23 07:14:26 +0000