[Libreoffice-commits] core.git: pyuno/source

Luke Deller luke at deller.id.au
Mon May 9 09:03:28 UTC 2016


 pyuno/source/module/pyuno_runtime.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f4604e43a653a067633c24e069b272b6309b2151
Author: Luke Deller <luke at deller.id.au>
Date:   Sun May 8 20:58:33 2016 +1000

    Fix call to deleted Any constructor
    
    A recent commit 6e70103d deleted some Any constructors and methods, and
    updated all the places where these had been called - except it looks
    like one call was missed, active only when building against Python 2.
    
    Adjust this call following what was done for the Python 3 case.
    
    Change-Id: I0f92b7476b617d9fdf0e5f698e363360497d115e
    Reviewed-on: https://gerrit.libreoffice.org/24759
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 0669360..468d21f 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -658,13 +658,11 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
     {
         if( o == Py_True )
         {
-            sal_Bool b = sal_True;
-            a = Any( &b, cppu::UnoType<bool>::get() );
+            a <<= true;
         }
         else if ( o == Py_False )
         {
-            sal_Bool b = sal_False;
-            a = Any( &b, cppu::UnoType<bool>::get() );
+            a <<= false;
         }
         else
         {


More information about the Libreoffice-commits mailing list