basic/source/runtime/runtime.cxx | 5 +---- editeng/source/accessibility/AccessibleStaticTextBase.cxx | 10 ---------- editeng/source/misc/svxacorr.cxx | 4 ---- sfx2/source/appl/appcfg.cxx | 7 +------ sfx2/source/appl/newhelp.cxx | 11 +---------- sfx2/source/control/dispatch.cxx | 7 +------ sfx2/source/control/unoctitm.cxx | 2 -- sfx2/source/dialog/splitwin.cxx | 2 -- sfx2/source/doc/objmisc.cxx | 11 +++-------- sfx2/source/doc/objstor.cxx | 6 ++---- svtools/source/control/asynclink.cxx | 5 +---- svtools/source/control/fmtfield.cxx | 7 ++----- svx/source/accessibility/AccessibleTextHelper.cxx | 8 -------- sw/source/core/doc/docnew.cxx | 6 ++---- sw/source/filter/ww8/wrtww8.cxx | 1 - tools/source/generic/config.cxx | 14 -------------- tools/source/stream/strmunx.cxx | 9 --------- vcl/source/filter/wmf/wmf.cxx | 2 -- 18 files changed, 14 insertions(+), 103 deletions(-)
New commits: commit f573de2a956d91f67c384dbb54c980c117219032 Author: Noel Grandin <[email protected]> Date: Thu Dec 15 12:03:55 2016 +0200 no need to wrap calls to SAL_INFO in #ifdef DBG_UTIL Change-Id: Ic373a8f145f3f78c3f109e36a9c1dd9156f0dd75 Reviewed-on: https://gerrit.libreoffice.org/32034 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 23d3f82..38d9a1e 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -975,10 +975,7 @@ SbxVariableRef SbiRuntime::PopVar() } #endif SbxVariableRef xVar = refExprStk->Get( --nExprLvl ); -#ifdef DBG_UTIL - if ( xVar->GetName() == "Cells" ) - SAL_INFO("basic", "PopVar: Name equals 'Cells'" ); -#endif + SAL_INFO_IF( xVar->GetName() == "Cells", "basic", "PopVar: Name equals 'Cells'" ); // methods hold themselves in parameter 0 if( dynamic_cast<const SbxMethod *>(xVar.get()) != nullptr ) { diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 2e184f3..a3175c0 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -458,15 +458,10 @@ namespace accessibility void AccessibleStaticTextBase::SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource ) { -#ifdef DBG_UTIL // precondition: solar mutex locked DBG_TESTSOLARMUTEX(); mpImpl->SetEditSource( std::move(pEditSource) ); - -#else - mpImpl->SetEditSource( std::move(pEditSource) ); -#endif } void AccessibleStaticTextBase::SetEventSource( const uno::Reference< XAccessible >& rInterface ) @@ -477,15 +472,10 @@ namespace accessibility void AccessibleStaticTextBase::SetOffset( const Point& rPoint ) { -#ifdef DBG_UTIL // precondition: solar mutex locked DBG_TESTSOLARMUTEX(); mpImpl->SetOffset( rPoint ); - -#else - mpImpl->SetOffset( rPoint ); -#endif } void AccessibleStaticTextBase::Dispose() diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 03e90b3..57186eb 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1463,12 +1463,10 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang ) auto const iter = m_pLangTable->find(LanguageTag(eLang)); if (iter != m_pLangTable->end() && iter->second) iter->second->SaveCplSttExceptList(); -#ifdef DBG_UTIL else { SAL_WARN("editeng", "Save an empty list? "); } -#endif } void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang) @@ -1476,12 +1474,10 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang) auto const iter = m_pLangTable->find(LanguageTag(eLang)); if (iter != m_pLangTable->end() && iter->second) iter->second->SaveWrdSttExceptList(); -#ifdef DBG_UTIL else { SAL_WARN("editeng", "Save an empty list? "); } -#endif } // Adds a single word. The list will immediately be written to the file! diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 3a5c453..a430396 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -850,12 +850,7 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron if ( bSynchron ) { -#ifdef DBG_UTIL - if (!pDoc) - { - SAL_INFO("sfx.appl", "SfxEvent: " << rEventHint.GetEventName()); - } -#endif + SAL_INFO_IF(!pDoc, "sfx.appl", "SfxEvent: " << rEventHint.GetEventName()); Broadcast(rEventHint); if ( pDoc ) pDoc->Broadcast( rEventHint ); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 52d37a0..6979b5d 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2505,9 +2505,7 @@ void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, bool void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const { -#ifdef DBG_UTIL bool bSetOff = false; -#endif // set off the pagestyle header to prevent print output of the help URL try { @@ -2539,9 +2537,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const Reference< XModifiable > xReset(xStyles, UNO_QUERY); xReset->setModified(false); -#ifdef DBG_UTIL bSetOff = true; -#endif } } } @@ -2554,12 +2550,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): unexpected exception" ); } -#ifdef DBG_UTIL - if ( !bSetOff ) - { - SAL_WARN( "sfx.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" ); - } -#endif + SAL_WARN_IF( !bSetOff, "sfx.appl", "SfxHelpTextWindow_Impl::SetPageStyleHeaderOff(): set off failed" ); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index ec5e1f7..ba5c92b 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -475,10 +475,8 @@ SfxDispatcher::SfxDispatcher(SfxViewFrame *pViewFrame) */ SfxDispatcher::~SfxDispatcher() { -#ifdef DBG_UTIL SAL_WARN("sfx.control", "Delete Dispatcher " << reinterpret_cast<sal_Int64>(this)); DBG_ASSERT( !xImp->bActive, "deleting active Dispatcher" ); -#endif // So that no timer by Reschedule in PlugComm strikes the LeaveRegistrations xImp->aIdle.Stop(); @@ -733,10 +731,9 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI) SFX_STACK(SfxDispatcher::DoActivate); if ( bMDI ) { -#ifdef DBG_UTIL SAL_WARN("sfx.control", "Activate Dispatcher " << reinterpret_cast<sal_Int64>(this)); DBG_ASSERT( !xImp->bActive, "Activation error" ); -#endif + xImp->bActive = true; xImp->bUpdated = false; SfxBindings* pBindings = GetBindings(); @@ -748,9 +745,7 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI) } else { -#ifdef DBG_UTIL SAL_WARN("sfx.control", "Non-MDI-Activate Dispatcher " << reinterpret_cast<sal_Int64>(this)); -#endif } if ( IsAppDispatcher() ) diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 3b0a6b8..3e744e5 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -754,10 +754,8 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, bSuccess = aReq.IsDone() || pItem != nullptr; } } -#ifdef DBG_UTIL else SAL_INFO("sfx.control", "MacroPlayer: Unknown slot dispatched!"); -#endif } } else diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 2409baa..7e96d95 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -733,7 +733,6 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0; pEmptyWin->bFadeIn = false; pEmptyWin->Actualize(); -#ifdef DBG_UTIL if ( !bPinned || !pEmptyWin->bFadeIn ) { SAL_INFO("sfx", "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" ); @@ -742,7 +741,6 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, { SAL_INFO("sfx", "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" ); } -#endif pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, true )->nVisible = SfxChildVisibility::VISIBLE; pWorkWin->ArrangeChildren_Impl(); if ( bFadeIn ) diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 027e57b..d546333 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -252,10 +252,7 @@ void SfxObjectShell::ResetError() void SfxObjectShell::EnableSetModified( bool bEnable ) { -#ifdef DBG_UTIL - if ( bEnable == pImpl->m_bEnableSetModified ) - SAL_INFO( "sfx", "SFX_PERSIST: EnableSetModified 2x called with the same value" ); -#endif + SAL_INFO_IF( bEnable == pImpl->m_bEnableSetModified, "sfx", "SFX_PERSIST: EnableSetModified 2x called with the same value" ); pImpl->m_bEnableSetModified = bEnable; } @@ -310,10 +307,8 @@ bool SfxObjectShell::IsModified() void SfxObjectShell::SetModified( bool bModifiedP ) { -#ifdef DBG_UTIL - if ( !bModifiedP && !IsEnableSetModified() ) - SAL_INFO( "sfx", "SFX_PERSIST: SetModified( sal_False ), although IsEnableSetModified() == sal_False" ); -#endif + SAL_INFO_IF( !bModifiedP && !IsEnableSetModified(), "sfx", + "SFX_PERSIST: SetModified( sal_False ), although IsEnableSetModified() == sal_False" ); if( !IsEnableSetModified() ) return; diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index e865a29..490d85d 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2772,10 +2772,8 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& // all values present in both itemsets will be overwritten by the new parameters pMergedParams->Put(rItemSet); -#ifdef DBG_UTIL - if ( pMergedParams->GetItemState( SID_DOC_SALVAGE) >= SfxItemState::SET ) - SAL_WARN( "sfx.doc","Salvage item present in Itemset, check the parameters!"); -#endif + SAL_WARN_IF( pMergedParams->GetItemState( SID_DOC_SALVAGE) >= SfxItemState::SET, + "sfx.doc","Salvage item present in Itemset, check the parameters!"); // should be unnecessary - too hot to handle! pMergedParams->ClearItem( SID_DOC_SALVAGE ); diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 1038b90..20cd96d 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -35,10 +35,7 @@ void AsynchronLink::CreateMutex() void AsynchronLink::Call( void* pObj, bool bAllowDoubles ) { -#ifdef DBG_UTIL - if ( !_bInCall ) - SAL_INFO( "svtools", "Recursives Call. Eher ueber Timer. TLX Fragen" ); // Do NOT translate. This is a valuable historical artefact. -#endif + SAL_INFO_IF( !_bInCall, "svtools", "Recursives Call. Eher ueber Timer. TLX Fragen" ); // Do NOT translate. This is a valuable historical artefact. if( _aLink.IsSet() ) { _pArg = pObj; diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 90d7926..f747d80 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -339,11 +339,8 @@ void FormattedField::SetText( const OUString& rStr, const Selection& rNewSelecti void FormattedField::SetTextFormatted(const OUString& rStr) { - -#if defined DBG_UTIL - if (ImplGetFormatter()->IsTextFormat(m_nFormatKey)) - SAL_INFO("svtools", "FormattedField::SetTextFormatted : valid only with text formats !"); -#endif + SAL_INFO_IF(ImplGetFormatter()->IsTextFormat(m_nFormatKey), "svtools", + "FormattedField::SetTextFormatted : valid only with text formats !"); m_sCurrentTextValue = rStr; diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 9ac6cea..c4c05e8 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -255,9 +255,7 @@ namespace accessibility // normally should employ RAII here... mnNotifierClientId(::comphelper::AccessibleEventNotifier::registerClient()) { -#ifdef DBG_UTIL SAL_INFO("svx", "received ID: " << mnNotifierClientId ); -#endif } AccessibleTextHelper_Impl::~AccessibleTextHelper_Impl() @@ -1322,9 +1320,7 @@ namespace accessibility } catch( const uno::Exception& ) { -#ifdef DBG_UTIL SAL_WARN("svx", "Unhandled exception."); -#endif } } } @@ -1438,9 +1434,7 @@ namespace accessibility } catch( const uno::Exception& ) { -#ifdef DBG_UTIL SAL_WARN("svx", "Unhandled exception."); -#endif mbInNotify = false; } @@ -1455,9 +1449,7 @@ namespace accessibility { // #106234# Unregister from EventNotifier ::comphelper::AccessibleEventNotifier::revokeClient( getNotifierClientId() ); -#ifdef DBG_UTIL SAL_INFO("svx", "disposed ID: " << mnNotifierClientId ); -#endif } catch( const uno::Exception& ) {} diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 6cc8e74..84f6aaf 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1227,10 +1227,8 @@ else SwFormatAnchor aAnchor( rCpyFormat.GetAnchor() ); if (FLY_AT_PAGE != aAnchor.GetAnchorId()) continue; -#ifdef DBG_UTIL - SAL_INFO( "sw.docappend", "PaAn: " << aAnchor.GetPageNum() - << " => " << aAnchor.GetPageNum() + pageOffset ); -#endif + SAL_INFO( "sw.docappend", "PaAn: " << aAnchor.GetPageNum() + << " => " << aAnchor.GetPageNum() + pageOffset ); if ( pageOffset != 0 ) aAnchor.SetPageNum( aAnchor.GetPageNum() + pageOffset ); this->getIDocumentLayoutAccess().CopyLayoutFormat( rCpyFormat, aAnchor, true, true ); diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index a266688..10ebf2d 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -4033,7 +4033,6 @@ void MSWordExportBase::OutputEndNode( const SwEndNode &rNode ) #ifdef DBG_UTIL SAL_INFO( "sw.ww8", pNodeInfo->toString()); #endif - const ww8::WW8TableNodeInfo::Inners_t aInners = pNodeInfo->getInners(); ww8::WW8TableNodeInfo::Inners_t::const_iterator aIt(aInners.begin()); ww8::WW8TableNodeInfo::Inners_t::const_iterator aEnd(aInners.end()); diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index c76e8a6..fc680c9 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -660,16 +660,12 @@ Config::Config( const OUString& rFileName ) mnDataUpdateId = 0; mnLockCount = 1; -#ifdef DBG_UTIL SAL_INFO("tools.generic", "Config::Config( " << maFileName << " )"); -#endif } Config::~Config() { -#ifdef DBG_UTIL SAL_INFO("tools.generic", "Config::~Config()" ); -#endif Flush(); ImplFreeConfigData( mpData ); @@ -808,10 +804,8 @@ OString Config::ReadKey(const OString& rKey) const OString Config::ReadKey(const OString& rKey, const OString& rDefault) const { -#ifdef DBG_UTIL SAL_INFO("tools.generic", "Config::ReadKey( " << rKey << " ) from " << GetGroup() << " in " << maFileName); -#endif // Update config data if necessary if ( !mnLockCount ) @@ -836,10 +830,8 @@ OString Config::ReadKey(const OString& rKey, const OString& rDefault) const void Config::WriteKey(const OString& rKey, const OString& rStr) { -#ifdef DBG_UTIL SAL_INFO("tools.generic", "Config::WriteKey( " << rKey << ", " << rStr << " ) to " << GetGroup() << " in " << maFileName); -#endif // Update config data if necessary if ( !mnLockCount || !mpData->mbRead ) @@ -939,9 +931,7 @@ void Config::DeleteKey(const OString& rKey) sal_uInt16 Config::GetKeyCount() const { -#ifdef DBG_UTIL SAL_INFO("tools.generic", "Config::GetKeyCount() from " << GetGroup() << " in " << maFileName); -#endif // Update config data if necessary if ( !mnLockCount ) @@ -967,10 +957,8 @@ sal_uInt16 Config::GetKeyCount() const OString Config::GetKeyName(sal_uInt16 nKey) const { -#ifdef DBG_UTIL SAL_INFO("tools.generic", "Config::GetKeyName( " << OString::number(static_cast<sal_Int32>(nKey)) << " ) from " << GetGroup() << " in " << maFileName); -#endif // search key and return name if found ImplGroupData* pGroup = ImplGetGroup(); @@ -995,10 +983,8 @@ OString Config::GetKeyName(sal_uInt16 nKey) const OString Config::ReadKey(sal_uInt16 nKey) const { -#ifdef DBG_UTIL SAL_INFO("tools.generic", "Config::ReadKey( " << OString::number(static_cast<sal_Int32>(nKey)) << " ) from " << GetGroup() << " in " << maFileName); -#endif // Search key and return value if found ImplGroupData* pGroup = ImplGetGroup(); diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index 206ec6c..1533cc5 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -307,9 +307,7 @@ SvFileStream::~SvFileStream() std::size_t SvFileStream::GetData( void* pData, std::size_t nSize ) { -#ifdef DBG_UTIL SAL_INFO("tools", OString::number(static_cast<sal_Int64>(nSize)) << " Bytes from " << aFilename); -#endif sal_uInt64 nRead = 0; if ( IsOpen() ) @@ -326,9 +324,7 @@ std::size_t SvFileStream::GetData( void* pData, std::size_t nSize ) std::size_t SvFileStream::PutData( const void* pData, std::size_t nSize ) { -#ifdef DBG_UTIL SAL_INFO("tools", OString::number(static_cast<sal_Int64>(nSize)) << " Bytes to " << aFilename); -#endif sal_uInt64 nWrite = 0; if ( IsOpen() ) @@ -458,9 +454,7 @@ void SvFileStream::Open( const OUString& rFilename, StreamMode nOpenMode ) aFilename = rFilename; -#ifdef DBG_UTIL SAL_INFO("tools", aFilename); -#endif OUString aFileURL; osl::DirectoryItem aItem; @@ -554,10 +548,7 @@ void SvFileStream::Close() if ( IsOpen() ) { -#ifdef DBG_UTIL SAL_INFO("tools", aFilename); -#endif - Flush(); osl_closeFile( pInstanceData->rHandle ); pInstanceData->rHandle = nullptr; diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx index dabf950..ad9d153 100644 --- a/vcl/source/filter/wmf/wmf.cxx +++ b/vcl/source/filter/wmf/wmf.cxx @@ -43,11 +43,9 @@ bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem, pExtHeader ).ReadWMF( ); } -#ifdef DBG_UTIL // #i123216# allow a look at CheckSum and ByteSize for debugging SAL_INFO("vcl.emf", "\t\t\tchecksum: 0x" << std::hex << rGDIMetaFile.GetChecksum() << std::dec); SAL_INFO("vcl.emf", "\t\t\tsize: " << rGDIMetaFile.GetSizeBytes()); -#endif rStreamWMF.SetEndian( nOrigNumberFormat ); return !rStreamWMF.GetError(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
