summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
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 'sfx2')
-rw-r--r--sfx2/source/appl/app.cxx2
-rw-r--r--sfx2/source/appl/appcfg.cxx6
-rw-r--r--sfx2/source/appl/appserv.cxx14
-rw-r--r--sfx2/source/control/dispatch.cxx12
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx10
-rw-r--r--sfx2/source/doc/doctempl.cxx4
-rw-r--r--sfx2/source/doc/guisaveas.cxx6
-rw-r--r--sfx2/source/doc/objstor.cxx4
-rw-r--r--sfx2/source/doc/objxtor.cxx10
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx2
11 files changed, 36 insertions, 36 deletions
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: