desktop/inc/dp_misc.h | 7 ----- desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 - desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 - desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 2 - desktop/source/deployment/misc/dp_misc.cxx | 5 ---- desktop/source/deployment/registry/dp_registry.cxx | 8 +++--- desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx | 8 +++--- desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 13 +++++------ desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 2 - desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 6 ++--- 10 files changed, 22 insertions(+), 33 deletions(-)
New commits: commit a78eb537d2897a688d7908eafe187c4471c2c356 Author: Gabor Kelemen <[email protected]> AuthorDate: Sat Aug 16 09:35:07 2025 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Mon Sep 15 20:15:02 2025 +0200 Drop dp_misc::TRACE, wrapper over SAL_INFO Change-Id: I731b9dc156b3c54ad282627d92089e850ab1f583 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189780 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h index 43749711714a..d0004d8f5864 100644 --- a/desktop/inc/dp_misc.h +++ b/desktop/inc/dp_misc.h @@ -121,13 +121,6 @@ void writeConsoleError(std::u16string_view sText); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString readConsole(); -/** print the text to the console in a debug build. - The argument is forwarded to writeConsole. The function does not add new line. - The code is only executed if OSL_DEBUG_LEVEL > 1 -*/ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -void TRACE(OUString const & sText); - /** registers or revokes shared or bundled extensions which have been recently added or removed. */ diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index e9b5326afe10..fc9fd6da4509 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -312,7 +312,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { uno::Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == uno::TypeClass_EXCEPTION ); - dp_misc::TRACE( "[dp_gui_cmdenv.cxx] incoming request: " + SAL_INFO("desktop.deployment", "[dp_gui_cmdenv.cxx] incoming request: " + ::comphelper::anyToString(request) + " "); lang::WrappedTargetException wtExc; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index f3998e286353..994d1f1c38e0 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -637,7 +637,7 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly, } catch( const uno::Exception& e ) { - dp_misc::TRACE( "Caught exception: " + SAL_INFO("desktop.deployment", "Caught exception: " + e.Message + " thread terminated. "); } } diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 21b0cf091e37..a2b47d054513 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -604,7 +604,7 @@ void UpdateCommandEnv::handle( { css::uno::Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == css::uno::TypeClass_EXCEPTION ); - dp_misc::TRACE("[dp_gui_cmdenv.cxx] incoming request: " + SAL_INFO("desktop.deployment", "[dp_gui_cmdenv.cxx] incoming request: " + ::comphelper::anyToString(request) + " "); css::deployment::VersionException verExc; diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 008303342583..be180c163fbc 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -446,11 +446,6 @@ OUString readConsole() throw css::uno::RuntimeException(u"reading from stdin failed"_ustr); } -void TRACE(OUString const & sText) -{ - SAL_INFO("desktop.deployment", sText); -} - void syncRepositories( bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv) { diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 6e9a4e9f1c2c..539875e6511f 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -361,13 +361,13 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( // dump tables: { t_registryset allBackends; - dp_misc::TRACE(u"> [dp_registry.cxx] media-type detection: "_ustr ); + SAL_INFO("desktop.deployment", u"> [dp_registry.cxx] media-type detection: "_ustr ); for (auto const& elem : that->m_filter2mediaType) { const Reference<deployment::XPackageRegistry> xBackend( that->m_mediaType2backend.find( elem.second )->second ); allBackends.insert( xBackend ); - dp_misc::TRACE( + SAL_INFO("desktop.deployment", "extension \"" + elem.first + "\" maps to media-type \"" + elem.second + "\" maps to backend " + Reference<lang::XServiceInfo>( @@ -375,7 +375,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( ->getImplementationName() + " "); } - dp_misc::TRACE( u"> [dp_registry.cxx] ambiguous backends: "_ustr ); + SAL_INFO("desktop.deployment", u"> [dp_registry.cxx] ambiguous backends: "_ustr ); for (auto const& ambiguousBackend : that->m_ambiguousBackends) { OUStringBuffer buf; @@ -396,7 +396,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( if (pos < (types.getLength() - 1)) buf.append( ", " ); } - dp_misc::TRACE(buf + " "); + SAL_INFO("desktop.deployment", buf + " "); } allBackends.insert( that->m_ambiguousBackends.begin(), that->m_ambiguousBackends.end() ); diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index 20ae7fc081f3..28f4581160b7 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <dp_misc.h> +#include <sal/log.hxx> #include "dp_parceldesc.hxx" @@ -69,7 +69,7 @@ ParcelDescDocHandler::startElement( const OUString& aName, const Reference< xml::sax::XAttributeList > & xAttribs ) { - dp_misc::TRACE("ParcelDescDocHandler::startElement() for " + + SAL_INFO("desktop.deployment", "ParcelDescDocHandler::startElement() for " + aName + " "); if ( !skipIndex ) { @@ -81,7 +81,7 @@ ParcelDescDocHandler::startElement( const OUString& aName, } else { - dp_misc::TRACE("ParcelDescDocHandler::startElement() skipping for " + SAL_INFO("desktop.deployment", "ParcelDescDocHandler::startElement() skipping for " + aName + " "); } @@ -92,7 +92,7 @@ void SAL_CALL ParcelDescDocHandler::endElement( const OUString & aName ) if ( skipIndex ) { --skipIndex; - dp_misc::TRACE("ParcelDescDocHandler::endElement() skipping for " + SAL_INFO("desktop.deployment", "ParcelDescDocHandler::endElement() skipping for " + aName + " "); } } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 987406e1dd27..8301ce68d2b7 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -25,6 +25,7 @@ #include <dp_ucb.h> #include "dp_parceldesc.hxx" #include <rtl/uri.hxx> +#include <sal/log.hxx> #include <ucbhelper/content.hxx> #include <svl/inettype.hxx> #include <com/sun/star/container/XNameContainer.hpp> @@ -156,7 +157,7 @@ BackendImpl::PackageImpl::PackageImpl( rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); m_name = m_displayName; - dp_misc::TRACE("PackageImpl displayName is " + m_displayName); + SAL_INFO("desktop.deployment", "PackageImpl displayName is " + m_displayName); } @@ -272,10 +273,10 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( sal_Int32 startOfReplace = sfwkLibType.indexOf( MACRONAME ); sal_Int32 charsToReplace = MACRONAME.getLength(); sfwkLibType = sfwkLibType.replaceAt( startOfReplace, charsToReplace, lang ); - dp_misc::TRACE(u"****************************** "_ustr); - dp_misc::TRACE(" BackEnd detected lang = " + lang + " "); - dp_misc::TRACE(" for url " + sParcelDescURL + " "); - dp_misc::TRACE(u"****************************** "_ustr); + SAL_INFO("desktop.deployment", u"****************************** "_ustr); + SAL_INFO("desktop.deployment", " BackEnd detected lang = " + lang + " "); + SAL_INFO("desktop.deployment", " for url " + sParcelDescURL + " "); + SAL_INFO("desktop.deployment", u"****************************** "_ustr); return new PackageImpl( this, url, sfwkLibType, bRemoved, identifier); } } @@ -350,7 +351,7 @@ void BackendImpl::PackageImpl::processPackage_( { if ( !m_xNameCntrPkgHandler.is() ) { - dp_misc::TRACE(u"no package handler!!!! "_ustr); + SAL_INFO("desktop.deployment", u"no package handler!!!! "_ustr); throw RuntimeException( u"No package Handler "_ustr ); } diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 719d09466a58..e7687fdfa606 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -198,7 +198,7 @@ void CommandEnvironmentImpl::handle( { Any request( xRequest->getRequest() ); OSL_ASSERT( request.getValueTypeClass() == TypeClass_EXCEPTION ); - dp_misc::TRACE("[unopkg_cmdenv.cxx] incoming request: " + SAL_INFO("desktop.deployment", "[unopkg_cmdenv.cxx] incoming request: " + ::comphelper::anyToString(request) + " "); // selections: diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index c0b7058b2206..59f99502a5f9 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -104,7 +104,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) if (len == 2 && arg[ 1 ] == option_info->m_short_option) { ++(*pIndex); - dp_misc::TRACE(__FILE__ ": identified option \'\'" + SAL_INFO("desktop.deployment", __FILE__ ": identified option \'\'" + OUStringChar( option_info->m_short_option ) + " "); return true; } @@ -112,7 +112,7 @@ bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ) arg.pData->buffer + 2, option_info->m_name ) == 0) { ++(*pIndex); - dp_misc::TRACE(__FILE__ ": identified option \'" + SAL_INFO("desktop.deployment", __FILE__ ": identified option \'" + OUString::createFromAscii(option_info->m_name) + "\' "); return true; } @@ -144,7 +144,7 @@ bool readArgument( { assert(pValue != nullptr); osl_getCommandArg( *pIndex, &pValue->pData ); - dp_misc::TRACE(__FILE__ ": argument value: " + SAL_INFO("desktop.deployment", __FILE__ ": argument value: " + *pValue + " "); ++(*pIndex); return true;
