[Libreoffice-commits] .: avmedia/source basic/source desktop/source sfx2/source

[Stephan Bergmann]

 avmedia/source/viewer/mediawindowbase_impl.cxx    |    1 -
 basic/source/uno/namecont.cxx                     |    2 --
 desktop/source/deployment/registry/dp_backend.cxx |    1 -
 sfx2/source/control/bindings.cxx                  |    8 ++------
 4 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit d6a8934eeb192b8a2d672bfc6b90ee2b333841ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 22 16:56:08 2011 +0100

    Remove no longer necessary "(void) x; // avoid warnings".

diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 3c883a1..97f36ce 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -90,7 +90,6 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
         }
         catch( const uno::Exception &e )
         {
-            (void)e;
             SAL_WARN_S(
                 "avmedia",
                 "couldn't create media player " AVMEDIA_MANAGER_SERVICE_NAME
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index f7abc39..8151b74 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -822,13 +822,11 @@ sal_Bool SfxLibraryContainer::init_Impl(
             }
             catch ( xml::sax::SAXException& e )
             {
-                (void) e; // avoid warning
                 SAL_WARN_S("basic", e.Message);
                 return sal_False;
             }
             catch ( io::IOException& e )
             {
-                (void) e; // avoid warning
                 SAL_WARN_S("basic", e.Message);
                 return sal_False;
             }
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index e847c3c..13f3a2a 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -681,7 +681,6 @@ void Package::processPackage_impl(
             }
         }
         catch (RuntimeException &e) {
-            (void) e; // avoid warnings
             SAL_WARN_S(
                 "basic", "unexpected RuntimeException \"" << e.Message << '"');
             throw;
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 671f79f..ce1d604 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) : ""));
 }
 
 //--------------------------------------------------------------------