extensions/source/ole/unoconversionutilities.hxx | 2 +-
include/com/sun/star/uno/Any.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b57184b2fb7f08fb48dc43958932e9f24d8d856f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed May 4 15:47:48 2016 +0200
Better fix for Windows-only code
Change-Id: I8437ec66b615754d71c726f715a6beeb4a0f7dda
diff --git a/extensions/source/ole/unoconversionutilities.hxx
b/extensions/source/ole/unoconversionutilities.hxx
index 1bc1faf..bdf61db 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1312,7 +1312,7 @@ SAFEARRAY*
UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq)
pArray = SafeArrayCreate(VT_VARIANT, 1, rgsabound);
Any unoElement;
- sal_uInt8 * pSeqData= (sal_uInt8*) punoSeq->elements;
+ char * pSeqData= punoSeq->elements;
for (sal_uInt32 i = 0; i < n; i++)
{
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 0eb9c68..26127f4 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
