diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-11-11 09:00:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-11 09:00:41 +0000 |
| commit | 866c97ebb26b0a4194081e08df68c10202f1c286 (patch) | |
| tree | 3a2a4ed3ec33e1fd77f3f9fb2c18e6f67521dd44 /extensions | |
| parent | 57573ad5adbf1a6bb520c1c557684d06211ca7cc (diff) | |
CWS-TOOLING: integrate CWS wae4extensions02
2008-11-07 21:36:14 +0100 fs r263487 : #i95962# 'extensions' is warning-free on wntmsci11/wntmsci12
2008-11-07 21:33:51 +0100 fs r263486 : #i95962# warning-free code on wntmsci12
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/activex/main/SOActionsApproval.h | 1 | ||||
| -rw-r--r-- | extensions/source/activex/main/SOComWindowPeer.h | 1 | ||||
| -rw-r--r-- | extensions/source/ole/oleobjw.cxx | 10 |
3 files changed, 7 insertions, 5 deletions
diff --git a/extensions/source/activex/main/SOActionsApproval.h b/extensions/source/activex/main/SOActionsApproval.h index fa64d42aea55..d10ec1461d80 100644 --- a/extensions/source/activex/main/SOActionsApproval.h +++ b/extensions/source/activex/main/SOActionsApproval.h @@ -33,6 +33,7 @@ class SOActionsApproval : { public: SOActionsApproval() {} + virtual ~SOActionsApproval() {} BEGIN_COM_MAP(SOActionsApproval) COM_INTERFACE_ENTRY(IDispatch) diff --git a/extensions/source/activex/main/SOComWindowPeer.h b/extensions/source/activex/main/SOComWindowPeer.h index 1e20e028af65..27c6f4037baa 100644 --- a/extensions/source/activex/main/SOComWindowPeer.h +++ b/extensions/source/activex/main/SOComWindowPeer.h @@ -33,6 +33,7 @@ class SOComWindowPeer : HWND m_hwnd; public: SOComWindowPeer() : m_hwnd( NULL ) {} + virtual ~SOComWindowPeer() { } BEGIN_COM_MAP(SOComWindowPeer) COM_INTERFACE_ENTRY(IDispatch) diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 5e923b5a7022..3d1df739c464 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -902,10 +902,10 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, } else // it is an JScriptObject { - int i; + int i = 0; try { - for(i = 0; i< parameterCount; i++) + for( ; i< parameterCount; i++) { // In parameter if( pMethod->pParams[i].bIn == sal_True && ! pMethod->pParams[i].bOut) @@ -1002,10 +1002,10 @@ Any IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName, OutParamIndex.realloc( outParameterCount); OutParam.realloc( outParameterCount); sal_Int32 outIndex=0; - int i; + int i = 0; try { - for( i = 0; i < parameterCount; i++) + for( ; i < parameterCount; i++) { if( pMethod->pParams[i].bOut ) { @@ -1301,7 +1301,7 @@ Any IUnknownWrapper_Impl::invokeWithDispIdComTlb(const OUString& sFuncName, CComVariant varResult; ExcepInfo excepinfo; unsigned int uArgErr; - sal_Int32 i; + sal_Int32 i = 0; sal_Int32 nUnoArgs = Params.getLength(); DISPID idPropertyPut = DISPID_PROPERTYPUT; scoped_array<DISPID> arDispidNamedArgs; |