diff options
141 files changed, 533 insertions, 512 deletions
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 098a580a9869..e33e6b390a50 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 6ce2239206e1..41713209e622 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 5e8307d0a6a9..cf56cd738f8e 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 dc4c6bc2e124..1914773f3923 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 c170074bb4a1..85f90e39d25d 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 d665c38099f2..a689ce9ec9ca 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 54b93c825dee..21b20cbcb943 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@mamane.lu OFlatTable::refreshHeader" ); + SAL_INFO( "connectivity.flat", "flat lionel@mamane.lu OFlatTable::refreshHeader" ); } diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index e4e8abac9b7c..3b2ffb848e99 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@mamane.lu OResultSet::ensureCacheForColumn" ); + SAL_INFO( "connectivity.odbc", "odbc lionel@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 8f1304a5990e..e22d4d1d92ab 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 4b644c4893a8..a7126b57c94a 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 57925af29bf6..780fe02ad70b 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 ad88c6032571..a9826065108e 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 f975d7e80fc4..a9bfaed9291e 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 8ad4dc7a727e..144e86d4b55e 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 b5430b0cb4fc..446fb5bca164 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 7a02fb191b69..58b98aff9919 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 772a394b6bf1..d9dedb672807 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 0426953ea5e9..fd4a58c52735 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 cbb3e6b05317..9406d32fdcbc 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 b845b261f51a..be95410d7d53 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 3e27f5c8c85f..eae3a99704f9 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 8e1288269ede..b0e65802db4d 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 610db9ca683b..2d37455d6039 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 c8bf51fe6a8e..01d24fa5ba60 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 09e5104652f6..9d66a17298ac 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 c4dc45d54700..45fcc1b7c4aa 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 d379bda4ada4..6f014090490c 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 73c2fdc0c227..92c129faeb3d 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 cd564964af35..b65ae15dbec7 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 8bfc59690ad5..79d0699c0e54 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 136570ae0351..2568902aaf15 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 11b482d2a7a2..6e6fc5e0bfbd 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 b0b95c0ac43a..90df17fb113e 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 6d169960c59f..47cb777bda08 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 50528effad87..ddf2be4d8098 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 324ca2374d8d..2a99e0aecda1 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 3cef49ac30e5..b47940e97316 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 54f98850c2de..f1b7e8b0f373 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 8285aa11b187..dd69c79f7d99 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 56646fbb4d3b..198077b56c4c 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 043cc746a1c0..031d53000870 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 8ed28f41d825..10210621fcb2 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 cbcd92c33a15..56531e3c7c89 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 50f00596c4b8..ab28bc7bdfc1 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 d3ae97085658..4e40fa26448f 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 3384f0eb7879..2629138b8ec3 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 1d0dd13fd773..2779e6851773 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 af4e50e68e95..759c1c7c1553 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 e2d203137133..501f09ba7a85 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 b7a19f45e82c..02c00aea63c8 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 6481734c9f48..c18d278bfc1e 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 c6c0a22ccbe4..50d37f3a0943 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 75afcc43d000..4a0e92eaddea 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 d540f09d6608..27874e688254 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 dadc8db91480..a7f0d54cac34 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 d75c47b72d86..14a5ad2995a4 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 1bb198618fdc..367bdb460682 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 68f0e38f5848..2ff7c77137c2 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 91be0281b146..c509e0b547e4 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 b240377a881c..5675d3667486 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 9f9735c6b495..3a5c453aedf6 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 f880b01180a0..fc81adb9ee3b 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 807fcd9e981e..ec5e1f74fe0e 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 4be6661f4495..4739073e2e17 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 ffc821d53baf..d3efaaee90db 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 cadeb45fa7e2..903f69d34ac2 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 f7aa774126a7..a2053b41e1c1 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 5067d18d2218..e865a294b681 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 4bfbe7a3fa9d..c5bafe78702c 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -1119,7 +1119,7 @@ void SfxObjectShell::SetInitialized_Impl( const bool i_fromInitNew ) bool SfxObjectShell::IsChangeRecording() const { // currently this function needs to be overwritten by Writer and Calc only - SAL_WARN( "sfx", "function not implemented" ); + SAL_WARN( "sfx.doc", "function not implemented" ); return false; } @@ -1127,7 +1127,7 @@ bool SfxObjectShell::IsChangeRecording() const bool SfxObjectShell::HasChangeRecordProtection() const { // currently this function needs to be overwritten by Writer and Calc only - SAL_WARN( "sfx", "function not implemented" ); + SAL_WARN( "sfx.doc", "function not implemented" ); return false; } @@ -1135,21 +1135,21 @@ bool SfxObjectShell::HasChangeRecordProtection() const void SfxObjectShell::SetChangeRecording( bool /*bActivate*/ ) { // currently this function needs to be overwritten by Writer and Calc only - SAL_WARN( "sfx", "function not implemented" ); + SAL_WARN( "sfx.doc", "function not implemented" ); } void SfxObjectShell::SetProtectionPassword( const OUString & /*rPassword*/ ) { // currently this function needs to be overwritten by Writer and Calc only - SAL_WARN( "sfx", "function not implemented" ); + SAL_WARN( "sfx.doc", "function not implemented" ); } bool SfxObjectShell::GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > & /*rPasswordHash*/ ) { // currently this function needs to be overwritten by Writer and Calc only - SAL_WARN( "sfx", "function not implemented" ); + SAL_WARN( "sfx.doc", "function not implemented" ); return false; } diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index f52a3ff2380a..2b4a668b67e7 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -885,7 +885,7 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) break; case VclEventId::WindowPaint: - SAL_INFO("sfx", "Paint"); + SAL_INFO("sfx.sidebar", "Paint"); break; default: diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx index 431294fa1498..4a34400b8def 100644 --- a/slideshow/source/engine/eventqueue.cxx +++ b/slideshow/source/engine/eventqueue.cxx @@ -257,7 +257,7 @@ namespace slideshow // since this will also capture segmentation // violations and the like. In such a case, we // still better let our clients now... - SAL_WARN("slideshow", "::presentation::internal::EventQueue: Event threw a SlideShowException, action might not have been fully performed" ); + SAL_WARN("slideshow.eventqueue", "::presentation::internal::EventQueue: Event threw a SlideShowException, action might not have been fully performed" ); } } else diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx index f2f0b3f103a1..3758a2a24d49 100644 --- a/slideshow/source/engine/opengl/TransitionerImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx @@ -325,7 +325,7 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta if( !mpContext->init( reinterpret_cast< vcl::Window* >( aVal ) ) ) return false; } - SAL_INFO("slideshow", "created the context"); + SAL_INFO("slideshow.opengl", "created the context"); mpContext->makeCurrent(); CHECK_GL_ERROR(); diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 187eb73991e9..033b6a6ae812 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -22,7 +22,6 @@ #include <tools/stream.hxx> #include <svl/cenumitm.hxx> #include <svl/eitem.hxx> -#include "whassert.hxx" #include <comphelper/extract.hxx> #include <libxml/xmlwriter.h> @@ -31,7 +30,7 @@ // virtual bool SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const { - SFX_ASSERT(SfxPoolItem::operator ==(rItem), Which(), "unequal type"); + SAL_WARN_IF(!SfxPoolItem::operator ==(rItem), "svl.items", "unequal type, with ID/pos " << Which() ); return GetEnumValue() == static_cast< const SfxEnumItemInterface * >(&rItem)-> GetEnumValue(); @@ -71,7 +70,7 @@ bool SfxEnumItemInterface::PutValue(const css::uno::Any& rVal, OUString SfxEnumItemInterface::GetValueTextByPos(sal_uInt16) const { - SAL_INFO("svl", "SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); + SAL_INFO("svl.items", "SfxEnumItemInterface::GetValueTextByPos(): Pure virtual"); return OUString(); } diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 27caf7c2e708..9f80d471cb88 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -24,7 +24,6 @@ #include <osl/diagnose.h> #include <sal/log.hxx> -#include "whassert.hxx" #include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> #include "poolio.hxx" diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 9996e9330476..9e44a8ba1889 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -29,7 +29,6 @@ #include <svl/itempool.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> -#include "whassert.hxx" #include <tools/stream.hxx> #include <tools/solar.h> @@ -537,9 +536,10 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich } } } - SFX_ASSERT( !m_pPool->IsItemPoolable(nWhich) || - dynamic_cast<const SfxSetItem*>( &rItem ) != nullptr || **ppFnd == rItem, - nWhich, "putted Item unequal" ); + SAL_WARN_IF(m_pPool->IsItemPoolable(nWhich) && + dynamic_cast<const SfxSetItem*>( &rItem ) == nullptr && + **ppFnd != rItem, + "svl.items", "putted Item unequal, with ID/pos " << nWhich ); return *ppFnd; } ppFnd += *(pPtr+1) - *pPtr + 1; @@ -910,7 +910,7 @@ const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const { if( reinterpret_cast<SfxPoolItem*>(-1) == *ppFnd ) { //FIXME: The following code is duplicated further down - SFX_ASSERT(m_pPool, nWhich, "no Pool, but status is ambiguous"); + SAL_WARN_IF(!m_pPool, "svl.items", "no Pool, but status is ambiguous, with ID/pos " << nWhich); //!((SfxAllItemSet *)this)->aDefault.SetWhich(nWhich); //!return aDefault; return m_pPool->GetDefaultItem( nWhich ); @@ -934,7 +934,7 @@ const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const } while (bSrchInParent && nullptr != (pAktSet = pAktSet->m_pParent)); // Get the Default from the Pool and return - SFX_ASSERT(m_pPool, nWhich, "no Pool, but status is ambiguous"); + SAL_WARN_IF(!m_pPool, "svl.items", "no Pool, but status is ambiguous, with ID/pos " << nWhich); const SfxPoolItem *pItem = &m_pPool->GetDefaultItem( nWhich ); return *pItem; } @@ -1446,7 +1446,7 @@ void SfxItemSet::Load const size_t nMaxRecords = rStream.remainingSize() / nMinRecordSize; if (nCount > nMaxRecords) { - SAL_WARN("svl", "Parsing error: " << nMaxRecords << + SAL_WARN("svl.items", "Parsing error: " << nMaxRecords << " max possible entries, but " << nCount << " claimed, truncating"); nCount = nMaxRecords; } @@ -1471,7 +1471,7 @@ void SfxItemSet::Load { // Remember Item pointer in the set ppFnd += nWhich - *pPtr; - SFX_ASSERT( !*ppFnd, nWhich, "Item is present twice"); + SAL_WARN_IF( *ppFnd, "svl.items", "Item is present twice, with ID/pos " << nWhich); *ppFnd = pItem; ++m_nCount; break; diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 4156ec945684..e008f74b032e 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -23,7 +23,6 @@ #include <sal/log.hxx> #include <tools/solar.h> #include <svl/itempool.hxx> -#include "whassert.hxx" #include <svl/SfxBroadcaster.hxx> #include <svl/filerec.hxx> #include "poolio.hxx" @@ -432,7 +431,7 @@ void SfxItemPool_Impl::readTheItems ( if ( nullptr != pOldArr ) for ( n = 0; bEmpty && n < pOldArr->size(); ++n ) bEmpty = pOldArr->operator[](n) == nullptr; - SAL_WARN_IF( !bEmpty, "svl", "loading non-empty pool" ); + SAL_WARN_IF( !bEmpty, "svl.items", "loading non-empty pool" ); if ( !bEmpty ) { // See if there's a new one for all old ones @@ -499,7 +498,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) for (auto const& rItemPtr : *rArrayPtr) if (rItemPtr) { - SAL_INFO( "svl", "loading non-empty ItemPool" ); + SAL_INFO( "svl.items", "loading non-empty ItemPool" ); AddRef(*rItemPtr); } } @@ -618,7 +617,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) const size_t nMaxRecords = rStream.remainingSize() / sizeof(sal_uInt16); if (nCount > nMaxRecords) { - SAL_WARN("svl", "Parsing error: " << nMaxRecords << + SAL_WARN("svl.items", "Parsing error: " << nMaxRecords << " max possible entries, but " << nCount << " claimed, truncating"); nCount = nMaxRecords; } @@ -864,7 +863,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate } } - SFX_ASSERT( false, rWhich, "can't resolve Which-Id in LoadSurrogate" ); + SAL_WARN("svl.items", "can't resolve Which-Id in LoadSurrogate, with ID/pos " << rWhich ); } return nullptr; @@ -908,7 +907,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const { if ( pImpl->mpSecondary ) return pImpl->mpSecondary->GetSurrogate( pItem ); - SFX_ASSERT( false, pItem->Which(), "unknown Which-Id - don't ask me for surrogates" ); + SAL_WARN( "svl.items", "unknown Which-Id - don't ask me for surrogates, with ID/pos " << pItem->Which()); } // Pointer on static or pool-default attribute? @@ -924,7 +923,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const if ( p == pItem ) return i; } - SFX_ASSERT( false, pItem->Which(), "Item not in the pool"); + SAL_WARN( "svl.items", "Item not in the pool, with ID/pos " << pItem->Which()); return SFX_ITEMS_NULL; } @@ -1059,7 +1058,7 @@ sal_uInt16 SfxItemPool::GetNewWhich { if ( pImpl->mpSecondary ) return pImpl->mpSecondary->GetNewWhich( nFileWhich ); - SFX_ASSERT( false, nFileWhich, "unknown which in GetNewWhich()" ); + SAL_WARN( "svl.items", "unknown which in GetNewWhich(), with ID/pos " << nFileWhich); } // Newer/the same/older version? diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index a96cc5f22019..f979c1bdbe7a 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -258,7 +258,7 @@ bool SfxStyleSheetBase::SetFollow( const OUString& rName ) { if( !pPool->Find( rName, nFamily ) ) { - SAL_WARN( "svl", "StyleSheet-Follow not found" ); + SAL_WARN( "svl.items", "StyleSheet-Follow not found" ); return false; } aFollow = rName; diff --git a/svl/source/items/whassert.hxx b/svl/source/items/whassert.hxx deleted file mode 100644 index 253debbf0e87..000000000000 --- a/svl/source/items/whassert.hxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SVL_SOURCE_ITEMS_WHASSERT_HXX -#define INCLUDED_SVL_SOURCE_ITEMS_WHASSERT_HXX - -#include <sal/config.h> - -#include <sal/log.hxx> - -#define SFX_ASSERT( bCondition, nId, sMessage ) SAL_WARN_IF( \ - !(bCondition), "svl", sMessage ", with ID/pos " << (nId)); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 95f82913fd12..2dbb8362e82b 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -242,7 +242,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetEdgeBlending() const } catch(const css::uno::Exception& ex) { - SAL_WARN("svtools", "Caught unexpected: " << ex.Message); + SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message); } return nRet; @@ -260,7 +260,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const } catch(const css::uno::Exception& ex) { - SAL_WARN("svtools", "Caught unexpected: " << ex.Message); + SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message); } return nRet; @@ -278,7 +278,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const } catch(const css::uno::Exception& ex) { - SAL_WARN("svtools", "Caught unexpected: " << ex.Message); + SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message); } return nRet; @@ -296,7 +296,7 @@ bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const } catch(const css::uno::Exception& ex) { - SAL_WARN("svtools", "Caught unexpected: " << ex.Message); + SAL_WARN("svtools.config", "Caught unexpected: " << ex.Message); } return bRet; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 218d0b53b8a3..9c1e990b1f0c 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -942,12 +942,12 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) } catch( css::ucb::CommandAbortedException const & ) { - SAL_INFO( "svtools", "CommandAbortedException" ); + SAL_INFO( "svtools.contnr", "CommandAbortedException" ); bRet = false; } catch( Exception const & ) { - SAL_INFO( "svtools", "Any other exception" ); + SAL_INFO( "svtools.contnr", "Any other exception" ); bRet = false; } @@ -2038,7 +2038,7 @@ bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl* co bEqual = true; break; default: - SAL_INFO( "svtools", "CompareSortingData_Impl: Compare unknown type!" ); + SAL_INFO( "svtools.contnr", "CompareSortingData_Impl: Compare unknown type!" ); bRet = false; } } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 67d8e95ea21a..215661b71c50 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3656,7 +3656,7 @@ VclPtr<PopupMenu> SvTreeListBox::CreateContextMenu() void SvTreeListBox::ExecuteContextMenuAction( sal_uInt16 ) { - SAL_INFO( "svtools", "SvTreeListBox::ExecuteContextMenuAction(): now there's happening nothing!" ); + SAL_INFO( "svtools.contnr", "SvTreeListBox::ExecuteContextMenuAction(): now there's happening nothing!" ); } void SvTreeListBox::EnableContextMenuHandling() diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index d07db154241f..2e7df555a1ab 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1877,7 +1877,7 @@ namespace try { xProp->getPropertyValue( _sPropName ) >>= sRetText; } catch (UnknownPropertyException const& e) { - SAL_WARN("svx.form", + SAL_WARN("svx.fmcomp", "exception caught: " << e.Message); } } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 6a115a3fd970..0ec4156755a6 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1288,7 +1288,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x } else { - SAL_INFO("svx", "DbFormattedField::Init : my uno-model has no format-key, but a formats supplier !"); + SAL_INFO("svx.fmcomp", "DbFormattedField::Init : my uno-model has no format-key, but a formats supplier !"); // the OFormattedModel which we usually are working with ensures that the model has a format key // as soon as the form is loaded. Unfortunally this method here is called from within loaded, too. // So if our LoadListener is called before the LoadListener of the model, this "else case" is @@ -3552,7 +3552,7 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, } catch (const Exception& e) { - SAL_WARN("svx.form", "PaintFieldToCell: caught an exception: " << e.Message); + SAL_WARN("svx.fmcomp", "PaintFieldToCell: caught an exception: " << e.Message); } } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 9457839c1c70..75516618b595 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2298,14 +2298,14 @@ sal_Int32 DbGridControl::AlignSeekCursor() if ( m_pDataCursor->isBeforeFirst() ) { // this is somewhat strange, but can nevertheless happen - SAL_INFO( "svx", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (before first)!" ); + SAL_INFO( "svx.fmcomp", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (before first)!" ); m_pSeekCursor->first(); m_pSeekCursor->previous(); m_nSeekPos = -1; } else if ( m_pDataCursor->isAfterLast() ) { - SAL_INFO( "svx", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (after last)!" ); + SAL_INFO( "svx.fmcomp", "DbGridControl::AlignSeekCursor: nobody should tamper with my cursor this way (after last)!" ); m_pSeekCursor->last(); m_pSeekCursor->next(); m_nSeekPos = -1; diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 76726e244420..4233fc17ab54 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -552,7 +552,7 @@ namespace svx { if ( m_bNeedClipboardInvalidation ) { - SAL_INFO("svx", "invalidating clipboard slots" ); + SAL_INFO("svx.form", "invalidating clipboard slots" ); m_rBindings.Invalidate( SID_CUT ); m_rBindings.Invalidate( SID_COPY ); m_rBindings.Invalidate( SID_PASTE ); @@ -614,7 +614,7 @@ namespace svx OString sMessage = "found a feature state for " + sUnoSlotNameAscii; if ( !bFeatureIsEnabled ) sMessage += " (disabled)"; - SAL_INFO("svx", sMessage ); + SAL_INFO("svx.form", sMessage ); #endif lcl_translateUnoStateToItem( nSlotId, aFeature->second->getFeatureState(), _rSet ); @@ -622,7 +622,7 @@ namespace svx #if OSL_DEBUG_LEVEL > 0 else { - SAL_WARN("svx", "found a feature state for " << sUnoSlotNameAscii << ", but could not translate it into an item!" ); + SAL_WARN("svx.form", "found a feature state for " << sUnoSlotNameAscii << ", but could not translate it into an item!" ); } #endif } @@ -954,7 +954,7 @@ namespace svx bNeedSelection = true; bNeedTextComponent = true; bNeedWriteableControl = true; - SAL_INFO("svx", "need to invalidate again" ); + SAL_INFO("svx.form", "need to invalidate again" ); m_bNeedClipboardInvalidation = true; break; @@ -1038,7 +1038,7 @@ namespace svx void FmTextControlShell::formActivated( const Reference< runtime::XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 - SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 )); + SAL_INFO("svx.form", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 )); #endif DBG_ASSERT( _rxController.is(), "FmTextControlShell::formActivated: invalid controller!" ); @@ -1064,7 +1064,7 @@ namespace svx void FmTextControlShell::formDeactivated( const Reference< runtime::XFormController >& _rxController ) { #if OSL_DEBUG_LEVEL > 0 - SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 )); + SAL_INFO("svx.form", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(_rxController.get()), 16 )); #endif (void)_rxController; @@ -1152,7 +1152,7 @@ namespace svx if ( m_xActiveTextComponent.is() ) { - SAL_INFO("svx", "stopping timer for clipboard invalidation" ); + SAL_INFO("svx.form", "stopping timer for clipboard invalidation" ); m_aClipboardInvalidation.Stop(); } // no more active control @@ -1217,7 +1217,7 @@ namespace svx if ( m_xActiveTextComponent.is() ) { - SAL_INFO("svx", "starting timer for clipboard invalidation" ); + SAL_INFO("svx.form", "starting timer for clipboard invalidation" ); m_aClipboardInvalidation.Start(); } @@ -1310,7 +1310,7 @@ namespace svx Reference< css::awt::XControl > xControl( _rEvent.Source, UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 - SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 )); + SAL_INFO("svx.form", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 )); #endif DBG_ASSERT( xControl.is(), "FmTextControlShell::focusGained: suspicious focus event!" ); @@ -1324,7 +1324,7 @@ namespace svx Reference< css::awt::XControl > xControl( _rEvent.Source, UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 - SAL_INFO("svx", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 )); + SAL_INFO("svx.form", "0x" << OUString::number( reinterpret_cast<sal_IntPtr>(xControl.get()), 16 )); #endif m_bActiveControl = false; diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 2f0b5cbe8bcb..45411186081a 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -319,12 +319,12 @@ int GalApp::Main() } catch (const uno::Exception& e) { - SAL_WARN("vcl.app", "Fatal exception: " << e.Message); + SAL_WARN("svx", "Fatal exception: " << e.Message); return EXIT_FAILURE; } catch (const std::exception &e) { - SAL_WARN("vcl.app", "Fatal exception: " << e.what()); + SAL_WARN("svx", "Fatal exception: " << e.what()); return 1; } diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index a16ce8dc3ffa..4b1d6b78904d 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -1382,7 +1382,7 @@ static bool lcl_CheckHiddenSection( SwNodeIndex& rIdx ) const SwNode* pFrameNd = rIdx.GetNodes().FindPrvNxtFrameNode( aTmp, pSectNd->EndOfSectionNode() ); bOk = pFrameNd != nullptr; - SAL_WARN_IF(!bOk, "sw", "found no Node with Frames"); + SAL_WARN_IF(!bOk, "sw.core", "found no Node with Frames"); rIdx = aTmp; } return bOk; @@ -1549,7 +1549,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd ) CheckTableBoxContent(); if(!m_pTableCursor) { - SAL_WARN("sw", "fdo#74854: " + SAL_WARN("sw.core", "fdo#74854: " "this should not happen, but better lose the selection " "rather than crashing"); return; diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 738ad8b6dfbe..067dadcb72dd 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2078,7 +2078,7 @@ void SwFrameFormats::DeleteAndDestroyAll( bool keepDefault ) std::pair<SwFrameFormats::const_iterator,bool> SwFrameFormats::push_back( const value_type& x ) { - SAL_WARN_IF(x->m_ffList != nullptr, "sw", "Inserting already assigned item"); + SAL_WARN_IF(x->m_ffList != nullptr, "sw.core", "Inserting already assigned item"); assert(x->m_ffList == nullptr); x->m_ffList = this; return m_PosIndex.push_back( x ); @@ -2087,7 +2087,7 @@ std::pair<SwFrameFormats::const_iterator,bool> SwFrameFormats::push_back( const bool SwFrameFormats::erase( const value_type& x ) { const_iterator const ret = find( x ); - SAL_WARN_IF(x->m_ffList != this, "sw", "Removing invalid / unassigned item"); + SAL_WARN_IF(x->m_ffList != this, "sw.core", "Removing invalid / unassigned item"); if (ret != end()) { assert( x == *ret ); m_PosIndex.erase( ret ); diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 431bc11c937e..73d2b38f85e3 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1396,7 +1396,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) SwClient::SwClientNotify(rMod, rHint); if (auto pLegacyHint = dynamic_cast<const sw::LegacyModifyHint*>(&rHint)) { - SAL_WARN_IF(mbDisconnectInProgress, "sw", "<SwDrawContact::Modify(..)> called during disconnection."); + SAL_WARN_IF(mbDisconnectInProgress, "sw.core", "<SwDrawContact::Modify(..)> called during disconnection."); const SfxPoolItem* pNew = pLegacyHint->m_pNew; sal_uInt16 nWhich = pNew ? pNew->Which() : 0; @@ -1435,7 +1435,7 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) maAnchoredDrawObj.DrawObj()->notifyShapePropertyChange(svx::ShapeProperty::TextDocAnchor); } else - SAL_WARN("sw", "SwDrawContact::Modify: no draw object here?"); + SAL_WARN("sw.core", "SwDrawContact::Modify: no draw object here?"); } } } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 230b5edd0de7..9c1d17a55758 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2539,7 +2539,7 @@ void SwFrameFormat::SetName( const OUString& rNewName, bool bBroadcast ) if (m_ffList != nullptr) { SwFrameFormats::iterator it = m_ffList->find( this ); assert( m_ffList->end() != it ); - SAL_INFO_IF(m_aFormatName == rNewName, "sw", "SwFrmFmt not really renamed, as both names are equal"); + SAL_INFO_IF(m_aFormatName == rNewName, "sw.core", "SwFrmFmt not really renamed, as both names are equal"); SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFormatName ); // As it's a non-unique list, rename should never fail! diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index bd5fef550b30..775059c5d966 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2789,7 +2789,7 @@ const SwContentFrame* SwFootnoteFrame::GetRef() const const SwContentFrame* pRefAttr = GetRefFromAttr(); SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr ) && !pRefAttr->IsAnFollow( pRef ), - "sw", "access to deleted Frame? pRef != pAttr->GetRef()" ); + "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" ); return pRef; } @@ -2798,7 +2798,7 @@ SwContentFrame* SwFootnoteFrame::GetRef() const SwContentFrame* pRefAttr = GetRefFromAttr(); SAL_WARN_IF( pRef != pRefAttr && !pRef->IsAnFollow( pRefAttr ) && !pRefAttr->IsAnFollow( pRef ), - "sw", "access to deleted Frame? pRef != pAttr->GetRef()" ); + "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" ); return pRef; } #endif diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 3592fc4e6008..d6d65727a625 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -1539,7 +1539,7 @@ lcl_getPrefixOrSuffix( uno::UNO_QUERY); if (!xObject.is()) continue; if (xEnum->hasMoreElements()) { - SAL_INFO("sw", "ignoring other odf:Prefix/odf:Suffix statements"); + SAL_INFO("sw.uno", "ignoring other odf:Prefix/odf:Suffix statements"); } return xObject->getValue(); } diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c3ebd97d479d..232403919894 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2195,7 +2195,7 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh if ( *pIt < 0x0020 ) // filter out the control codes { impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt ); - SAL_INFO("sw", "Ignored control code in a text run: " << *pIt ); + SAL_INFO("sw.ww8", "Ignored control code in a text run: " << *pIt ); } prevUnicode = *pIt; break; @@ -2207,12 +2207,12 @@ void DocxAttributeOutput::RunText( const OUString& rText, rtl_TextEncoding /*eCh void DocxAttributeOutput::RawText(const OUString& /*rText*/, rtl_TextEncoding /*eCharSet*/) { - SAL_INFO("sw", "TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::RawText( const String& rText, bool bForceUnicode, rtl_TextEncoding eCharSet )" ); } void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::StartRuby( const SwTextNode& rNode, const SwFormatRuby& rRuby )" ); EndRun(); // end run before starting ruby to avoid nested runs, and overlap assert(!m_closeHyperlinkInThisRun); // check that no hyperlink overlaps ruby assert(!m_closeHyperlinkInPreviousRun); @@ -2276,7 +2276,7 @@ void DocxAttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 nPos, co void DocxAttributeOutput::EndRuby() { - SAL_INFO("sw", "TODO DocxAttributeOutput::EndRuby()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::EndRuby()" ); EndRun( ); m_pSerializer->endElementNS( XML_w, XML_rubyBase ); m_pSerializer->endElementNS( XML_w, XML_ruby ); @@ -2558,7 +2558,7 @@ void DocxAttributeOutput::StartRedline( const SwRedlineData * pRedlineData ) break; case nsRedlineType_t::REDLINE_FORMAT: - SAL_INFO("sw", "TODO DocxAttributeOutput::StartRedline()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::StartRedline()" ); break; default: break; @@ -2581,7 +2581,7 @@ void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData ) break; case nsRedlineType_t::REDLINE_FORMAT: - SAL_INFO("sw", "TODO DocxAttributeOutput::EndRedline()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::EndRedline()" ); break; default: break; @@ -2590,7 +2590,7 @@ void DocxAttributeOutput::EndRedline( const SwRedlineData * pRedlineData ) void DocxAttributeOutput::FormatDrop( const SwTextNode& /*rNode*/, const SwFormatDrop& /*rSwFormatDrop*/, sal_uInt16 /*nStyle*/, ww8::WW8TableNodeInfo::Pointer_t /*pTextNodeInfo*/, ww8::WW8TableNodeInfoInner::Pointer_t ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle )" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FormatDrop( const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle )" ); } void DocxAttributeOutput::ParagraphStyle( sal_uInt16 nStyle ) @@ -3758,17 +3758,17 @@ void DocxAttributeOutput::TableNodeInfoInner( ww8::WW8TableNodeInfoInner::Pointe void DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ ) { - SAL_INFO("sw", "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )" ); + SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )" ); } void DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ ) { - SAL_INFO("sw", "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" ); + SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" ); } void DocxAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ ) { - SAL_INFO("sw", "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )" ); + SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableRowEnd( sal_uInt32 nDepth = 1 )" ); } void DocxAttributeOutput::StartStyles() @@ -4116,7 +4116,7 @@ void DocxAttributeOutput::EndStyles( sal_uInt16 nNumberOfStyles ) void DocxAttributeOutput::DefaultStyle() { // are these the values of enum ww::sti (see ../inc/wwstyles.hxx)? - SAL_INFO("sw", "TODO DocxAttributeOutput::DefaultStyle()"); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::DefaultStyle()"); } /* Writes <a:srcRect> tag back to document.xml if a file conatins a cropped image. @@ -4209,7 +4209,7 @@ void DocxAttributeOutput::CacheRelId(BitmapChecksum nChecksum, const OUString& r void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) - some stuff still missing" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) - some stuff still missing" ); GetSdtEndBefore(pSdrObj); @@ -4474,7 +4474,7 @@ void DocxAttributeOutput::WritePostponedChart() if( xChartDoc.is() ) { - SAL_INFO("sw", "DocxAttributeOutput::WriteOLE2Obj: export chart "); + SAL_INFO("sw.ww8", "DocxAttributeOutput::WriteOLE2Obj: export chart "); m_pSerializer->startElementNS( XML_w, XML_drawing, FSEND ); m_pSerializer->startElementNS( XML_wp, XML_inline, @@ -5046,7 +5046,7 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame &rFrame, const P } break; default: - SAL_INFO("sw", "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame, const Point& rNdTopLeft ) - frame type " << + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::OutputFlyFrame_Impl( const ww8::Frame& rFrame, const Point& rNdTopLeft ) - frame type " << ( rFrame.GetWriterType() == ww8::Frame::eTextBox ? "eTextBox": ( rFrame.GetWriterType() == ww8::Frame::eOle ? "eOle": "???" ) ) ); break; @@ -5462,7 +5462,7 @@ void DocxAttributeOutput::SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectio break; default: - SAL_INFO("sw", "Unknown section break to write: " << nC ); + SAL_INFO("sw.ww8", "Unknown section break to write: " << nC ); break; } } @@ -5757,7 +5757,7 @@ void DocxAttributeOutput::SectionPageNumbering( sal_uInt16 nNumType, const ::boo m_pSerializer->singleElementNS( XML_w, XML_pgNumType, xAttrs ); // see 2.6.12 pgNumType (Page Numbering Settings) - SAL_INFO("sw", "TODO DocxAttributeOutput::SectionPageNumbering()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::SectionPageNumbering()" ); } void DocxAttributeOutput::SectionType( sal_uInt8 nBreakCode ) @@ -6420,7 +6420,7 @@ void DocxAttributeOutput::CharWeight( const SvxWeightItem& rWeight ) void DocxAttributeOutput::CharAutoKern( const SvxAutoKernItem& ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::CharAutoKern()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::CharAutoKern()" ); } void DocxAttributeOutput::CharAnimatedText( const SvxBlinkItem& rBlink ) @@ -6645,7 +6645,7 @@ void DocxAttributeOutput::RefField( const SwField& rField, const OUString& rRef void DocxAttributeOutput::HiddenField( const SwField& /*rField*/ ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::HiddenField()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::HiddenField()" ); } void DocxAttributeOutput::PostitField( const SwField* pField ) @@ -7294,7 +7294,7 @@ void DocxAttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize ) void DocxAttributeOutput::FormatPaperBin( const SvxPaperBinItem& ) { - SAL_INFO("sw", "TODO DocxAttributeOutput::FormatPaperBin()" ); + SAL_INFO("sw.ww8", "TODO DocxAttributeOutput::FormatPaperBin()" ); } void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem& rLRSpace ) diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 0ae22daa9997..5f41a530dd56 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -348,7 +348,7 @@ void DocxExport::DoComboBox(const OUString& rName, void DocxExport::DoFormText(const SwInputField* /*pField*/) { - SAL_INFO("sw", "TODO DocxExport::ForFormText()" ); + SAL_INFO("sw.ww8", "TODO DocxExport::ForFormText()" ); } OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer ) @@ -521,12 +521,12 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode ) void DocxExport::OutputGrfNode( const SwGrfNode& ) { - SAL_INFO("sw", "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" ); + SAL_INFO("sw.ww8", "TODO DocxExport::OutputGrfNode( const SwGrfNode& )" ); } void DocxExport::OutputOLENode( const SwOLENode& ) { - SAL_INFO("sw", "TODO DocxExport::OutputOLENode( const SwOLENode& )" ); + SAL_INFO("sw.ww8", "TODO DocxExport::OutputOLENode( const SwOLENode& )" ); } void DocxExport::OutputLinkedOLE( const OUString& ) diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 4b39b7901b66..627b3e1e5cd6 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -3108,7 +3108,7 @@ void MSWordExportBase::OutputContentNode( const SwContentNode& rNode ) OutputOLENode( *rNode.GetOLENode() ); break; default: - SAL_WARN("sw", "Unhandled node, type == " << (int)rNode.GetNodeType() ); + SAL_WARN("sw.ww8", "Unhandled node, type == " << (int)rNode.GetNodeType() ); break; } } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 68894bdb3655..841816796d99 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -4755,7 +4755,7 @@ void SwWW8ImplReader::ReadDocInfo() Sttb aSttb; m_pTableStream->Seek( m_pWwFib->m_fcSttbfAssoc ); // point at tgc record if (!aSttb.Read( *m_pTableStream ) ) - SAL_WARN("sw", "** Read of SttbAssoc data failed!!!! "); + SAL_WARN("sw.ww8", "** Read of SttbAssoc data failed!!!! "); m_pTableStream->Seek( nCur ); // return to previous position, is that necessary? #if OSL_DEBUG_LEVEL > 1 aSttb.Print( stderr ); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index d9169ef84505..66327a29117e 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -154,7 +154,7 @@ sal_Int32 ReadThroughComponent( uno::Reference< xml::sax::XDocumentHandler > xFilter( rxContext->getServiceManager()->createInstanceWithArgumentsAndContext(aFilterName, rFilterArguments, rxContext), UNO_QUERY); - SAL_WARN_IF(!xFilter.is(), "sw", "Can't instantiate filter component: " << aFilterName); + SAL_WARN_IF(!xFilter.is(), "sw.filter", "Can't instantiate filter component: " << aFilterName); if( !xFilter.is() ) return ERR_SWG_READ_ERROR; SAL_INFO( "sw.filter", "" << pFilterName << " created" ); diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index fcaf9de3fa8f..fb86d2776306 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -912,7 +912,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) SAL_WARN_IF( officecfg::Office::Common::Undo::Steps::get() <= 0, - "sw", "/org.openoffice.Office.Common/Undo/Steps <= 0"); + "sw.ui", "/org.openoffice.Office.Common/Undo/Steps <= 0"); m_pWrtShell->DoUndo(); const bool bBrowse = m_pWrtShell->GetViewOptions()->getBrowseMode(); diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx index e4556be8c1c0..0245de35c640 100644 --- a/tools/source/datetime/tdate.cxx +++ b/tools/source/datetime/tdate.cxx @@ -103,7 +103,7 @@ inline sal_uInt16 ImplDaysInMonth( sal_uInt16 nMonth, sal_Int16 nYear ) void Date::setDateFromDMY( sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear ) { - SAL_WARN_IF( nYear == 0, "tools","Date::setDateFromDMY - sure about 0 year? It's not in the calendar."); + SAL_WARN_IF( nYear == 0, "tools.datetime", "Date::setDateFromDMY - sure about 0 year? It's not in the calendar."); if (nYear < 0) mnDate = (static_cast<sal_Int32>( nYear ) * 10000) - @@ -125,7 +125,7 @@ void Date::SetDate( sal_Int32 nNewDate ) // static sal_uInt16 Date::GetDaysInMonth( sal_uInt16 nMonth, sal_Int16 nYear ) { - SAL_WARN_IF( nMonth < 1 || 12 < nMonth, "tools", "Date::GetDaysInMonth - nMonth out of bounds " << nMonth); + SAL_WARN_IF( nMonth < 1 || 12 < nMonth, "tools.datetime", "Date::GetDaysInMonth - nMonth out of bounds " << nMonth); if (nMonth < 1) nMonth = 1; else if (12 < nMonth) diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx index 8c801f46d87e..c76e8a60b93e 100644 --- a/tools/source/generic/config.cxx +++ b/tools/source/generic/config.cxx @@ -661,14 +661,14 @@ Config::Config( const OUString& rFileName ) mnLockCount = 1; #ifdef DBG_UTIL - SAL_INFO("tools", "Config::Config( " << maFileName << " )"); + SAL_INFO("tools.generic", "Config::Config( " << maFileName << " )"); #endif } Config::~Config() { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::~Config()" ); + SAL_INFO("tools.generic", "Config::~Config()" ); #endif Flush(); @@ -809,7 +809,7 @@ OString Config::ReadKey(const OString& rKey) const OString Config::ReadKey(const OString& rKey, const OString& rDefault) const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::ReadKey( " << rKey << " ) from " << GetGroup() + SAL_INFO("tools.generic", "Config::ReadKey( " << rKey << " ) from " << GetGroup() << " in " << maFileName); #endif @@ -837,7 +837,7 @@ OString Config::ReadKey(const OString& rKey, const OString& rDefault) const void Config::WriteKey(const OString& rKey, const OString& rStr) { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::WriteKey( " << rKey << ", " << rStr << " ) to " + SAL_INFO("tools.generic", "Config::WriteKey( " << rKey << ", " << rStr << " ) to " << GetGroup() << " in " << maFileName); #endif @@ -940,7 +940,7 @@ void Config::DeleteKey(const OString& rKey) sal_uInt16 Config::GetKeyCount() const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::GetKeyCount() from " << GetGroup() << " in " << maFileName); + SAL_INFO("tools.generic", "Config::GetKeyCount() from " << GetGroup() << " in " << maFileName); #endif // Update config data if necessary @@ -968,7 +968,7 @@ sal_uInt16 Config::GetKeyCount() const OString Config::GetKeyName(sal_uInt16 nKey) const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::GetKeyName( " << OString::number(static_cast<sal_Int32>(nKey)) + SAL_INFO("tools.generic", "Config::GetKeyName( " << OString::number(static_cast<sal_Int32>(nKey)) << " ) from " << GetGroup() << " in " << maFileName); #endif @@ -996,7 +996,7 @@ OString Config::GetKeyName(sal_uInt16 nKey) const OString Config::ReadKey(sal_uInt16 nKey) const { #ifdef DBG_UTIL - SAL_INFO("tools", "Config::ReadKey( " << OString::number(static_cast<sal_Int32>(nKey)) + SAL_INFO("tools.generic", "Config::ReadKey( " << OString::number(static_cast<sal_Int32>(nKey)) << " ) from " << GetGroup() << " in " << maFileName); #endif diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index 230eb987d3e2..4670528609b7 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -161,7 +161,7 @@ ResMgrContainer::~ResMgrContainer() { for( std::pair< OUString, ContainerElement > const & rPair : m_aResFiles ) { - SAL_INFO("tools", "Resource file " << rPair.second.aFileURL << " loaded " << rPair.second.nLoadCount << " times"); + SAL_INFO("tools.rc", "Resource file " << rPair.second.aFileURL << " loaded " << rPair.second.nLoadCount << " times"); delete rPair.second.pResMgr; } } @@ -1237,7 +1237,7 @@ ResMgr* ResMgr::CreateFallbackResMgr( const ResId& rId, const Resource* pResourc ResMgrContainer::get().freeResMgr( pRes ); return nullptr; } - SAL_INFO("tools", "trying fallback: " << pRes->aFileName ); + SAL_INFO("tools.rc", "trying fallback: " << pRes->aFileName ); pFallback = new ResMgr( pRes ); pFallback->pOriginalResMgr = this; // try to recreate the resource stack diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx index d778180c4594..350ac64ecbcb 100644 --- a/tools/source/stream/stream.cxx +++ b/tools/source/stream/stream.cxx @@ -106,7 +106,7 @@ inline static void SwapDouble( double& r ) { if( sizeof(double) != 8 ) { - SAL_WARN( "tools", "Can only swap 8-Byte-doubles\n" ); + SAL_WARN( "tools.stream", "Can only swap 8-Byte-doubles\n" ); } else { @@ -1983,7 +1983,7 @@ OString read_uInt8s_ToOString(SvStream& rStrm, std::size_t nLen) //alloc a (ref-count 1) rtl_String of the desired length. //rtl_String's buffer is uninitialized, except for null termination pStr = rtl_string_alloc(sal::static_int_cast<sal_Int32>(nLen)); - SAL_WARN_IF(!pStr, "tools", "allocation failed"); + SAL_WARN_IF(!pStr, "tools.stream", "allocation failed"); if (pStr) { std::size_t nWasRead = rStrm.ReadBytes(pStr->buffer, nLen); @@ -2012,7 +2012,7 @@ OUString read_uInt16s_ToOUString(SvStream& rStrm, std::size_t nLen) //alloc a (ref-count 1) rtl_uString of the desired length. //rtl_String's buffer is uninitialized, except for null termination pStr = rtl_uString_alloc(sal::static_int_cast<sal_Int32>(nLen)); - SAL_WARN_IF(!pStr, "tools", "allocation failed"); + SAL_WARN_IF(!pStr, "tools.stream", "allocation failed"); if (pStr) { std::size_t nWasRead = rStrm.ReadBytes(pStr->buffer, nLen*2)/2; diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 5c5308040bb7..f58b87c14c10 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -372,7 +372,7 @@ OUString getExecutableBaseName() sExecutable = sExecutable.copy(0,nExtIndex); } else - SAL_WARN("unotools", "Cannot get executable name: osl_getExecutableFile failed"); + SAL_WARN("unotools.config", "Cannot get executable name: osl_getExecutableFile failed"); return sExecutable; } diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index bb68778e4da4..142f685984fb 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -1795,7 +1795,7 @@ void LocaleDataWrapper::outputCheckMessage( const char* pStr ) { fprintf( stderr, "\n%s\n", pStr); fflush( stderr); - SAL_WARN("unotools", pStr); + SAL_WARN("unotools.i18n", pStr); } // static diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 483ab6ef0691..9ad31af03771 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -127,7 +127,7 @@ void VCLSession::callSaveRequested( bool bShutdown ) m_bInteractionRequested = m_bInteractionGranted = !m_xSession; // answer the session manager even if no listeners available anymore - SAL_WARN_IF( aListeners.empty(), "vcl", "saveRequested but no listeners !" ); + SAL_WARN_IF( aListeners.empty(), "vcl.app", "saveRequested but no listeners !" ); if( aListeners.empty() ) { if (m_xSession) @@ -154,7 +154,7 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted ) m_bInteractionGranted = bInteractionGranted; // answer the session manager even if no listeners available anymore - SAL_WARN_IF( aListeners.empty(), "vcl", "interactionGranted but no listeners !" ); + SAL_WARN_IF( aListeners.empty(), "vcl.app", "interactionGranted but no listeners !" ); if( aListeners.empty() ) { if (m_xSession) diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 9057a50f0ff8..40c0e1c95830 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1270,7 +1270,7 @@ sal_uInt16 GraphicFilter::CanImportGraphic( const INetURLObject& rPath, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat ) { sal_uInt16 nRetValue = GRFILTER_FORMATERROR; - SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl", "GraphicFilter::CanImportGraphic() : ProtType == INetProtocol::NotValid" ); + SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl.filter", "GraphicFilter::CanImportGraphic() : ProtType == INetProtocol::NotValid" ); OUString aMainUrl( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); std::unique_ptr<SvStream> xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE )); @@ -1300,7 +1300,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject& sal_uInt16 nFormat, sal_uInt16 * pDeterminedFormat, GraphicFilterImportFlags nImportFlags ) { sal_uInt16 nRetValue = GRFILTER_FORMATERROR; - SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl", "GraphicFilter::ImportGraphic() : ProtType == INetProtocol::NotValid" ); + SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl.filter", "GraphicFilter::ImportGraphic() : ProtType == INetProtocol::NotValid" ); OUString aMainUrl( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); std::unique_ptr<SvStream> xStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE )); @@ -1791,7 +1791,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO { SAL_INFO( "vcl.filter", "GraphicFilter::ExportGraphic() (thb)" ); sal_uInt16 nRetValue = GRFILTER_FORMATERROR; - SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl", "GraphicFilter::ExportGraphic() : ProtType == INetProtocol::NotValid" ); + SAL_WARN_IF( rPath.GetProtocol() == INetProtocol::NotValid, "vcl.filter", "GraphicFilter::ExportGraphic() : ProtType == INetProtocol::NotValid" ); bool bAlreadyExists = DirEntryExists( rPath ); OUString aMainUrl( rPath.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ); diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx index 05b4f79431ed..7f91ffc3d14c 100644 --- a/vcl/source/filter/wmf/enhwmf.cxx +++ b/vcl/source/filter/wmf/enhwmf.cxx @@ -505,7 +505,7 @@ template <class T> tools::Polygon EnhWMFReader::ReadPolygon(sal_uInt32 nStartIndex, sal_uInt32 nPoints) { bool bRecordOk = nPoints <= SAL_MAX_UINT16; - SAL_WARN_IF(!bRecordOk, "vcl.filter", "polygon record has more polygons than we can handle"); + SAL_WARN_IF(!bRecordOk, "vcl.emf", "polygon record has more polygons than we can handle"); if (!bRecordOk) return tools::Polygon(); @@ -1552,7 +1552,7 @@ bool EnhWMFReader::ReadEnhWMF() if ( nOptions & ETO_RTLREADING ) nTextLayoutMode = ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft; pOut->SetTextLayoutMode( nTextLayoutMode ); - SAL_WARN_IF( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) != 0, "vcl", "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" ); + SAL_WARN_IF( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) != 0, "vcl.emf", "SJ: ETO_PDY || ETO_GLYPH_INDEX in EMF" ); Point aPos( ptlReferenceX, ptlReferenceY ); bool bLenSane = nLen > 0 && nLen < static_cast<sal_Int32>( SAL_MAX_UINT32 / sizeof(sal_Int32) ); diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index 0ddafcd87b18..33a53a3c57ab 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -357,7 +357,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) pOut->DrawPolygon(aPoly); } - SAL_WARN_IF(!bRecordOk, "vcl.filter", "polygon record has more points than we can handle"); + SAL_WARN_IF(!bRecordOk, "vcl.wmf", "polygon record has more points than we can handle"); bRecordOk &= pWMF->good(); @@ -400,7 +400,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) nPoints += pnPoints[a]; } - SAL_WARN_IF(!bRecordOk, "vcl.filter", "polypolygon record has more polygons than we can handle"); + SAL_WARN_IF(!bRecordOk, "vcl.wmf", "polypolygon record has more polygons than we can handle"); bRecordOk &= pWMF->good(); @@ -464,7 +464,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) pOut->DrawPolyLine( aPoly ); } - SAL_WARN_IF(!bRecordOk, "vcl.filter", "polyline record has more points than we can handle"); + SAL_WARN_IF(!bRecordOk, "vcl.wmf", "polyline record has more points than we can handle"); bRecordOk &= pWMF->good(); @@ -537,7 +537,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc ) if ( nOptions & ETO_RTLREADING ) nTextLayoutMode = ComplexTextLayoutFlags::BiDiRtl | ComplexTextLayoutFlags::TextOriginLeft; pOut->SetTextLayoutMode( nTextLayoutMode ); - SAL_WARN_IF( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) != 0, "vcl", "SJ: ETO_PDY || ETO_GLYPH_INDEX in WMF" ); + SAL_WARN_IF( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) != 0, "vcl.wmf", "SJ: ETO_PDY || ETO_GLYPH_INDEX in WMF" ); // output only makes sense if the text contains characters if( nLen ) diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 6baf993b0ef4..e2991df36b61 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -348,7 +348,7 @@ bool ImplConvertToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine, BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer ) { // help the compiler to avoid instantiations of unneeded conversions - SAL_WARN_IF( SRCFMT == DSTFMT, "vcl", "ImplConvertToBitmap into same format"); + SAL_WARN_IF( SRCFMT == DSTFMT, "vcl.gdi", "ImplConvertToBitmap into same format"); if( SRCFMT == DSTFMT ) return false; @@ -543,7 +543,7 @@ bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine, BitmapBuffer& rDstBuffer, const BitmapBuffer& rSrcBuffer, const BitmapBuffer& rMskBuffer ) { - SAL_WARN_IF( rMskBuffer.mnFormat != ScanlineFormat::N8BitPal, "vcl", "FastBmp BlendImage: unusual MSKFMT" ); + SAL_WARN_IF( rMskBuffer.mnFormat != ScanlineFormat::N8BitPal, "vcl.gdi", "FastBmp BlendImage: unusual MSKFMT" ); const int nSrcLinestep = rSrcBuffer.mnScanlineSize; int nMskLinestep = rMskBuffer.mnScanlineSize; diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 3ecd02cc6af8..304ce2112c85 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -347,7 +347,7 @@ void GDIMetaFile::Play( OutputDevice* pOut, size_t nPos ) pOut->SetLayoutMode( ComplexTextLayoutFlags::Default ); pOut->SetDigitLanguage( 0 ); - SAL_INFO( "vcl", "GDIMetaFile::Play on device of size: " << pOut->GetOutputSizePixel().Width() << " " << pOut->GetOutputSizePixel().Height()); + SAL_INFO( "vcl.gdi", "GDIMetaFile::Play on device of size: " << pOut->GetOutputSizePixel().Width() << " " << pOut->GetOutputSizePixel().Height()); if( !ImplPlayWithRenderer( pOut, Point(0,0), pOut->GetOutputSize() ) ) { size_t i = 0; @@ -435,7 +435,7 @@ bool GDIMetaFile::ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, S catch (const uno::Exception& e) { // ignore errors, no way of reporting them here - SAL_WARN("vcl", + SAL_WARN("vcl.gdi", "GDIMetaFile::ImplPlayWithRenderer: exception: " << e.Message); } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 1a6a2b7def25..78d341bfd0db 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1448,7 +1448,7 @@ void PDFWriterImpl::PDFPage::appendPolygon( const tools::Polygon& rPoly, OString if( pFlagArray && pFlagArray[i] == PolyFlags::Control && nPoints-i > 2 ) { // bezier - SAL_WARN_IF( pFlagArray[i+1] != PolyFlags::Control || pFlagArray[i+2] == PolyFlags::Control, "vcl", "unexpected sequence of control points" ); + SAL_WARN_IF( pFlagArray[i+1] != PolyFlags::Control || pFlagArray[i+2] == PolyFlags::Control, "vcl.pdfwriter", "unexpected sequence of control points" ); appendPoint( rPoly[i], rBuffer ); rBuffer.append( " " ); appendPoint( rPoly[i+1], rBuffer ); @@ -2351,7 +2351,7 @@ bool PDFWriterImpl::updateObject( sal_Int32 n ) sal_uInt64 nOffset = ~0U; osl::File::RC aError = m_aFile.getPos(nOffset); - SAL_WARN_IF( aError != osl::File::E_None, "vcl", "could not register object" ); + SAL_WARN_IF( aError != osl::File::E_None, "vcl.pdfwriter", "could not register object" ); if (aError != osl::File::E_None) { m_aFile.close(); @@ -2811,7 +2811,7 @@ bool PDFWriterImpl::emitTilings() for( std::vector<TilingEmit>::iterator it = m_aTilings.begin(); it != m_aTilings.end(); ++it ) { - SAL_WARN_IF( !it->m_pTilingStream, "vcl", "tiling without stream" ); + SAL_WARN_IF( !it->m_pTilingStream, "vcl.pdfwriter", "tiling without stream" ); if( ! it->m_pTilingStream ) continue; @@ -3296,8 +3296,8 @@ bool PDFWriterImpl::emitFonts() { sal_uInt8 nEnc = fit->second.getGlyphId(); - SAL_WARN_IF( aGlyphIds[nEnc] != 0 || pEncoding[nEnc] != 0, "vcl", "duplicate glyph" ); - SAL_WARN_IF( nEnc > lit->m_aMapping.size(), "vcl", "invalid glyph encoding" ); + SAL_WARN_IF( aGlyphIds[nEnc] != 0 || pEncoding[nEnc] != 0, "vcl.pdfwriter", "duplicate glyph" ); + SAL_WARN_IF( nEnc > lit->m_aMapping.size(), "vcl.pdfwriter", "invalid glyph encoding" ); aGlyphIds[ nEnc ] = fit->first; pEncoding[ nEnc ] = nEnc; @@ -3379,7 +3379,7 @@ bool PDFWriterImpl::emitFonts() sal_uInt64 nBytesRead = 0; if ( osl::File::E_None != aFontFile.read(xBuffer.get(), nLength1, nBytesRead) ) return false; - SAL_WARN_IF( nBytesRead!=nLength1, "vcl", "PDF-FontSubset read incomplete!" ); + SAL_WARN_IF( nBytesRead!=nLength1, "vcl.pdfwriter", "PDF-FontSubset read incomplete!" ); if ( osl::File::E_None != aFontFile.setPos(osl_Pos_Absolut, 0) ) return false; // get the PFB-segment lengths ThreeInts aSegmentLengths = {0,0,0}; @@ -7759,7 +7759,7 @@ bool PDFWriterImpl::emitTrailer() aLine.append( '0' ); aLine.append( aOffset ); aLine.append( " 00000 n \n" ); - SAL_WARN_IF( aLine.getLength() != 20, "vcl", "invalid xref entry" ); + SAL_WARN_IF( aLine.getLength() != 20, "vcl.pdfwriter", "invalid xref entry" ); CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) ); } @@ -7933,7 +7933,7 @@ void PDFWriterImpl::sortWidgets() } else { - SAL_WARN( "vcl", "wrong number of sorted annotations" ); + SAL_WARN( "vcl.pdfwriter", "wrong number of sorted annotations" ); #if OSL_DEBUG_LEVEL > 0 SAL_INFO("vcl.pdfwriter", "PDFWriterImpl::sortWidgets(): wrong number of sorted assertions " "on page nr " << (long int)it->first << ", " << @@ -9585,7 +9585,7 @@ void PDFWriterImpl::drawPolyPolygon( const tools::PolyPolygon& rPolyPoly ) void PDFWriterImpl::drawTransparent( const tools::PolyPolygon& rPolyPoly, sal_uInt32 nTransparentPercent ) { - SAL_WARN_IF( nTransparentPercent > 100, "vcl", "invalid alpha value" ); + SAL_WARN_IF( nTransparentPercent > 100, "vcl.pdfwriter", "invalid alpha value" ); nTransparentPercent = nTransparentPercent % 100; MARK( "drawTransparent" ); @@ -9745,7 +9745,7 @@ void PDFWriterImpl::beginTransparencyGroup() void PDFWriterImpl::endTransparencyGroup( const Rectangle& rBoundingBox, sal_uInt32 nTransparentPercent ) { - SAL_WARN_IF( nTransparentPercent > 100, "vcl", "invalid alpha value" ); + SAL_WARN_IF( nTransparentPercent > 100, "vcl.pdfwriter", "invalid alpha value" ); nTransparentPercent = nTransparentPercent % 100; if( m_aContext.Version >= PDFWriter::PDF_1_4 ) @@ -10110,7 +10110,7 @@ void PDFWriterImpl::drawPolyLine( const tools::Polygon& rPoly, const LineInfo& r void PDFWriterImpl::convertLineInfoToExtLineInfo( const LineInfo& rIn, PDFWriter::ExtLineInfo& rOut ) { - SAL_WARN_IF( rIn.GetStyle() != LineStyle::Dash, "vcl", "invalid conversion" ); + SAL_WARN_IF( rIn.GetStyle() != LineStyle::Dash, "vcl.pdfwriter", "invalid conversion" ); rOut.m_fLineWidth = rIn.GetWidth(); rOut.m_fTransparency = 0.0; rOut.m_eCap = PDFWriter::capButt; @@ -10826,13 +10826,13 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask ) { aBitmap = getExportBitmap(rObject.m_aBitmap.GetMask()); aBitmap.Convert( BMP_CONVERSION_1BIT_THRESHOLD ); - SAL_WARN_IF( aBitmap.GetBitCount() != 1, "vcl", "mask conversion failed" ); + SAL_WARN_IF( aBitmap.GetBitCount() != 1, "vcl.pdfwriter", "mask conversion failed" ); } else if( aBitmap.GetBitCount() != 8 ) { aBitmap = getExportBitmap(rObject.m_aBitmap.GetAlpha().GetBitmap()); aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS ); - SAL_WARN_IF( aBitmap.GetBitCount() != 8, "vcl", "alpha mask conversion failed" ); + SAL_WARN_IF( aBitmap.GetBitCount() != 8, "vcl.pdfwriter", "alpha mask conversion failed" ); } } @@ -10898,7 +10898,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask ) { // #i47395# 1 bit bitmaps occasionally have an inverted grey palette sal_Int32 nBlackIndex = pAccess->GetBestPaletteIndex( BitmapColor( Color( COL_BLACK ) ) ); - SAL_WARN_IF( nBlackIndex != 0 && nBlackIndex != 1, "vcl", "wrong black index" ); + SAL_WARN_IF( nBlackIndex != 0 && nBlackIndex != 1, "vcl.pdfwriter", "wrong black index" ); if( nBlackIndex == 1 ) aLine.append( "/Decode[1 0]\n" ); } @@ -10954,7 +10954,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask ) { aLine.append( "/ImageMask true\n" ); sal_Int32 nBlackIndex = pAccess->GetBestPaletteIndex( BitmapColor( Color( COL_BLACK ) ) ); - SAL_WARN_IF( nBlackIndex != 0 && nBlackIndex != 1, "vcl", "wrong black index" ); + SAL_WARN_IF( nBlackIndex != 0 && nBlackIndex != 1, "vcl.pdfwriter", "wrong black index" ); if( nBlackIndex ) aLine.append( "/Decode[ 1 0 ]\n" ); else @@ -12102,7 +12102,7 @@ sal_Int32 PDFWriterImpl::beginStructureElement( PDFWriter::StructElement eType, if( childType == PDFWriter::Document ) { m_nCurrentStructElement = nNewCurElement; - SAL_WARN( "vcl", "Structure element inserted to StructTreeRoot that is not a document" ); + SAL_WARN( "vcl.pdfwriter", "Structure element inserted to StructTreeRoot that is not a document" ); } else { OSL_FAIL( "document structure in disorder !" ); @@ -12898,7 +12898,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget& rControl, sa rNewWidget.m_eType = PDFWriter::CheckBox; rNewWidget.m_nRadioGroup = rBtn.RadioGroup; - SAL_WARN_IF( nRadioGroupWidget < 0 || nRadioGroupWidget >= (sal_Int32)m_aWidgets.size(), "vcl", "no radio group parent" ); + SAL_WARN_IF( nRadioGroupWidget < 0 || nRadioGroupWidget >= (sal_Int32)m_aWidgets.size(), "vcl.pdfwriter", "no radio group parent" ); PDFWidget& rRadioButton = m_aWidgets[nRadioGroupWidget]; rRadioButton.m_aKids.push_back( rNewWidget.m_nObject ); diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index e058dbc4c3a1..1d4a6c343eae 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -625,7 +625,7 @@ bool PNGReaderImpl::ImplReadHeader( const Size& rPreviewSizeHint ) } if( aPreviewSize.Width() < maOrigSize.Width() && aPreviewSize.Height() < maOrigSize.Height() ) { - SAL_INFO( "vcl", "preview size " << aPreviewSize.Width() << " " << aPreviewSize.Height() ); + SAL_INFO( "vcl.gdi", "preview size " << aPreviewSize.Width() << " " << aPreviewSize.Height() ); for( int i = 1; i < 5; ++i ) { diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index da2305cd66ba..a0b9218013a8 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -314,21 +314,21 @@ void Printer::EmulateDrawTransparent ( const tools::PolyPolygon& rPolyPoly, void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/ ) { - SAL_WARN( "vcl", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); + SAL_WARN( "vcl.gdi", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); } void Printer::DrawOutDev( const Point& /*rDestPt*/, const Size& /*rDestSize*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/, const OutputDevice& /*rOutDev*/ ) { - SAL_WARN( "vcl", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); + SAL_WARN( "vcl.gdi", "Don't use OutputDevice::DrawOutDev(...) with printer devices!" ); } void Printer::CopyArea( const Point& /*rDestPt*/, const Point& /*rSrcPt*/, const Size& /*rSrcSize*/, bool /*bWindowInvalidate*/ ) { - SAL_WARN( "vcl", "Don't use OutputDevice::CopyArea(...) with printer devices!" ); + SAL_WARN( "vcl.gdi", "Don't use OutputDevice::CopyArea(...) with printer devices!" ); } void Printer::SetPrinterOptions( const PrinterOptions& i_rOptions ) @@ -965,8 +965,8 @@ Printer::~Printer() void Printer::dispose() { - SAL_WARN_IF( IsPrinting(), "vcl", "Printer::~Printer() - Job is printing" ); - SAL_WARN_IF( IsJobActive(), "vcl", "Printer::~Printer() - Job is active" ); + SAL_WARN_IF( IsPrinting(), "vcl.gdi", "Printer::~Printer() - Job is printing" ); + SAL_WARN_IF( IsJobActive(), "vcl.gdi", "Printer::~Printer() - Job is active" ); delete mpPrinterOptions; mpPrinterOptions = nullptr; @@ -1654,7 +1654,7 @@ bool Printer::EndJob() if ( !IsJobActive() ) return bRet; - SAL_WARN_IF( mbInPrintPage, "vcl", "Printer::EndJob() - StartPage() without EndPage() called" ); + SAL_WARN_IF( mbInPrintPage, "vcl.gdi", "Printer::EndJob() - StartPage() without EndPage() called" ); mbJobActive = false; diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index b9de9928cc76..196b908d26b1 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -1465,7 +1465,7 @@ void PrinterController::setValue( const css::beans::PropertyValue& i_rPropertyVa void PrinterController::setUIOptions( const css::uno::Sequence< css::beans::PropertyValue >& i_rOptions ) { - SAL_WARN_IF( mpImplData->maUIOptions.getLength() != 0, "vcl", "setUIOptions called twice !" ); + SAL_WARN_IF( mpImplData->maUIOptions.getLength() != 0, "vcl.gdi", "setUIOptions called twice !" ); mpImplData->maUIOptions = i_rOptions; @@ -1911,7 +1911,7 @@ css::uno::Any PrinterOptionsHelper::setUIControlOpt(const css::uno::Sequence< OU for( sal_Int32 i = 0; i < nAddProps; i++ ) aCtrl[ nUsed++ ] = i_rControlOptions.maAddProps[i]; - SAL_WARN_IF( nUsed != nElements, "vcl", "nUsed != nElements, probable heap corruption" ); + SAL_WARN_IF( nUsed != nElements, "vcl.gdi", "nUsed != nElements, probable heap corruption" ); return css::uno::makeAny( aCtrl ); } diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx index 2eb763093c25..18f7f1759ce0 100644 --- a/vcl/source/gdi/svmconverter.cxx +++ b/vcl/source/gdi/svmconverter.cxx @@ -530,7 +530,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) sal_Int32 nActBegin = rIStm.Tell(); rIStm.ReadInt32( nActionSize ); - SAL_WARN_IF( ( nType > 33 ) && ( nType < 1024 ), "vcl", "Unknown GDIMetaAction while converting!" ); + SAL_WARN_IF( ( nType > 33 ) && ( nType < 1024 ), "vcl.gdi", "Unknown GDIMetaAction while converting!" ); switch( nType ) { @@ -863,7 +863,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm.ReadUChar( nTerminator ); - SAL_WARN_IF( nTerminator != 0, "vcl", "expected string to be NULL terminated" ); + SAL_WARN_IF( nTerminator != 0, "vcl.gdi", "expected string to be NULL terminated" ); OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if ( nUnicodeCommentActionNumber == i ) @@ -884,7 +884,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm.ReadUChar( nTerminator ); - SAL_WARN_IF( nTerminator != 0, "vcl", "expected string to be NULL terminated" ); + SAL_WARN_IF( nTerminator != 0, "vcl.gdi", "expected string to be NULL terminated" ); OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); @@ -943,7 +943,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) OString aByteStr = read_uInt8s_ToOString(rIStm, nTmp); sal_uInt8 nTerminator = 0; rIStm.ReadUChar( nTerminator ); - SAL_WARN_IF( nTerminator != 0, "vcl", "expected string to be NULL terminated" ); + SAL_WARN_IF( nTerminator != 0, "vcl.gdi", "expected string to be NULL terminated" ); OUString aStr(OStringToOUString(aByteStr, eActualCharSet)); if ( nUnicodeCommentActionNumber == i ) diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index 1d3bc028dc73..fbd59bdb83b4 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -212,7 +212,7 @@ VirtualDevice::VirtualDevice(DeviceFormat eFormat) meRefDevMode( RefDevMode::NONE ), mbForceZeroExtleadBug( false ) { - SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); + SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); ImplInitVirDev(Application::GetDefaultDevice(), 0, 0, eFormat); } @@ -222,7 +222,7 @@ VirtualDevice::VirtualDevice(const OutputDevice& rCompDev, DeviceFormat eFormat) meRefDevMode( RefDevMode::NONE ), mbForceZeroExtleadBug( false ) { - SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); + SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); ImplInitVirDev(&rCompDev, 0, 0, eFormat); } @@ -232,7 +232,7 @@ VirtualDevice::VirtualDevice(const OutputDevice& rCompDev, DeviceFormat eFormat, , meRefDevMode( RefDevMode::NONE ) , mbForceZeroExtleadBug( false ) { - SAL_INFO( "vcl.gdi", + SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << ", " << static_cast<int>(eAlphaFormat) << " )" ); ImplInitVirDev(&rCompDev, 0, 0, eFormat); @@ -247,7 +247,7 @@ VirtualDevice::VirtualDevice(const SystemGraphicsData *pData, const Size &rSize, meRefDevMode( RefDevMode::NONE ), mbForceZeroExtleadBug( false ) { - SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); + SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); ImplInitVirDev(Application::GetDefaultDevice(), rSize.Width(), rSize.Height(), eFormat, pData); @@ -255,13 +255,13 @@ VirtualDevice::VirtualDevice(const SystemGraphicsData *pData, const Size &rSize, VirtualDevice::~VirtualDevice() { - SAL_INFO( "vcl.gdi", "VirtualDevice::~VirtualDevice()" ); + SAL_INFO( "vcl.virdev", "VirtualDevice::~VirtualDevice()" ); disposeOnce(); } void VirtualDevice::dispose() { - SAL_INFO( "vcl.gdi", "VirtualDevice::dispose()" ); + SAL_INFO( "vcl.virdev", "VirtualDevice::dispose()" ); ImplSVData* pSVData = ImplGetSVData(); @@ -286,7 +286,7 @@ void VirtualDevice::dispose() bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, sal_uInt8 *const pBuffer) { - SAL_INFO( "vcl.gdi", + SAL_INFO( "vcl.virdev", "VirtualDevice::InnerImplSetOutputSizePixel( " << rNewSize.Width() << ", " << rNewSize.Height() << ", " << int(bErase) << " )" ); @@ -462,7 +462,7 @@ void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode ) { case RefDevMode::NONE: default: - SAL_WARN( "vcl", "VDev::SetRefDev illegal argument!" ); + SAL_WARN( "vcl.virdev", "VDev::SetRefDev illegal argument!" ); break; case RefDevMode::Dpi600: nDPIX = nDPIY = 600; diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx index 29bdbc00a4a8..f72ee83c0f4e 100644 --- a/vcl/source/image/ImageList.cxx +++ b/vcl/source/image/ImageList.cxx @@ -39,7 +39,7 @@ ImageList::ImageList() ImageList::ImageList(const ResId& rResId) { - SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList( const ResId& rResId )" ); + SAL_INFO( "vcl", "vcl: ImageList::ImageList( const ResId& rResId )" ); rResId.SetRT( RSC_IMAGELIST ); @@ -77,7 +77,7 @@ ImageList::ImageList(const ResId& rResId) ImageList::ImageList(const std::vector< OUString >& rNameVector, const OUString& rPrefix) { - SAL_INFO( "vcl.gdi", "vcl: ImageList::ImageList(const vector< OUString >& ..." ); + SAL_INFO( "vcl", "vcl: ImageList::ImageList(const vector< OUString >& ..." ); ImplInit( sal::static_int_cast< sal_uInt16 >( rNameVector.size() ), Size() ); @@ -324,7 +324,7 @@ OUString ImageList::GetImageName( sal_uInt16 nPos ) const void ImageList::GetImageNames( std::vector< OUString >& rNames ) const { - SAL_INFO( "vcl.gdi", "vcl: ImageList::GetImageNames" ); + SAL_INFO( "vcl", "vcl: ImageList::GetImageNames" ); rNames = std::vector< OUString >(); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index fe5e49c09d86..7d50895ef98f 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -1476,7 +1476,6 @@ sal_Int32 OutputDevice::ValidateKashidas ( const OUString& rTxt, bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ) { - rVector.clear(); if( nIndex >= rStr.getLength() ) @@ -1510,8 +1509,8 @@ sal_Int32 OutputDevice::HasGlyphs( const vcl::Font& rTempFont, const OUString& r else nEnd = std::min( rStr.getLength(), nIndex + nLen ); - SAL_WARN_IF( nIndex >= nEnd, "vcl", "StartPos >= EndPos?" ); - SAL_WARN_IF( nEnd > rStr.getLength(), "vcl", "String too short" ); + SAL_WARN_IF( nIndex >= nEnd, "vcl.gdi", "StartPos >= EndPos?" ); + SAL_WARN_IF( nEnd > rStr.getLength(), "vcl.gdi", "String too short" ); // to get the map temporarily set font const vcl::Font aOrigFont = GetFont(); diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 55cf14f8bb64..c89aeb600055 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -46,7 +46,7 @@ static Fraction ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) { if( nD1 == 0 || nD2 == 0 ) //under these bad circumstances the following while loop will be endless { - SAL_WARN("vcl", "Invalid parameter for ImplMakeFraction"); + SAL_WARN("vcl.gdi", "Invalid parameter for ImplMakeFraction"); return Fraction( 1, 1 ); } @@ -703,7 +703,7 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) mpMetaFile->AddAction( new MetaMapModeAction( rNewMapMode ) ); #ifdef DBG_UTIL if ( GetOutDevType() != OUTDEV_PRINTER ) - SAL_WARN_IF( !bRelMap, "vcl", "Please record only relative MapModes!" ); + SAL_WARN_IF( !bRelMap, "vcl.gdi", "Please record only relative MapModes!" ); #endif } @@ -1511,17 +1511,17 @@ static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest ) && eUnitDest != MapUnit::MapAppFont && eUnitDest != MapUnit::MapRelative, "Destination MapUnit is not permitted" ); - SAL_WARN_IF( eUnitSource == MapUnit::MapPixel, "vcl", + SAL_WARN_IF( eUnitSource == MapUnit::MapPixel, "vcl.gdi", "MapUnit::MapPixel approximated with 72dpi" ); - SAL_WARN_IF( eUnitDest == MapUnit::MapPixel, "vcl", + SAL_WARN_IF( eUnitDest == MapUnit::MapPixel, "vcl.gdi", "MapUnit::MapPixel approximated with 72dpi" ); } #define ENTER3( eUnitSource, eUnitDest ) \ long nNumerator = 1; \ long nDenominator = 1; \ - SAL_WARN_IF( eUnitSource > s_MaxValidUnit, "vcl", "Invalid source map unit"); \ - SAL_WARN_IF( eUnitDest > s_MaxValidUnit, "vcl", "Invalid destination map unit"); \ + SAL_WARN_IF( eUnitSource > s_MaxValidUnit, "vcl.gdi", "Invalid source map unit"); \ + SAL_WARN_IF( eUnitDest > s_MaxValidUnit, "vcl.gdi", "Invalid destination map unit"); \ if( (eUnitSource <= s_MaxValidUnit) && (eUnitDest <= s_MaxValidUnit) ) \ { \ nNumerator = aImplNumeratorAry[eUnitSource] * \ diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 5cb45be03b09..ccf2e929d771 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -222,7 +222,7 @@ SalGraphics* OutputDevice::GetGraphics() { if ( !AcquireGraphics() ) { - SAL_WARN("vcl", "No mpGraphics set"); + SAL_WARN("vcl.gdi", "No mpGraphics set"); } } @@ -237,7 +237,7 @@ SalGraphics const *OutputDevice::GetGraphics() const { if ( !AcquireGraphics() ) { - SAL_WARN("vcl", "No mpGraphics set"); + SAL_WARN("vcl.gdi", "No mpGraphics set"); } } @@ -635,7 +635,7 @@ void OutputDevice::drawOutDevDirect( const OutputDevice* pSrcDev, SalTwoRect& rP if ( !AcquireGraphics() ) return; } - SAL_WARN_IF( !mpGraphics || !pSrcDev->mpGraphics, "vcl", + SAL_WARN_IF( !mpGraphics || !pSrcDev->mpGraphics, "vcl.gdi", "OutputDevice::DrawOutDev(): We need more than one Graphics" ); } } diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx index 64b25881cc17..42ef07f056f0 100644 --- a/vcl/source/window/accel.cxx +++ b/vcl/source/window/accel.cxx @@ -218,7 +218,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const vcl::KeyCode& rKeyC } else if ( !mpData->maKeyMap.insert( std::make_pair( nCode, pEntry ) ).second ) { - SAL_WARN( "vcl.layout", "Accelerator::InsertItem(): KeyCode (Key: " << nCode << ") already exists" ); + SAL_WARN( "vcl", "Accelerator::InsertItem(): KeyCode (Key: " << nCode << ") already exists" ); delete pEntry; } else diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 98f9bf9448fc..e0e1a936f5d9 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1328,7 +1328,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP bool bOutput = IsOutputEnabled(); EnableOutput(); - SAL_WARN_IF( GetMapMode().GetMapUnit() != MapUnit::MapPixel, "vcl", "MapMode must be PIXEL based" ); + SAL_WARN_IF( GetMapMode().GetMapUnit() != MapUnit::MapPixel, "vcl.window", "MapMode must be PIXEL based" ); if ( GetMapMode().GetMapUnit() != MapUnit::MapPixel ) return; @@ -1441,8 +1441,8 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& / { // FIXME: scaling: currently this is for pixel copying only - SAL_WARN_IF( pDev->HasMirroredGraphics(), "vcl", "PaintToDevice to mirroring graphics" ); - SAL_WARN_IF( pDev->IsRTLEnabled(), "vcl", "PaintToDevice to mirroring device" ); + SAL_WARN_IF( pDev->HasMirroredGraphics(), "vcl.window", "PaintToDevice to mirroring graphics" ); + SAL_WARN_IF( pDev->IsRTLEnabled(), "vcl.window", "PaintToDevice to mirroring device" ); vcl::Window* pRealParent = nullptr; if( ! mpWindowImpl->mbVisible ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1bf8a4defef3..9d576db7ed28 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -241,9 +241,9 @@ void Window::dispose() if ( pSVData->maHelpData.mpHelpWin && (pSVData->maHelpData.mpHelpWin->GetParent() == this) ) ImplDestroyHelpWindow( true ); - SAL_WARN_IF( pSVData->maWinData.mpTrackWin.get() == this, "vcl", + SAL_WARN_IF( pSVData->maWinData.mpTrackWin.get() == this, "vcl.window", "Window::~Window(): Window is in TrackingMode" ); - SAL_WARN_IF(IsMouseCaptured(), "vcl", + SAL_WARN_IF(IsMouseCaptured(), "vcl.window", "Window::~Window(): Window has the mouse captured"); // due to old compatibility @@ -519,7 +519,7 @@ void Window::dispose() auto myPos = ::std::find( pParentWinData->maTopWindowChildren.begin(), pParentWinData->maTopWindowChildren.end(), VclPtr<vcl::Window>(this) ); - SAL_WARN_IF( myPos == pParentWinData->maTopWindowChildren.end(), "vcl", "Window::~Window: inconsistency in top window chain!" ); + SAL_WARN_IF( myPos == pParentWinData->maTopWindowChildren.end(), "vcl.window", "Window::~Window: inconsistency in top window chain!" ); if ( myPos != pParentWinData->maTopWindowChildren.end() ) pParentWinData->maTopWindowChildren.erase( myPos ); } @@ -549,7 +549,7 @@ void Window::dispose() pSysWin->mpWindowImpl->mpFrameData->mpNextFrame = mpWindowImpl->mpFrameData->mpNextFrame; } else // if it is not in the list, we can't remove it. - SAL_WARN("vcl", "Window " << this << " marked as frame window, " + SAL_WARN("vcl.window", "Window " << this << " marked as frame window, " "is missing from list of " << nWindows << " frames"); } mpWindowImpl->mpFrame->SetCallback( nullptr, nullptr ); @@ -902,7 +902,7 @@ static sal_Int32 CountDPIScaleFactor(sal_Int32 nDPI) void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData ) { - SAL_WARN_IF( !mpWindowImpl->mbFrame && !pParent && GetType() != WINDOW_FIXEDIMAGE, "vcl", + SAL_WARN_IF( !mpWindowImpl->mbFrame && !pParent && GetType() != WINDOW_FIXEDIMAGE, "vcl.window", "Window::Window(): pParent == NULL" ); ImplSVData* pSVData = ImplGetSVData(); @@ -3173,7 +3173,7 @@ Reference< css::awt::XWindowPeer > Window::GetComponentInterface( bool bCreate ) void Window::SetComponentInterface( Reference< css::awt::XWindowPeer > const & xIFace ) { UnoWrapperBase* pWrapper = Application::GetUnoWrapper(); - SAL_WARN_IF( !pWrapper, "vcl", "SetComponentInterface: No Wrapper!" ); + SAL_WARN_IF( !pWrapper, "vcl.window", "SetComponentInterface: No Wrapper!" ); if ( pWrapper ) pWrapper->SetWindowInterface( this, xIFace ); } diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 63de2b436765..5a937fcdb234 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -549,11 +549,9 @@ cairo::SurfaceSharedPtr X11SalGraphics::CreateBitmapSurface( const OutputDevice& const BitmapSystemData& rData, const Size& rSize ) const { - SAL_INFO( - "canvas.cairo", - "requested size: " << rSize.Width() << " x " << rSize.Height() - << " available size: " << rData.mnWidth << " x " - << rData.mnHeight); + SAL_INFO("vcl", "requested size: " << rSize.Width() << " x " << rSize.Height() + << " available size: " << rData.mnWidth << " x " + << rData.mnHeight); if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() ) { if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW ) diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index cc661fb839b9..00ed8860c3e2 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -540,11 +540,11 @@ void CUPSManager::setupJobContextData( JobData& rData ) FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand ) { - SAL_INFO( "vcl", "startSpool: " << rPrintername << " " << (bQuickCommand ? "true" : "false") ); + SAL_INFO( "vcl.unx.print", "startSpool: " << rPrintername << " " << (bQuickCommand ? "true" : "false") ); if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() ) { - SAL_INFO( "vcl", "defer to PrinterInfoManager::startSpool" ); + SAL_INFO( "vcl.unx.print", "defer to PrinterInfoManager::startSpool" ); return PrinterInfoManager::startSpool( rPrintername, bQuickCommand ); } @@ -617,7 +617,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner, const OUString& rFaxNumber ) { - SAL_INFO( "vcl", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies ); + SAL_INFO( "vcl.unx.print", "endSpool: " << rPrintername << "," << rJobTitle << " copy count = " << rDocumentJobData.m_nCopies ); int nJobID = 0; @@ -627,7 +627,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi m_aCUPSDestMap.find( rPrintername ); if( dest_it == m_aCUPSDestMap.end() ) { - SAL_INFO( "vcl", "defer to PrinterInfoManager::endSpool" ); + SAL_INFO( "vcl.unx.print", "defer to PrinterInfoManager::endSpool" ); return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData, bBanner, rFaxNumber ); } diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 72d7cfa297f7..234ed35d5100 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -717,40 +717,40 @@ PPDParser::PPDParser( const OUString& rFile ) : if( m_pImageableAreas ) m_pDefaultImageableArea = m_pImageableAreas->getDefaultValue(); if (m_pImageableAreas == nullptr) { - SAL_WARN( "vcl", "no ImageableArea in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no ImageableArea in " << m_aFile); } if (m_pDefaultImageableArea == nullptr) { - SAL_WARN( "vcl", "no DefaultImageableArea in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no DefaultImageableArea in " << m_aFile); } m_pPaperDimensions = getKey( OUString( "PaperDimension" ) ); if( m_pPaperDimensions ) m_pDefaultPaperDimension = m_pPaperDimensions->getDefaultValue(); if (m_pPaperDimensions == nullptr) { - SAL_WARN( "vcl", "no PaperDimensions in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no PaperDimensions in " << m_aFile); } if (m_pDefaultPaperDimension == nullptr) { - SAL_WARN( "vcl", "no DefaultPaperDimensions in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no DefaultPaperDimensions in " << m_aFile); } m_pResolutions = getKey( OUString( "Resolution" ) ); if( m_pResolutions ) m_pDefaultResolution = m_pResolutions->getDefaultValue(); if (m_pResolutions == nullptr) { - SAL_WARN( "vcl", "no Resolution in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no Resolution in " << m_aFile); } if (m_pDefaultResolution == nullptr) { - SAL_WARN( "vcl", "no DefaultResolution in " + m_aFile); + SAL_WARN( "vcl.unx.print", "no DefaultResolution in " + m_aFile); } m_pInputSlots = getKey( OUString( "InputSlot" ) ); if( m_pInputSlots ) m_pDefaultInputSlot = m_pInputSlots->getDefaultValue(); if (m_pInputSlots == nullptr) { - SAL_WARN( "vcl", "no InputSlot in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no InputSlot in " << m_aFile); } if (m_pDefaultInputSlot == nullptr) { - SAL_WARN( "vcl", "no DefaultInputSlot in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no DefaultInputSlot in " << m_aFile); } m_pDuplexTypes = getKey( OUString( "Duplex" ) ); @@ -759,7 +759,7 @@ PPDParser::PPDParser( const OUString& rFile ) : m_pFontList = getKey( OUString( "Font" ) ); if (m_pFontList == nullptr) { - SAL_WARN( "vcl", "no Font in " << m_aFile); + SAL_WARN( "vcl.unx.print", "no Font in " << m_aFile); } // fill in direct values diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 7d122b1d02aa..b31cc783c8d5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -161,7 +161,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext LABEL_TOGGLE( PREVIEW ); LABEL_TOGGLE( SELECTION ); default: - SAL_WARN( "vcl", "Handle unknown control " << i); + SAL_WARN( "vcl.gtk", "Handle unknown control " << i); break; } @@ -197,7 +197,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext LABEL_LIST( TEMPLATE ); LABEL_LIST( IMAGE_TEMPLATE ); default: - SAL_WARN( "vcl", "Handle unknown control " << i); + SAL_WARN( "vcl.gtk", "Handle unknown control " << i); break; } @@ -1078,7 +1078,7 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) MAP_LIST_LABEL( TEMPLATE ); MAP_LIST_LABEL( IMAGE_TEMPLATE ); default: - SAL_WARN( "vcl", "Handle unknown control " << nControlId); + SAL_WARN( "vcl.gtk", "Handle unknown control " << nControlId); break; } #undef MAP @@ -1166,7 +1166,7 @@ void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nContr } break; default: - SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction); + SAL_WARN( "vcl.gtk", "undocumented/unimplemented ControlAction for a list " << nControlAction); break; } @@ -1228,7 +1228,7 @@ uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nC } break; default: - SAL_WARN( "vcl", "undocumented/unimplemented ControlAction for a list " << nControlAction); + SAL_WARN( "vcl.gtk", "undocumented/unimplemented ControlAction for a list " << nControlAction); break; } return aAny; @@ -1245,7 +1245,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr GtkWidget *pWidget; if( !( pWidget = getWidget( nControlId, &tType ) ) ) - SAL_WARN( "vcl", "enable unknown control " << nControlId); + SAL_WARN( "vcl.gtk", "enable unknown control " << nControlId); else if( tType == GTK_TYPE_TOGGLE_BUTTON ) { bool bChecked = false; @@ -1256,7 +1256,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr HandleSetListValue(GTK_COMBO_BOX(pWidget), nControlAction, rValue); else { - SAL_WARN( "vcl", "Can't set value on button / list " << nControlId << " " << nControlAction ); + SAL_WARN( "vcl.gtk", "Can't set value on button / list " << nControlId << " " << nControlAction ); } } @@ -1273,13 +1273,13 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC GtkWidget *pWidget; if( !( pWidget = getWidget( nControlId, &tType ) ) ) - SAL_WARN( "vcl", "enable unknown control " << nControlId); + SAL_WARN( "vcl.gtk", "enable unknown control " << nControlId); else if( tType == GTK_TYPE_TOGGLE_BUTTON ) aRetval <<= bool( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ) ); else if( tType == GTK_TYPE_COMBO_BOX ) aRetval = HandleGetListValue(GTK_COMBO_BOX(pWidget), nControlAction); else - SAL_WARN( "vcl", "Can't get value on button / list " << nControlId << " " << nControlAction ); + SAL_WARN( "vcl.gtk", "Can't get value on button / list " << nControlId << " " << nControlAction ); return aRetval; } @@ -1305,7 +1305,7 @@ throw( uno::RuntimeException, std::exception ) } } else - SAL_WARN( "vcl", "enable unknown control " << nControlId ); + SAL_WARN( "vcl.gtk", "enable unknown control " << nControlId ); } void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel ) @@ -1320,7 +1320,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& if( !( pWidget = getWidget( nControlId, &tType ) ) ) { - SAL_WARN( "vcl", "Set label on unknown control " << nControlId); + SAL_WARN( "vcl.gtk", "Set label on unknown control " << nControlId); return; } @@ -1342,7 +1342,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& g_object_set( pWidget, "label", aTxt.getStr(), "use_underline", true, nullptr ); else - SAL_WARN( "vcl", "Can't set label on list"); + SAL_WARN( "vcl.gtk", "Can't set label on list"); } OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) @@ -1357,11 +1357,11 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) GtkWidget *pWidget; if( !( pWidget = getWidget( nControlId, &tType ) ) ) - SAL_WARN( "vcl", "Get label on unknown control " << nControlId); + SAL_WARN( "vcl.gtk", "Get label on unknown control " << nControlId); else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL ) aTxt = gtk_button_get_label( GTK_BUTTON( pWidget ) ); else - SAL_WARN( "vcl", "Can't get label on list"); + SAL_WARN( "vcl.gtk", "Can't get label on list"); return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 ); } @@ -1458,21 +1458,21 @@ void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *, GParamSpec *, { FilePickerEvent evt; evt.ElementId = LISTBOX_FILTER; - SAL_INFO( "vcl", "filter_changed, isn't it great " << pobjFP ); + SAL_INFO( "vcl.gtk", "filter_changed, isn't it great " << pobjFP ); pobjFP->impl_controlStateChanged( evt ); } void SalGtkFilePicker::folder_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP ) { FilePickerEvent evt; - SAL_INFO( "vcl", "folder_changed, isn't it great " << pobjFP ); + SAL_INFO( "vcl.gtk", "folder_changed, isn't it great " << pobjFP ); pobjFP->impl_directoryChanged( evt ); } void SalGtkFilePicker::selection_changed_cb( GtkFileChooser *, SalGtkFilePicker *pobjFP ) { FilePickerEvent evt; - SAL_INFO( "vcl", "selection_changed, isn't it great " << pobjFP ); + SAL_INFO( "vcl.gtk", "selection_changed, isn't it great " << pobjFP ); pobjFP->impl_fileSelectionChanged( evt ); } @@ -1747,7 +1747,7 @@ void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) OUString aShrunkName = shrinkFilterName( rFilter ); if( aShrunkName.equals( sFilterName) ) { - SAL_INFO( "vcl", "actually setting " << filtername ); + SAL_INFO( "vcl.gtk", "actually setting " << filtername ); gtk_file_chooser_set_filter( GTK_FILE_CHOOSER( m_pDialog ), pFilter ); bFound = true; } @@ -1818,7 +1818,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ), g_free ); - SAL_INFO( "vcl", "fustering with " << aToken ); + SAL_INFO( "vcl.gtk", "fustering with " << aToken ); } #if OSL_DEBUG_LEVEL > 0 else @@ -1936,7 +1936,7 @@ void SalGtkFilePicker::SetFilters() else if(!m_aCurrentFilter.isEmpty()) SetCurFilter( m_aCurrentFilter ); - SAL_INFO( "vcl", "end setting filters"); + SAL_INFO( "vcl.gtk", "end setting filters"); } SalGtkFilePicker::~SalGtkFilePicker() diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index c5cac3813e91..1f1a814828d3 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -2452,7 +2452,7 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings ) pGraphics = static_cast<GtkSalGraphics*>(AcquireGraphics()); if ( !pGraphics ) { - SAL_WARN("vcl", "Could not get graphics - unable to update settings"); + SAL_WARN("vcl.gtk", "Could not get graphics - unable to update settings"); return; } bFreeGraphics = true; @@ -3492,7 +3492,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent ) return true; else { - SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl", "key press has vanished !" ); + SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl.gtk", "key press has vanished !" ); if( ! m_aPrevKeyPresses.empty() ) // sanity check { // event was not swallowed, do not filter a following diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 01ed2c53a6fa..8c91660bd5df 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2348,7 +2348,7 @@ void GtkSalFrame::UpdateSettings( AllSettings& rSettings ) pGraphics = static_cast<GtkSalGraphics*>(AcquireGraphics()); if ( !pGraphics ) { - SAL_WARN("vcl", "Could not get graphics - unable to update settings"); + SAL_WARN("vcl.gtk3", "Could not get graphics - unable to update settings"); return; } bFreeGraphics = true; @@ -3708,7 +3708,7 @@ bool GtkSalFrame::IMHandler::handleKeyEvent( GdkEventKey* pEvent ) return true; else { - SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl", "key press has vanished !" ); + SAL_WARN_IF( m_nPrevKeyPresses <= 0, "vcl.gtk3", "key press has vanished !" ); if( ! m_aPrevKeyPresses.empty() ) // sanity check { // event was not swallowed, do not filter a following @@ -3927,7 +3927,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ for (int i = start; i < end; ++i) { SAL_WARN_IF(i >= static_cast<int>(pThis->m_aInputFlags.size()), - "vcl.gtk", "pango attrib out of range. Broken range: " + "vcl.gtk3", "pango attrib out of range. Broken range: " << start << "," << end << " Legal range: 0," << pThis->m_aInputFlags.size()); if (i >= static_cast<int>(pThis->m_aInputFlags.size())) @@ -4015,7 +4015,7 @@ static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(vcl:: } catch(const uno::Exception& e) { - SAL_WARN( "vcl.gtk", "Exception in getting input method surrounding text: " << e.Message); + SAL_WARN( "vcl.gtk3", "Exception in getting input method surrounding text: " << e.Message); } return xText; } diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 0a573445cf7e..185e5bd791d9 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -78,12 +78,12 @@ SAL_IMPLEMENT_MAIN() } catch (const Exception& e) { - SAL_WARN("vcl.app", "Fatal exception: " << e.Message); + SAL_WARN("vcl", "Fatal exception: " << e.Message); return 1; } catch (const std::exception& e) { - SAL_WARN("vcl.app", "Fatal exception: " << e.what()); + SAL_WARN("vcl", "Fatal exception: " << e.what()); return 1; } diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 0b89aa15dc4d..61f53e03219a 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -885,14 +885,14 @@ bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRow) { if (nRow >= static_cast<sal_Int32>(rTableRanges.size())) { - SAL_WARN("writerfilter", "m_aCellProperties not in sync with rTableRanges?"); + SAL_WARN("writerfilter.dmapper", "m_aCellProperties not in sync with rTableRanges?"); return false; } RowSequence_t rRowSeq = rTableRanges[nRow]; if (rRowSeq.getLength() == 0) { - SAL_WARN("writerfilter", "m_aCellProperties not in sync with rTableRanges?"); + SAL_WARN("writerfilter.dmapper", "m_aCellProperties not in sync with rTableRanges?"); return false; } @@ -908,7 +908,7 @@ bool lcl_emptyRow(std::vector<RowSequence_t>& rTableRanges, sal_Int32 nRow) } catch (const lang::IllegalArgumentException& e) { - SAL_WARN("writerfilter", "compareRegionStarts() failed: " << e.Message); + SAL_WARN( "writerfilter.dmapper", "compareRegionStarts() failed: " << e.Message); return false; } return true; diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 87d93bec313f..fec064cbc826 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -571,7 +571,7 @@ void DomainMapper_Impl::PopProperties(ContextType eId) PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId) { PropertyMapPtr pRet; - SAL_WARN_IF( m_aPropertyStacks[eId].empty(), "writerfilter", + SAL_WARN_IF( m_aPropertyStacks[eId].empty(), "writerfilter.dmapper", "no context of type " << static_cast<int>(eId) << " available"); if(!m_aPropertyStacks[eId].empty()) pRet = m_aPropertyStacks[eId].top(); @@ -587,7 +587,7 @@ uno::Reference< text::XTextAppend > DomainMapper_Impl::GetTopTextAppend() FieldContextPtr DomainMapper_Impl::GetTopFieldContext() { - SAL_WARN_IF(m_aFieldStack.empty(), "writerfilter", "Field stack is empty"); + SAL_WARN_IF(m_aFieldStack.empty(), "writerfilter.dmapper", "Field stack is empty"); return m_aFieldStack.top(); } @@ -662,7 +662,7 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId) //search until the property is set or no parent is available StyleSheetEntryPtr pNewEntry = GetStyleSheetTable()->FindParentStyleSheet(pEntry->sBaseStyleIdentifier); - SAL_WARN_IF( pEntry == pNewEntry, "writerfilter", "circular loop in style hierarchy?"); + SAL_WARN_IF( pEntry == pNewEntry, "writerfilter.dmapper", "circular loop in style hierarchy?"); if (pEntry == pNewEntry) //fdo#49587 break; @@ -1199,7 +1199,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap ) } catch(const uno::Exception& e) { - SAL_WARN( "writerfilter", "finishParagraph() exception: " << e.Message ); + SAL_WARN( "writerfilter.dmapper", "finishParagraph() exception: " << e.Message ); } } @@ -1630,7 +1630,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote ) } catch( const uno::Exception& e ) { - SAL_WARN("writerfilter", "exception in PushFootOrEndnote: " << e.Message); + SAL_WARN("writerfilter.dmapper", "exception in PushFootOrEndnote: " << e.Message); } } @@ -1748,7 +1748,7 @@ void DomainMapper_Impl::PushAnnotation() } catch( const uno::Exception& rException) { - SAL_WARN("writerfilter", "exception in PushAnnotation: " << rException.Message); + SAL_WARN("writerfilter.dmapper", "exception in PushAnnotation: " << rException.Message); } } @@ -1766,7 +1766,7 @@ void DomainMapper_Impl::PopFootOrEndnote() if (m_aRedlines.size() == 1) { - SAL_WARN("writerfilter", "PopFootOrEndnote() is called without PushFootOrEndnote()?"); + SAL_WARN("writerfilter.dmapper", "PopFootOrEndnote() is called without PushFootOrEndnote()?"); return; } m_aRedlines.pop(); @@ -1815,7 +1815,7 @@ void DomainMapper_Impl::PopAnnotation() } catch (uno::Exception const& e) { - SAL_WARN("writerfilter", + SAL_WARN("writerfilter.dmapper", "Cannot insert annotation field: exception: " << e.Message); } @@ -2007,7 +2007,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape } catch ( const uno::Exception& e ) { - SAL_WARN("writerfilter", "Exception when adding shape: " << e.Message); + SAL_WARN("writerfilter.dmapper", "Exception when adding shape: " << e.Message); } } /* @@ -2614,7 +2614,7 @@ void DomainMapper_Impl::ChainTextFrames() } catch (const uno::Exception& rException) { - SAL_WARN("writerfilter", "failed. message: " << rException.Message); + SAL_WARN("writerfilter.dmapper", "failed. message: " << rException.Message); } } @@ -4250,7 +4250,7 @@ void DomainMapper_Impl::CloseFieldCommand() } catch( const uno::Exception& e ) { - SAL_WARN( "writerfilter", "Exception in CloseFieldCommand(): " << e.Message ); + SAL_WARN( "writerfilter.dmapper", "Exception in CloseFieldCommand(): " << e.Message ); } pContext->SetCommandCompleted(); } @@ -4903,7 +4903,7 @@ void DomainMapper_Impl::ExecuteFrameConversion() } catch( const uno::Exception& rEx) { - SAL_WARN( "writerfilter", "Exception caught when converting to frame: " + rEx.Message ); + SAL_WARN( "writerfilter.dmapper", "Exception caught when converting to frame: " + rEx.Message ); } } m_xFrameStartRange = nullptr; diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx index 3841f4ea19be..452dd95211db 100644 --- a/writerfilter/source/dmapper/FontTable.cxx +++ b/writerfilter/source/dmapper/FontTable.cxx @@ -68,7 +68,7 @@ void FontTable::lcl_attribute(Id Name, Value & val) else if (static_cast<Id>(nIntValue) == NS_ooxml::LN_Value_ST_Pitch_default) m_pImpl->pCurrentEntry->nPitchRequest = awt::FontPitch::DONTKNOW; else - SAL_WARN("writerfilter", "FontTable::lcl_attribute: unhandled NS_ooxml::CT_Pitch_val: " << nIntValue); + SAL_WARN("writerfilter.dmapper", "FontTable::lcl_attribute: unhandled NS_ooxml::CT_Pitch_val: " << nIntValue); break; case NS_ooxml::LN_CT_Font_name: m_pImpl->pCurrentEntry->sFontName = sValue; @@ -143,7 +143,7 @@ void FontTable::lcl_sprm(Sprm& rSprm) case NS_ooxml::LN_CT_Font_notTrueType: break; default: - SAL_WARN("writerfilter", "FontTable::lcl_sprm: unhandled token: " << nSprmId); + SAL_WARN("writerfilter.dmapper", "FontTable::lcl_sprm: unhandled token: " << nSprmId); break; } } diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index f8d5bdc883df..32b25c3d3a64 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -81,7 +81,7 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & rStreamHandler, } catch (uno::Exception const& e) { - SAL_INFO("writerfilter", "resolveFastSubStream: exception while " + SAL_INFO("writerfilter.ooxml", "resolveFastSubStream: exception while " "resolving stream " << nType << " : " << e.Message); return; } @@ -139,7 +139,7 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre } catch (uno::Exception const& e) { - SAL_INFO("writerfilter", "importSubStream: exception while " + SAL_INFO("writerfilter.ooxml", "importSubStream: exception while " "importing stream " << nType << " : " << e.Message); return xRet; } @@ -157,7 +157,7 @@ uno::Reference<xml::dom::XDocument> OOXMLDocumentImpl::importSubStream(OOXMLStre } catch (uno::Exception const& e) { - SAL_INFO("writerfilter", "importSubStream: exception while " + SAL_INFO("writerfilter.ooxml", "importSubStream: exception while " "parsing stream " << nType << " : " << e.Message); return xRet; } @@ -190,7 +190,7 @@ void OOXMLDocumentImpl::importSubStreamRelations(const OOXMLStream::Pointer_t& p } catch (uno::Exception const& e) { - SAL_WARN("writerfilter", "importSubStreamRelations: exception while " + SAL_WARN("writerfilter.ooxml", "importSubStreamRelations: exception while " "importing stream " << nType << " : " << e.Message); return; } @@ -211,7 +211,7 @@ void OOXMLDocumentImpl::importSubStreamRelations(const OOXMLStream::Pointer_t& p } catch (uno::Exception const& e) { - SAL_WARN("writerfilter", "importSubStream: exception while " + SAL_WARN("writerfilter.ooxml", "importSubStream: exception while " "parsing stream " << nType << " : " << e.Message); mxCustomXmlProsDom = xRelation; } @@ -617,7 +617,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) } catch (uno::Exception const& e) { - SAL_INFO("writerfilter", "resolveGlossaryStream: exception while " + SAL_INFO("writerfilter.ooxml", "resolveGlossaryStream: exception while " "createStream for glossary" << OOXMLStream::GLOSSARY << " : " << e.Message); return; } @@ -684,7 +684,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) } catch (uno::Exception const& e) { - SAL_INFO("writerfilter", "importSubStream: exception while " + SAL_INFO("writerfilter.ooxml", "importSubStream: exception while " "parsing stream of Type" << nType << " : " << e.Message); return; } @@ -771,7 +771,7 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS } catch (uno::Exception const& e) { - SAL_INFO("writerfilter", "resolveEmbeddingsStream: can't find header/footer whilst " + SAL_INFO("writerfilter.ooxml", "resolveEmbeddingsStream: can't find header/footer whilst " "resolving stream " << streamType << " : " << e.Message); return; } diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx index 2529492494d7..6905f1c4d983 100644 --- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx +++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx @@ -408,7 +408,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) break; default: { - SAL_INFO("writerfilter", "TODO handle symbol '" << keywordToString(nKeyword) << "'"); + SAL_INFO("writerfilter.rtf", "TODO handle symbol '" << keywordToString(nKeyword) << "'"); aSkip.setParsed(false); } break; diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c113167c1cc8..6cd868a1149f 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -140,7 +140,7 @@ RTFSprms& getLastAttributes(RTFSprms& rSprms, Id nId) return p->getSprms().back().second->getAttributes(); else { - SAL_WARN("writerfilter", "trying to set property when no type is defined"); + SAL_WARN("writerfilter.rtf", "trying to set property when no type is defined"); return rSprms; } } @@ -366,9 +366,9 @@ void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString& rIgno } pImpl->m_nDefaultFontIndex = m_nDefaultFontIndex; pImpl->Strm().Seek(nPos); - SAL_INFO("writerfilter", "substream start"); + SAL_INFO("writerfilter.rtf", "substream start"); Mapper().substream(nId, pImpl); - SAL_INFO("writerfilter", "substream end"); + SAL_INFO("writerfilter.rtf", "substream end"); Strm().Seek(nCurrent); } @@ -585,7 +585,7 @@ void RTFDocumentImpl::parBreak() void RTFDocumentImpl::sectBreak(bool bFinal) { - SAL_INFO("writerfilter", OSL_THIS_FUNC << ": final? " << bFinal << ", needed? " << m_bNeedSect); + SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": final? " << bFinal << ", needed? " << m_bNeedSect); bool bNeedSect = m_bNeedSect; RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_type); bool bContinuous = pBreak.get() && pBreak->getInt() == static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_continuous); @@ -738,28 +738,28 @@ void RTFDocumentImpl::resolve(Stream& rMapper) switch (m_pTokenizer->resolveParse()) { case RTFError::OK: - SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: finished without errors"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: finished without errors"); break; case RTFError::GROUP_UNDER: - SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: unmatched '}'"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: unmatched '}'"); break; case RTFError::GROUP_OVER: - SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: unmatched '{'"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: unmatched '{'"); throw io::WrongFormatException(m_pTokenizer->getPosition()); break; case RTFError::UNEXPECTED_EOF: - SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: unexpected end of file"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: unexpected end of file"); throw io::WrongFormatException(m_pTokenizer->getPosition()); break; case RTFError::HEX_INVALID: - SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: invalid hex char"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: invalid hex char"); throw io::WrongFormatException(m_pTokenizer->getPosition()); break; case RTFError::CHAR_OVER: - SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: characters after last '}'"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: characters after last '}'"); break; case RTFError::CLASSIFICATION: - SAL_INFO("writerfilter", "RTFDocumentImpl::resolve: classification prevented paste"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolve: classification prevented paste"); break; } } @@ -1148,7 +1148,7 @@ RTFError RTFDocumentImpl::resolveChars(char ch) } OUString aOUStr(OStringToOUString(aStr, m_aStates.top().nCurrentEncoding)); - SAL_INFO("writerfilter", "RTFDocumentImpl::resolveChars: collected '" << aOUStr << "'"); + SAL_INFO("writerfilter.rtf", "RTFDocumentImpl::resolveChars: collected '" << aOUStr << "'"); if (m_aStates.top().eDestination == Destination::COLORTABLE) { @@ -1273,7 +1273,7 @@ void RTFDocumentImpl::text(OUString& rString) m_aStyleTableEntries.insert(std::make_pair(m_nCurrentStyleIndex, pProp)); } else - SAL_INFO("writerfilter", "no RTF style type defined, ignoring"); + SAL_INFO("writerfilter.rtf", "no RTF style type defined, ignoring"); break; } case Destination::LISTNAME: @@ -1761,7 +1761,7 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int n break; default: { - SAL_INFO("writerfilter", "TODO handle toggle '" << keywordToString(nKeyword) << "'"); + SAL_INFO("writerfilter.rtf", "TODO handle toggle '" << keywordToString(nKeyword) << "'"); aSkip.setParsed(false); } break; @@ -1771,7 +1771,7 @@ RTFError RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, bool bParam, int n RTFError RTFDocumentImpl::pushState() { - //SAL_INFO("writerfilter", OSL_THIS_FUNC << " before push: " << m_pTokenizer->getGroup()); + //SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << " before push: " << m_pTokenizer->getGroup()); checkUnicode(/*bUnicode =*/ true, /*bHex =*/ true); m_nGroupStartPos = Strm().Tell(); @@ -1979,7 +1979,7 @@ RTFError RTFDocumentImpl::popState() } catch (const rtl::MalformedUriException& rException) { - SAL_WARN("writerfilter", "rtl::Uri::convertRelToAbs() failed: " << rException.getMessage()); + SAL_WARN("writerfilter.rtf", "rtl::Uri::convertRelToAbs() failed: " << rException.getMessage()); } if (!aPictureURL.isEmpty()) @@ -2762,7 +2762,7 @@ RTFError RTFDocumentImpl::popState() } catch (const uno::Exception& rException) { - SAL_WARN("writerfilter", "failed to set property " << rKey << ": " << rException.Message); + SAL_WARN("writerfilter.rtf", "failed to set property " << rKey << ": " << rException.Message); } } } diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index 5727b144d11c..8fe6b9f2bc59 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -54,7 +54,7 @@ RTFTokenizer::~RTFTokenizer() = default; RTFError RTFTokenizer::resolveParse() { - SAL_INFO("writerfilter", OSL_THIS_FUNC); + SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC); char ch; RTFError ret; // for hex chars @@ -134,7 +134,7 @@ RTFError RTFTokenizer::resolveParse() } else { - SAL_INFO("writerfilter", OSL_THIS_FUNC << ": hex internal state"); + SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": hex internal state"); b = b << 4; sal_Int8 parsed = asHex(ch); if (parsed == -1) @@ -288,7 +288,7 @@ RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nPara int i = low - s_aRTFControlWords.begin(); if (low == s_aRTFControlWords.end() || aSymbol < *low) { - SAL_INFO("writerfilter", OSL_THIS_FUNC << ": unknown keyword '\\" << rKeyword.getStr() << "'"); + SAL_INFO("writerfilter.rtf", OSL_THIS_FUNC << ": unknown keyword '\\" << rKeyword.getStr() << "'"); RTFSkipDestination aSkip(m_rImport); aSkip.setParsed(false); return RTFError::OK; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 11c05c6ee154..9a3344f0f010 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1111,7 +1111,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt eType = XML_BOOLEAN_STYLE; break; } - SAL_WARN_IF( eType == XML_TOKEN_INVALID, "xmloff", "unknown format type" ); + SAL_WARN_IF( eType == XML_TOKEN_INVALID, "xmloff.style", "unknown format type" ); OUString sAttrValue; bool bUserDef = ( rFormat.GetType() & css::util::NumberFormat::DEFINED ); @@ -1883,7 +1883,7 @@ OUString SvXMLNumFmtExport::GetStyleName( sal_uInt32 nKey ) void SvXMLNumFmtExport::SetUsed( sal_uInt32 nKey ) { - SAL_WARN_IF( pFormatter == nullptr, "xmloff", "missing formatter" ); + SAL_WARN_IF( pFormatter == nullptr, "xmloff.style", "missing formatter" ); if( !pFormatter ) return; @@ -1919,7 +1919,7 @@ sal_uInt32 SvXMLNumFmtExport::ForceSystemLanguage( sal_uInt32 nKey ) const SvNumberformat* pFormat = lcl_GetFormat( pFormatter, nKey ); if( pFormat != nullptr ) { - SAL_WARN_IF( pFormatter == nullptr, "xmloff", "format without formatter?" ); + SAL_WARN_IF( pFormatter == nullptr, "xmloff.style", "format without formatter?" ); sal_Int32 nErrorPos; short nType = pFormat->GetType(); diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 0c25d3848c08..a08bcc7fc3f5 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -297,7 +297,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( sal_uIn if( !pIndices && bCreateIndex && !aStyles.empty() ) { pIndices = o3tl::make_unique<IndicesType>(aStyles.begin(), aStyles.end()); - SAL_WARN_IF(pIndices->size() != aStyles.size(), "xmloff", "Here is a duplicate Style"); + SAL_WARN_IF(pIndices->size() != aStyles.size(), "xmloff.style", "Here is a duplicate Style"); #if OSL_DEBUG_LEVEL > 0 SAL_WARN_IF(0 != m_nIndexCreated, "xmloff.style", "Performance warning: sdbcx::Index created multiple times"); diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index c4a290cd382c..4d7a03df8b98 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -508,7 +508,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ ) case XML_TEXT_FRAME_GRAPHIC: sServiceName = "com.sun.star.text.GraphicObject"; break; } Reference<XInterface> xIfc = xFactory->createInstance( sServiceName ); - SAL_WARN_IF( !xIfc.is(), "xmloff", "couldn't create frame" ); + SAL_WARN_IF( !xIfc.is(), "xmloff.text", "couldn't create frame" ); if( xIfc.is() ) xPropSet.set( xIfc, UNO_QUERY ); } diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 26cea156ca73..0c901ae0c0d0 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2447,7 +2447,7 @@ void XMLTextFieldExport::ProcessDisplay(bool bIsVisible, void XMLTextFieldExport::ProcessBoolean(enum XMLTokenEnum eName, bool bBool, bool bDefault) { - SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff", "invalid element token"); + SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff.text", "invalid element token"); if ( XML_TOKEN_INVALID == eName ) return; @@ -2466,7 +2466,7 @@ void XMLTextFieldExport::ProcessString(enum XMLTokenEnum eName, bool bOmitEmpty, sal_uInt16 nPrefix) { - SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff", "invalid element token"); + SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff.text", "invalid element token"); if ( XML_TOKEN_INVALID == eName ) return; @@ -2517,8 +2517,8 @@ void XMLTextFieldExport::ProcessString( enum XMLTokenEnum eValue, sal_uInt16 nPrefix) { - SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff", "invalid element token" ); - SAL_WARN_IF( eValue == XML_TOKEN_INVALID, "xmloff", "invalid value token" ); + SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff.text", "invalid element token" ); + SAL_WARN_IF( eValue == XML_TOKEN_INVALID, "xmloff.text", "invalid value token" ); if ( XML_TOKEN_INVALID == eName ) return; @@ -2556,7 +2556,7 @@ void XMLTextFieldExport::ProcessParagraphSequence( void XMLTextFieldExport::ProcessInteger(enum XMLTokenEnum eName, sal_Int32 nNum) { - SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff", "invalid element token"); + SAL_WARN_IF( eName == XML_TOKEN_INVALID, "xmloff.text", "invalid element token"); if ( XML_TOKEN_INVALID == eName ) return; @@ -2802,9 +2802,9 @@ void XMLTextFieldExport::ExportDataBaseElement( const Reference<XPropertySet>& rPropertySet, const Reference<XPropertySetInfo>& rPropertySetInfo ) { - SAL_WARN_IF( eElementName == XML_TOKEN_INVALID, "xmloff", "need token" ); - SAL_WARN_IF( !rPropertySet.is(), "xmloff", "need property set" ); - SAL_WARN_IF( !rPropertySetInfo.is(), "xmloff", "need property set info" ); + SAL_WARN_IF( eElementName == XML_TOKEN_INVALID, "xmloff.text", "need token" ); + SAL_WARN_IF( !rPropertySet.is(), "xmloff.text", "need property set" ); + SAL_WARN_IF( !rPropertySetInfo.is(), "xmloff.text", "need property set info" ); // get database properties OUString sDataBaseName; |