summaryrefslogtreecommitdiffstats
path: root/framework
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-09-08 21:49:45 +0300
committerTor Lillqvist <tml@collabora.com>2013-09-08 23:51:41 +0300
commit6aa069882831720fcff5217b0b0705e42dee72cc (patch)
tree493c58ff421b5b070b886c90949799f68d7aedf3 /framework
parentUse SAL_INFO instead of framework's own LOG_EXCEPTION (diff)
downloadcore-6aa069882831720fcff5217b0b0705e42dee72cc.tar.gz
core-6aa069882831720fcff5217b0b0705e42dee72cc.zip
Use SAL_INFO instead of framework's own LOG_WARNING
Change-Id: Ief44fceaf03d2567f4aacd9ff74d361436e5e05b
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/macros/debug.hxx5
-rw-r--r--framework/inc/macros/debug/assertion.hxx39
-rw-r--r--framework/source/accelerators/acceleratorconfiguration.cxx24
-rw-r--r--framework/source/accelerators/storageholder.cxx6
-rw-r--r--framework/source/fwe/classes/framelistanalyzer.cxx4
-rw-r--r--framework/source/fwi/jobs/configaccess.cxx2
-rw-r--r--framework/source/jobs/job.cxx12
-rw-r--r--framework/source/loadenv/loadenv.cxx4
-rw-r--r--framework/source/services/autorecovery.cxx12
-rw-r--r--framework/source/services/desktop.cxx4
-rw-r--r--framework/source/services/frame.cxx8
-rw-r--r--framework/source/xml/acceleratorconfigurationreader.cxx18
12 files changed, 41 insertions, 97 deletions
diff --git a/framework/inc/macros/debug.hxx b/framework/inc/macros/debug.hxx
index c56dcf952b7f..de3d07a60931 100644
--- a/framework/inc/macros/debug.hxx
+++ b/framework/inc/macros/debug.hxx
@@ -41,12 +41,10 @@
#ifndef ENABLE_ASSERTIONS
#define ENABLE_ASSERTIONS
#endif
- #ifndef ENABLE_WARNINGS
- #define ENABLE_WARNINGS
- #endif
//-----------------------------------------------------------------------------------------------------------------
// => "non product"
+// NOTE
#elif OSL_DEBUG_LEVEL > 0
// Enable log mechanism for normal assertion and error handling.
@@ -67,7 +65,6 @@
#undef ENABLE_LOGMECHANISM
#undef ENABLE_ASSERTIONS
- #undef ENABLE_WARNINGS
#undef ENABLE_EVENTDEBUG
#undef ENABLE_REGISTRATIONDEBUG
// #undef ENABLE_TIMEMEASURE
diff --git a/framework/inc/macros/debug/assertion.hxx b/framework/inc/macros/debug/assertion.hxx
index a1a620e2a8c6..75cafcc2fe78 100644
--- a/framework/inc/macros/debug/assertion.hxx
+++ b/framework/inc/macros/debug/assertion.hxx
@@ -20,7 +20,7 @@
#ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_
#define __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_
-#if defined( ENABLE_ASSERTIONS ) || defined( ENABLE_WARNINGS )
+#if defined( ENABLE_ASSERTIONS )
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
@@ -31,17 +31,15 @@
// special macros for assertion handling
// 1) LOGTYPE use it to define the output of all assertions, errors, exception infos
// 2) LOGFILE_ASSERTIONS use it to define the file name to log assertions if LOGTYPE=LOGTYPE_FILE...
-// 3) LOGFILE_WARNINGS use it to define the file name to log warnings if LOGTYPE=LOGTYPE_FILE...
// active for "non product":
// 4) LOG_ASSERT( BCONDITION, STEXT ) assert some critical errors which depend from given condition
// 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!
-// 7) LOG_WARNING( SMETHOD, STEXT ) should be used to detect leaks in algorithm, mechanism or operation handling
//*****************************************************************************************************************
//_________________________________________________________________________________________________________________
-#if defined( ENABLE_ASSERTIONS ) || defined( ENABLE_WARNINGS )
+#if defined( ENABLE_ASSERTIONS )
/*_____________________________________________________________________________________________________________
LOGFILE_ASSERTIONS
@@ -160,39 +158,6 @@
#endif // ENABLE_ASSERTIONS
-//_________________________________________________________________________________________________________________
-#if defined( ENABLE_WARNINGS )
-
- /*_____________________________________________________________________________________________________________
- LOGFILE_WARNINGS
-
- For follow macros we need a special log file. If user forget to specify anyone, we must do it for him!
- _____________________________________________________________________________________________________________*/
-
- #ifndef LOGFILE_WARNINGS
- #define LOGFILE_WARNINGS "_framework_warnings.log"
- #endif
-
- /*_____________________________________________________________________________________________________________
- LOG_WARNING( SMETHOD, STEXT )
-
- Use it to show/log warnings for programmer for follow reasons:
- - algorithm errors
- - undefined states
- - unknown errors from other modules ...
- _____________________________________________________________________________________________________________*/
-
- #define LOG_WARNING( SMETHOD, STEXT ) \
- LOG_ERROR( SMETHOD, STEXT )
-
-#else
-
- // If right testmode is'nt set - implements these macros empty!
- #undef LOGFILE_WARNINGS
- #define LOG_WARNING( SMETHOD, STEXT )
-
-#endif // ENABLE_WARNINGS
-
#endif // #ifndef __FRAMEWORK_MACROS_DEBUG_ASSERTION_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index e7190fd91c0b..546fc66a2728 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -399,14 +399,14 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XMLBasedAcceleratorConfiguration::setStorage()", "TODO implement this HACK .-)")
+ SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
}
//-----------------------------------------------
::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage()
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XMLBasedAcceleratorConfiguration::hasStorage()", "TODO implement this HACK .-)")
+ SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)");
return sal_False;
}
@@ -414,14 +414,14 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Refer
void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XMLBasedAcceleratorConfiguration::addConfigurationListener()", "TODO implement me")
+ SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
}
//-----------------------------------------------
void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XMLBasedAcceleratorConfiguration::removeConfigurationListener()", "TODO implement me")
+ SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
}
//-----------------------------------------------
@@ -441,14 +441,14 @@ throw(css::uno::RuntimeException)
void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XMLBasedAcceleratorConfiguration::addResetListener()", "TODO implement me")
+ SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me");
}
//-----------------------------------------------
void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XMLBasedAcceleratorConfiguration::removeResetListener()", "TODO implement me")
+ SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me");
}
//-----------------------------------------------
@@ -1088,14 +1088,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XCUBasedAcceleratorConfiguration::setStorage()", "TODO implement this HACK .-)")
+ SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
}
//-----------------------------------------------
::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage()
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XCUBasedAcceleratorConfiguration::hasStorage()", "TODO implement this HACK .-)")
+ SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)");
return sal_False;
}
@@ -1103,14 +1103,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Refer
void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XCUBasedAcceleratorConfiguration::addConfigurationListener()", "TODO implement me")
+ SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
}
//-----------------------------------------------
void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XCUBasedAcceleratorConfiguration::removeConfigurationListener()", "TODO implement me")
+ SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
}
//-----------------------------------------------
@@ -1139,14 +1139,14 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XCUBasedAcceleratorConfiguration::addResetListener()", "TODO implement me")
+ SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me");
}
//-----------------------------------------------
void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
throw(css::uno::RuntimeException)
{
- LOG_WARNING("XCUBasedAcceleratorConfiguration::removeResetListener()", "TODO implement me")
+ SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me");
}
//-----------------------------------------------
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 395c9943b7a3..56bd698afd5f 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -449,7 +449,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
// <- SAFE ----------------------------------
// ?
- LOG_WARNING("StorageHolder::getParentStorage()", "Unexpected situation. Cached storage item seems to be wrong.")
+ SAL_INFO("fwk", "StorageHolder::getParentStorage(): Unexpected situation. Cached storage item seems to be wrong.");
return css::uno::Reference< css::embed::XStorage >();
}
@@ -502,7 +502,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal
return xSubStorage;
// d) no chance!
- LOG_WARNING("openSubStorageWithFallback()", "Unexpected situation! Got no exception for missing storage ...")
+ SAL_INFO("fwk", "openSubStorageWithFallback(): Unexpected situation! Got no exception for missing storage ...");
return css::uno::Reference< css::embed::XStorage >();
}
@@ -542,7 +542,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
return xSubStream;
// d) no chance!
- LOG_WARNING("openSubStreamWithFallbacks()", "Unexpected situation! Got no exception for missing stream ...")
+ SAL_INFO("fwk", "openSubStreamWithFallbacks(): Unexpected situation! Got no exception for missing stream ...");
return css::uno::Reference< css::io::XStream >();
}
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index 5322e6b275e5..5ee04ebf3174 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -164,7 +164,6 @@ void FrameListAnalyzer::impl_analyze()
)
continue;
- #ifdef ENABLE_WARNINGS
if (
((m_eDetectMode & E_ZOMBIE) == E_ZOMBIE) &&
(
@@ -173,9 +172,8 @@ void FrameListAnalyzer::impl_analyze()
)
)
{
- LOG_WARNING("FrameListAnalyzer::impl_analyze()", "ZOMBIE!")
+ SAL_INFO("fwk", "FrameListAnalyzer::impl_analyze(): ZOMBIE!");
}
- #endif
// -------------------------------------------------
// a) Is it the special help task?
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index b3aafcd4cbb2..ca37516aa98c 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -141,7 +141,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode )
catch(const css::uno::Exception& ex)
{
(void) ex; // avoid warning
- LOG_WARNING("open config ...", U2B(ex.Message))
+ SAL_INFO("fwk", "open config: " << ex.Message);
}
m_eMode = E_CLOSED;
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 036d031c5e00..d3e7ca9a0504 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -127,7 +127,7 @@ void Job::setDispatchResultFake( /*IN*/ const css::uno::Reference< css::frame::X
// reject dangerous calls
if (m_eRunState != E_NEW)
{
- LOG_WARNING("Job::setJobData()", "job may still running or already finished")
+ SAL_INFO("fwk", "Job::setJobData(): job may still running or already finished");
return;
}
@@ -145,7 +145,7 @@ void Job::setJobData( const JobData& aData )
// reject dangerous calls
if (m_eRunState != E_NEW)
{
- LOG_WARNING("Job::setJobData()", "job may still running or already finished")
+ SAL_INFO("fwk", "Job::setJobData(): job may still running or already finished");
return;
}
@@ -174,7 +174,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
// reject dangerous calls
if (m_eRunState != E_NEW)
{
- LOG_WARNING("Job::execute()", "job may still running or already finished")
+ SAL_INFO("fwk", "Job::execute(): job may still running or already finished");
return;
}
@@ -228,11 +228,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
#if OSL_DEBUG_LEVEL > 0
catch(const css::uno::Exception& ex)
{
- OUStringBuffer sMsg(256);
- sMsg.appendAscii("Got exception during job execution. Original Message was:\n\"");
- sMsg.append (ex.Message);
- sMsg.appendAscii("\"");
- LOG_WARNING("Job::execute()", U2B(sMsg.makeStringAndClear()).getStr())
+ SAL_INFO("fwk", "Job::execute(): Got exception during job execution. Original Message was: \"" << ex.Message << "\"");
}
#else
catch(const css::uno::Exception&)
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index fc60f1c04a53..effa1d3a7702 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -620,7 +620,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
pIt->second >>= xStream;
if (xStream.is())
return E_CAN_BE_LOADED;
- LOG_WARNING("LoadEnv::classifyContent()", "loading from stream with right URL but invalid stream detected")
+ SAL_INFO("fwk", "LoadEnv::classifyContent(): loading from stream with right URL but invalid stream detected");
return E_UNSUPPORTED_CONTENT;
}
@@ -633,7 +633,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
pIt->second >>= xModel;
if (xModel.is())
return E_CAN_BE_SET;
- LOG_WARNING("LoadEnv::classifyContent()", "loading with object with right URL but invalid object detected")
+ SAL_INFO("fwk", "LoadEnv::classifyContent(): loading with object with right URL but invalid object detected");
return E_UNSUPPORTED_CONTENT;
}
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 619fbba2a080..0463b9daba65 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -488,7 +488,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
((m_eJob & AutoRecovery::E_AUTO_SAVE ) != AutoRecovery::E_AUTO_SAVE)
)
{
- LOG_WARNING("AutoRecovery::dispatch()", "There is already an asynchronous dispatch() running. New request will be ignored!")
+ SAL_INFO("fwk", "AutoRecovery::dispatch(): There is already an asynchronous dispatch() running. New request will be ignored!");
return;
}
@@ -1091,10 +1091,8 @@ void AutoRecovery::implts_readConfig()
aWriteLock.unlock();
// <- SAFE ----------------------
}
- #ifdef ENABLE_WARNINGS
else
- LOG_WARNING("AutoRecovery::implts_readConfig()", "Who changed numbering of recovery items? Cache will be inconsistent then! I do not know, what will happen next time .-)")
- #endif
+ SAL_INFO("fwk", "AutoRecovery::implts_readConfig(): Who changed numbering of recovery items? Cache will be inconsistent then! I do not know, what will happen next time .-)");
// THREADSAFE -> --------------------------
aWriteLock.lock();
@@ -2859,10 +2857,8 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_ENTRY_CLEANUP));
else if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE)
sFeature.appendAscii(RTL_CONSTASCII_STRINGPARAM(CMD_DO_AUTO_SAVE));
- #ifdef ENABLE_WARNINGS
else if ( eJob != AutoRecovery::E_NO_JOB )
- LOG_WARNING("AutoRecovery::implst_getJobDescription()", "Invalid job identifier detected.")
- #endif
+ SAL_INFO("fwk", "AutoRecovery::implst_getJobDescription(): Invalid job identifier detected.");
return sFeature.makeStringAndClear();
}
@@ -2894,7 +2890,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
return AutoRecovery::E_SET_AUTOSAVE_STATE;
}
- LOG_WARNING("AutoRecovery::implts_classifyJob()", "Invalid URL (protocol).")
+ SAL_INFO("fwk", "AutoRecovery::implts_classifyJob(): Invalid URL (protocol).");
return AutoRecovery::E_NO_JOB;
}
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 51ba3e5ea542..e037f2189592 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -650,7 +650,7 @@ But; Don't forget - you will be the owner of returned object and must release it
*//*-*************************************************************************************************************/
css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getTasks() throw( css::uno::RuntimeException )
{
- LOG_WARNING("Desktop::getTasks()", "Use of obsolete interface XTaskSupplier")
+ SAL_INFO("fwk", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier");
return NULL;
}
@@ -674,7 +674,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
*//*-*************************************************************************************************************/
css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw( css::uno::RuntimeException )
{
- LOG_WARNING("Desktop::getActiveTask()", "Use of obsolete interface XTaskSupplier")
+ SAL_INFO("fwk", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier");
return NULL;
}
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 94065be7f6ab..356172051087 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2642,11 +2642,9 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/,
}
break;
- #ifdef ENABLE_WARNINGS
default :
- LOG_WARNING( "Frame::setFastPropertyValue_NoBroadcast()", "Invalid handle detected!" )
+ SAL_INFO("fwk", "Frame::setFastPropertyValue_NoBroadcast(): Invalid handle detected!" );
break;
- #endif
}
}
@@ -2689,11 +2687,9 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*
}
break;
- #ifdef ENABLE_WARNINGS
default :
- LOG_WARNING( "Frame::getFastPropertyValue()", "Invalid handle detected!" )
+ SAL_INFO("fwk", "Frame::getFastPropertyValue(): Invalid handle detected!" );
break;
- #endif
}
return aValue;
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 4a613a5a7baf..168d867d357d 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -162,23 +162,19 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString&
// Check for already existing items there.
if (!m_rContainer.hasKey(aEvent))
m_rContainer.setKeyCommandPair(aEvent, sCommand);
- #ifdef ENABLE_WARNINGS
else
{
// Attention: Its not realy a reason to throw an exception and kill the office, if the configuration contains
// multiple registrations for the same key :-) Show a warning ... and ignore the second item.
// THROW_PARSEEXCEPTION("Command is registered for the same key more then once.")
- OUStringBuffer sMsg(256);
- sMsg.appendAscii("Double registration detected.\nCommand = \"");
- sMsg.append (sCommand );
- sMsg.appendAscii("\"\nKeyCode = " );
- sMsg.append ((sal_Int32)aEvent.KeyCode );
- sMsg.appendAscii("\nModifiers = " );
- sMsg.append ((sal_Int32)aEvent.Modifiers );
- sMsg.appendAscii("\nIgnore this item!" );
- LOG_WARNING("AcceleratorConfigurationReader::startElement()", U2B(sMsg.makeStringAndClear()))
+ SAL_INFO("fwk",
+ "AcceleratorConfigurationReader::startElement(): Double registration detected. Command=\"" <<
+ sCommand <<
+ "\" KeyCode=" <<
+ aEvent.KeyCode <<
+ "Modifiers=" <<
+ aEvent.Modifiers);
}
- #endif // ENABLE_WARNINGS
}
if (eElement == E_ELEMENT_ACCELERATORLIST)