From 71a61ab2d8b650ebe0655cebd7233959a5a3811e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 10 Feb 2019 12:29:15 +0200 Subject: loplugin:indentation in unotools..vbahelper Change-Id: I76de5678dd21f207e9e9c2a0c446f2c0b9be974e Reviewed-on: https://gerrit.libreoffice.org/67609 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vbahelper/source/msforms/service.cxx | 6 ++--- vbahelper/source/msforms/vbacontrol.cxx | 14 +++++------ vbahelper/source/msforms/vbalistbox.cxx | 2 +- vbahelper/source/msforms/vbatogglebutton.cxx | 4 ++-- vbahelper/source/vbahelper/vbadocumentsbase.cxx | 4 ++-- vbahelper/source/vbahelper/vbafontbase.cxx | 2 +- vbahelper/source/vbahelper/vbahelper.cxx | 32 ++++++++++++------------- vbahelper/source/vbahelper/vbashaperange.cxx | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) (limited to 'vbahelper/source') diff --git a/vbahelper/source/msforms/service.cxx b/vbahelper/source/msforms/service.cxx index 3da00781514c..1014966f323a 100644 --- a/vbahelper/source/msforms/service.cxx +++ b/vbahelper/source/msforms/service.cxx @@ -35,10 +35,10 @@ extern "C" const sal_Char * pImplName, void *, void *) { SAL_INFO("vbahelper", "In component_getFactory for " << pImplName ); - void* pRet = sdecl::component_getFactoryHelper( + void* pRet = sdecl::component_getFactoryHelper( pImplName, {&controlprovider::serviceDecl, &userform::serviceDecl} ); - SAL_INFO("vbahelper", "Ret is 0x" << std::hex << pRet); - return pRet; + SAL_INFO("vbahelper", "Ret is 0x" << std::hex << pRet); + return pRet; } } diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 8f60a67af807..de81fc5d9fdc 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -79,7 +79,7 @@ ScVbaControl::getWindowPeer() // would seem to be a Userform control uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY_THROW ); xWinPeer = xControl->getPeer(); - return xWinPeer; + return xWinPeer; } // form control xControlModel.set( xControlShape->getControl(), uno::UNO_QUERY_THROW ); @@ -153,10 +153,10 @@ ScVbaControl::ScVbaControl( const uno::Reference< XHelperInterface >& xParent, c ScVbaControl::~ScVbaControl() { if( m_xControl.is() ) -{ + { uno::Reference< lang::XComponent > xComponent( m_xControl, uno::UNO_QUERY_THROW ); - xComponent->removeEventListener( m_xEventListener ); -} + xComponent->removeEventListener( m_xEventListener ); + } } void @@ -305,7 +305,7 @@ ScVbaControl::getControlSource() table::CellAddress aAddress; xProps->getPropertyValue( "BoundCell" ) >>= aAddress; xConvertor->setPropertyValue( "Address" , uno::makeAny( aAddress ) ); - xConvertor->getPropertyValue( "XLA1Representation" ) >>= sControlSource; + xConvertor->getPropertyValue( "XLA1Representation" ) >>= sControlSource; } catch(const uno::Exception&) { @@ -321,7 +321,7 @@ ScVbaControl::setControlSource( const OUString& _controlsource ) // reference tab in case no Sheet is specified in "_controlsource" // Can't use the active sheet either, code may of course access uno::Reference< drawing::XDrawPagesSupplier > xSupplier( m_xModel, uno::UNO_QUERY_THROW ); - uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW ); + uno::Reference< container::XIndexAccess > xIndex( xSupplier->getDrawPages(), uno::UNO_QUERY_THROW ); sal_Int32 nLen = xIndex->getCount(); bool bMatched = false; sal_Int16 nRefTab = 0; @@ -527,7 +527,7 @@ void SAL_CALL ScVbaControl::fireEvent( const script::ScriptEvent& rEvt ) lang::EventObject aEvt; uno::Reference< drawing::XControlShape > xControlShape( m_xControl, uno::UNO_QUERY ) ; - uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY ) ; + uno::Reference< awt::XControl > xControl( m_xControl, uno::UNO_QUERY ) ; if ( xControlShape.is() ) { diff --git a/vbahelper/source/msforms/vbalistbox.cxx b/vbahelper/source/msforms/vbalistbox.cxx index c91996c6d6f4..da919b42dad1 100644 --- a/vbahelper/source/msforms/vbalistbox.cxx +++ b/vbahelper/source/msforms/vbalistbox.cxx @@ -207,7 +207,7 @@ ScVbaListBox::setValueEvent( const uno::Any& value ) nList.realloc( nLength - 1 ); //m_xProps->setPropertyValue( sSourceName, uno::makeAny( nList ) ); fireClickEvent(); - m_xProps->setPropertyValue( "SelectedItems", uno::makeAny( nList ) ); + m_xProps->setPropertyValue( "SelectedItems", uno::makeAny( nList ) ); return; } } diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index 66106e9266d8..61b6562f0beb 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -55,8 +55,8 @@ uno::Any SAL_CALL ScVbaToggleButton::getValue() { sal_Int16 nState = 0; - m_xProps->getPropertyValue( "State" ) >>= nState; - return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) ); + m_xProps->getPropertyValue( "State" ) >>= nState; + return uno::makeAny( nState ? sal_Int16( -1 ) : sal_Int16( 0 ) ); } diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index d188812e89cd..fc20c882f092 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -258,8 +258,8 @@ uno::Any VbaDocumentsBase::openDocument( const OUString& rFileName, const uno::A bool bInteractive = !xApplication.is() || xApplication->getInteractive(); // we need to detect if this is a URL, if not then assume it's a file path - OUString aURL; - INetURLObject aObj; + OUString aURL; + INetURLObject aObj; aObj.SetURL( rFileName ); bool bIsURL = aObj.GetProtocol() != INetProtocol::NotValid; if ( bIsURL ) diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index d83d217be40b..408801e947d0 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -100,7 +100,7 @@ VbaFontBase::setSubscript( const uno::Any& aValue ) nValue2 = SUBSCRIPTHEIGHT; } - mxFont->setPropertyValue( "CharEscapementHeight" , uno::Any(nValue2) ); + mxFont->setPropertyValue( "CharEscapementHeight" , uno::Any(nValue2) ); mxFont->setPropertyValue( "CharEscapement" , uno::Any(nValue) ); } diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 3297bbec5fd0..5ec3311899f1 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -114,7 +114,7 @@ getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) const uno::Any& aNULL() { - static uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() ); + static uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() ); return aNULLL; } @@ -232,10 +232,10 @@ static uno::Reference< frame::XModel > getCurrentDocCtx( const OUString& ctxName, const uno::Reference< uno::XComponentContext >& xContext ) { uno::Reference< frame::XModel > xModel; - // try fallback to calling doc - css::uno::Reference< css::container::XNameAccess > xNameAccess( xContext, css::uno::UNO_QUERY_THROW ); - xModel.set( xNameAccess->getByName( ctxName ), uno::UNO_QUERY_THROW ); - return xModel; + // try fallback to calling doc + css::uno::Reference< css::container::XNameAccess > xNameAccess( xContext, css::uno::UNO_QUERY_THROW ); + xModel.set( xNameAccess->getByName( ctxName ), uno::UNO_QUERY_THROW ); + return xModel; } uno::Reference< frame::XModel > @@ -295,8 +295,8 @@ getCurrentWordDoc( const uno::Reference< uno::XComponentContext >& xContext ) sal_Int32 OORGBToXLRGB( sal_Int32 nCol ) { - sal_Int32 nAutoBits = nCol; - nAutoBits &= 0xFF000000; + sal_Int32 nAutoBits = nCol; + nAutoBits &= 0xFF000000; sal_Int32 nRed = nCol; nRed &= 0x00FF0000; nRed >>= 16; @@ -312,8 +312,8 @@ OORGBToXLRGB( sal_Int32 nCol ) sal_Int32 XLRGBToOORGB( sal_Int32 nCol ) { - sal_Int32 nAutoBits = nCol; - nAutoBits &= 0xFF000000; + sal_Int32 nAutoBits = nCol; + nAutoBits &= 0xFF000000; sal_Int32 nBlue = nCol; nBlue &= 0x00FF0000; @@ -779,14 +779,14 @@ bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const OUStr void setOrAppendPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const OUString& aName, const uno::Any& aValue ) { - if( setPropertyValue( aProp, aName, aValue ) ) - return; + if( setPropertyValue( aProp, aName, aValue ) ) + return; - // append the property - sal_Int32 nLength = aProp.getLength(); - aProp.realloc( nLength + 1 ); - aProp[ nLength ].Name = aName; - aProp[ nLength ].Value = aValue; + // append the property + sal_Int32 nLength = aProp.getLength(); + aProp.realloc( nLength + 1 ); + aProp[ nLength ].Name = aName; + aProp[ nLength ].Value = aValue; } // ====UserFormGeomentryHelper==== diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index dd5954fb0284..6cb5fdbf621e 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -394,7 +394,7 @@ ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource ) // #TODO #FIXME Shape parent should always be the sheet the shapes belong // to uno::Reference< msforms::XShape > xVbShape( new ScVbaShape( uno::Reference< XHelperInterface >(), mxContext, xShape, getShapes(), m_xModel, ScVbaShape::getType( xShape ) ) ); - return uno::makeAny( xVbShape ); + return uno::makeAny( xVbShape ); } OUString -- cgit