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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Sep 20 00:43:22 PDT 2012


 pyuno/source/module/pyuno_runtime.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit ed39debbc379628ce74b096f7b7b179ab826551b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jul 20 10:32:47 2012 +0200

    warning C4702: unreachable code
    
    (cherry picked from commit 618376bcb55906913bc76365d7db9b71eb422daa)
    
    Conflicts:
    	pyuno/source/module/pyuno_runtime.cxx
    
    Change-Id: Ie2cc83dde7e0522e0bf669a1dd3d7a8ca680f7e2

diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 56ee7fa..0cf2998 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -598,9 +598,6 @@ PyRef Runtime::any2PyObject (const Any &a ) const
         throw RuntimeException(buf.makeStringAndClear( ), Reference< XInterface > () );
     }
     }
-    //We shouldn't be here...
-    Py_INCREF( Py_None );
-    return Py_None;
 }
 
 static Sequence< Type > invokeGetTypes( const Runtime & r , PyObject * o )


More information about the Libreoffice-commits mailing list