summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-11-22 16:56:08 +0100
committerStephan Bergmann <sbergman@redhat.com>2011-11-22 17:03:12 +0100
commitd6a8934eeb192b8a2d672bfc6b90ee2b333841ae (patch)
tree5705082b133a4b7cbca9f2b732305aa828f280ee /sfx2
parent33a8ac0750d4ee7800b9faccdee3fffb850a04b1 (diff)
Remove no longer necessary "(void) x; // avoid warnings".
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/control/bindings.cxx8
1 files changed, 2 insertions, 6 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 671f79fff095..ce1d60468c1e 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1742,8 +1742,6 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
{
- (void)pFile;
- (void)nLine;
DBG_MEMTEST();
SAL_INFO_S(
"sfx2",
@@ -1787,8 +1785,6 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int nLine )
{
(void)nLevel; // unused variable
- (void)pFile;
- (void)nLine;
DBG_MEMTEST();
DBG_ASSERT( nRegLevel, "Leave without Enter" );
DBG_ASSERT( nLevel == USHRT_MAX || nLevel == nRegLevel, "wrong Leave" );
@@ -1852,8 +1848,8 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
"sfx2",
std::setw(Min(nRegLevel, sal_uInt16(8))) << ' ' << "this = " << this
<< " Level = " << nRegLevel << " SfxBindings::LeaveRegistrations "
- << "File: " << (pFile ? pFile : "--") << " Line: "
- << (pFile ? nLine : 0));
+ << (pFile
+ ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : ""));
}
//--------------------------------------------------------------------