sfx2/source/appl/appserv.cxx | 4 ++--
sfx2/source/control/bindings.cxx | 4 ++--
sfx2/source/control/dispatch.cxx | 2 +-
sfx2/source/control/shell.cxx | 4 ++--
sfx2/source/dialog/filedlghelper.cxx | 6 +++---
sfx2/source/dialog/filtergrouping.cxx | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 5e06877f8929f375c9fd293aeca5c8e0c7569e8f
Author: LuboÅ¡ LuÅák <l.lu...@suse.cz>
Date: Tue Jul 9 13:49:58 2013 +0200
fix the sfx2->sfx log area rename
These were missing from d38cb53e3bcf3fd95a75e03b01c3b7a209d07b46.
Change-Id: I50b2f7a2ec1ff5848802fc6c08e7a6e8e7ccb7f7
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 1d04f64..1df307f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -147,7 +147,7 @@ namespace
catch (Exception & e)
{
SAL_INFO(
- "sfx2.appl",
+ "sfx.appl",
"assuming Base to be missing; caught " << e.Message);
return false;
}
@@ -174,7 +174,7 @@ namespace
catch (const Exception & e)
{
SAL_INFO(
- "sfx2.appl",
+ "sfx.appl",
"trying to install LibreOffice Base, caught " <<
e.Message);
}
return;
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 5735738..f88aae2 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1721,7 +1721,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
{
SAL_INFO(
- "sfx2.control",
+ "sfx.control",
std::setw(std::min(nRegLevel, sal_uInt16(8))) << ' ' << "this = " <<
this
<< " Level = " << nRegLevel << " SfxBindings::EnterRegistrations "
<< (pFile
@@ -1820,7 +1820,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel,
const char *pFile, int
}
SAL_INFO(
- "sfx2.control",
+ "sfx.control",
std::setw(std::min(nRegLevel, sal_uInt16(8))) << ' ' << "this = " <<
this
<< " Level = " << nRegLevel << " SfxBindings::LeaveRegistrations "
<< (pFile
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index b7573a1..fdaf369 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -437,7 +437,7 @@ void SfxDispatcher::Pop
SfxApplication *pSfxApp = SFX_APP();
SAL_INFO(
- "sfx2.control",
+ "sfx.control",
"-SfxDispatcher(" << this << (bPush ? ")::Push(" : ")::Pop(")
<< (rShell.GetInterface()
? rShell.GetInterface()->GetClassName() : SAL_STREAM(&rShell))
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 810e0ed..5542998 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -556,7 +556,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame,
sal_Bool bMDI )
return;
#endif
SAL_INFO(
- "sfx2.control",
+ "sfx.control",
"SfxShell::DoActivate() " << this << " " << GetInterface()->GetName()
<< " bMDI " << (bMDI ? "MDI" : ""));
@@ -592,7 +592,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame,
sal_Bool bMDI )
return;
#endif
SAL_INFO(
- "sfx2.control",
+ "sfx.control",
"SfxShell::DoDeactivate()" << this << " " << GetInterface()->GetName()
<< " bMDI " << (bMDI ? "MDI" : ""));
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 8fb374a..e0ce50b 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1668,7 +1668,7 @@ void FileDialogHelper_Impl::verifyPath()
url.GetMainURL(INetURLObject::NO_DECODE), sysPathU);
if (e != osl::FileBase::E_None) {
SAL_WARN(
- "sfx2.dialog",
+ "sfx.dialog",
"getSystemPathFromFileURL("
<< url.GetMainURL(INetURLObject::NO_DECODE) << ") failed with "
<< +e);
@@ -1681,7 +1681,7 @@ void FileDialogHelper_Impl::verifyPath()
| RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
{
SAL_WARN(
- "sfx2.dialog",
+ "sfx.dialog",
"convertToString(" << sysPathU << ") failed for encoding "
<< +osl_getThreadTextEncoding());
return;
@@ -1689,7 +1689,7 @@ void FileDialogHelper_Impl::verifyPath()
struct stat aFileStat;
if (stat(sysPathC.getStr(), &aFileStat) == -1) {
SAL_WARN(
- "sfx2.dialog",
+ "sfx.dialog",
"stat(" << sysPathC.getStr() << ") failed with errno " << errno);
return;
}
diff --git a/sfx2/source/dialog/filtergrouping.cxx
b/sfx2/source/dialog/filtergrouping.cxx
index eef5bed..6fc6901 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -357,7 +357,7 @@ namespace sfx2
::std::pair< FilterGroupEntryReferrer::iterator, bool > aInsertRes
=
m_rEntryReferrer.insert( FilterGroupEntryReferrer::value_type(
_rName, m_aClassPos ) );
SAL_WARN_IF(
- !aInsertRes.second, "sfx2.dialog",
+ !aInsertRes.second, "sfx.dialog",
"already have an element for " << _rName);
}
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
