[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source

[Stephan Bergmann]

 desktop/source/deployment/dp_persmap.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 8f6ecf2c86c70835efca9537f862c56431be2f8b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 10 23:54:33 2012 +0200

    warning C4702: unreachable code
    
    Change-Id: Icec8f9e37fa679b25d9bd44de56c98477d758abc
    (cherry picked from commit e940b0f5e2b57c67b93ffadd7063ec650aa7bcbf)
    
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 6c7cd94..fb7aeca 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -144,7 +144,9 @@ bool PersistentMap::get( OString * value, OString const & key ) const
     catch (DbException & exc) {
         throw_rtexc( exc.get_errno(), exc.what() );
     }
+#ifndef _MSC_VER
     return false; // avoiding warning
+#endif
 }
 
 //______________________________________________________________________________
@@ -192,7 +194,9 @@ bool PersistentMap::erase( OString const & key, bool flush_immediately )
     catch (DbException & exc) {
         throw_rtexc( exc.get_errno(), exc.what() );
     }
+#ifndef _MSC_VER
     return false; // avoiding warning
+#endif
 }
 
 //______________________________________________________________________________
@@ -231,7 +235,9 @@ t_string2string_map PersistentMap::getEntries() const
     catch (DbException & exc) {
         throw_rtexc( exc.get_errno(), exc.what() );
     }
+#ifndef _MSC_VER
     return t_string2string_map(); // avoiding warning
+#endif
 }
 
 }