summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-02-26 11:02:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2019-02-26 21:15:41 +0100
commitea58b039ab455b38aabbd20e8e50ec8965a1d69d (patch)
tree0010ec68a8da3c8dad5c34c27d42bfc0acd9a5b6 /extensions/source
parent0a29c928afa74123bca05dc089c751603d368467 (diff)
loplugin:indentation (clang-cl)
Change-Id: I94689e4eed290b4505d2caba2d9802ef7fb6cffd Reviewed-on: https://gerrit.libreoffice.org/68378 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/ole/oleobjw.cxx2
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx32
-rw-r--r--extensions/source/ole/unoobjw.cxx12
-rw-r--r--extensions/source/ole/unotypewrapper.cxx4
-rw-r--r--extensions/source/ole/windata.hxx2
5 files changed, 26 insertions, 26 deletions
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index b264e049e81d..76d6d246f377 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -456,7 +456,7 @@ Any SAL_CALL IUnknownWrapper::getValue( const OUString& aPropertyName )
{
if ( pInfo && m_sTypeName.getLength() == 0 )
{
- m_sTypeName = "IDispatch";
+ m_sTypeName = "IDispatch";
CComBSTR sName;
if ( SUCCEEDED( pInfo->GetDocumentation( -1, &sName, nullptr, nullptr, nullptr ) ) )
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index ec8c46d80016..b987a439b70b 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1029,7 +1029,7 @@ SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq,
for( sal_Int32 i=0; i < dims; i++)
{
//prgsabound[0] is the right most dimension
- prgsabound[dims - i - 1].lLbound = 0;
+ prgsabound[dims - i - 1].lLbound = 0;
prgsabound[dims - i - 1].cElements = seqElementCounts[i];
}
@@ -1682,7 +1682,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
}
// COM pointer are NULL, no wrapper required
- if (spUnknown == nullptr)
+ if (spUnknown == nullptr)
{
Reference<XInterface> xInt;
if( aType.getTypeClass() == TypeClass_INTERFACE)
@@ -1701,7 +1701,7 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
CComQIPtr<IUnoObjectWrapper> spUno( spUnknown);
if( spUno)
{ // it is a wrapper
- Reference<XInterface> xInt;
+ Reference<XInterface> xInt;
if( SUCCEEDED( spUno->getOriginalUnoObject( &xInt)))
{
ret <<= xInt;
@@ -1801,17 +1801,17 @@ Any UnoConversionUtilities<T>::createOleObjectWrapper(VARIANT* pVar, const Type&
// we have a wrapper object
//The wrapper implements already XInvocation and XInterface. If
//param aType is void then the object is supposed to have XInvocation.
- if (aType == cppu::UnoType<XInvocation>::get()||
- (aType == VOID_TYPE && seqTypes.getLength() == 0 ))
- {
- ret = xIntNewProxy->queryInterface(desiredType);
- }
- else
- {
- Reference<XInterface> xIntAdapter =
- createAdapter(seqTypes, xIntNewProxy);
- ret = xIntAdapter->queryInterface(desiredType);
- }
+ if (aType == cppu::UnoType<XInvocation>::get()||
+ (aType == VOID_TYPE && seqTypes.getLength() == 0 ))
+ {
+ ret = xIntNewProxy->queryInterface(desiredType);
+ }
+ else
+ {
+ Reference<XInterface> xIntAdapter =
+ createAdapter(seqTypes, xIntNewProxy);
+ ret = xIntAdapter->queryInterface(desiredType);
+ }
return ret;
}
template<class T>
@@ -1970,10 +1970,10 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
Type elemType( pSeqElemDescRef);
_typelib_TypeDescription* pSeqElemDesc=nullptr;
TYPELIB_DANGER_GET( &pSeqElemDesc, pSeqElemDescRef);
- sal_uInt32 nelementSize= pSeqElemDesc->nSize;
+ sal_uInt32 nelementSize= pSeqElemDesc->nSize;
TYPELIB_DANGER_RELEASE( pSeqElemDesc);
- uno_Sequence *p_uno_Seq;
+ uno_Sequence *p_uno_Seq;
uno_sequence_construct( &p_uno_Seq, pDesc, nullptr, length, cpp_acquire);
typelib_TypeClass typeElement= pSeqDesc->pType->eTypeClass;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 03314e44f506..8f1130905ea7 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1969,7 +1969,7 @@ STDMETHODIMP InterfaceOleWrapper::Invoke(DISPID dispidMember,
OUString message= "InterfaceOleWrapper::Invoke : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
- ret = DISP_E_EXCEPTION;
+ ret = DISP_E_EXCEPTION;
}
return ret;
@@ -2062,7 +2062,7 @@ HRESULT InterfaceOleWrapper::doInvoke( DISPPARAMS * pdispparams, VARIANT * pvarR
OUString message= "InterfaceOleWrapper::doInvoke : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
- ret = DISP_E_EXCEPTION;
+ ret = DISP_E_EXCEPTION;
}
return ret;
}
@@ -2100,7 +2100,7 @@ HRESULT InterfaceOleWrapper::doGetProperty( DISPPARAMS * /*pdispparams*/, VARIAN
OUString message= "InterfaceOleWrapper::doInvoke : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
- ret = DISP_E_EXCEPTION;
+ ret = DISP_E_EXCEPTION;
}
return ret;
}
@@ -2886,7 +2886,7 @@ HRESULT InterfaceOleWrapper::InvokeGeneral( DISPID dispidMember, unsigned short
OUString message= "InterfaceOleWrapper::InvokeGeneral : \n"
"Unexpected exception";
writeExcepinfo(pexcepinfo, message);
- ret = DISP_E_EXCEPTION;
+ ret = DISP_E_EXCEPTION;
}
return ret;
}
@@ -3347,8 +3347,8 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*
{
OUString message= "UnoObjectWrapperRemoteOpt::Invoke : \n" +
e.Message;
- writeExcepinfo(pexcepinfo, message);
- ret = DISP_E_EXCEPTION;
+ writeExcepinfo(pexcepinfo, message);
+ ret = DISP_E_EXCEPTION;
}
catch(...)
{
diff --git a/extensions/source/ole/unotypewrapper.cxx b/extensions/source/ole/unotypewrapper.cxx
index 333ced2f4d45..b54b5a37209e 100644
--- a/extensions/source/ole/unotypewrapper.cxx
+++ b/extensions/source/ole/unotypewrapper.cxx
@@ -140,7 +140,7 @@ STDMETHODIMP UnoTypeWrapper::Invoke( DISPID dispIdMember,
STDMETHODIMP UnoTypeWrapper::put_Name(BSTR val)
{
Lock();
- m_sName = val;
+ m_sName = val;
Unlock();
return S_OK;
}
@@ -151,7 +151,7 @@ STDMETHODIMP UnoTypeWrapper::get_Name(BSTR *pVal)
Lock();
if( !pVal)
return E_POINTER;
- *pVal = m_sName.Copy();
+ *pVal = m_sName.Copy();
Unlock();
return S_OK;
}
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index 760d1e6c052a..396e51077f9b 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -151,7 +151,7 @@ public:
}
~ExcepInfo()
{
- if (bstrSource != nullptr)
+ if (bstrSource != nullptr)
::SysFreeString(bstrSource);
if (bstrDescription != nullptr)
::SysFreeString(bstrDescription);