[Libreoffice-commits] core.git: 26 commits - embedserv/source extensions/source
Stephan Bergmann
sbergman at redhat.com
Mon Nov 23 23:47:29 PST 2015
embedserv/source/embed/docholder.cxx | 4 -
embedserv/source/embed/intercept.cxx | 4 -
embedserv/source/embed/servprov.cxx | 2
embedserv/source/embed/syswinwrapper.cxx | 24 ++------
embedserv/source/embed/tracker.cxx | 2
extensions/source/activex/SOActiveX.cxx | 4 -
extensions/source/ole/oledll.cxx | 15 +++++
extensions/source/ole/oleobjw.cxx | 31 +++++-----
extensions/source/ole/servprov.cxx | 6 +-
extensions/source/ole/servprov.hxx | 20 +++---
extensions/source/ole/unoconversionutilities.hxx | 68 +++++++++--------------
extensions/source/ole/unoobjw.cxx | 20 +++---
extensions/source/ole/wincrap.hxx | 15 +++++
extensions/source/ole/windata.hxx | 28 +++++++--
14 files changed, 133 insertions(+), 110 deletions(-)
New commits:
commit bbc7c0aea474460fd2214a708c6bc6477c481f39
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 23:49:21 2015 +0100
Silence clang-cl warnings in system ATL includes
Change-Id: Ie9c35db4404182efa948949851caabf402f2d74b
diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx
index 2c07ebf..f3adb8e 100644
--- a/extensions/source/ole/oledll.cxx
+++ b/extensions/source/ole/oledll.cxx
@@ -24,6 +24,17 @@
#pragma warning (push,1)
#pragma warning (disable:4548)
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wattributes"
+#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#pragma clang diagnostic ignored "-Winvalid-noreturn"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#pragma clang diagnostic ignored "-Wnon-pod-varargs"
+#endif
+
#ifdef __MINGW32__
#define _INIT_ATL_COMMON_VARS
#endif
@@ -31,6 +42,10 @@
CComModule _Module;
#include <atlcom.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
#pragma warning (pop)
BEGIN_OBJECT_MAP(ObjectMap)
diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx
index 210ccf9..f47b5ce 100644
--- a/extensions/source/ole/wincrap.hxx
+++ b/extensions/source/ole/wincrap.hxx
@@ -40,12 +40,27 @@
#include <prewin.h>
#include <list>
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wattributes"
+#pragma clang diagnostic ignored "-Wdelete-incomplete"
+#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#pragma clang diagnostic ignored "-Winvalid-noreturn"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#pragma clang diagnostic ignored "-Wnon-pod-varargs"
+#endif
+
// from oleobjw.hxx
#include <atlbase.h>
// from jscriptclasses.hxx
extern CComModule _Module;
#include <atlcom.h>
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
// from unoobjw.cxx
#include <olectl.h>
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index e946108..5e6c30a 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -22,10 +22,26 @@
#pragma warning (push,1)
#pragma warning (disable:4668)
#pragma warning (disable:4548)
+
#include "oleidl.h"
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wall"
+#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
+#pragma clang diagnostic ignored "-Winvalid-noreturn"
+#pragma clang diagnostic ignored "-Wmicrosoft"
+#pragma clang diagnostic ignored "-Wnon-pod-varargs"
+#endif
+
#include <atlbase.h>
+
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+
#pragma warning (pop)
+
#include "osl/diagnose.h"
namespace ole_adapter
commit bce4c82f3a01e3414d18cbac7d6cc69ae4a2c5ff
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 23:32:14 2015 +0100
-Werror,-Wreorder
Change-Id: I0a82c589b77ee247ce43dbfd88767100b7bd4147
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index a38dd90..e88a5b6 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -192,10 +192,10 @@ STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int /*fLock*/)
OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl( const Reference<XMultiServiceFactory>& smgr,
const Reference<XInterface>& xInst,
GUID* pGuid )
- : m_xInst(xInst)
- , m_refCount(0)
- , m_smgr(smgr)
+ : m_refCount(0)
+ , m_xInst(xInst)
, m_factoryHandle(0)
+ , m_smgr(smgr)
{
m_guid = *pGuid;
commit 330a67586c66c772e6f2f187ea118d4c05abb11e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 23:31:01 2015 +0100
-Werror,-Wlogical-op-parentheses
Change-Id: Ifbac95117d58d0fd9f40ef373e14544a37c0cce6
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 49fcf0f..0f897ba 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -570,10 +570,10 @@ static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource)
if (spValueDest)
{
VARIANT_BOOL varBool= VARIANT_FALSE;
- if( SUCCEEDED( hr= spValueDest->IsOutParam( &varBool) )
- && varBool == VARIANT_TRUE ||
- SUCCEEDED(hr= spValueDest->IsInOutParam( &varBool) )
- && varBool == VARIANT_TRUE )
+ if ((SUCCEEDED(hr = spValueDest->IsOutParam(&varBool))
+ && varBool == VARIANT_TRUE)
+ || (SUCCEEDED(hr = spValueDest->IsInOutParam(&varBool))
+ && varBool == VARIANT_TRUE))
{
if( SUCCEEDED( spValueDest->Set( CComVariant(), *pSource)))
ret= sal_True;
commit 149469ca9efda157f8ce2ff6cd3024177656da6b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 23:26:47 2015 +0100
-Werror,-Wwritable-strings
Change-Id: Ib407ba5bb6b20281948ba83a4e150b9fe19c19d9
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 5345942..49fcf0f 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -373,10 +373,10 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID id,
// Get the IN-param at index "0"
IDispatch* pdisp= pdispparams->rgvarg[i].pdispVal;
- OLECHAR* sindex= L"0";
+ OLECHAR const * sindex= L"0";
DISPID id;
DISPPARAMS noParams= {0,0,0,0};
- if(SUCCEEDED( hr= pdisp->GetIDsOfNames( IID_NULL, &sindex, 1, LOCALE_USER_DEFAULT, &id)))
+ if(SUCCEEDED( hr= pdisp->GetIDsOfNames( IID_NULL, const_cast<OLECHAR **>(&sindex), 1, LOCALE_USER_DEFAULT, &id)))
hr= pdisp->Invoke( id, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET,
& noParams, & varParam, NULL, NULL);
if( FAILED( hr))
commit 3fea33d6c84d9d3ab1663fc3579adcc69477f745
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 23:24:57 2015 +0100
-Werror,-Wreorder
Change-Id: Iaefccb789c7f3d3da259af39a909ebc2abeccc74
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index c60d7f6..5345942 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -87,8 +87,8 @@ static void writeExcepinfo(EXCEPINFO * pInfo, const OUString& message)
InterfaceOleWrapper_Impl::InterfaceOleWrapper_Impl( Reference<XMultiServiceFactory>& xFactory,
sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass):
- m_defaultValueType( 0),
- UnoConversionUtilities<InterfaceOleWrapper_Impl>( xFactory, unoWrapperClass, comWrapperClass)
+ UnoConversionUtilities<InterfaceOleWrapper_Impl>( xFactory, unoWrapperClass, comWrapperClass),
+ m_defaultValueType( 0)
{
}
commit 6b71293436eea26ae3a293d86f603d583d2fc7b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 23:05:52 2015 +0100
-Werror,-Winconsistent-missing-override
Change-Id: I851a1ce314dc3c47744d7a039065a945e62568d8
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index eb08cb0..06ced5e 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -175,14 +175,14 @@ public:
// XBridgeSupplier2 ---------------------------------------------------
- virtual Any SAL_CALL createBridge(const Any& modelDepObject,
+ Any SAL_CALL createBridge(const Any& modelDepObject,
const Sequence<sal_Int8>& ProcessId,
sal_Int16 sourceModelType,
sal_Int16 destModelType)
- throw (IllegalArgumentException, RuntimeException);
+ throw (IllegalArgumentException, RuntimeException) override;
// XInitialization
- virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException);
+ void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) override;
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
@@ -194,8 +194,8 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
// Abstract struct UnoConversionUtilities
- virtual Reference< XInterface > createUnoWrapperInstance();
- virtual Reference< XInterface > createComWrapperInstance();
+ Reference< XInterface > createUnoWrapperInstance() override;
+ Reference< XInterface > createComWrapperInstance() override;
protected:
};
@@ -218,9 +218,9 @@ public:
~OleClient_Impl();
// XMultiServiceFactory
- virtual Reference<XInterface> SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( Exception, RuntimeException);
- virtual Reference<XInterface> SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) throw (Exception, RuntimeException);
- Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (RuntimeException);
+ Reference<XInterface> SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( Exception, RuntimeException) override;
+ Reference<XInterface> SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const Sequence< Any >& Arguments) throw (Exception, RuntimeException) override;
+ Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (RuntimeException) override;
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
@@ -232,8 +232,8 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
// Abstract struct UnoConversionUtilities
- virtual Reference< XInterface > createUnoWrapperInstance();
- virtual Reference< XInterface > createComWrapperInstance();
+ Reference< XInterface > createUnoWrapperInstance() override;
+ Reference< XInterface > createComWrapperInstance() override;
protected:
Reference<XBridgeSupplier2> m_bridgeSupplier;
commit 997ec3f4864bf48746e0b839cc98f6e4a8ac1e95
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:58:41 2015 +0100
-Werror,-Wunused-local-typedef
Change-Id: I72b1fe3d183e0d2af40c3af2f2a65fdc0c251624
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 6674271..ee81b48 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -2204,7 +2204,6 @@ void IUnknownWrapper_Impl::getFuncDesc(const OUString & sFuncName, FUNCDESC ** p
OSL_ASSERT( * pFuncDesc == 0);
buildComTlbIndex();
typedef TLBFuncIndexMap::const_iterator cit;
- typedef TLBFuncIndexMap::iterator it;
//We assume there is only one entry with the function name. A property
//would have two entries.
cit itIndex= m_mapComFunc.find(sFuncName);
commit 7d41b30eb43a02da5e1c2b0262e73b5b32c31462
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:56:37 2015 +0100
-Werror,-Wint-to-pointer-cast
Change-Id: I27098dec221b5019aaef927cf9567910621fdd3d
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index ac431e6..6674271 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -78,16 +78,16 @@ namespace ole_adapter
// called.
// Before UNO object is wrapped to COM object this map is checked
// to see if the UNO object is already a wrapper.
-std::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
+std::unordered_map<sal_uIntPtr, sal_uIntPtr> AdapterToWrapperMap;
// key: XInterface of the wrapper object.
// value: XInterface of the Interface created by the Invocation Adapter Factory.
// A COM wrapper is responsible for removing the corresponding entry
// in AdapterToWrappperMap if it is being destroyed. Because the wrapper does not
// know about its adapted interface it uses WrapperToAdapterMap to get the
// adapted interface which is then used to locate the entry in AdapterToWrapperMap.
-std::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap;
+std::unordered_map<sal_uIntPtr,sal_uIntPtr> WrapperToAdapterMap;
-std::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
+std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > ComPtrToWrapperMap;
/*****************************************************************************
class implementation IUnknownWrapper_Impl
@@ -114,17 +114,17 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
#endif
// remove entries in global maps
- typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT;
- _IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot);
+ typedef std::unordered_map<sal_uIntPtr, sal_uIntPtr>::iterator _IT;
+ _IT it= WrapperToAdapterMap.find( (sal_uIntPtr) xIntRoot);
if( it != WrapperToAdapterMap.end())
{
- sal_uInt32 adapter= it->second;
+ sal_uIntPtr adapter= it->second;
AdapterToWrapperMap.erase( adapter);
WrapperToAdapterMap.erase( it);
}
- IT_Com it_c= ComPtrToWrapperMap.find( (sal_uInt32) m_spUnknown.p);
+ IT_Com it_c= ComPtrToWrapperMap.find( (sal_uIntPtr) m_spUnknown.p);
if(it_c != ComPtrToWrapperMap.end())
ComPtrToWrapperMap.erase(it_c);
}
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 0599c1e..be18ec9 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -63,17 +63,17 @@ using namespace com::sun::star::bridge::ModelDependent;
using namespace com::sun::star::bridge::oleautomation;
namespace ole_adapter
{
-extern std::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
-extern std::unordered_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap;
-typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap;
-typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap;
+extern std::unordered_map<sal_uIntPtr, sal_uIntPtr> AdapterToWrapperMap;
+extern std::unordered_map<sal_uIntPtr, sal_uIntPtr> WrapperToAdapterMap;
+typedef std::unordered_map<sal_uIntPtr, sal_uIntPtr>::iterator IT_Wrap;
+typedef std::unordered_map<sal_uIntPtr, sal_uIntPtr>::iterator CIT_Wrap;
//Maps IUnknown pointers to a weak reference of the respective wrapper class (e.g.
// IUnknownWrapperImpl. It is the responsibility of the wrapper to remove the entry when
// it is being destroyed.
// Used to ensure that an Automation object is always mapped to the same UNO objects.
-extern std::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
-typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com;
-typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com;
+extern std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > ComPtrToWrapperMap;
+typedef std::unordered_map<sal_uIntPtr, WeakReference<XInterface> >::iterator IT_Com;
+typedef std::unordered_map<sal_uIntPtr, WeakReference<XInterface> >::const_iterator CIT_Com;
// Maps XInterface pointers to a weak reference of its wrapper class (i.e.
// InterfaceOleWrapper_Impl). It is the responsibility of the wrapper to remove the entry when
@@ -81,9 +81,9 @@ typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterat
// is mapped to IDispatch which is kept alive in the COM environment. If the same
// UNO interface is mapped again to COM then the IDispach of the first mapped instance
// must be returned.
-extern std::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
-typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno;
-typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno;
+extern std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > UnoObjToWrapperMap;
+typedef std::unordered_map<sal_uIntPtr, WeakReference<XInterface> >::iterator IT_Uno;
+typedef std::unordered_map<sal_uIntPtr, WeakReference<XInterface> >::const_iterator CIT_Uno;
#ifdef __MINGW32__
inline void reduceRange( Any& any);
#endif
@@ -1375,7 +1375,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
Reference<XInterface> xIntWrapper;
// Does a UNO wrapper exist already ?
- IT_Uno it_uno = UnoObjToWrapperMap.find( (sal_uInt32) xInt.get());
+ IT_Uno it_uno = UnoObjToWrapperMap.find( (sal_uIntPtr) xInt.get());
if(it_uno != UnoObjToWrapperMap.end())
{
xIntWrapper = it_uno->second;
@@ -1390,9 +1390,9 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
else
{
Reference<XInterface> xIntComWrapper = xInt;
- typedef std::unordered_map<sal_uInt32,sal_uInt32>::iterator _IT;
+ typedef std::unordered_map<sal_uIntPtr,sal_uIntPtr>::iterator _IT;
// Adapter? then get the COM wrapper to which the adapter delegates its calls
- _IT it= AdapterToWrapperMap.find( (sal_uInt32) xInt.get());
+ _IT it= AdapterToWrapperMap.find( (sal_uIntPtr) xInt.get());
if( it != AdapterToWrapperMap.end() )
xIntComWrapper= reinterpret_cast<XInterface*>(it->second);
@@ -1445,7 +1445,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
// be mapped again and there is already a wrapper then the old wrapper
// will be used.
if(xInt.is()) // only interfaces
- UnoObjToWrapperMap[(sal_uInt32) xInt.get()]= xNewWrapper;
+ UnoObjToWrapperMap[(sal_uIntPtr) xInt.get()]= xNewWrapper;
convertSelfToCom(xNewWrapper, pVar);
return;
}
@@ -1753,7 +1753,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
// wrap ordinary dispatch objects. The dispatch-UNO objects usually are adapted to represent
// particular UNO interfaces.
Reference<XInterface> xIntWrapper;
- CIT_Com cit_currWrapper= ComPtrToWrapperMap.find( reinterpret_cast<sal_uInt32>(spUnknown.p));
+ CIT_Com cit_currWrapper= ComPtrToWrapperMap.find( reinterpret_cast<sal_uIntPtr>(spUnknown.p));
if(cit_currWrapper != ComPtrToWrapperMap.end())
xIntWrapper = cit_currWrapper->second;
if (xIntWrapper.is())
@@ -1762,7 +1762,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
//find the proper Adapter. The pointer in the WrapperToAdapterMap are valid as long as
//we get a pointer to the wrapper from ComPtrToWrapperMap, because the Adapter hold references
//to the wrapper.
- CIT_Wrap it = WrapperToAdapterMap.find((sal_uInt32) xIntWrapper.get());
+ CIT_Wrap it = WrapperToAdapterMap.find((sal_uIntPtr) xIntWrapper.get());
if (it == WrapperToAdapterMap.end())
{
// No adapter available.
@@ -1823,21 +1823,13 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
OSL_ASSERT( xInit.is());
Any params[3];
-#ifdef __MINGW32__
- params[0] <<= reinterpret_cast<sal_uInt32>( spUnknown.p );
-#else
params[0] <<= reinterpret_cast<sal_uIntPtr>(spUnknown.p);
-#endif
sal_Bool bDisp = pVar->vt == VT_DISPATCH ? sal_True : sal_False;
params[1].setValue( & bDisp, cppu::UnoType<bool>::get());
params[2] <<= seqTypes;
xInit->initialize( Sequence<Any>( params, 3));
-#ifdef __MINGW32__
- ComPtrToWrapperMap[reinterpret_cast<sal_uInt32>( spUnknown.p )]= xIntNewProxy;
-#else
- ComPtrToWrapperMap[reinterpret_cast<sal_uInt32>(spUnknown.p)]= xIntNewProxy;
-#endif
+ ComPtrToWrapperMap[reinterpret_cast<sal_uInt64>(spUnknown.p)] = xIntNewProxy;
// we have a wrapper object
//The wrapper implements already XInvocation and XInterface. If
@@ -1876,9 +1868,9 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty
// in a global map. Thus we can determine in a call to createUnoObjectWrapper whether the UNO
// object is a wrapped COM object. In that case we extract the original COM object rather than
// creating a wrapper around the UNO object.
- typedef std::unordered_map<sal_uInt32,sal_uInt32>::value_type VALUE;
- AdapterToWrapperMap.insert( VALUE( (sal_uInt32) xIntAdapted.get(), (sal_uInt32) receiver.get()));
- WrapperToAdapterMap.insert( VALUE( (sal_uInt32) receiver.get(), (sal_uInt32) xIntAdapted.get()));
+ typedef std::unordered_map<sal_uInt64,sal_uInt64>::value_type VALUE;
+ AdapterToWrapperMap.insert( VALUE( (sal_uInt64) xIntAdapted.get(), (sal_uInt64) receiver.get()));
+ WrapperToAdapterMap.insert( VALUE( (sal_uInt64) receiver.get(), (sal_uInt64) xIntAdapted.get()));
}
else
{
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 5d1c62d..c60d7f6 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -67,7 +67,7 @@ extern "C" const GUID IID_IDispatchEx;
namespace ole_adapter
{
-std::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
+std::unordered_map<sal_uIntPtr, WeakReference<XInterface> > UnoObjToWrapperMap;
static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource);
static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource);
static HRESULT mapCannotConvertException(const CannotConvertException &e, unsigned int * puArgErr);
@@ -96,7 +96,7 @@ InterfaceOleWrapper_Impl::~InterfaceOleWrapper_Impl()
{
MutexGuard guard(getBridgeMutex());
// remove entries in global map
- IT_Uno it= UnoObjToWrapperMap.find( (sal_uInt32) m_xOrigin.get());
+ IT_Uno it= UnoObjToWrapperMap.find( (sal_uIntPtr) m_xOrigin.get());
if(it != UnoObjToWrapperMap.end())
UnoObjToWrapperMap.erase(it);
}
commit 6525d1663f8d03e2c28e626fadc2e3e848798224
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:38:35 2015 +0100
-Werror,-Wenum-compare
Change-Id: I165daea216ac3b960d11dfece861f4fb21209ed0
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 02acbe5..0599c1e 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -2071,7 +2071,7 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
else
{
// type after conversion must be the element type of the sequence
- OSL_ENSURE( (any.getValueTypeClass() == typeElement), "wrong conversion");
+ OSL_ENSURE(any.getValueTypeClass() == css::uno::TypeClass(typeElement), "wrong conversion");
uno_type_assignData( pDest, pSeqElemDescRef,const_cast<void*>( any.getValue()), any.getValueTypeRef(),
cpp_queryInterface, cpp_acquire, cpp_release);
}
commit dc5cb4d47dc7908ce2ea165cb9aa26ceca4f8701
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:35:43 2015 +0100
-Werror,-Wwritable-strings
Change-Id: Ief710b95ab7f41ef5fcb534dabe05311aa1135d3
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index e3574d8..02acbe5 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1985,11 +1985,11 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
DISPPARAMS param= {0,0,0,0};
CComVariant result;
- OLECHAR* sLength= L"length";
+ OLECHAR const * sLength= L"length";
// Get the length of the array. Can also be obtained throu GetNextDispID. The
// method only returns DISPIDs of the array data. Their names are like "0", "1" etc.
- if( FAILED( hr= pdispEx->GetIDsOfNames(IID_NULL, &sLength , 1, LOCALE_USER_DEFAULT, &dispid)))
+ if( FAILED( hr= pdispEx->GetIDsOfNames(IID_NULL, const_cast<OLECHAR **>(&sLength), 1, LOCALE_USER_DEFAULT, &dispid)))
throw BridgeRuntimeError("[automation bridge] UnoConversionUtilities<T>::dispatchExObject2Sequence \n"
"Conversion of dispatch object to Sequence failed!");
if( FAILED( hr= pdispEx->InvokeEx(dispid, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET,
@@ -2258,12 +2258,13 @@ sal_Bool UnoConversionUtilities<T>::isJScriptArray(const VARIANT* rvar)
{
OSL_ENSURE( rvar->vt == VT_DISPATCH, "param is not a VT_DISPATCH");
HRESULT hr;
- OLECHAR* sindex= L"0";
+ OLECHAR const * sindex= L"0";
DISPID id;
if ( rvar->vt == VT_DISPATCH && rvar->pdispVal )
{
- hr= rvar->pdispVal->GetIDsOfNames( IID_NULL, &sindex, 1,
- LOCALE_USER_DEFAULT, &id);
+ hr= rvar->pdispVal->GetIDsOfNames(
+ IID_NULL, const_cast<OLECHAR **>(&sindex), 1, LOCALE_USER_DEFAULT,
+ &id);
if( SUCCEEDED ( hr) )
return sal_True;
commit 96fd3d32fa5ab347d08f2ce467b5b449e43ecce6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:30:13 2015 +0100
-Werror,-Wreorder
Change-Id: Ie400720915ad9e6a075666dcac2b1b3711376bf3
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index eefe5f7..e3574d8 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -108,7 +108,8 @@ public:
{}
UnoConversionUtilities( const Reference<XMultiServiceFactory> & xFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass )
- : m_smgr( xFactory), m_nComWrapperClass( comWrapperClass), m_nUnoWrapperClass( unoWrapperClass)
+ : m_nUnoWrapperClass(unoWrapperClass),
+ m_nComWrapperClass(comWrapperClass), m_smgr(xFactory)
{}
virtual ~UnoConversionUtilities() {}
commit 441236a3e0e2492256472e7d19c80a683f1d3fc2
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:25:14 2015 +0100
-Werror,-Wenum-compare
Change-Id: I1d4263e9f754d85eb70bc5ce88fe1deffb05e9bb
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index fc7c2d7..ac431e6 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1556,7 +1556,7 @@ void IUnknownWrapper_Impl::getMethodInfo(const OUString& sName, TypeDescription&
if( desc.is())
{
typelib_TypeDescription* pMember= desc.get();
- if( pMember->eTypeClass == TypeClass_INTERFACE_METHOD )
+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_METHOD )
methodInfo= pMember;
}
}
@@ -1567,7 +1567,7 @@ void IUnknownWrapper_Impl::getAttributeInfo(const OUString& sName, TypeDescripti
if( desc.is())
{
typelib_TypeDescription* pMember= desc.get();
- if( pMember->eTypeClass == TypeClass_INTERFACE_ATTRIBUTE )
+ if( pMember->eTypeClass == typelib_TypeClass_INTERFACE_ATTRIBUTE )
{
attributeInfo= ((typelib_InterfaceAttributeTypeDescription*)pMember)->pAttributeTypeRef;
}
commit a5ad198816518a277745698580ed0df47cb50094
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:21:08 2015 +0100
-Werror,-Wlogical-op-parentheses
Change-Id: I48bcb6e35ffc3ce73a2142e52f453b1c839e4831
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 430d02f..fc7c2d7 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -302,8 +302,8 @@ void SAL_CALL IUnknownWrapper_Impl::setValue( const OUString& aPropertyName,
throw UnknownPropertyException(msg);
}
- if ( (! aDescPut && aDescGet) || aVarDesc
- && aVarDesc->wVarFlags == VARFLAG_FREADONLY )
+ if ( (! aDescPut && aDescGet)
+ || (aVarDesc && aVarDesc->wVarFlags == VARFLAG_FREADONLY) )
{
//read-only
OUString msg("[automation bridge] Property " + aPropertyName +
@@ -614,8 +614,8 @@ sal_Bool SAL_CALL IUnknownWrapper_Impl::hasMethod( const OUString& aName )
FuncDesc aDescPut(pInfo);
VarDesc aVarDesc(pInfo);
getPropDesc( aName, & aDescGet, & aDescPut, & aVarDesc);
- if (aDescGet && aDescGet->cParams > 0
- || aDescPut && aDescPut->cParams > 0)
+ if ((aDescGet && aDescGet->cParams > 0)
+ || (aDescPut && aDescPut->cParams > 0))
ret = sal_True;
}
else
commit 8b5182155b6d35a1be64d37136584e30ea6a6ef8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:18:03 2015 +0100
-Werror,-Wmicrosoft-exception-spec
Change-Id: Iba187daa891d326011cddecf09daa349e9090913
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 794cb25..430d02f 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -156,7 +156,7 @@ Reference<XIntrospectionAccess> SAL_CALL IUnknownWrapper_Impl::getIntrospection(
return ret;
}
-Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
+Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException)
{
Any aResult;
try
@@ -184,7 +184,7 @@ Any SAL_CALL IUnknownWrapper_Impl::invokeGetProperty( const OUString& aPropertyN
return aResult;
}
-Any SAL_CALL IUnknownWrapper_Impl::invokePutProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
+Any SAL_CALL IUnknownWrapper_Impl::invokePutProperty( const OUString& aPropertyName, const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException)
{
Any aResult;
try
commit ef02b16e2fa44df18dd118fea9c8c2014e3871a9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:13:58 2015 +0100
-Werror,-Wreorder
Change-Id: Iecb4fcc79614eee8dbfa7980c50f41150110711b
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index fd907d8..e946108 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -41,8 +41,8 @@ public:
VARDESC* m_pVarDesc;
VarDesc(ITypeInfo* pTypeInfo) :
- m_pVarDesc(NULL),
- m_pTypeInfo(pTypeInfo)
+ m_pTypeInfo(pTypeInfo),
+ m_pVarDesc(NULL)
{
OSL_ASSERT(pTypeInfo);
}
@@ -81,8 +81,8 @@ class FuncDesc
public:
FuncDesc(ITypeInfo * pTypeInfo) :
- m_pFuncDesc(NULL),
- m_pTypeInfo(pTypeInfo)
+ m_pTypeInfo(pTypeInfo),
+ m_pFuncDesc(NULL)
{
OSL_ASSERT(pTypeInfo);
}
@@ -159,8 +159,8 @@ public:
TYPEATTR* m_pTypeAttr;
TypeAttr(ITypeInfo* pTypeInfo) :
- m_pTypeAttr( NULL ),
- m_pTypeInfo( pTypeInfo )
+ m_pTypeInfo( pTypeInfo ),
+ m_pTypeAttr( NULL )
{
OSL_ASSERT(pTypeInfo);
}
commit a93c3c87443331086880ee3c7b6d6a918da43b02
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 22:10:41 2015 +0100
-Wmicrosoft-default-arg-redefinition
Change-Id: I69c009af5d5bd8d497a636eaa1de9b8eed919c8f
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index fe008e9..eefe5f7 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1652,11 +1652,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANT* pVariant, Any& rAny
// UNO wrapper than the original UNO object is being extracted, queried for "aType" (if
// it is no struct) and returned.
template<class T>
-#ifdef __MINGW32__
Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType)
-#else
-Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type& aType= Type())
-#endif
{
//To allow passing "Nothing" in VS 2008 we need to accept VT_EMPTY
if (pVar->vt != VT_UNKNOWN && pVar->vt != VT_DISPATCH && pVar->vt != VT_EMPTY)
commit 3b55411a0ab7c065efc074ef2505ae5e42c909ff
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 08:11:36 2015 +0100
-Werror,-Wlogical-op-parentheses
Change-Id: I2fa3e03d34a371cec694f58cf71f15df6f52c63a
diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx
index c0505d9..09e3f26 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -276,7 +276,7 @@ HRESULT CSOActiveX::TerminateOffice()
if ( SUCCEEDED( hr ) )
{
if ( ( aFrames.vt == ( VT_ARRAY | VT_DISPATCH ) || aFrames.vt == ( VT_ARRAY | VT_VARIANT ) )
- && ( !aFrames.parray || aFrames.parray->cDims == 1 && aFrames.parray->rgsabound[0].cElements == 0 ) )
+ && ( !aFrames.parray || (aFrames.parray->cDims == 1 && aFrames.parray->rgsabound[0].cElements == 0) ) )
{
// there is no frames open
// TODO: check whether the frames are hidden if they are open?
commit d1f44ab2d827b3e3375be7128316c7bca7ae46e5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Nov 20 08:10:17 2015 +0100
-Werror,-Wreorder
Change-Id: Iccdd21e974671f8d02cf1b55f0f828cdc881aedc
diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx
index fdb312e..c0505d9 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -145,8 +145,8 @@ CSOActiveX::CSOActiveX()
, mCurFileUrl( L"private:factory/swriter" )
, mbLoad( FALSE )
, mParentWin( NULL )
-, mOffWin( NULL )
, mbViewOnly( TRUE )
+, mOffWin( NULL )
, mpDispatchInterceptor( NULL )
, mnVersion( SO_NOT_DETECTED )
, mbReadyForActivation( FALSE )
commit 0ea675516163d08db063b4b5ede5cc3317cbae2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 22:34:39 2015 +0100
-Werror,-Wunused-variable
Change-Id: If674f0a3199a43cec84eb8cfb3b3c1d334a288ca
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index 7670a64..303f49a 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -98,16 +98,6 @@ HINSTANCE winwrap::CWindow::Instance()
return m_hInst;
}
-
-
-
-
-//Hatch pattern brush bits
-static WORD g_wHatchBmp[]={0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88};
-
-// void DrawShading(LPRECT, HDC, UINT);
-
-
/*
* HatchWindowRegister
*
commit fa257a38b0d41cbfa9a9c1535761b406bff6adb5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 22:31:19 2015 +0100
Use Get/SetWindowLongPtr, for 64-bit build
Change-Id: I02e5ca8dad87c24f8bf6e192a6b37ffc82a5a04a
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index 424b24f..7670a64 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -393,14 +393,14 @@ LRESULT APIENTRY winwrap::HatchWndProc(
HDC hDC;
PAINTSTRUCT ps;
- phw=(PCHatchWin)GetWindowLong(hWnd, HWWL_STRUCTURE);
+ phw=(PCHatchWin)GetWindowLongPtr(hWnd, HWWL_STRUCTURE);
POINT ptMouse;
switch (iMsg)
{
case WM_CREATE:
phw=(PCHatchWin)((LPCREATESTRUCT)lParam)->lpCreateParams;
- SetWindowLong(hWnd, HWWL_STRUCTURE, (LONG)phw);
+ SetWindowLongPtr(hWnd, HWWL_STRUCTURE, (LONG_PTR)phw);
break;
case WM_PAINT:
hDC=BeginPaint(hWnd,&ps);
commit 04277e7bcf2c7b2dd507b5765d069dc437d650ed
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 22:18:19 2015 +0100
-Werror,-Wbitwise-op-parentheses
Change-Id: I36bd91dc2bb77a09f59e865527db1e9c6724a652
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index 8375ba0..d40e69a 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -772,7 +772,7 @@ int Tracker::HitTestHandles(POINT point) const
{
RECT rect = m_rect;
NormalizeRect(&rect);
- if ((m_nStyle & dottedLine|solidLine) != 0)
+ if ((m_nStyle & (dottedLine|solidLine)) != 0)
InflateRect(&rect,+1, +1);
if (!PtInRect(&rect,point))
return hitNothing; // must have been between resize handles
commit 09682385170c87bef001186797fe287849aea5d6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 22:09:48 2015 +0100
Expand single use of SendCommand macro
Change-Id: I8af259f55e8fc318ccdbc69bba00ae0d7d3aacdb
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index d493dd9..424b24f 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -41,10 +41,6 @@ using namespace winwrap;
#define HWN_BORDERDOUBLECLICKED 1
#define CBHATCHWNDEXTRA (sizeof(LONG))
#define SZCLASSHATCHWIN TEXT("hatchwin")
-#define SendCommand(hWnd, wID, wCode, hControl) \
- SendMessage(hWnd, WM_COMMAND, MAKEWPARAM(wID, wCode) \
- , (LPARAM)hControl)
-
typedef CHatchWin *PCHatchWin;
@@ -448,8 +444,10 @@ LRESULT APIENTRY winwrap::HatchWndProc(
*/
if (NULL!=phw->m_hWndAssociate)
{
- SendCommand(phw->m_hWndAssociate, phw->m_uID
- , HWN_BORDERDOUBLECLICKED, hWnd);
+ SendMessage(
+ phw->m_hWndAssociate, WM_COMMAND,
+ MAKEWPARAM(phw->m_uID, HWN_BORDERDOUBLECLICKED),
+ (LPARAM) hWnd);
}
break;
commit 63915326cb8fccca47a265abfca351a555c865f5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 21:54:29 2015 +0100
-Werror,-Wreorder
Change-Id: I8350b7e60e54eb0f0be5fa33a4ca4de40551618c
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 775a31f..1132094 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -143,8 +143,8 @@ css::uno::Sequence<OUString> EmbedServer_Impl::getSupportedServiceNames()
EmbedProviderFactory_Impl::EmbedProviderFactory_Impl(const uno::Reference<lang::XMultiServiceFactory>& xFactory, const GUID* pGuid)
: m_refCount( 0L )
- , m_xFactory( xFactory )
, m_guid( *pGuid )
+ , m_xFactory( xFactory )
{
}
commit e3eebcc45ce0bf4cfa5d923ea2f3b2ff0a76e86d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 21:53:27 2015 +0100
-Werror,-Wlogical-op-parentheses
Change-Id: I39f59a88c34c37bad520dd44f3e8fcaf4a016eee
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 7946185..58fa935 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -213,7 +213,7 @@ void Interceptor::generateFeatureStateEvent()
for(int i = 0; i < IUL; ++i)
{
- if( i == 1 || m_bLink && i != 5 )
+ if( i == 1 || (m_bLink && i != 5) )
continue;
cppu::OInterfaceContainerHelper* pICH =
commit 550838301438e0f03cc419c32efdbc22bcba61d5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 21:52:32 2015 +0100
-Werror,-Wreorder
Change-Id: I71e3d8878a8c7190ef239e4529d23eccaadc80d6
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 8c32da3..7946185 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -97,8 +97,8 @@ Interceptor::Interceptor(
: m_xOleAccess( xOleAccess ),
m_xDocHLocker( static_cast< ::cppu::OWeakObject* >( pDocH ) ),
m_pDocH(pDocH),
- m_pStatCL(0),
m_pDisposeEventListeners(0),
+ m_pStatCL(0),
m_bLink( bLink )
{
m_aInterceptedURL[0] = ".uno:Save";
commit cf2f0f9c20cd256152974a28b8c24deaa210df01
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 19 21:05:04 2015 +0100
-Werror,-Wint-to-pointer-cast
Change-Id: I6db7d7595fda972e7c5d5c24d235678671478975
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index a88b1ba..c95f46e 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -574,7 +574,7 @@ BOOL DocumentHolder::InPlaceMenuCreate()
uno::Sequence<sal_Int8> aProcessIdent(16);
rtl_getGlobalProcessId((sal_uInt8*)aProcessIdent.getArray());
uno::Any aAny = xSysDepWin->getWindowHandle(aProcessIdent,lang::SystemDependent::SYSTEM_WIN32);
- sal_Int32 tmp;
+ sal_Int64 tmp;
aAny >>= tmp;
HWND aHwnd = (HWND) tmp;
m_pIOleIPFrame->SetMenu(
@@ -1256,7 +1256,7 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWin
if(xSysWin.is()) {
aAny = xSysWin->getWindowHandle(
aProcessIdent,lang::SystemDependent::SYSTEM_WIN32);
- sal_Int32 tmp;
+ sal_Int64 tmp;
if( aAny >>= tmp )
SetContainerWindowHandle((HWND) tmp);
}
More information about the Libreoffice-commits
mailing list