From d15b4e204598fc7e4c1682c4f10228e217575937 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 14 Dec 2016 09:49:39 +0200 Subject: teach sallogareas plugin to catch inconsistencies Change-Id: I8bcea5ffc74d48148bea78da8c17744e288c069a Reviewed-on: https://gerrit.libreoffice.org/32004 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../accelerators/acceleratorconfiguration.cxx | 26 +++++++++++----------- framework/source/loadenv/loadenv.cxx | 4 ++-- framework/source/services/autorecovery.cxx | 10 ++++----- framework/source/services/desktop.cxx | 20 ++++++++--------- framework/source/services/frame.cxx | 16 ++++++------- 5 files changed, 38 insertions(+), 38 deletions(-) (limited to 'framework') diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 3e27f5c8c85f..eae3a99704f9 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -83,7 +83,7 @@ XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::un XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration() { - SAL_WARN_IF(m_pWriteCache, "fwk", "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration(): Changes not flushed. Ignore it ..."); + SAL_WARN_IF(m_pWriteCache, "fwk.accelerators", "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration(): Changes not flushed. Ignore it ..."); } css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents() @@ -344,26 +344,26 @@ sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly() void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); + SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); + SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); return false; } void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); + SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); + SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } void SAL_CALL XMLBasedAcceleratorConfiguration::reset() @@ -380,13 +380,13 @@ throw(css::uno::RuntimeException, std::exception) void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me"); + SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me"); } void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me"); + SAL_INFO("fwk.accelerators", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me"); } // IStorageListener @@ -945,26 +945,26 @@ sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly() void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); + SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)"); } sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage() throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); + SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::hasStorage(): implement this HACK .-)"); return false; } void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); + SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); + SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::reset() @@ -991,13 +991,13 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset() void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me"); + SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/) throw(css::uno::RuntimeException, std::exception) { - SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me"); + SAL_INFO("fwk.accelerators", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me"); } void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent) diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 8e1288269ede..b0e65802db4d 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -565,7 +565,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& pIt->second >>= xStream; if (xStream.is()) return E_CAN_BE_LOADED; - SAL_INFO("fwk", "LoadEnv::classifyContent(): loading from stream with right URL but invalid stream detected"); + SAL_INFO("fwk.loadenv", "LoadEnv::classifyContent(): loading from stream with right URL but invalid stream detected"); return E_UNSUPPORTED_CONTENT; } @@ -578,7 +578,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString& pIt->second >>= xModel; if (xModel.is()) return E_CAN_BE_SET; - SAL_INFO("fwk", "LoadEnv::classifyContent(): loading with object with right URL but invalid object detected"); + SAL_INFO("fwk.loadenv", "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 610db9ca683b..2d37455d6039 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1882,12 +1882,12 @@ void AutoRecovery::implts_readConfig() if (aInfo.ID > m_nIdPool) { m_nIdPool = aInfo.ID+1; - SAL_WARN_IF(m_nIdPool<0, "fwk", "AutoRecovery::implts_readConfig(): Overflow of IDPool detected!"); + SAL_WARN_IF(m_nIdPool<0, "fwk.autorecovery", "AutoRecovery::implts_readConfig(): Overflow of IDPool detected!"); } } /* SAFE */ } else - 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 .-)"); + SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_readConfig(): Who changed numbering of recovery items? Cache will be inconsistent then! I do not know, what will happen next time .-)"); /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -2508,7 +2508,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame // create a new cache entry ... this document is not known. ++m_nIdPool; aNew.ID = m_nIdPool; - SAL_WARN_IF(m_nIdPool<0, "fwk", "AutoRecovery::implts_registerDocument(): Overflow of ID pool detected."); + SAL_WARN_IF(m_nIdPool<0, "fwk.autorecovery", "AutoRecovery::implts_registerDocument(): Overflow of ID pool detected."); m_lDocCache.push_back(aNew); AutoRecovery::TDocumentList::iterator pIt1 = AutoRecovery::impl_searchDocument(m_lDocCache, xDocument); @@ -3586,7 +3586,7 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob) else if ((eJob & AutoRecovery::E_AUTO_SAVE) == AutoRecovery::E_AUTO_SAVE) sFeature.append(CMD_DO_AUTO_SAVE); else if ( eJob != AutoRecovery::E_NO_JOB ) - SAL_INFO("fwk", "AutoRecovery::implst_getJobDescription(): Invalid job identifier detected."); + SAL_INFO("fwk.autorecovery", "AutoRecovery::implst_getJobDescription(): Invalid job identifier detected."); return sFeature.makeStringAndClear(); } @@ -3617,7 +3617,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL) return AutoRecovery::E_SET_AUTOSAVE_STATE; } - SAL_INFO("fwk", "AutoRecovery::implts_classifyJob(): Invalid URL (protocol)."); + SAL_INFO("fwk.autorecovery", "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 c8bf51fe6a8e..01d24fa5ba60 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -124,8 +124,8 @@ void Desktop::constructorInit() // Safe impossible cases // We can't work without this helper! - SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "Desktop::Desktop(): Frames helper is not valid. XFrames, XIndexAccess and XElementAcces are not supported!"); - SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk", "Desktop::Desktop(): Dispatch helper is not valid. XDispatch will not work correctly!" ); + SAL_WARN_IF( !m_xFramesHelper.is(), "fwk.desktop", "Desktop::Desktop(): Frames helper is not valid. XFrames, XIndexAccess and XElementAcces are not supported!"); + SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk.desktop", "Desktop::Desktop(): Dispatch helper is not valid. XDispatch will not work correctly!" ); // Enable object for real working! // Otherwise all calls will be rejected ... @@ -186,8 +186,8 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon *//*-*************************************************************************************************************/ Desktop::~Desktop() { - SAL_WARN_IF( !m_bIsTerminated, "fwk", "Desktop not terminated before being destructed" ); - SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk", "Desktop::~Desktop(): Who forgot to dispose this service?" ); + SAL_WARN_IF( !m_bIsTerminated, "fwk.desktop", "Desktop not terminated before being destructed" ); + SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk.desktop", "Desktop::~Desktop(): Who forgot to dispose this service?" ); } css::uno::Any SAL_CALL Desktop::queryInterface( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) @@ -618,7 +618,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, std::exception ) { - SAL_INFO("fwk", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier"); + SAL_INFO("fwk.desktop", "Desktop::getTasks(): Use of obsolete interface XTaskSupplier"); return nullptr; } @@ -640,7 +640,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, std::exception ) { - SAL_INFO("fwk", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier"); + SAL_INFO("fwk.desktop", "Desktop::getActiveTask(): Use of obsolete interface XTaskSupplier"); return nullptr; } @@ -1047,7 +1047,7 @@ void SAL_CALL Desktop::disposing() // But if you just ignore the assertion (which happens in unit // tests for instance in sc/qa/unit) nothing bad happens. - SAL_WARN_IF( !m_bIsTerminated, "fwk", "Desktop disposed before terminating it" ); + SAL_WARN_IF( !m_bIsTerminated, "fwk.desktop", "Desktop disposed before terminating it" ); SolarMutexClearableGuard aWriteLock; @@ -1117,7 +1117,7 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Safe impossible cases // Method not defined for all incoming parameter. - SAL_WARN_IF( !xListener.is(), "fwk", "Desktop::addEventListener(): Invalid parameter detected!" ); + SAL_WARN_IF( !xListener.is(), "fwk.desktop", "Desktop::addEventListener(): Invalid parameter detected!" ); // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); @@ -1129,7 +1129,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Safe impossible cases // Method not defined for all incoming parameter. - SAL_WARN_IF( !xListener.is(), "fwk", "Desktop::removeEventListener(): Invalid parameter detected!" ); + SAL_WARN_IF( !xListener.is(), "fwk.desktop", "Desktop::removeEventListener(): Invalid parameter detected!" ); // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); @@ -1179,7 +1179,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent& *//*-*************************************************************************************************************/ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception ) { - SAL_WARN( "fwk", "Desktop::disposing(): Algorithm error! Normally desktop is temp. listener ... not all the time. So this method shouldn't be called." ); + SAL_WARN( "fwk.desktop", "Desktop::disposing(): Algorithm error! Normally desktop is temp. listener ... not all the time. So this method shouldn't be called." ); } /*-************************************************************************************************************ diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 09e5104652f6..9d66a17298ac 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -603,13 +603,13 @@ void Frame::initListeners() // Safe impossible cases // We can't work without these helpers! - SAL_WARN_IF( !xDispatchProvider.is(), "fwk", "Frame::Frame(): Slowest slave for dispatch- and interception helper " + SAL_WARN_IF( !xDispatchProvider.is(), "fwk.frame", "Frame::Frame(): Slowest slave for dispatch- and interception helper " "is not valid. XDispatchProvider, XDispatch, XDispatchProviderInterception are not full supported!" ); - SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk", "Frame::Frame(): Interception helper is not valid. XDispatchProvider, " + SAL_WARN_IF( !m_xDispatchHelper.is(), "fwk.frame", "Frame::Frame(): Interception helper is not valid. XDispatchProvider, " "XDispatch, XDispatchProviderInterception are not full supported!" ); - SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "Frame::Frame(): Frames helper is not valid. XFrames, " + SAL_WARN_IF( !m_xFramesHelper.is(), "fwk.frame", "Frame::Frame(): Frames helper is not valid. XFrames, " "XIndexAccess and XElementAcces are not supported!" ); - SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "Frame::Frame(): DropTarget helper is not valid. " + SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk.frame", "Frame::Frame(): DropTarget helper is not valid. " "Drag and drop without functionality!" ); // establish notifies for changing of "disabled commands" configuration during runtime @@ -869,7 +869,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& // This must be the first call of this method! // We should initialize our object and open it for working. // Set the new window. - SAL_WARN_IF( m_xContainerWindow.is(), "fwk", "Frame::initialize(): Leak detected! This state should never occur ..." ); + SAL_WARN_IF( m_xContainerWindow.is(), "fwk.frame", "Frame::initialize(): Leak detected! This state should never occur ..." ); m_xContainerWindow = xWindow; // if window is initially visible, we will never get a windowShowing event @@ -2836,7 +2836,7 @@ void SAL_CALL Frame::removeActionLock() { { SolarMutexGuard g; - SAL_WARN_IF( m_nExternalLockCount<=0, "fwk", "Frame::removeActionLock(): Frame is not locked! " + SAL_WARN_IF( m_nExternalLockCount<=0, "fwk.frame", "Frame::removeActionLock(): Frame is not locked! " "Possible multithreading problem detected." ); --m_nExternalLockCount; } @@ -2927,7 +2927,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, break; default : - SAL_INFO("fwk", "Frame::setFastPropertyValue_NoBroadcast(): Invalid handle detected!" ); + SAL_INFO("fwk.frame", "Frame::setFastPropertyValue_NoBroadcast(): Invalid handle detected!" ); break; } } @@ -2971,7 +2971,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty* break; default : - SAL_INFO("fwk", "Frame::getFastPropertyValue(): Invalid handle detected!" ); + SAL_INFO("fwk.frame", "Frame::getFastPropertyValue(): Invalid handle detected!" ); break; } -- cgit