[Libreoffice-commits] core.git: basctl/source compilerplugins/clang dbaccess/source extensions/source filter/source framework/source include/sal sc/source sd/source sfx2/source sw/source
Stephan Bergmann
sbergman at redhat.com
Thu Nov 19 07:06:08 PST 2015
basctl/source/basicide/bastypes.cxx | 2 -
compilerplugins/clang/store/sallogareas.cxx | 36 +++++++++++++++++-
compilerplugins/clang/store/sallogareas.hxx | 1
dbaccess/source/ui/dlg/generalpage.cxx | 4 +-
extensions/source/bibliography/datman.cxx | 2 -
extensions/source/propctrlr/selectlabeldialog.cxx | 2 -
filter/source/svg/svgfilter.cxx | 2 -
framework/source/fwe/classes/addonsoptions.cxx | 2 -
framework/source/uielement/toolbarsmenucontroller.cxx | 2 -
include/sal/log-areas.dox | 21 +++++++++-
sc/source/filter/orcus/interface.cxx | 2 -
sc/source/filter/xcl97/XclImpChangeTrack.cxx | 2 -
sc/source/ui/view/viewdata.cxx | 4 +-
sd/source/ui/animations/SlideTransitionPane.cxx | 2 -
sfx2/source/appl/appuno.cxx | 4 +-
sfx2/source/appl/module.cxx | 6 +--
sfx2/source/appl/sfxhelp.cxx | 2 -
sfx2/source/doc/objcont.cxx | 4 +-
sfx2/source/sidebar/SidebarController.cxx | 2 -
sw/source/core/doc/docfmt.cxx | 2 -
sw/source/core/view/vdraw.cxx | 2 -
sw/source/ui/misc/linenum.cxx | 2 -
sw/source/uibase/dbui/dbmgr.cxx | 4 +-
23 files changed, 81 insertions(+), 31 deletions(-)
New commits:
commit b0339005b820149f86e691f88f0540c07a306d69
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 16:05:35 2015 +0100
loplugin:sallogareas
Change-Id: I2220ab194384fb397716bf3227d38716ba54f537
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index adca1ed..30f83fa 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -651,7 +651,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEra
nLine++;
}
- SAL_WARN_IF( nStartPos == -1, "basctl", "CutLines: Startzeile nicht gefunden!" );
+ SAL_WARN_IF( nStartPos == -1, "basctl.basicide", "CutLines: Startzeile nicht gefunden!" );
if ( nStartPos == -1 )
return;
diff --git a/compilerplugins/clang/store/sallogareas.cxx b/compilerplugins/clang/store/sallogareas.cxx
index f427e65..a9f6e35 100644
--- a/compilerplugins/clang/store/sallogareas.cxx
+++ b/compilerplugins/clang/store/sallogareas.cxx
@@ -107,9 +107,38 @@ 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);
}
}
+void SalLogAreas::checkAreaSyntax(StringRef area, SourceLocation location) {
+ for (std::size_t i = 0;;) {
+ std::size_t j = area.find('.', i);
+ if (j == StringRef::npos) {
+ j = area.size();
+ }
+ if (j == i) {
+ goto bad;
+ }
+ for (; i != j; ++i) {
+ auto c = area[i];
+ if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'z'))) {
+ goto bad;
+ }
+ }
+ if (j == area.size()) {
+ return;
+ }
+ i = j + 1;
+ }
+bad:
+ report(
+ DiagnosticsEngine::Warning,
+ "invalid log area syntax '%0'%1 (see include/sal/log.hxx for details)",
+ location)
+ << area << (location.isValid() ? "" : " in include/sal/log-areas.dox");
+}
+
void SalLogAreas::readLogAreas()
{
ifstream is( SRCDIR "/include/sal/log-areas.dox" );
@@ -122,10 +151,13 @@ void SalLogAreas::readLogAreas()
{
pos += strlen( "@li @c " );
size_t end = line.find( ' ', pos );
+ std::string area;
if( end == string::npos )
- logAreas.insert( line.substr( pos ));
+ area = line.substr( pos );
else if( pos != end )
- logAreas.insert( line.substr( pos, end - pos ));
+ area = line.substr( pos, end - pos );
+ checkAreaSyntax(area, SourceLocation());
+ logAreas.insert(area);
}
}
// If you get this error message, you possibly have too old icecream (ICECC_EXTRAFILES is needed).
diff --git a/compilerplugins/clang/store/sallogareas.hxx b/compilerplugins/clang/store/sallogareas.hxx
index d18df94..d665c38 100644
--- a/compilerplugins/clang/store/sallogareas.hxx
+++ b/compilerplugins/clang/store/sallogareas.hxx
@@ -30,6 +30,7 @@ class SalLogAreas
bool VisitCallExpr( const CallExpr* call );
private:
void checkArea( StringRef area, SourceLocation location );
+ void checkAreaSyntax(StringRef area, SourceLocation location);
void readLogAreas();
const FunctionDecl* inFunction;
SourceLocation lastSalDetailLogStreamMacro;
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index ffe6c1d..839fbff 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -411,7 +411,7 @@ namespace dbaui
const sal_Int32 nSelected = _rBox.GetSelectEntryPos();
if (static_cast<size_t>(nSelected) >= m_aEmbeddedURLPrefixes.size() )
{
- SAL_WARN("dbaccess.ui.OGeneralPage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix");
+ SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix");
return;
}
const OUString sURLPrefix = m_aEmbeddedURLPrefixes[ nSelected ];
@@ -431,7 +431,7 @@ namespace dbaui
const sal_Int32 nSelected = _rBox.GetSelectEntryPos();
if (static_cast<size_t>(nSelected) >= m_aURLPrefixes.size() )
{
- SAL_WARN("dbaccess.ui.OGeneralPage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix");
+ SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix");
return;
}
const OUString sURLPrefix = m_aURLPrefixes[ nSelected ];
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 8c3cb72..10541f5 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -138,7 +138,7 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSe
xConn.set(*static_cast<Reference< XInterface > const *>(xFormProps->getPropertyValue("ActiveConnection").getValue()), UNO_QUERY);
if (!xConn.is())
{
- SAL_INFO("extensions", "no active connection");
+ SAL_INFO("extensions.biblio", "no active connection");
}
}
catch (const Exception&)
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 4b58bca..c693408 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -179,7 +179,7 @@ namespace pcr
xContainer->getByIndex(i) >>= xAsSet;
if (!xAsSet.is())
{
- SAL_INFO("extensions", "OSelectLabelDialog::InsertEntries : strange : a form component which isn't a property set !");
+ SAL_INFO("extensions.propctrlr", "OSelectLabelDialog::InsertEntries : strange : a form component which isn't a property set !");
continue;
}
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 15523b3..16595cf 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -384,7 +384,7 @@ OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor) throw
return OUString(constFilterName);
}
} catch (css::io::IOException & e) {
- SAL_WARN("filter", "caught IOException " + e.Message);
+ SAL_WARN("filter.svg", "caught IOException " + e.Message);
}
return OUString();
}
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index ee5af2e..f905bc4 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -417,7 +417,7 @@ void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/
void AddonsOptions_Impl::ImplCommit()
{
- SAL_WARN("framework", "AddonsOptions_Impl::ImplCommit(): Not implemented yet!");
+ SAL_WARN("fwk", "AddonsOptions_Impl::ImplCommit(): Not implemented yet!");
}
// public method
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 59ee67b..ba9476a 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -553,7 +553,7 @@ void SAL_CALL ToolbarsMenuController::statusChanged( const FeatureStateEvent& Ev
VCLXPopupMenu* pXPopupMenu = static_cast<VCLXPopupMenu *>(VCLXMenu::GetImplementation( xPopupMenu ));
PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : nullptr;
- SAL_WARN_IF(!pVCLPopupMenu, "framework", "worrying lack of popup menu");
+ SAL_WARN_IF(!pVCLPopupMenu, "fwk.uielement", "worrying lack of popup menu");
if (!pVCLPopupMenu)
return;
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 7b482e9..5074ba6 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -61,7 +61,6 @@ certain functionality.
@li @c chart2
@li @c chart2.3dopengl
@li @c chart2.areachart
- at li @c chart2.barchart3D
@li @c chart2.opengl
@li @c chart2.tools
@@ -117,15 +116,23 @@ certain functionality.
@li @c sc.core.formulacell - ScFormulaCell and group
@li @c sc.core.grouparealistener - sc::FormulaGroupAreaListener
@li @c sc.filter - Calc filter
+ at li @c sc.orcus
+ at li @c sc.orcus.autofilter
+ at li @c sc.orcus.condformat
+ at li @c sc.orcus.style
+ at li @c sc.orcus.table
@li @c sc.ui - Calc UI
+ at li @c sc.viewdata
@section desktop
@li @c desktop
@li @c desktop.app
@li @c desktop.deployment
+ at li @c desktop.lib
@li @c desktop.migration
@li @c desktop.offacc
+ at li @c desktop.opengl
@li @c desktop.splash
@li @c desktop.test
@@ -138,6 +145,7 @@ certain functionality.
@li @c sd.slideshow
@li @c sd.sls - slidesorter
@li @c sd.tools
+ at li @c sd.transitions
@li @c sd.ui
@li @c sd.view
@li @c sdremote
@@ -178,6 +186,7 @@ certain functionality.
@li @c filter.os2met
@li @c filter.pdf
@li @c filter.pict
+ at li @c filter.svg
@li @c filter.tiff
@li @c filter.xmlfa
@li @c filter.xslt - xslt import/export
@@ -190,6 +199,7 @@ certain functionality.
@li @c oox.drawingml - DrawingML
@li @c oox.drawingml.gradient
@li @c oox.ppt - pptx filter
+ at li @c oox.shape
@li @c oox.storage - ZipStorage class
@li @c oox.xmlstream - XmlStream class
@@ -286,6 +296,7 @@ certain functionality.
@li @c sfx.doc
@li @c sfx.notify
@li @c sfx.sidebar
+ at li @c sfx.tiledrendering
@li @c sfx.view
@section slideshow
@@ -318,6 +329,7 @@ certain functionality.
@section svx
@li @c svx
+ at li @c svx.chaining
@li @c svx.dialog
@li @c svx.fmcomp
@li @c svx.form
@@ -332,6 +344,7 @@ certain functionality.
@section toolkit
+ at li @c toolkit
@li @c toolkit.controls
@section tools
@@ -392,12 +405,15 @@ certain functionality.
@li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
@li @c vcl.gdi.fontmetric
@li @c vcl.gtk - Gtk+ 2/3 plugin
+ at li @c vcl.gtk3
@li @c vcl.harfbuzz - HarfBuzz text layout
@li @c vcl.headless - bitmap-based backend
@li @c vcl.helper
+ at li @c vcl.icontest
@li @c vcl.kde - KDE
@li @c vcl.kde4 - KDE4
@li @c vcl.layout - Widget layout
+ at li @c vcl.pdfwriter
@li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
@li @c vcl.opengl
@li @c vcl.osx
@@ -478,7 +494,7 @@ certain functionality.
@li @c dbaccess
@li @c dbaccess.core
@li @c dbaccess.ui
- at li @c dbaccess.ui.OGeneralPage
+ at li @c dbaccess.ui.generalpage
@section avmedia
@@ -499,6 +515,7 @@ certain functionality.
@li @c helpcompiler
@li @c jvmaccess
@li @c linguistic
+ at li @c lwp - lotuswordpro
@li @c mysqlc
@li @c registry
@li @c reportdesign
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 78c0b9d..5e98d29 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -244,7 +244,7 @@ double translateToInternal(double nVal, orcus::length_unit_t unit)
return nVal * 20.0 * 72.0 / 2.54;
break;
case orcus::length_unit_unknown:
- SAL_WARN("sc,orcus", "unknown unit");
+ SAL_WARN("sc.orcus", "unknown unit");
break;
default:
break;
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 75da05a..86ba23c 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -358,7 +358,7 @@ void XclImpChangeTrack::ReadChTrCellContent()
sal_uInt16 nOldSize;
nOldSize = pStrm->ReaduInt16();
SAL_WARN_IF( (nOldSize == 0) != (nOldValueType == EXC_CHTR_TYPE_EMPTY),
- "sc.xcl97",
+ "sc.filter",
"XclImpChangeTrack::ReadChTrCellContent - old value mismatch" );
pStrm->Ignore( 4 );
switch( nValueType & EXC_CHTR_TYPE_FORMATMASK )
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 91272a5..3488ed9 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -629,9 +629,9 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vec
CreateTabData( tabs );
// sanity check - we shouldn't need something this low / big
- SAL_WARN_IF(rNewX < Fraction(1, 100) || rNewX > Fraction(100, 1), "sal_viewdata",
+ SAL_WARN_IF(rNewX < Fraction(1, 100) || rNewX > Fraction(100, 1), "sc.viewdata",
"fraction rNewX not sensible: " << (double) rNewX);
- SAL_WARN_IF(rNewY < Fraction(1, 100) || rNewY > Fraction(100, 1), "sal_viewdata",
+ SAL_WARN_IF(rNewY < Fraction(1, 100) || rNewY > Fraction(100, 1), "sc.viewdata",
"fraction rNewY not sensible: " << (double) rNewY);
if ( bAll )
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index e3fb90c..5c8c7b9 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void)
SAL_INFO( "sd.transitions", "Transition presets by offsets:");
for( auto aIter: rPresetList )
{
- SAL_INFO( "sd.transitions ", nPresetOffset++ << " " <<
+ SAL_INFO( "sd.transitions", nPresetOffset++ << " " <<
aIter->getPresetId() << ": " << aIter->getSetId() );
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index eb4264a..42f4b54 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -247,7 +247,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
{
OStringBuffer aStr("MacroPlayer: wrong number of parameters for slot: ");
aStr.append(static_cast<sal_Int32>(nSlotId));
- SAL_INFO("sfx2.appl", aStr.getStr());
+ SAL_INFO("sfx.appl", aStr.getStr());
}
#endif
// complex property; collect sub items from the parameter set and reconstruct complex item
@@ -906,7 +906,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
// except for the "special" slots: assure that every argument was convertible
OStringBuffer aStr("MacroPlayer: Some properties didn't match to any formal argument for slot: ");
aStr.append(pSlot->pUnoName);
- SAL_INFO( "sfx2.appl", aStr.getStr() );
+ SAL_INFO( "sfx.appl", aStr.getStr() );
}
#endif
}
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 327ace2..9d46fbf 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -245,7 +245,7 @@ void SfxModule::RegisterToolBoxControl( const SfxTbxCtrlFactory& rFact )
if ( pF->nTypeId == rFact.nTypeId &&
(pF->nSlotId == rFact.nSlotId || pF->nSlotId == 0) )
{
- SAL_INFO("sfx2.appl", "TbxController-Registering is not clearly defined!");
+ SAL_INFO("sfx.appl", "TbxController-Registering is not clearly defined!");
}
}
#endif
@@ -267,7 +267,7 @@ void SfxModule::RegisterStatusBarControl( const SfxStbCtrlFactory& rFact )
if ( pF->nTypeId == rFact.nTypeId &&
(pF->nSlotId == rFact.nSlotId || pF->nSlotId == 0) )
{
- SAL_INFO("sfx2.appl", "TbxController-Registering is not clearly defined!");
+ SAL_INFO("sfx.appl", "TbxController-Registering is not clearly defined!");
}
}
#endif
@@ -289,7 +289,7 @@ void SfxModule::RegisterMenuControl( const SfxMenuCtrlFactory& rFact )
if ( pF->nTypeId == rFact.nTypeId &&
(pF->nSlotId == rFact.nSlotId || pF->nSlotId == 0) )
{
- SAL_INFO("sfx2.appl", "MenuController-Registering is not clearly defined!");
+ SAL_INFO("sfx.appl", "MenuController-Registering is not clearly defined!");
}
}
#endif
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 7d46fbd..6fe553f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -279,7 +279,7 @@ OUString getCurrentModuleIdentifier_Impl()
}
catch (const css::frame::UnknownModuleException&)
{
- SAL_INFO( "sfx2.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" );
+ SAL_INFO( "sfx.appl", "SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" );
}
catch (const Exception&)
{
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 8090351..135a4d2 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -660,12 +660,12 @@ bool SfxObjectShell::IsModifyPasswordEntered()
void SfxObjectShell::libreOfficeKitCallback(int /*nType*/, const char* /*pPayload*/) const
{
- SAL_INFO("tiled-rendering", "SfxObjectShell::libreOfficeKitCallback interface not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name());
+ SAL_INFO("sfx.tiledrendering", "SfxObjectShell::libreOfficeKitCallback interface not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name());
}
bool SfxObjectShell::isTiledRendering() const
{
- SAL_INFO("tiled-rendering", "SfxObjectShell::isTiledRendering interface not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name());
+ SAL_INFO("sfx.tiledrendering", "SfxObjectShell::isTiledRendering interface not overridden for SfxObjectShell subclass typeId: " << typeid(*this).name());
return false;
}
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 469be08..8cd077f 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -148,7 +148,7 @@ SidebarController* SidebarController::GetSidebarControllerForFrame (
uno::Reference<frame::XController> const xController(rxFrame->getController());
if (!xController.is()) // this may happen during dispose of Draw controller but perhaps it's a bug
{
- SAL_WARN("sfx2.sidebar", "GetSidebarControllerForFrame: frame has no XController");
+ SAL_WARN("sfx.sidebar", "GetSidebarControllerForFrame: frame has no XController");
return nullptr;
}
uno::Reference<ui::XContextChangeEventListener> const xListener(
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 6e95614..55c4d81 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1584,7 +1584,7 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
// automatic SwNumRules, because all should have been
// created by the style copying!
// So just warn and ignore.
- SAL_WARN( "sw.styles", "Found unknown auto SwNumRule during reset!" );
+ SAL_WARN( "sw.core", "Found unknown auto SwNumRule during reset!" );
}
}
}
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 2d70f0c..25f2b87 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -234,7 +234,7 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz )
// This should be turned into an DBG_ASSERT, once layouting is fixed!
const SwPageFrm *pPageFrm = pAnchor->FindPageFrm();
if (!pPageFrm || pPageFrm->IsInvalid() ) {
- SAL_WARN( "sw.resizeview", "Trying to move anchor from invalid page - fix layouting!" );
+ SAL_WARN( "sw.core", "Trying to move anchor from invalid page - fix layouting!" );
continue;
}
}
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 008dd90..5a30ab0 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -41,7 +41,7 @@ static rtl::Reference<SwDocStyleSheet> lcl_getDocStyleSheet(const OUString& rNam
sal_uInt16 nFamily = SFX_STYLE_FAMILY_PARA;
SfxStyleSheetBasePool* mpBase = pSh->GetView().GetDocShell()->GetStyleSheetPool();
SfxStyleSheetBase* pStyle = mpBase->Find(rName, (SfxStyleFamily)nFamily);
- SAL_WARN_IF( !pStyle, "linenumbering.ui", "Style not found" );
+ SAL_WARN_IF( !pStyle, "sw.ui", "Style not found" );
if(!pStyle)
return nullptr;
return new SwDocStyleSheet(*static_cast<SwDocStyleSheet*>(pStyle));
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 3c441d2..f98896a 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2109,7 +2109,7 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter,
aValue.PutDouble( aNumber );
else
aValue.PutString( aString );
- SAL_INFO( "sw.dbmgr", "'" << pColNames[nCol] << "': " << aNumber << " / " << aString );
+ SAL_INFO( "sw.ui", "'" << pColNames[nCol] << "': " << aNumber << " / " << aString );
rCalc.VarChange( pColNames[nCol], aValue );
}
}
@@ -2117,7 +2117,7 @@ bool SwDBManager::FillCalcWithMergeData( SvNumberFormatter *pDocFormatter,
{
SwSbxValue aValue;
aValue.PutString( aString );
- SAL_INFO( "sw.dbmgr", "'" << pColNames[nCol] << "': " << aString );
+ SAL_INFO( "sw.ui", "'" << pColNames[nCol] << "': " << aString );
rCalc.VarChange( pColNames[nCol], aValue );
}
}
More information about the Libreoffice-commits
mailing list