desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 +- desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx | 2 +- desktop/source/deployment/registry/dp_registry.cxx | 4 ++-- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 2 +- desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 24a5553c129590f65c1967576fbbeaecb2323e72 Author: Gabor Kelemen <[email protected]> AuthorDate: Thu Sep 18 10:20:04 2025 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Tue Sep 23 16:23:47 2025 +0200 Remove bogus file location tags from SAL_INFO calls After "Drop dp_misc::TRACE, wrapper over SAL_INFO" the __FILE__ marking became unnecessary Similar manually added file name tags are removed too such as dp_gui_cmdenv.cxx which file was removed in the 2008 commit 8fc3fe99c8f98853bee4795db7db28b697b69d69 Change-Id: I8294ddd967b2f707cc2824fda3a6b7afe4dc4207 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191112 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index fc9fd6da4509..fefc789ce611 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 ); - SAL_INFO("desktop.deployment", "[dp_gui_cmdenv.cxx] incoming request: " + SAL_INFO("desktop.deployment", "incoming request: " + ::comphelper::anyToString(request) + " "); lang::WrappedTargetException wtExc; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index a2b47d054513..e095d6352050 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 ); - SAL_INFO("desktop.deployment", "[dp_gui_cmdenv.cxx] incoming request: " + SAL_INFO("desktop.deployment", "incoming request: " + ::comphelper::anyToString(request) + " "); css::deployment::VersionException verExc; diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 539875e6511f..2538a9d273e7 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -361,7 +361,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( // dump tables: { t_registryset allBackends; - SAL_INFO("desktop.deployment", u"> [dp_registry.cxx] media-type detection: "_ustr ); + SAL_INFO("desktop.deployment", u"media-type detection: "_ustr ); for (auto const& elem : that->m_filter2mediaType) { const Reference<deployment::XPackageRegistry> xBackend( @@ -375,7 +375,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( ->getImplementationName() + " "); } - SAL_INFO("desktop.deployment", u"> [dp_registry.cxx] ambiguous backends: "_ustr ); + SAL_INFO("desktop.deployment", u"ambiguous backends: "_ustr ); for (auto const& ambiguousBackend : that->m_ambiguousBackends) { OUStringBuffer buf; diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index e7687fdfa606..b37de9a4ade9 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 ); - SAL_INFO("desktop.deployment", "[unopkg_cmdenv.cxx] incoming request: " + SAL_INFO("desktop.deployment", "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 59f99502a5f9..a5981522615d 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); - SAL_INFO("desktop.deployment", __FILE__ ": identified option \'\'" + SAL_INFO("desktop.deployment", "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); - SAL_INFO("desktop.deployment", __FILE__ ": identified option \'" + SAL_INFO("desktop.deployment", "identified option \'" + OUString::createFromAscii(option_info->m_name) + "\' "); return true; } @@ -144,7 +144,7 @@ bool readArgument( { assert(pValue != nullptr); osl_getCommandArg( *pIndex, &pValue->pData ); - SAL_INFO("desktop.deployment", __FILE__ ": argument value: " + SAL_INFO("desktop.deployment", "argument value: " + *pValue + " "); ++(*pIndex); return true;
