summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-12-14 09:49:39 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-12-15 06:45:14 +0000
commitd15b4e204598fc7e4c1682c4f10228e217575937 (patch)
tree1173b2725abac5f06bfd2e28965a95256283e6a4 /sd/source
parent14a0d26d6ae0ee59a685c254ec235fea81636475 (diff)
teach sallogareas plugin to catch inconsistencies
Change-Id: I8bcea5ffc74d48148bea78da8c17744e288c069a Reviewed-on: https://gerrit.libreoffice.org/32004 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/filter/eppt/pptx-epptooxml.cxx2
-rw-r--r--sd/source/ui/framework/module/ModuleController.cxx6
-rw-r--r--sd/source/ui/remotecontrol/Receiver.cxx8
-rw-r--r--sd/source/ui/tools/SdGlobalResourceContainer.cxx6
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx6
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx4
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx2
8 files changed, 18 insertions, 18 deletions
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();