[Libreoffice-commits] core.git: basic/source comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source editeng/source filter/source fpicker/source framework/source oox/source sal/osl sal/rtl scripting/source sc/source sd/source sfx2/source slideshow/source svl/source svtools/source svx/source sw/source tools/source unotools/source vcl/source vcl/unx vcl/workben writerfilter/source xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Dec 15 06:45:52 UTC 2016
basic/source/sbx/sbxobj.cxx | 8 -
basic/source/sbx/sbxvalue.cxx | 4
basic/source/sbx/sbxvar.cxx | 2
comphelper/source/container/embeddedobjectcontainer.cxx | 2
compilerplugins/clang/sallogareas.cxx | 57 ++++++++++
compilerplugins/clang/sallogareas.hxx | 2
connectivity/source/drivers/flat/ETable.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 10 -
cppu/source/threadpool/threadpool.cxx | 2
cppu/source/typelib/typelib.cxx | 2
cppuhelper/source/servicemanager.cxx | 2
cui/source/options/optlingu.cxx | 8 -
cui/source/options/optpath.cxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 2
desktop/source/deployment/registry/component/dp_component.cxx | 4
editeng/source/items/textitem.cxx | 6 -
filter/source/svg/svgreader.cxx | 14 +-
filter/source/svg/test/svg2odf.cxx | 4
fpicker/source/office/iodlg.cxx | 2
framework/source/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 +-
oox/source/drawingml/diagram/diagram.cxx | 4
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 4
oox/source/drawingml/graphicshapecontext.cxx | 2
oox/source/drawingml/shape.cxx | 2
oox/source/export/chartexport.cxx | 4
oox/source/export/drawingml.cxx | 18 +--
oox/source/export/shapes.cxx | 14 +-
oox/source/ppt/slidetransition.cxx | 2
oox/source/ppt/timenodelistcontext.cxx | 8 -
sal/osl/unx/file_url.cxx | 5
sal/rtl/bootstrap.cxx | 8 -
sc/source/core/data/bcaslot.cxx | 4
sc/source/core/data/dpsave.cxx | 2
sc/source/core/data/dptabsrc.cxx | 2
sc/source/core/data/formulacell.cxx | 4
sc/source/core/tool/grouparealistener.cxx | 2
sc/source/core/tool/scmatrix.cxx | 12 +-
sc/source/core/tool/token.cxx | 2
sc/source/filter/excel/xiescher.cxx | 16 +-
sc/source/filter/excel/xipivot.cxx | 2
sc/source/filter/excel/xlpivot.cxx | 2
sc/source/filter/oox/condformatbuffer.cxx | 2
sc/source/filter/oox/formulaparser.cxx | 4
sc/source/filter/orcus/interface.cxx | 4
sc/source/ui/miscdlgs/solverutil.cxx | 2
scripting/source/provider/MasterScriptProvider.cxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/ui/framework/module/ModuleController.cxx | 6 -
sd/source/ui/remotecontrol/Receiver.cxx | 8 -
sd/source/ui/tools/SdGlobalResourceContainer.cxx | 6 -
sd/source/ui/view/ViewShellBase.cxx | 6 -
sd/source/ui/view/ViewShellManager.cxx | 4
sd/source/ui/view/drviews2.cxx | 2
sd/source/ui/view/viewshel.cxx | 2
sfx2/source/appl/app.cxx | 2
sfx2/source/appl/appcfg.cxx | 6 -
sfx2/source/appl/appserv.cxx | 14 +-
sfx2/source/control/dispatch.cxx | 12 +-
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 10 -
sfx2/source/doc/doctempl.cxx | 4
sfx2/source/doc/guisaveas.cxx | 6 -
sfx2/source/doc/objstor.cxx | 4
sfx2/source/doc/objxtor.cxx | 10 -
sfx2/source/sidebar/SidebarController.cxx | 2
slideshow/source/engine/eventqueue.cxx | 2
slideshow/source/engine/opengl/TransitionerImpl.cxx | 2
svl/source/items/cenumitm.cxx | 5
svl/source/items/itempool.cxx | 1
svl/source/items/itemset.cxx | 16 +-
svl/source/items/poolio.cxx | 15 +-
svl/source/items/style.cxx | 2
svl/source/items/whassert.hxx | 31 -----
svtools/source/config/accessibilityoptions.cxx | 8 -
svtools/source/contnr/fileview.cxx | 6 -
svtools/source/contnr/treelistbox.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/fmcomp/gridcell.cxx | 4
svx/source/fmcomp/gridctrl.cxx | 4
svx/source/form/fmtextcontrolshell.cxx | 20 +--
svx/source/gengal/gengal.cxx | 4
sw/source/core/crsr/crsrsh.cxx | 4
sw/source/core/doc/docfmt.cxx | 4
sw/source/core/draw/dcontact.cxx | 4
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/layout/ftnfrm.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 38 +++---
sw/source/filter/ww8/docxexport.cxx | 6 -
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/xml/swxml.cxx | 2
sw/source/uibase/uiview/view.cxx | 2
tools/source/datetime/tdate.cxx | 4
tools/source/generic/config.cxx | 14 +-
tools/source/rc/resmgr.cxx | 4
tools/source/stream/stream.cxx | 6 -
unotools/source/config/bootstrap.cxx | 2
unotools/source/i18n/localedatawrapper.cxx | 2
vcl/source/app/session.cxx | 4
vcl/source/filter/graphicfilter.cxx | 6 -
vcl/source/filter/wmf/enhwmf.cxx | 4
vcl/source/filter/wmf/winwmf.cxx | 8 -
vcl/source/gdi/bmpfast.cxx | 4
vcl/source/gdi/gdimtf.cxx | 4
vcl/source/gdi/pdfwriter_impl.cxx | 34 ++---
vcl/source/gdi/pngread.cxx | 2
vcl/source/gdi/print.cxx | 12 +-
vcl/source/gdi/print3.cxx | 4
vcl/source/gdi/svmconverter.cxx | 8 -
vcl/source/gdi/virdev.cxx | 16 +-
vcl/source/image/ImageList.cxx | 6 -
vcl/source/outdev/font.cxx | 5
vcl/source/outdev/map.cxx | 12 +-
vcl/source/outdev/outdev.cxx | 6 -
vcl/source/window/accel.cxx | 2
vcl/source/window/paint.cxx | 6 -
vcl/source/window/window.cxx | 12 +-
vcl/unx/generic/gdi/salgdi.cxx | 8 -
vcl/unx/generic/printer/cupsmgr.cxx | 8 -
vcl/unx/generic/printer/ppdparser.cxx | 18 +--
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 40 +++----
vcl/unx/gtk/gtksalframe.cxx | 4
vcl/unx/gtk3/gtk3gtkframe.cxx | 8 -
vcl/workben/svpclient.cxx | 4
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 6 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 24 ++--
writerfilter/source/dmapper/FontTable.cxx | 4
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 16 +-
writerfilter/source/rtftok/rtfdispatchsymbol.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 34 ++---
writerfilter/source/rtftok/rtftokenizer.cxx | 6 -
xmloff/source/style/xmlnumfe.cxx | 6 -
xmloff/source/style/xmlstyle.cxx | 2
xmloff/source/text/XMLTextFrameContext.cxx | 2
xmloff/source/text/txtflde.cxx | 16 +-
141 files changed, 533 insertions(+), 512 deletions(-)
New commits:
commit d15b4e204598fc7e4c1682c4f10228e217575937
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Dec 14 09:49:39 2016 +0200
teach sallogareas plugin to catch inconsistencies
Change-Id: I8bcea5ffc74d48148bea78da8c17744e288c069a
Reviewed-on: https://gerrit.libreoffice.org/32004
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 098a580..e33e6b3 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -242,7 +242,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
case SbxClassType::Property: pArray = pProps.get(); break;
case SbxClassType::Method: pArray = pMethods.get(); break;
case SbxClassType::Object: pArray = pObjs.get(); break;
- default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic.sbx", "Invalid SBX-Class" ); break;
}
if( pArray )
{
@@ -340,7 +340,7 @@ SbxArray* SbxObject::FindVar( SbxVariable* pVar, sal_uInt16& nArrayIdx )
case SbxClassType::Property: pArray = pProps.get(); break;
case SbxClassType::Method: pArray = pMethods.get(); break;
case SbxClassType::Object: pArray = pObjs.get(); break;
- default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic.sbx", "Invalid SBX-Class" ); break;
}
}
if( pArray )
@@ -377,7 +377,7 @@ SbxVariable* SbxObject::Make( const OUString& rName, SbxClassType ct, SbxDataTyp
case SbxClassType::Property: pArray = pProps.get(); break;
case SbxClassType::Method: pArray = pMethods.get(); break;
case SbxClassType::Object: pArray = pObjs.get(); break;
- default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic.sbx", "Invalid SBX-Class" ); break;
}
if( !pArray )
{
@@ -490,7 +490,7 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
case SbxClassType::Property: pArray = pProps.get(); break;
case SbxClassType::Method: pArray = pMethods.get(); break;
case SbxClassType::Object: pArray = pObjs.get(); break;
- default: SAL_WARN( "basic", "Invalid SBX-Class" ); break;
+ default: SAL_WARN( "basic.sbx", "Invalid SBX-Class" ); break;
}
}
if( pArray )
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 6ce2239..4171320 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1509,7 +1509,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
memset (&aData,0,sizeof(aData));
ResetFlag(SbxFlagBits::Fixed);
aData.eType = SbxNULL;
- SAL_WARN( "basic", "Loaded a non-supported data type" );
+ SAL_WARN( "basic.sbx", "Loaded a non-supported data type" );
return false;
}
@@ -1611,7 +1611,7 @@ bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
case SbxWCHAR:
break;
default:
- SAL_WARN( "basic", "Saving a non-supported data type" );
+ SAL_WARN( "basic.sbx", "Saving a non-supported data type" );
return false;
}
return true;
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 5e8307d..cf56cd7 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -560,7 +560,7 @@ bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
break;
default:
aData.eType = SbxNULL;
- SAL_WARN( "basic", "Loaded a non-supported data type" );
+ SAL_WARN( "basic.sbx", "Loaded a non-supported data type" );
return false;
}
// putt value
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index dc4c6bc..1914773 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -656,7 +656,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
}
catch (uno::Exception const& e)
{
- SAL_WARN("comphelper", "EmbeddedObjectContainer::InsertEmbeddedLink: "
+ SAL_WARN("comphelper.container", "EmbeddedObjectContainer::InsertEmbeddedLink: "
"exception caught: " << e.Message);
}
diff --git a/compilerplugins/clang/sallogareas.cxx b/compilerplugins/clang/sallogareas.cxx
index c170074..85f90e3 100644
--- a/compilerplugins/clang/sallogareas.cxx
+++ b/compilerplugins/clang/sallogareas.cxx
@@ -108,6 +108,63 @@ void SalLogAreas::checkArea( StringRef area, SourceLocation location )
report( DiagnosticsEngine::Warning, "unknown log area '%0' (check or extend include/sal/log-areas.dox)",
location ) << area;
checkAreaSyntax(area, location);
+ return;
+ }
+ if (compiler.getSourceManager().isInMainFile(location))
+ {
+ auto matchpair = [this,area](StringRef p1, StringRef p2) {
+ return (area == p1 && firstSeenLogArea == p2) || (area == p2 && firstSeenLogArea == p1);
+ };
+ // these are "cross-module" log areas
+ if (area == "i18n" || area == "lok" || area == "lok.tiledrendering")
+ ;
+ // these appear to be cross-file log areas
+ else if ( area == "chart2"
+ || area == "oox.cscode" || area == "oox.csdata"
+ || area == "slideshow.verbose"
+ || area == "sc.opencl"
+ || area == "sc.core.formulagroup"
+ || area == "sw.pageframe" || area == "sw.idle" || area == "sw.level2"
+ || area == "sw.docappend" || area == "sw.mailmerge"
+ || area == "sw.uno"
+ || area == "vcl.layout" || area == "vcl.a11y"
+ || area == "vcl.gdi.fontmetric" || area == "vcl.opengl"
+ || area == "vcl.harfbuzz" || area == "vcl.eventtesting"
+ || area == "vcl.schedule" || area == "vcl.unity"
+ || area == "xmlsecurity.comp"
+ )
+ ;
+ else if (firstSeenLogArea == "")
+ {
+ firstSeenLogArea = area;
+ firstSeenLocation = location;
+ }
+ // some modules do this deliberately
+ else if (firstSeenLogArea.compare(0, 3, "jfw") == 0
+ || firstSeenLogArea.compare(0, 6, "opencl") == 0)
+ ;
+ // mixing these in the same file seems legitimate
+ else if (
+ matchpair("chart2.pie.label.bestfit", "chart2.pie.label.bestfit.inside")
+ || matchpair("editeng", "editeng.chaining")
+ || matchpair("oox.drawingml", "oox.cscode")
+ || matchpair("oox.drawingml", "oox.drawingml.gradient")
+ || matchpair("sc.core", "sc.core.grouparealistener")
+ || matchpair("sc.orcus", "sc.orcus.condformat")
+ || matchpair("sc.orcus", "sc.orcus.style")
+ || matchpair("sc.orcus", "sc.orcus.autofilter")
+ || matchpair("svx", "svx.chaining")
+ || matchpair("sw.ww8", "sw.ww8.level2")
+ || matchpair("writerfilter", "writerfilter.profile")
+ )
+ ;
+ else if (firstSeenLogArea != area)
+ {
+ report( DiagnosticsEngine::Warning, "two different log areas '%0' and '%1' in the same file?",
+ location ) << firstSeenLogArea << area;
+ report( DiagnosticsEngine::Note, "first area was seen here",
+ firstSeenLocation );
+ }
}
}
diff --git a/compilerplugins/clang/sallogareas.hxx b/compilerplugins/clang/sallogareas.hxx
index d665c38..a689ce9 100644
--- a/compilerplugins/clang/sallogareas.hxx
+++ b/compilerplugins/clang/sallogareas.hxx
@@ -35,6 +35,8 @@ class SalLogAreas
const FunctionDecl* inFunction;
SourceLocation lastSalDetailLogStreamMacro;
set< string > logAreas;
+ string firstSeenLogArea;
+ SourceLocation firstSeenLocation;
};
} // namespace
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 54b93c8..21b20cb 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -708,7 +708,7 @@ bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, bool
void OFlatTable::refreshHeader()
{
- SAL_INFO( "connectivity.drivers", "flat lionel at mamane.lu OFlatTable::refreshHeader" );
+ SAL_INFO( "connectivity.flat", "flat lionel at mamane.lu OFlatTable::refreshHeader" );
}
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index e4e8aba..3b2ffb8 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -313,7 +313,7 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
aPair = TVoidPtr(reinterpret_cast< sal_Int64 >(new sal_Int8[m_aRow[_nColumnIndex].getSequence().getLength()]),_nType);
break;
default:
- SAL_WARN( "connectivity.drivers", "Unknown type");
+ SAL_WARN( "connectivity.odbc", "Unknown type");
aPair = TVoidPtr(0,_nType);
}
return aPair;
@@ -385,7 +385,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
void OResultSet::ensureCacheForColumn(sal_Int32 columnIndex)
{
- SAL_INFO( "connectivity.drivers", "odbc lionel at mamane.lu OResultSet::ensureCacheForColumn" );
+ SAL_INFO( "connectivity.odbc", "odbc lionel at mamane.lu OResultSet::ensureCacheForColumn" );
assert(columnIndex >= 0);
@@ -1610,7 +1610,7 @@ void OResultSet::fillColumn(const sal_Int32 _nColumn)
*pColumn = impl_getLong(curCol);
break;
default:
- SAL_WARN( "connectivity.drivers","Unknown DataType");
+ SAL_WARN( "connectivity.odbc","Unknown DataType");
}
if ( m_bWasNull )
@@ -1670,7 +1670,7 @@ bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nO
if ( aIter->second == _nOffset )
return moveToBookmark(makeAny(aIter->first));
}
- SAL_WARN( "connectivity.drivers","Bookmark not found!");
+ SAL_WARN( "connectivity.odbc", "Bookmark not found!");
}
return false;
}
@@ -1810,7 +1810,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
break;
}
default:
- SAL_WARN( "connectivity.drivers","Not supported at the moment!");
+ SAL_WARN( "connectivity.odbc", "Not supported at the moment!");
}
nRet = N3SQLParamData(m_aStatementHandle,&pColumnIndex);
}
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 8f1304a..e22d4d1 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -454,7 +454,7 @@ uno_threadpool_putJob(
if (!getThreadPool(hPool)->addJob( pThreadId, bIsOneway, pJob ,doRequest ))
{
SAL_WARN(
- "cppu",
+ "cppu.threadpool",
"uno_threadpool_putJob in parallel with uno_threadpool_destroy");
}
}
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 4b644c4..a7126b5 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -716,7 +716,7 @@ void newTypeDescription(
&& (pStructMembers == nullptr || eTypeClass == typelib_TypeClass_STRUCT));
if (typelib_TypeClass_TYPEDEF == eTypeClass)
{
- SAL_WARN("cppu", "unexpected typedef!" );
+ SAL_WARN("cppu.typelib", "unexpected typedef!" );
typelib_typedescriptionreference_getDescription( ppRet, pType );
return;
}
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 57925af..780fe02 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1935,7 +1935,7 @@ void cppuhelper::ServiceManager::preloadImplementations() {
{
// load component library
osl::Module aModule(aUri, SAL_LOADMODULE_NOW | SAL_LOADMODULE_GLOBAL);
- SAL_INFO("lok", "loaded component library " << aUri << ( aModule.is() ? " ok" : " no"));
+ SAL_INFO("cppuhelper", "loaded component library " << aUri << ( aModule.is() ? " ok" : " no"));
if (aModule.is() &&
!iterator->second->info->environment.isEmpty())
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index ad88c60..a982606 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -2042,7 +2042,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox)
const bool bHasLang = rTable.count( eCurLanguage );
if (!bHasLang)
{
- SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported
+ SAL_INFO( "cui.options", "language entry missing" ); // only relevant if all languages found should be supported
}
const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0;
lcl_SetCheckButton( pNewEntry, bCheck );
@@ -2086,7 +2086,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox)
const bool bHasLang = rTable.count( eCurLanguage );
if (!bHasLang)
{
- SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported
+ SAL_INFO( "cui.options", "language entry missing" ); // only relevant if all languages found should be supported
}
const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0;
lcl_SetCheckButton( pNewEntry, bCheck );
@@ -2130,7 +2130,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox)
const bool bHasLang = rTable.count( eCurLanguage );
if (!bHasLang)
{
- SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported
+ SAL_INFO( "cui.options", "language entry missing" ); // only relevant if all languages found should be supported
}
const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0;
lcl_SetCheckButton( pNewEntry, bCheck );
@@ -2174,7 +2174,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox* pBox)
const bool bHasLang = rTable.count( eCurLanguage );
if (!bHasLang)
{
- SAL_INFO( "cui.dialogs", "language entry missing" ); // only relevant if all languages found should be supported
+ SAL_INFO( "cui.options", "language entry missing" ); // only relevant if all languages found should be supported
}
const bool bCheck = bHasLang && lcl_SeqGetEntryPos( rTable[ eCurLanguage ], aImplName ) >= 0;
lcl_SetCheckButton( pNewEntry, bCheck );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index f975d7e..a9bfaed 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -828,7 +828,7 @@ void SvxPathTabPage::SetPathList(
}
catch( const Exception& e )
{
- SAL_WARN("cui.tabpages", "caught: " << e.Message);
+ SAL_WARN("cui.options", "caught: " << e.Message);
}
}
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 8ad4dc7..144e86d 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -67,7 +67,7 @@ namespace dbaui
const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rItems.GetItem(DSID_TYPECOLLECTION) );
if (pCollectionItem)
m_pCollection = pCollectionItem->getCollection();
- SAL_WARN_IF(!m_pCollection, "dbaccess", "OGeneralPage::OGeneralPage : really need a DSN type collection !");
+ SAL_WARN_IF(!m_pCollection, "dbaccess.ui.generalpage", "OGeneralPage::OGeneralPage : really need a DSN type collection !");
// do some knittings
m_pDatasourceType->SetSelectHdl(LINK(this, OGeneralPage, OnDatasourceTypeSelected));
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index b5430b0..446fb5b 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -316,7 +316,7 @@ void ODatabaseExport::insertValueIntoColumn()
OSL_ENSURE((nNewPos) < static_cast<sal_Int32>(m_vColumnTypes.size()),"Illegal index for vector");
if (m_vColumnTypes[nNewPos] != DataType::VARCHAR && m_vColumnTypes[nNewPos] != DataType::CHAR && m_vColumnTypes[nNewPos] != DataType::LONGVARCHAR )
{
- SAL_INFO("dbaccess", "ODatabaseExport::insertValueIntoColumn != DataType::VARCHAR" );
+ SAL_INFO("dbaccess.ui", "ODatabaseExport::insertValueIntoColumn != DataType::VARCHAR" );
ensureFormatter();
sal_Int32 nNumberFormat = 0;
double fOutNumber = 0.0;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 7a02fb1..58b98af 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1202,7 +1202,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion(
try {
set->insert(css::uno::Any(*factory++));
} catch (const container::ElementExistException &) {
- SAL_WARN("desktop", "implementation already registered " << *i);
+ SAL_WARN("desktop.deployment", "implementation already registered " << *i);
}
}
if (!data.singletons.empty()) {
@@ -1224,7 +1224,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion(
try {
cont->insertByName(name, css::uno::Any());
} catch (const container::ElementExistException &) {
- SAL_WARN("desktop", "singleton already registered " << i->first);
+ SAL_WARN("desktop.deployment", "singleton already registered " << i->first);
cont->replaceByName(name, css::uno::Any());
}
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 772a394..d9dedb6 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -339,7 +339,7 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
if ( ePitch != rItem.ePitch || eTextEncoding != rItem.eTextEncoding )
{
bRet = false;
- SAL_INFO( "editeng", "FontItem::operator==(): only pitch or rtl_TextEncoding different ");
+ SAL_INFO( "editeng.items", "FontItem::operator==(): only pitch or rtl_TextEncoding different ");
}
}
return bRet;
@@ -3079,7 +3079,7 @@ bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI
return true;
}
- SAL_WARN("editeng", "SvxCharScaleWidthItem::PutValue - Wrong type!" );
+ SAL_WARN("editeng.items", "SvxCharScaleWidthItem::PutValue - Wrong type!" );
return false;
}
@@ -3336,7 +3336,7 @@ void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
switch( nSlotId )
{
default:
- SAL_WARN( "editeng", "wrong SlotId for class SvxScriptSetItem" );
+ SAL_WARN( "editeng.items", "wrong SlotId for class SvxScriptSetItem" );
SAL_FALLTHROUGH; // default to font - Id Range !!
case SID_ATTR_CHAR_FONT:
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 0426953..fd4a58c 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -64,7 +64,7 @@ template<typename Func> void visitChildren(const Func& rFunc,
const sal_Int32 nNumNodes( xChildren->getLength() );
for( sal_Int32 i=0; i<nNumNodes; ++i )
{
- SAL_INFO("svg", "node type: " << sal::static_int_cast<sal_uInt32>(xChildren->item(i)->getNodeType()) << " tag name " << xChildren->item(i)->getNodeName() << " value |" << xChildren->item(i)->getNodeValue() << "|");
+ SAL_INFO("filter.svg", "node type: " << sal::static_int_cast<sal_uInt32>(xChildren->item(i)->getNodeType()) << " tag name " << xChildren->item(i)->getNodeName() << " value |" << xChildren->item(i)->getNodeValue() << "|");
if( xChildren->item(i)->getNodeType() == eChildType )
rFunc( *xChildren->item(i).get() );
}
@@ -631,7 +631,7 @@ struct AnnotatingVisitor
std::pair<StatePool::iterator,
bool> aRes = mrStates.insert(rState);
- SAL_INFO ("svg", "size " << mrStates.size() << " id " << const_cast<State&>(*aRes.first).mnStyleId);
+ SAL_INFO ("filter.svg", "size " << mrStates.size() << " id " << const_cast<State&>(*aRes.first).mnStyleId);
if( !aRes.second )
return false; // not written
@@ -640,7 +640,7 @@ struct AnnotatingVisitor
// mnStyleId does not take part in hashing/comparison
const_cast<State&>(*aRes.first).mnStyleId = mnCurrStateId;
- SAL_INFO ("svg", " --> " << const_cast<State&>(*aRes.first).mnStyleId);
+ SAL_INFO ("filter.svg", " --> " << const_cast<State&>(*aRes.first).mnStyleId);
mrStateMap.insert(std::make_pair(
mnCurrStateId,
@@ -870,7 +870,7 @@ struct AnnotatingVisitor
void writeStyle(const uno::Reference<xml::dom::XElement>& xElem, const sal_Int32 nTagId)
{
- SAL_INFO ("svg", "writeStyle xElem " << xElem->getTagName());
+ SAL_INFO ("filter.svg", "writeStyle xElem " << xElem->getTagName());
sal_Int32 nStyleId=0;
if( writeStyle(maCurrState, nTagId) )
@@ -1230,10 +1230,10 @@ struct AnnotatingVisitor
nTokenId, sValue );
break;
case XML_TOKEN_INVALID:
- SAL_INFO("svg", "unhandled token");
+ SAL_INFO("filter.svg", "unhandled token");
break;
default:
- SAL_INFO("svg", "unhandled token " << getTokenName(nTokenId));
+ SAL_INFO("filter.svg", "unhandled token " << getTokenName(nTokenId));
break;
}
}
@@ -2044,7 +2044,7 @@ struct OfficeStylesWritingVisitor
}
}
- SAL_INFO("svg", "SvgDashArray2Odf " << *dash_distance << " " << *dots1 << " " << *dots1_length << " " << *dots2 << " " << *dots2_length );
+ SAL_INFO("filter.svg", "SvgDashArray2Odf " << *dash_distance << " " << *dots1 << " " << *dots1_length << " " << *dots2 << " " << *dots2_length );
return;
}
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
index cbb3e6b..9406d32 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -120,12 +120,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
catch (const uno::Exception& e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.Message);
+ SAL_WARN("filter.svg", "Fatal exception: " << e.Message);
return 1;
}
catch (const std::exception &e)
{
- SAL_WARN("vcl.app", "Fatal exception: " << e.what());
+ SAL_WARN("filter.svg", "Fatal exception: " << e.what());
return 1;
}
return nRet;
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index b845b26..be95410 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -220,7 +220,7 @@ namespace
}
catch( const css::uno::Exception& )
{
- SAL_INFO( "fpicker", "Exception in lcl_autoUpdateFileExtension" );
+ SAL_INFO( "fpicker.office", "Exception in lcl_autoUpdateFileExtension" );
}
}
}
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 3e27f5c..eae3a99 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 8e12882..b0e6580 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 610db9c..2d37455 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 c8bf51f..01d24fa 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 09e5104..9d66a172 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;
}
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index c4dc45d..45fcc1b 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -73,10 +73,10 @@ DiagramData::DiagramData()
void DiagramData::dump()
{
- SAL_INFO("oox", "Dgm: DiagramData # of cnx: " << maConnections.size() );
+ SAL_INFO("oox.drawingml", "Dgm: DiagramData # of cnx: " << maConnections.size() );
std::for_each( maConnections.begin(), maConnections.end(),
[] (dgm::Connection & rConnection) { rConnection.dump(); } );
- SAL_INFO("oox", "Dgm: DiagramData # of pt: " << maPoints.size() );
+ SAL_INFO("oox.drawingml", "Dgm: DiagramData # of pt: " << maPoints.size() );
std::for_each( maPoints.begin(), maPoints.end(),
[] (dgm::Point & rPoint) { rPoint.dump(); } );
}
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index d379bda..6f01409 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -80,7 +80,7 @@ void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr
void LayoutAtom::dump(int level)
{
- SAL_INFO("oox", "level = " << level << " - " << msName << " of type " << typeid(*this).name() );
+ SAL_INFO("oox.drawingml", "level = " << level << " - " << msName << " of type " << typeid(*this).name() );
const std::vector<LayoutAtomPtr>& rChildren=getChildren();
std::for_each( rChildren.begin(), rChildren.end(),
[level] (LayoutAtomPtr const& pAtom) { pAtom->dump(level + 1); } );
@@ -643,7 +643,7 @@ void ShapeCreationVisitor::visit(LayoutNode& rAtom)
}
else
{
- SAL_WARN("oox", "ShapeCreationVisitor::visit: no shape set while processing layoutnode named " << rAtom.getName() );
+ SAL_WARN("oox.drawingml", "ShapeCreationVisitor::visit: no shape set while processing layoutnode named " << rAtom.getName() );
}
// set new parent for children
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 73c2fdc..92c129f 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -157,7 +157,7 @@ ContextHandlerRef GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
return new table::TableContext( *this, mpShapePtr );
else
{
- SAL_WARN("oox", "OOX: Ignore graphicsData of :" << sUri );
+ SAL_WARN("oox.drawingml", "OOX: Ignore graphicsData of :" << sUri );
return nullptr;
}
}
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index cd56496..b65ae15 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -296,7 +296,7 @@ void Shape::setTextBox(bool bTextBox)
void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
{
- SAL_INFO("oox", OSL_THIS_FUNC << "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
if ( rReferencedShape.mpTextBody.get() && bUseText )
mpTextBody = std::make_shared<TextBody>( *rReferencedShape.mpTextBody.get() );
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 8bfc596..79d0699 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1016,7 +1016,7 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x
pFS->singleElement(FSNS(XML_c, XML_y),
XML_val, IS(y),
FSEND);
- SAL_WARN_IF(aPos.Anchor != 0, "oox.chart", "unsupported anchor position");
+ SAL_WARN_IF(aPos.Anchor != 0, "oox", "unsupported anchor position");
pFS->endElement(FSNS(XML_c, XML_manualLayout));
pFS->endElement(FSNS(XML_c, XML_layout));
@@ -1357,7 +1357,7 @@ void ChartExport::exportManualLayout(const css::chart2::RelativePosition& rPos,
x -= w;
break;
default:
- SAL_WARN("oox.chart", "unhandled alignment case for manual layout export");
+ SAL_WARN("oox", "unhandled alignment case for manual layout export");
}
pFS->singleElement(FSNS(XML_c, XML_x),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 136570a..2568902 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -721,17 +721,17 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet )
}
SAL_WARN_IF(nLineWidth <= 0,
- "oox", "while writing outline - custom dash - line width was < 0 : " << nLineWidth);
+ "oox.shape", "while writing outline - custom dash - line width was < 0 : " << nLineWidth);
SAL_WARN_IF(aLineDash.Dashes < 0,
- "oox", "while writing outline - custom dash - number of dashes was < 0 : " << aLineDash.Dashes);
+ "oox.shape", "while writing outline - custom dash - number of dashes was < 0 : " << aLineDash.Dashes);
SAL_WARN_IF(aLineDash.Dashes > 0 && aLineDash.DashLen <= 0,
- "oox", "while writing outline - custom dash - dash length was < 0 : " << aLineDash.DashLen);
+ "oox.shape", "while writing outline - custom dash - dash length was < 0 : " << aLineDash.DashLen);
SAL_WARN_IF(aLineDash.Dots < 0,
- "oox", "while writing outline - custom dash - number of dots was < 0 : " << aLineDash.Dots);
+ "oox.shape", "while writing outline - custom dash - number of dots was < 0 : " << aLineDash.Dots);
SAL_WARN_IF(aLineDash.Dots > 0 && aLineDash.DotLen <= 0,
- "oox", "while writing outline - custom dash - dot length was < 0 : " << aLineDash.DotLen);
+ "oox.shape", "while writing outline - custom dash - dot length was < 0 : " << aLineDash.DotLen);
SAL_WARN_IF(aLineDash.Distance <= 0,
- "oox", "while writing outline - custom dash - distance was < 0 : " << aLineDash.Distance);
+ "oox.shape", "while writing outline - custom dash - distance was < 0 : " << aLineDash.Distance);
mpFS->endElementNS( XML_a, XML_custDash );
}
@@ -903,7 +903,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia )
}
else
{
- SAL_WARN("oox", "unhandled graphic type" );
+ SAL_WARN("oox.shape", "unhandled graphic type" );
/*Earlier, even in case of unhandled graphic types we were
proceeding to write the image, which would eventually
write an empty image with a zero size, and return a valid
@@ -2233,7 +2233,7 @@ std::map< OString, std::vector<OString> > lcl_getAdjNames()
rtl::Bootstrap::expandMacros(aPath);
SvFileStream aStream(aPath, StreamMode::READ);
if (aStream.GetError() != ERRCODE_NONE)
- SAL_WARN("oox", "failed to open oox-drawingml-adj-names");
+ SAL_WARN("oox.shape", "failed to open oox-drawingml-adj-names");
OString aLine;
bool bNotDone = aStream.ReadLine(aLine);
while (bNotDone)
@@ -2368,7 +2368,7 @@ bool DrawingML::WriteCustomGeometry( const Reference< XShape >& rXShape )
if ( nExpectedPairCount > aPairs.getLength() )
{
- SAL_WARN("oox", "Segments need " << nExpectedPairCount << " coordinates, but Coordinates have only " << aPairs.getLength() << " pairs.");
+ SAL_WARN("oox.shape", "Segments need " << nExpectedPairCount << " coordinates, but Coordinates have only " << aPairs.getLength() << " pairs.");
return false;
}
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 11b482d..6e6fc5e 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -258,7 +258,7 @@ static uno::Reference<io::XInputStream> lcl_StoreOwnAsOOXML(
if (!pFilterName)
{
- SAL_WARN("oox", "oox::GetOLEObjectStream: unknown ClassId " << classId.GetHexName());
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: unknown ClassId " << classId.GetHexName());
return nullptr;
}
@@ -284,7 +284,7 @@ static uno::Reference<io::XInputStream> lcl_StoreOwnAsOOXML(
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox", "oox::GetOLEObjectStream: exception: \"" << e.Message << "\"");
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: exception: \"" << e.Message << "\"");
return nullptr;
}
xTempStream->getOutputStream()->closeOutput();
@@ -324,7 +324,7 @@ uno::Reference<io::XInputStream> GetOLEObjectStream(
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox", "oox::GetOLEObjectStream: exception: " << e.Message);
+ SAL_WARN("oox.shape", "oox::GetOLEObjectStream: exception: " << e.Message);
}
return xInStream;
}
@@ -1813,7 +1813,7 @@ void ShapeExport::WriteMathShape(Reference<XShape> const& xShape)
xPropSet->getPropertyValue("Model") >>= xMathModel;
assert(xMathModel.is());
assert(GetDocumentType() != DOCUMENT_DOCX); // should be written in DocxAttributeOutput
- SAL_WARN_IF(GetDocumentType() == DOCUMENT_XLSX, "oox", "Math export to XLSX isn't tested, should it happen here?");
+ SAL_WARN_IF(GetDocumentType() == DOCUMENT_XLSX, "oox.shape", "Math export to XLSX isn't tested, should it happen here?");
// ECMA standard does not actually allow oMath outside of
// WordProcessingML so write a MCE like PPT 2010 does
@@ -1900,7 +1900,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
if (!xObj.is())
{
- SAL_WARN("oox", "ShapeExport::WriteOLE2Shape: no object");
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLE2Shape: no object");
return *this;
}
@@ -1918,7 +1918,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
}
catch (uno::Exception const& e)
{
- SAL_WARN("oox", "ShapeExport::WriteOLE2Shape: exception: " << e.Message);
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLE2Shape: exception: " << e.Message);
return *this;
}
@@ -1987,7 +1987,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( const Reference< XShape >& xShape )
try {
::comphelper::OStorageHelper::CopyInputToOutput(xInStream, xOutStream);
} catch (uno::Exception const& e) {
- SAL_WARN("oox", "ShapeExport::WriteOLEObject: exception: " << e.Message);
+ SAL_WARN("oox.shape", "ShapeExport::WriteOLEObject: exception: " << e.Message);
}
OUString const sRelId = mpFB->addRelation(
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index b0b95c0..90df17f 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -294,7 +294,7 @@ namespace oox { namespace ppt {
mnTransitionType = TransitionType::BARWIPE;
mnTransitionSubType = TransitionSubType::FADEOVERCOLOR;
}
- SAL_WARN("oox", "OOX: cut transition fallback." );
+ SAL_WARN("oox.ppt", "OOX: cut transition fallback." );
break;
case PPT_TOKEN( fade ):
mnTransitionType = TransitionType::FADE;
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 6d16996..47cb777 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -190,7 +190,7 @@ namespace oox { namespace ppt {
{
maTo = makeAny( aString == "visible" );
if( !maTo.has<sal_Bool>() )
- SAL_WARN("oox", "conversion failed" );
+ SAL_WARN("oox.ppt", "conversion failed" );
}
mpNode->setTo( maTo );
}
@@ -294,7 +294,7 @@ namespace oox { namespace ppt {
mpNode->getNodeProperties()[ NP_COMMAND ] = makeAny((sal_Int16)nCommand);
if( nCommand == EffectCommands::CUSTOM )
{
- SAL_WARN("oox", "OOX: CmdTimeNodeContext::endFastElement(), unknown command!");
+ SAL_WARN("oox.ppt", "OOX: CmdTimeNodeContext::endFastElement(), unknown command!");
aParamValue.Name = "UserDefined";
aParamValue.Value <<= msCommand;
}
@@ -306,7 +306,7 @@ namespace oox { namespace ppt {
}
catch( RuntimeException& )
{
- SAL_WARN("oox", "OOX: Exception in CmdTimeNodeContext::endFastElement()" );
+ SAL_WARN("oox.ppt", "OOX: Exception in CmdTimeNodeContext::endFastElement()" );
}
}
}
@@ -981,7 +981,7 @@ namespace oox { namespace ppt {
break;
case PPT_TOKEN( video ):
nNodeType = AnimationNodeType::AUDIO;
- SAL_WARN("oox", "OOX: video requested, gave Audio instead" );
+ SAL_WARN("oox.ppt", "OOX: video requested, gave Audio instead" );
break;
default:
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 50528ef..ddf2be4 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -182,7 +182,7 @@ oslFileError getSystemPathFromFileUrl(
if (j == 2) {
OUString home;
if (!osl::Security().getHomeDir(home)) {
- SAL_WARN("sal.osl", "osl::Security::getHomeDir failed");
+ SAL_WARN("sal.file", "osl::Security::getHomeDir failed");
return osl_File_E_INVAL;
}
i = url.indexOf('/', i + 1);
@@ -198,8 +198,7 @@ oslFileError getSystemPathFromFileUrl(
try {
home = rtl::Uri::convertRelToAbs(home, url.copy(i));
} catch (rtl::MalformedUriException & e) {
- SAL_WARN(
- "sal.osl", "rtl::MalformedUriException " << e.getMessage());
+ SAL_WARN("sal.file", "rtl::MalformedUriException " << e.getMessage());
return osl_File_E_INVAL;
}
return getSystemPathFromFileUrl(home, path, false);
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 324ca23..2a99e0a 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -348,7 +348,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
rtl_bootstrap_args_open( base_ini.pData ) );
}
}
- SAL_INFO("sal.rtl", "Bootstrap_Impl(): sFile=" << _iniName);
+ SAL_INFO("sal.bootstrap", "Bootstrap_Impl(): sFile=" << _iniName);
oslFileHandle handle;
if (!_iniName.isEmpty() &&
osl_openFile(_iniName.pData, &handle, osl_File_OpenFlag_Read) == osl_File_E_None)
@@ -367,7 +367,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
nameValue.sValue = OStringToOUString(
line.copy(nIndex+1).trim(), RTL_TEXTENCODING_UTF8 );
- SAL_INFO("sal.rtl", "pushing: name=" << nameValue.sName << " value=" << nameValue.sValue);
+ SAL_INFO("sal.bootstrap", "pushing: name=" << nameValue.sName << " value=" << nameValue.sValue);
_nameValueList.push_back(nameValue);
}
@@ -376,7 +376,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
}
else
{
- SAL_WARN( "sal.rtl", "couldn't open file: " << _iniName );
+ SAL_WARN( "sal.bootstrap", "couldn't open file: " << _iniName );
}
}
@@ -776,7 +776,7 @@ void SAL_CALL rtl_bootstrap_set (
}
}
- SAL_INFO("sal.rtl", "explicitly getting: name=" << name << " value=" <<value);
+ SAL_INFO("sal.bootstrap", "explicitly getting: name=" << name << " value=" <<value);
r_rtl_bootstrap_set_list.push_back( rtl_bootstrap_NameValue( name, value ) );
}
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 3cef49a..b47940e 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -671,7 +671,7 @@ ScBroadcastAreaSlotMachine::~ScBroadcastAreaSlotMachine()
delete pBCAlways;
// Areas to-be-erased still present is a serious error in handling, but at
// this stage there's nothing we can do anymore.
- SAL_WARN_IF( !maAreasToBeErased.empty(), "sc", "ScBroadcastAreaSlotMachine::dtor: maAreasToBeErased not empty");
+ SAL_WARN_IF( !maAreasToBeErased.empty(), "sc.core", "ScBroadcastAreaSlotMachine::dtor: maAreasToBeErased not empty");
}
inline SCSIZE ScBroadcastAreaSlotMachine::ComputeSlotOffset(
@@ -1184,7 +1184,7 @@ void ScBroadcastAreaSlotMachine::PushAreaToBeErased( ScBroadcastAreaSlot* pSlot,
void ScBroadcastAreaSlotMachine::FinallyEraseAreas( ScBroadcastAreaSlot* pSlot )
{
- SAL_WARN_IF( pSlot->IsInBroadcastIteration(), "sc",
+ SAL_WARN_IF( pSlot->IsInBroadcastIteration(), "sc.core",
"ScBroadcastAreaSlotMachine::FinallyEraseAreas: during iteration? NO!");
if (pSlot->IsInBroadcastIteration())
return;
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 54f9885..f1b7e8b 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1230,7 +1230,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
if ((*iter)->GetDupFlag())
{
uno::Reference<util::XCloneable> xCloneable(xIntDim, uno::UNO_QUERY);
- SAL_WARN_IF(!xCloneable.is(), "sc", "cannot clone dimension");
+ SAL_WARN_IF(!xCloneable.is(), "sc.core", "cannot clone dimension");
if (xCloneable.is())
{
uno::Reference<util::XCloneable> xNew = xCloneable->createClone();
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 8285aa1..dd69c79 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2725,7 +2725,7 @@ const ScDPCache* ScDPSource::GetCache()
const ScDPItemData* ScDPMember::GetItemData() const
{
const ScDPItemData* pData = pSource->GetItemDataById(nDim, mnDataId);
- SAL_WARN_IF( !pData, "sc", "ScDPMember::GetItemData: what data? nDim " << nDim << ", mnDataId " << mnDataId);
+ SAL_WARN_IF( !pData, "sc.core", "ScDPMember::GetItemData: what data? nDim " << nDim << ", mnDataId " << mnDataId);
return pData;
}
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 56646fb..198077b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1336,7 +1336,7 @@ void ScFormulaCell::CompileXML( sc::CompileFormulaContext& rCxt, ScProgress& rPr
if (pPreviousCell->mbIsExtRef)
pDocument->GetExternalRefManager()->insertRefCellFromTemplate( pPreviousCell, this );
- SAL_INFO( "sc", "merged '" << aFormula << "' == '" << aShouldBe
+ SAL_INFO( "sc.core.formulacell", "merged '" << aFormula << "' == '" << aShouldBe
<< "'extend group to " << xGroup->mnLength );
}
}
@@ -4247,7 +4247,7 @@ bool ScFormulaCell::InterpretInvariantFormulaGroup()
ScFormulaCell* pCell = pDocument->GetFormulaCell(aTmpPos);
if (!pCell)
{
- SAL_WARN("sc", "GetFormulaCell not found");
+ SAL_WARN("sc.core.formulacell", "GetFormulaCell not found");
continue;
}
diff --git a/sc/source/core/tool/grouparealistener.cxx b/sc/source/core/tool/grouparealistener.cxx
index 043cc74..031d530 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -326,7 +326,7 @@ const ScFormulaCell* FormulaGroupAreaListener::getTopCell() const
{
size_t nBlockSize = 0;
const ScFormulaCell* const * pp = mpColumn->GetFormulaCellBlockAddress( mnTopCellRow, nBlockSize);
- SAL_WARN_IF(!pp, "sc", "GetFormulaCellBlockAddress not found");
+ SAL_WARN_IF(!pp, "sc.core.grouparealistener", "GetFormulaCellBlockAddress not found");
return pp ? *pp : nullptr;
}
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 8ed28f4..1021062 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -1496,7 +1496,7 @@ inline double evaluate( double fVal, ScQueryOp eOp )
;
}
- SAL_WARN("sc", "evaluate: unhandled comparison operator: " << (int)eOp);
+ SAL_WARN("sc.core", "evaluate: unhandled comparison operator: " << (int)eOp);
return CreateDoubleError( FormulaError::UnknownState);
}
@@ -2425,7 +2425,7 @@ void ScMatrixImpl::Dump() const
void ScMatrixImpl::CalcPosition(SCSIZE nIndex, SCSIZE& rC, SCSIZE& rR) const
{
SCSIZE nRowSize = maMat.size().row;
- SAL_WARN_IF( !nRowSize, "sc", "ScMatrixImpl::CalcPosition: 0 rows!");
+ SAL_WARN_IF( !nRowSize, "sc.core", "ScMatrixImpl::CalcPosition: 0 rows!");
rC = nRowSize > 1 ? nIndex / nRowSize : nIndex;
rR = nIndex - rC*nRowSize;
}
@@ -2631,17 +2631,17 @@ void ScMatrix::DecRef() const
bool ScMatrix::IsSizeAllocatable( SCSIZE nC, SCSIZE nR )
{
- SAL_WARN_IF( !nC, "sc", "ScMatrix with 0 columns!");
- SAL_WARN_IF( !nR, "sc", "ScMatrix with 0 rows!");
+ SAL_WARN_IF( !nC, "sc.core", "ScMatrix with 0 columns!");
+ SAL_WARN_IF( !nR, "sc.core", "ScMatrix with 0 rows!");
// 0-size matrix is valid, it could be resized later.
if ((nC && !nR) || (!nC && nR))
{
- SAL_WARN( "sc", "ScMatrix one-dimensional zero: " << nC << " columns * " << nR << " rows");
+ SAL_WARN( "sc.core", "ScMatrix one-dimensional zero: " << nC << " columns * " << nR << " rows");
return false;
}
if (nC && nR && (nC > (ScMatrix::GetElementsMax() / nR)))
{
- SAL_WARN( "sc", "ScMatrix overflow: " << nC << " columns * " << nR << " rows");
+ SAL_WARN( "sc.core", "ScMatrix overflow: " << nC << " columns * " << nR << " rows");
return false;
}
return true;
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index cbcd92c..56531e3 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -450,7 +450,7 @@ FormulaToken* ScRawToken::CreateToken() const
return new FormulaUnknownToken( eOp );
default:
{
- SAL_WARN("sc", "unknown ScRawToken::CreateToken() type " << int(GetType()));
+ SAL_WARN("sc.core", "unknown ScRawToken::CreateToken() type " << int(GetType()));
return new FormulaUnknownToken( ocBad );
}
}
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 50f0059..ab28bc7 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -189,7 +189,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj3( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_BUTTON: xDrawObj.reset( new XclImpButtonObj( rRoot ) ); break;
case EXC_OBJTYPE_PICTURE: xDrawObj.reset( new XclImpPictureObj( rRoot ) ); break;
default:
- SAL_WARN("sc", "XclImpDrawObjBase::ReadObj3 - unknown object type 0x" << std::hex << nObjType );
+ SAL_WARN("sc.filter", "XclImpDrawObjBase::ReadObj3 - unknown object type 0x" << std::hex << nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
}
}
@@ -226,7 +226,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj4( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_PICTURE: xDrawObj.reset( new XclImpPictureObj( rRoot ) ); break;
case EXC_OBJTYPE_POLYGON: xDrawObj.reset( new XclImpPolygonObj( rRoot ) ); break;
default:
- SAL_WARN("sc", "XclImpDrawObjBase::ReadObj4 - unknown object type 0x" << std::hex << nObjType );
+ SAL_WARN("sc.filter", "XclImpDrawObjBase::ReadObj4 - unknown object type 0x" << std::hex << nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
}
}
@@ -273,7 +273,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_GROUPBOX: xDrawObj.reset( new XclImpGroupBoxObj( rRoot ) ); break;
case EXC_OBJTYPE_DROPDOWN: xDrawObj.reset( new XclImpDropDownObj( rRoot ) ); break;
default:
- SAL_WARN("sc", "XclImpDrawObjBase::ReadObj5 - unknown object type 0x" << std::hex << nObjType );
+ SAL_WARN("sc.filter", "XclImpDrawObjBase::ReadObj5 - unknown object type 0x" << std::hex << nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
xDrawObj.reset( new XclImpPhObj( rRoot ) );
}
@@ -338,7 +338,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStr
case EXC_OBJTYPE_NOTE: xDrawObj.reset( new XclImpNoteObj( rRoot ) ); break;
default:
- SAL_WARN("sc", "XclImpDrawObjBase::ReadObj8 - unknown object type 0x" << std::hex << nObjType );
+ SAL_WARN("sc.filter", "XclImpDrawObjBase::ReadObj8 - unknown object type 0x" << std::hex << nObjType );
rRoot.GetTracer().TraceUnsupportedObjects();
}
}
@@ -346,7 +346,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStr
if (!xDrawObj) //ensure placeholder for unknown or broken records
{
- SAL_WARN( "sc", "XclImpDrawObjBase::ReadObj8 import failed, substituting placeholder");
+ SAL_WARN( "sc.filter", "XclImpDrawObjBase::ReadObj8 import failed, substituting placeholder");
xDrawObj.reset( new XclImpPhObj( rRoot ) );
}
@@ -467,7 +467,7 @@ SdrObjectPtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, c
}
catch(const Exception&)
{
- SAL_WARN("sc", "XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ControlTypeinMSO!");
+ SAL_WARN("sc.filter", "XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ControlTypeinMSO!");
}
}
if( mnObjType == 8 )//OCX
@@ -486,7 +486,7 @@ SdrObjectPtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffConv, c
}
catch(const Exception&)
{
- SAL_WARN("sc", "XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ObjIDinMSO!");
+ SAL_WARN("sc.filter", "XclImpDrawObjBase::CreateSdrObject, this control can't be set the property ObjIDinMSO!");
}
}
}
@@ -2054,7 +2054,7 @@ void XclImpTbxObjBase::ConvertLabel( ScfPropertySet& rPropSet ) const
xPropset->setPropertyValue( "Description", makeAny(::rtl::OUString(aLabel)) );
}catch( ... )
{
- SAL_WARN("sc", "Can't set a default text for TBX Control ");
+ SAL_WARN("sc.filter", "Can't set a default text for TBX Control ");
}
}
ConvertFont( rPropSet );
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index d3ae970..4e40fa2 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -829,7 +829,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
break;
default:
- SAL_WARN("sc", "XclImpPivotCache::ReadPivotCacheStream - unknown record 0x" << std::hex << aPCStrm.GetRecId() );
+ SAL_WARN("sc.filter", "XclImpPivotCache::ReadPivotCacheStream - unknown record 0x" << std::hex << aPCStrm.GetRecId() );
}
}
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 3384f0e..2629138 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -227,7 +227,7 @@ sal_Int32 XclPCNumGroupInfo::GetScDateType() const
case EXC_SXNUMGROUP_TYPE_MONTH: nScType = ScDPGroupBy::MONTHS; break;
case EXC_SXNUMGROUP_TYPE_QUART: nScType = ScDPGroupBy::QUARTERS; break;
case EXC_SXNUMGROUP_TYPE_YEAR: nScType = ScDPGroupBy::YEARS; break;
- default: SAL_WARN("sc", "XclPCNumGroupInfo::GetScDateType - unexpected date type " << GetXclDataType() );
+ default: SAL_WARN("sc.filter", "XclPCNumGroupInfo::GetScDateType - unexpected date type " << GetXclDataType() );
}
return nScType;
}
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 1d0dd13..2779e68 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -947,7 +947,7 @@ void CondFormatRule::finalizeImport()
eDateType = condformat::NEXTMONTH;
break;
default:
- SAL_WARN("sc", "CondFormatRule::finalizeImport - unknown time period type" );
+ SAL_WARN("sc.filter", "CondFormatRule::finalizeImport - unknown time period type" );
}
ScDocument& rDoc = getScDocument();
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index af4e50e..759c1c7 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -593,13 +593,13 @@ ApiTokenSequence FormulaParserImpl::importOoxFormulaSc( const ScAddress&, const
ApiTokenSequence FormulaParserImpl::importBiff12Formula( const CellAddress&, FormulaType, SequenceInputStream& )
{
- SAL_WARN("sc", "FormulaParserImpl::importBiff12Formula - not implemented" );
+ SAL_WARN("sc.filter", "FormulaParserImpl::importBiff12Formula - not implemented" );
return ApiTokenSequence();
}
ApiTokenSequence FormulaParserImpl::importBiff12FormulaSc( const ScAddress&, FormulaType, SequenceInputStream& )
{
- SAL_WARN("sc", "FormulaParserImpl::importBiff12Formula - not implemented" );
+ SAL_WARN("sc.filter", "FormulaParserImpl::importBiff12Formula - not implemented" );
return ApiTokenSequence();
}
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index e2d2031..501f09ba 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -599,7 +599,7 @@ void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, const char*
ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab));
if (!pCell)
{
- SAL_WARN("sc", "trying to set formula result for non formula \
+ SAL_WARN("sc.orcus", "trying to set formula result for non formula \
cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab);
return;
}
@@ -612,7 +612,7 @@ void ScOrcusSheet::set_formula_result(os::row_t row, os::col_t col, double /*val
ScFormulaCell* pCell = mrDoc.getDoc().GetFormulaCell(ScAddress(col, row, mnTab));
if (!pCell)
{
- SAL_WARN("sc", "trying to set formula result for non formula \
+ SAL_WARN("sc.orcus", "trying to set formula result for non formula \
cell! Col: " << col << ";Row: " << row << ";Tab: " << mnTab);
return;
}
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index b7a19f4..02c00ae 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -84,7 +84,7 @@ void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames,
}
catch (const css::uno::Exception& e)
{
- SAL_INFO("sc", "ScSolverUtil::GetImplementations: cannot instantiate: " << sName << ", because: " << e.Message);
+ SAL_INFO("sc.ui", "ScSolverUtil::GetImplementations: cannot instantiate: " << sName << ", because: " << e.Message);
}
}
}
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index 6481734..c18d278 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -221,7 +221,7 @@ void MasterScriptProvider::createPkgProvider()
catch ( const Exception& e )
{
(void)e;
- SAL_WARN("scripting", "Exception creating MasterScriptProvider for uno_packages in context "
+ SAL_WARN("scripting.provider", "Exception creating MasterScriptProvider for uno_packages in context "
<< m_sCtxString << ": " << e.Message );
}
}
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index c6c0a22..50d37f3 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -279,7 +279,7 @@ ShapeExport& PowerPointShapeExport::WriteTextShape( const Reference< XShape >& x
ShapeExport::WriteTextShape( xShape );
}
else
- SAL_WARN("sd.filter", "PowerPointShapeExport::WriteTextShape: shape of type '" << sShapeType << "' is ignored");
+ SAL_WARN("sd.eppt", "PowerPointShapeExport::WriteTextShape: shape of type '" << sShapeType << "' is ignored");
return *this;
}
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 75afcc4..4a0e92e 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -163,7 +163,7 @@ void ModuleController::InstantiateStartupServices()
}
catch (Exception&)
{
- SAL_WARN("sd", "ERROR in ModuleController::InstantiateStartupServices");
+ SAL_WARN("sd.fwk", "ERROR in ModuleController::InstantiateStartupServices");
}
}
@@ -195,7 +195,7 @@ void ModuleController::ProcessStartupService (const ::std::vector<Any>& rValues)
}
catch (Exception&)
{
- SAL_WARN("sd", "ERROR in ModuleController::ProcessStartupServices");
+ SAL_WARN("sd.fwk", "ERROR in ModuleController::ProcessStartupServices");
}
}
@@ -232,7 +232,7 @@ void SAL_CALL ModuleController::requestResource (const OUString& rsResourceURL)
}
catch (const Exception&)
{
- SAL_WARN("sd", "caught exception while creating factory.");
+ SAL_WARN("sd.fwk", "caught exception while creating factory.");
}
// Remember that this factory has been instanced.
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index d540f09..27874e6 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -148,7 +148,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
}
catch ( Exception& )
{
- SAL_WARN( "sd.slideshow", "sd::SlideShowImpl::setPointerPosition(), "
+ SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerPosition(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
}
@@ -162,7 +162,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
}
catch ( Exception& )
{
- SAL_WARN( "sd.slideshow", "sd::SlideShowImpl::setPointerMode(), "
+ SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerMode(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
}
@@ -181,7 +181,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
}
catch ( Exception& )
{
- SAL_WARN( "sd.slideshow", "sd::SlideShowImpl::setPointerMode(), "
+ SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerMode(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
}
@@ -206,7 +206,7 @@ void Receiver::executeCommand( const std::vector<OString> &aCommand )
}
catch ( Exception& )
{
- SAL_WARN( "sd.slideshow", "sd::SlideShowImpl::setPointerPosition(), "
+ SAL_WARN( "sdremote", "sd::SlideShowImpl::setPointerPosition(), "
"exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
}
}
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index dadc8db..a7f0d54 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -80,7 +80,7 @@ void SdGlobalResourceContainer::AddResource (
{
// Because the given resource is a unique_ptr it is highly unlikely
// that we come here. But who knows?
- SAL_WARN ( "sd",
+ SAL_WARN ( "sd.tools",
"SdGlobalResourceContainer:AddResource(): Resource added twice.");
}
// We can not put the unique_ptr into the vector so we release the
@@ -102,7 +102,7 @@ void SdGlobalResourceContainer::AddResource (
mpImpl->maSharedResources.push_back(pResource);
else
{
- SAL_WARN ("sd",
+ SAL_WARN ("sd.tools",
"SdGlobalResourceContainer:AddResource(): Resource added twice.");
}
}
@@ -120,7 +120,7 @@ void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxReso
mpImpl->maXInterfaceResources.push_back(rxResource);
else
{
- SAL_WARN ("sd",
+ SAL_WARN ("sd.tools",
"SdGlobalResourceContainer:AddResource(): Resource added twice.");
}
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index d75c47b..14a5ad2 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -508,7 +508,7 @@ void ViewShellBase::Rearrange()
}
else
{
- SAL_WARN("sd", "Rearrange: window missing");
+ SAL_WARN("sd.view", "Rearrange: window missing");
}
GetViewFrame()->Resize(true);
@@ -910,7 +910,7 @@ OUString ViewShellBase::GetInitialViewShellType()
// The page kind is invalid. This is probably an
// error by the caller. We use the standard type to
// keep things going.
- SAL_WARN( "sd", "ViewShellBase::GetInitialViewShellType: invalid page kind");
+ SAL_WARN( "sd.view", "ViewShellBase::GetInitialViewShellType: invalid page kind");
sRequestedView = FrameworkHelper::msImpressViewURL;
break;
}
@@ -1410,7 +1410,7 @@ void CurrentPageSetter::operator() (bool)
}
catch (const beans::UnknownPropertyException&)
{
- SAL_WARN("sd", "CurrentPage property unknown");
+ SAL_WARN("sd.view", "CurrentPage property unknown");
}
}
}
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 1bb1986..367bdb4 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -436,7 +436,7 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell)
}
else
{
- SAL_WARN("sd",
+ SAL_WARN("sd.view",
"ViewShellManager::ActivateViewShell: "
"new view shell has no active window");
}
@@ -1130,7 +1130,7 @@ void ViewShellManager::Implementation::Shutdown()
}
else
{
- SAL_WARN("sd",
+ SAL_WARN("sd.view",
"ViewShellManager::Implementation::Shutdown(): empty active shell descriptor");
maActiveViewShells.pop_front();
}
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 68f0e38..2ff7c77 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2897,7 +2897,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
default:
{
- SAL_WARN( "sd", "Slot without function" );
+ SAL_WARN( "sd.ui", "Slot without function" );
Cancel();
rReq.Ignore ();
}
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 91be028..c509e0b 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -163,7 +163,7 @@ ViewShell::~ViewShell()
if (mpContentWindow)
{
SAL_INFO(
- "sd.ui",
+ "sd.view",
"destroying mpContentWindow at " << mpContentWindow.get()
<< " with parent " << mpContentWindow->GetParent());
mpContentWindow.disposeAndClear();
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index b240377..5675d36 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -570,7 +570,7 @@ void SfxApplication::MacroOrganizer( sal_Int16 nTabId )
aMod.release();
- SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!");
+ SAL_WARN_IF(!pSymbol, "sfx.appl", "SfxApplication::MacroOrganizer, no symbol!");
if (!pSymbol)
return;
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 9f9735c..3a5c453 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -125,7 +125,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, IdleHdl, Idle*, pAsyncIdle, void)
{
SfxObjectShellRef xRef( aHint.GetObjShell() );
pAsyncIdle->Stop();
- SAL_INFO_IF(!xRef.Is(), "sfx", "SfxEvent: " << aHint.GetEventName());
+ SAL_INFO_IF(!xRef.Is(), "sfx.appl", "SfxEvent: " << aHint.GetEventName());
SfxGetpApp()->Broadcast( aHint );
if ( xRef.Is() )
xRef->Broadcast( aHint );
@@ -464,7 +464,7 @@ void SfxApplication::GetOptions( SfxItemSet& rSet )
break;
default:
- SAL_INFO( "sfx", "W1:Wrong ID while getting Options!" );
+ SAL_INFO( "sfx.appl", "W1:Wrong ID while getting Options!" );
break;
}
SAL_WARN_IF(!bRet, "sfx.appl", "Putting options failed!");
@@ -853,7 +853,7 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
#ifdef DBG_UTIL
if (!pDoc)
{
- SAL_INFO("sfx", "SfxEvent: " << rEventHint.GetEventName());
+ SAL_INFO("sfx.appl", "SfxEvent: " << rEventHint.GetEventName());
}
#endif
Broadcast(rEventHint);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f880b01..fc81adb 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -374,7 +374,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
if this dialog is closed by the user ...
So we ignore this request now and wait for a new user decision.
*/
- SAL_INFO("sfx", "QueryExit => sal_False, DispatchLevel == " << Application::GetDispatchLevel() );
+ SAL_INFO("sfx.appl", "QueryExit => sal_False, DispatchLevel == " << Application::GetDispatchLevel() );
return;
}
@@ -1210,7 +1210,7 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, const Refere
// get symbol
basicide_choose_macro pSymbol = reinterpret_cast<basicide_choose_macro>(aMod.getFunctionSymbol("basicide_choose_macro"));
- SAL_WARN_IF(!pSymbol, "sfx.doc", "SfxApplication::MacroOrganizer, no symbol!");
+ SAL_WARN_IF(!pSymbol, "sfx.appl", "SfxApplication::MacroOrganizer, no symbol!");
if (!pSymbol)
return OUString();
aMod.release();
@@ -1482,7 +1482,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_MACROORGANIZER:
{
- SAL_INFO("sfx", "handling SID_MACROORGANIZER");
+ SAL_INFO("sfx.appl", "handling SID_MACROORGANIZER");
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
sal_Int16 nTabId = 0;
@@ -1499,7 +1499,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_RUNMACRO:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- SAL_INFO("sfx", "SfxApplication::OfaExec_Impl: case ScriptOrg");
+ SAL_INFO("sfx.appl", "SfxApplication::OfaExec_Impl: case ScriptOrg");
Reference< XFrame > xFrame;
const SfxItemSet* pIntSet = rReq.GetInternalArgs_Impl();
@@ -1552,7 +1552,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
case SID_SCRIPTORGANIZER:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
- SAL_INFO("sfx", "SfxApplication::OfaExec_Impl: case ScriptOrg");
+ SAL_INFO("sfx.appl", "SfxApplication::OfaExec_Impl: case ScriptOrg");
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
OUString aLanguage;
@@ -1562,7 +1562,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
}
OUString aLang( aLanguage );
- SAL_INFO("sfx", "SfxApplication::OfaExec_Impl: about to create dialog for: " << aLang);
+ SAL_INFO("sfx.appl", "SfxApplication::OfaExec_Impl: about to create dialog for: " << aLang);
// not sure about the vcl::Window*
VclPtr<VclAbstractDialog> pDlg = pFact->CreateSvxScriptOrgDialog( GetTopWindow(), aLanguage );
if( pDlg )
@@ -1572,7 +1572,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
}
else
{
- SAL_WARN("sfx", "no dialog!!!");
+ SAL_WARN("sfx.appl", "no dialog!!!");
}
rReq.Done();
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 807fcd9..ec5e1f7 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -476,7 +476,7 @@ SfxDispatcher::SfxDispatcher(SfxViewFrame *pViewFrame)
SfxDispatcher::~SfxDispatcher()
{
#ifdef DBG_UTIL
- SAL_WARN("sfx", "Delete Dispatcher " << reinterpret_cast<sal_Int64>(this));
+ SAL_WARN("sfx.control", "Delete Dispatcher " << reinterpret_cast<sal_Int64>(this));
DBG_ASSERT( !xImp->bActive, "deleting active Dispatcher" );
#endif
@@ -561,7 +561,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode)
xImp->aToDoStack.push_front( SfxToDo_Impl(bPush, bDelete, bUntil, rShell) );
if (xImp->bFlushed)
{
- SAL_WARN("sfx", "Unflushed dispatcher!");
+ SAL_WARN("sfx.control", "Unflushed dispatcher!");
xImp->bFlushed = false;
xImp->bUpdated = false;
@@ -734,7 +734,7 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI)
if ( bMDI )
{
#ifdef DBG_UTIL
- SAL_WARN("sfx", "Activate Dispatcher " << reinterpret_cast<sal_Int64>(this));
+ SAL_WARN("sfx.control", "Activate Dispatcher " << reinterpret_cast<sal_Int64>(this));
DBG_ASSERT( !xImp->bActive, "Activation error" );
#endif
xImp->bActive = true;
@@ -749,7 +749,7 @@ void SfxDispatcher::DoActivate_Impl(bool bMDI)
else
{
#ifdef DBG_UTIL
- SAL_WARN("sfx", "Non-MDI-Activate Dispatcher " << reinterpret_cast<sal_Int64>(this));
+ SAL_WARN("sfx.control", "Non-MDI-Activate Dispatcher " << reinterpret_cast<sal_Int64>(this));
#endif
}
@@ -1501,7 +1501,7 @@ void SfxDispatcher::FlushImpl()
{
SFX_STACK(SfxDispatcher::FlushImpl);
- SAL_INFO("sfx", "Flushing dispatcher!");
+ SAL_INFO("sfx.control", "Flushing dispatcher!");
xImp->aIdle.Stop();
@@ -1566,7 +1566,7 @@ void SfxDispatcher::FlushImpl()
xImp->bFlushing = false;
xImp->bUpdated = false; // not only when bModify, if Doc/Template-Config
xImp->bFlushed = true;
- SAL_INFO("sfx", "Successfully flushed dispatcher!");
+ SAL_INFO("sfx.control", "Successfully flushed dispatcher!");
//fdo#70703 FlushImpl may call back into itself so use aToDoCopyStack to talk
//to outer levels of ourself. If DoActivate_Impl/DoDeactivate_Impl deletes
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4be6661..4739073 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -244,7 +244,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
// "fix" property? => not a custom property => ignore it!
if (!(pProps[i].Attributes & css::beans::PropertyAttribute::REMOVABLE))
{
- SAL_WARN( "sfx", "non-removable user-defined property?");
+ SAL_WARN( "sfx.dialog", "non-removable user-defined property?");
continue;
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index ffc821d..d3efaae 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -287,7 +287,7 @@ const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
void SfxTabPage::PageCreated( const SfxAllItemSet& /*aSet*/ )
{
- SAL_WARN( "sfx", "SfxTabPage::PageCreated should not be called");
+ SAL_WARN( "sfx.dialog", "SfxTabPage::PageCreated should not be called");
}
void SfxTabPage::ChangesApplied()
@@ -357,7 +357,7 @@ void SfxTabDialog::dispose()
RTL_TEXTENCODING_UTF8);
if (sConfigId.isEmpty())
{
- SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");
+ SAL_WARN("sfx.dialog", "Tabpage needs to be converted to .ui format");
sConfigId = OUString::number(pDataObject->nId);
}
@@ -661,7 +661,7 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
RTL_TEXTENCODING_UTF8);
if (sConfigId.isEmpty())
{
- SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");
+ SAL_WARN("sfx.dialog", "Tabpage needs to be converted to .ui format");
sConfigId = OUString::number(pDataObject->nId);
}
@@ -1064,7 +1064,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
if (!pDataObject)
{
- SAL_WARN("sfx.config", "Tab Page ID not known, this is pretty serious and needs investigation");
+ SAL_WARN("sfx.dialog", "Tab Page ID not known, this is pretty serious and needs investigation");
return;
}
@@ -1092,7 +1092,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
OUString sConfigId = OStringToOUString(pTabPage->GetConfigId(), RTL_TEXTENCODING_UTF8);
if (sConfigId.isEmpty())
{
- SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");
+ SAL_WARN("sfx.dialog", "Tabpage needs to be converted to .ui format");
sConfigId = OUString::number(pDataObject->nId);
}
SvtViewOptions aPageOpt(E_TABPAGE, sConfigId);
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index cadeb45..903f69d 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -865,12 +865,12 @@ bool SfxDocumentTemplates::CopyFrom
}
else
{
- SAL_WARN( "sfx", "CopyFrom(): The content should contain target URL!" );
+ SAL_WARN( "sfx.doc", "CopyFrom(): The content should contain target URL!" );
}
}
else
{
- SAL_WARN( "sfx", "CopyFrom(): The content just was created!" );
+ SAL_WARN( "sfx.doc", "CopyFrom(): The content just was created!" );
}
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index f7aa774..a2053b4 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -139,7 +139,7 @@ sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
else if ( nStoreMode == SAVEASREMOTE_REQUESTED )
nResult = SID_SAVEASREMOTE;
else {
- SAL_WARN( "sfx", "Unacceptable slot name is provided!\n" );
+ SAL_WARN( "sfx.doc", "Unacceptable slot name is provided!\n" );
}
return nResult;
@@ -1422,7 +1422,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
}
catch (const lang::IllegalArgumentException& e)
{
- SAL_WARN("sfx", "Ignoring parameters! "
+ SAL_WARN("sfx.doc", "Ignoring parameters! "
"ModelData considers this illegal: " << e.Message);
aModelData.GetStorable()->store();
}
@@ -1599,7 +1599,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
}
else
{
- SAL_WARN( "sfx", "This code must be unreachable!\n" );
+ SAL_WARN( "sfx.doc", "This code must be unreachable!\n" );
throw task::ErrorCodeIOException(
"SfxStoringHelper::GUIStoreModel: ERRCODE_IO_INVALIDPARAMETER",
uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER);
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 5067d18..e865a29 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -317,14 +317,14 @@ SotClipboardFormatId GetChartVersion( sal_Int32 nVersion, bool bTemplate )
{
if (bTemplate)
{
- SAL_WARN("sfx", "no chart template support yet");
+ SAL_WARN("sfx.doc", "no chart template support yet");
return SotClipboardFormatId::STARCHART_8;
}
else
return SotClipboardFormatId::STARCHART_8;
}
- SAL_WARN("sfx", "unsupported version");
+ SAL_WARN("sfx.doc", "unsupported version");
return SotClipboardFormatId::NONE;
}
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 4bfbe7a..c5bafe7 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list