[Libreoffice-commits] core.git: extensions/source include/com

[Stephan Bergmann]

 extensions/source/ole/unoconversionutilities.hxx |    3 +--
 include/com/sun/star/uno/Any.h                   |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit f7b2782e24c7b67dc127cb0a453901c3fc0a1fb7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 4 13:06:12 2016 +0200

    Fix Windows-only code
    
    Change-Id: Iaf6d668f65e31c60dba8140d789f6578ef461264

diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index e090dd00..5698558 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1557,8 +1557,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
                 }
                 case VT_BOOL:
                 {
-                    sal_Bool b= var.boolVal == VARIANT_TRUE;
-                    rAny.setValue( &b, cppu::UnoType<decltype(b)>::get());
+                    rAny <<= (var.boolVal == VARIANT_TRUE);
                     break;
                 }
                 case VT_I1:
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 26127f4..0eb9c68 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -227,7 +227,7 @@ public:
     void setValue(sal_Bool const *, Type const &) = delete;
     void setValue(sal_Bool const *, typelib_TypeDescriptionReference *)
         = delete;
-    void setValue(sal_Bool const *, typelib_TypeDescription *) = delete;
+    // void setValue(sal_Bool const *, typelib_TypeDescription *) = delete;
     void setValue(std::nullptr_t, Type const & type)
     { setValue(static_cast<void *>(nullptr), type); }
     void setValue(std::nullptr_t, typelib_TypeDescriptionReference * type)