ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Drop dp_misc::TRACE, wrapper over SAL_INFO

Browse Source 
Change-Id: I731b9dc156b3c54ad282627d92089e850ab1f583
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189780
Reviewed-by: Gabor Kelemen <gabor.kelemen.extern@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
Gabor Kelemen
2025-09-15 20:15:02 +02:00
committed by Gabor Kelemen
parent bb3316dfad
commit a78eb537d2
10 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/inc/dp_misc.h
-7
View File
@@ -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.
*/
desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+1 -1
View File
@@ -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:\n"
SAL_INFO("desktop.deployment", "[dp_gui_cmdenv.cxx] incoming request:\n"
+ ::comphelper::anyToString(request) + "\n");
lang::WrappedTargetException wtExc;
desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+1 -1
View File
@@ -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 + "\n thread terminated.\n\n");
}
}
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+1 -1
View File
@@ -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:\n"
SAL_INFO("desktop.deployment", "[dp_gui_cmdenv.cxx] incoming request:\n"
+ ::comphelper::anyToString(request) + "\n\n");
css::deployment::VersionException verExc;
desktop/source/deployment/misc/dp_misc.cxx
-5
View File
@@ -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)
{
desktop/source/deployment/registry/dp_registry.cxx
+4 -4
View File
@@ -361,13 +361,13 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create(
// dump tables:
{
t_registryset allBackends;
dp_misc::TRACE(u"> [dp_registry.cxx] media-type detection:\n\n"_ustr );
SAL_INFO("desktop.deployment", u"> [dp_registry.cxx] media-type detection:\n\n"_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()
+ "\n");
}
dp_misc::TRACE( u"> [dp_registry.cxx] ambiguous backends:\n\n"_ustr );
SAL_INFO("desktop.deployment", u"> [dp_registry.cxx] ambiguous backends:\n\n"_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 + "\n\n");
SAL_INFO("desktop.deployment", buf + "\n\n");
}
allBackends.insert( that->m_ambiguousBackends.begin(),
that->m_ambiguousBackends.end() );
desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx
+4 -4
View File
@@ -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 + "\n");
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 + "\n");
}
@@ -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 + "\n");
}
}
desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+7 -6
View File
@@ -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"******************************\n"_ustr);
dp_misc::TRACE(" BackEnd detected lang = " + lang + "\n");
dp_misc::TRACE(" for url " + sParcelDescURL + "\n");
dp_misc::TRACE(u"******************************\n"_ustr);
SAL_INFO("desktop.deployment", u"******************************\n"_ustr);
SAL_INFO("desktop.deployment", " BackEnd detected lang = " + lang + "\n");
SAL_INFO("desktop.deployment", " for url " + sParcelDescURL + "\n");
SAL_INFO("desktop.deployment", u"******************************\n"_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!!!!\n"_ustr);
SAL_INFO("desktop.deployment", u"no package handler!!!!\n"_ustr);
throw RuntimeException( u"No package Handler "_ustr );
}
desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+1 -1
View File
@@ -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:\n"
SAL_INFO("desktop.deployment", "[unopkg_cmdenv.cxx] incoming request:\n"
+ ::comphelper::anyToString(request) + "\n\n");
// selections:
desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+3 -3
View File
@@ -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 ) + "\n");
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) + "\'\n");
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 + "\n");
++(*pIndex);
return true;