From f76bf262a60c154684ffefbd53a5339fa3864e42 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 12 Nov 2018 12:17:35 +0200 Subject: new loplugin indentation look for mixed indentation in compound statements, which makes them hard to read, and sometimes makes it look like a statement is associated with a nearby if/for Change-Id: Ic8429cee1f9a86d938097a4a8769a2bce97b3361 Reviewed-on: https://gerrit.libreoffice.org/63283 Tested-by: Jenkins Reviewed-by: Noel Grandin --- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 2 +- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 14 +++++++------- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'xmlscript/source') diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx index 641370f7cb64..82cf6eca2116 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx @@ -928,7 +928,7 @@ void ElementDescriptor::readDataAwareAttr( OUString const & rAttrName ) try { Reference< beans::XPropertySet > xConvertor( xFac->createInstance( "com.sun.star.table.CellAddressConversion" ), uno::UNO_QUERY ); - Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY ); + Reference< beans::XPropertySet > xBindable( xBinding->getValueBinding(), UNO_QUERY ); if ( xBindable.is() ) { table::CellAddress aAddress; diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 239f795e426a..16dffcb51681 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -72,9 +72,9 @@ Reference< xml::input::XElement > Frame::startChildElement( void Frame::endElement() { - if ( !m_xContainer.is() ) + if ( !m_xContainer.is() ) m_xContainer.set( m_xImport->_xDialogModelFactory->createInstance( "com.sun.star.awt.UnoFrameModel" ), UNO_QUERY ); - Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); + Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); // m_xImport is what we need to add to ( e.g. the dialog in this case ) ControlImportContext ctx( m_xImport.get(), xProps, getControlId( _xAttributes ) ); @@ -118,7 +118,7 @@ Reference< xml::input::XElement > MultiPage::startChildElement( // Create new DialogImport for this container DialogImport* pMultiPageImport = new DialogImport( *m_xImport ); - pMultiPageImport->_xDialogModel = m_xContainer; + pMultiPageImport->_xDialogModel = m_xContainer; return new BulletinBoardElement( rLocalName, xAttributes, this, pMultiPageImport ); } else @@ -130,7 +130,7 @@ Reference< xml::input::XElement > MultiPage::startChildElement( void MultiPage::endElement() { - Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); + Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); // m_xImport is what we need to add to ( e.g. the dialog in this case ) ControlImportContext ctx( m_xImport.get(), xProps, getControlId( _xAttributes )); @@ -148,7 +148,7 @@ void MultiPage::endElement() ctx.importDefaults( 0, 0, _xAttributes ); // inherited from BulletinBoardElement ctx.importLongProperty("MultiPageValue" , "value", _xAttributes ); - ctx.importBooleanProperty( "Decoration", "withtabs", _xAttributes) ; + ctx.importBooleanProperty( "Decoration", "withtabs", _xAttributes) ; ctx.importEvents( _events ); // avoid ring-reference: // vector< event elements > holding event elements holding this (via _pParent) @@ -171,7 +171,7 @@ Reference< xml::input::XElement > Page::startChildElement( { DialogImport* pPageImport = new DialogImport( *m_xImport ); - pPageImport->_xDialogModel = m_xContainer; + pPageImport->_xDialogModel = m_xContainer; return new BulletinBoardElement( rLocalName, xAttributes, this, pPageImport ); } else @@ -183,7 +183,7 @@ Reference< xml::input::XElement > Page::startChildElement( void Page::endElement() { - Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); + Reference< beans::XPropertySet > xProps( m_xContainer, UNO_QUERY_THROW ); ControlImportContext ctx( m_xImport.get(), xProps, getControlId( _xAttributes )); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx index e275ea679832..4c8ea1327b21 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx @@ -1766,7 +1766,7 @@ Reference< xml::sax::XDocumentHandler > importDialogModel( // single set of styles and stylenames apply to all containers std::shared_ptr< std::vector< OUString > > pStyleNames( new std::vector< OUString > ); std::shared_ptr< std::vector< css::uno::Reference< css::xml::input::XElement > > > pStyles( new std::vector< css::uno::Reference< css::xml::input::XElement > > ); - return ::xmlscript::createDocumentHandler( + return ::xmlscript::createDocumentHandler( static_cast< xml::input::XRoot * >( new DialogImport( xContext, xDialogModel, pStyleNames, pStyles, xDocument ) ) ); } -- cgit