diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:53:08 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-09 17:08:00 +0100 |
commit | 4188ae6a093d935c7c983c7abb0a2fcb89f96c2a (patch) | |
tree | 1546698631a17520fab828822672ba874dddeeb4 /reportdesign | |
parent | 82b91027691a0a7138c0f70b94d6500e35bb8b44 (diff) |
loplugin:indentation in registry..sax
Change-Id: I4b877751818febaec8e64018335dca691a476a43
Reviewed-on: https://gerrit.libreoffice.org/67561
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/core/api/FormattedField.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/core/sdr/UndoActions.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlColumn.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlControlProperty.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFixedContent.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFormatCondition.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFormattedField.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlFunction.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlImage.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/filter/xml/xmlReport.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/propbrw.cxx | 2 |
14 files changed, 23 insertions, 23 deletions
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 6ba798b977ba..a50e79ab19fb 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -357,7 +357,7 @@ OUString SAL_CALL OFormattedField::getShapeType( ) ::osl::MutexGuard aGuard(m_aMutex); if ( m_aProps.aComponent.m_xShape.is() ) return m_aProps.aComponent.m_xShape->getShapeType(); - return OUString("com.sun.star.drawing.ControlShape"); + return OUString("com.sun.star.drawing.ControlShape"); } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index c048d2ecb8b4..077a0cdee96b 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1654,11 +1654,11 @@ void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect, const { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - bool bChanged = + bool bChanged = (m_pImpl->m_aVisualAreaSize.Width != _aSize.Width || m_pImpl->m_aVisualAreaSize.Height != _aSize.Height); - m_pImpl->m_aVisualAreaSize = _aSize; - if( bChanged ) + m_pImpl->m_aVisualAreaSize = _aSize; + if( bChanged ) setModified( true ); m_pImpl->m_nAspect = _nAspect; } @@ -2227,7 +2227,7 @@ OUString SAL_CALL OReportDefinition::getShapeType( ) ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); if ( m_aProps->m_xShape.is() ) return m_aProps->m_xShape->getShapeType(); - return OUString("com.sun.star.drawing.OLE2Shape"); + return OUString("com.sun.star.drawing.OLE2Shape"); } typedef ::cppu::WeakImplHelper< container::XNameContainer, diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index c144edcf2100..db4418c4b34c 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -271,7 +271,7 @@ void OUndoGroupSectionAction::implReInsert( ) void OUndoGroupSectionAction::implReRemove( ) { - OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); + OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv(); try { OXUndoEnvironment::OUndoEnvLock aLock(rEnv); diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 1fca8a23e08b..a5216aa7bc8e 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -60,7 +60,7 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); const OUString sValue = _xAttrList->getValueByIndex( i ); diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index 06455cc95339..a844ae79f149 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -70,7 +70,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport const sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); const OUString sValue = _xAttrList->getValueByIndex( i ); diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 72da5a31a7fc..94842e6bdb4c 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -185,14 +185,14 @@ void OXMLFixedContent::EndElement() uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD); Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY); xControl->setDataField("rpt:" + m_sPageText); - OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); + OSL_ENSURE(xControl.is(),"Could not create FormattedField!"); m_pInP->m_xReportComponent = xControl.get(); m_xReportComponent = xControl.get(); } else { Reference< XFixedText > xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY); - OSL_ENSURE(xControl.is(),"Could not create FixedContent!"); + OSL_ENSURE(xControl.is(),"Could not create FixedContent!"); m_pInP->m_xReportComponent = xControl.get(); m_xReportComponent = xControl.get(); xControl->setLabel(m_sLabel); diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index e232f9221fc5..676ee22896ae 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -55,7 +55,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, { for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); const OUString sValue = _xAttrList->getValueByIndex( i ); diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 019eb3fa4054..0e268a99565d 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -51,7 +51,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, { for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); const OUString sValue = _xAttrList->getValueByIndex( i ); diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 2fcf25de1d76..f2a5850eef0f 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -57,7 +57,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE); for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); const OUString sValue = _xAttrList->getValueByIndex( i ); diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 48cd7813f844..0c4f8b2137fc 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -57,7 +57,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport, { for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); /* const */ OUString sValue = _xAttrList->getValueByIndex( i ); @@ -66,9 +66,9 @@ OXMLImage::OXMLImage( ORptFilter& rImport, { case XML_TOK_IMAGE_DATA: { - SvtPathOptions aPathOptions; - sValue = aPathOptions.SubstituteVariable(sValue); - _xComponent->setImageURL(rImport.GetAbsoluteReference( sValue )); + SvtPathOptions aPathOptions; + sValue = aPathOptions.SubstituteVariable(sValue); + _xComponent->setImageURL(rImport.GetAbsoluteReference( sValue )); break; } case XML_TOK_PRESERVE_IRI: diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index b5bc5d0db848..d33424691292 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -60,7 +60,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, { for(sal_Int16 i = 0; i < nLength; ++i) { - OUString sLocalName; + OUString sLocalName; const OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); const OUString sValue = _xAttrList->getValueByIndex( i ); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 09fb88ebd1bb..ec3297328428 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -367,7 +367,7 @@ void OAddFieldWindow::Update() m_aActions->EnableItem(m_aActions->GetItemId(i)); } } - OnSelectHdl(nullptr); + OnSelectHdl(nullptr); } } catch( const Exception& ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index cefc45f953b3..5cbef2d2be07 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -4257,11 +4257,11 @@ void OReportController::openZoomDialog() void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) { ::osl::MutexGuard aGuard( getMutex() ); - bool bChanged = + bool bChanged = (m_aVisualAreaSize.Width != _aSize.Width || m_aVisualAreaSize.Height != _aSize.Height); - m_aVisualAreaSize = _aSize; - if( bChanged ) + m_aVisualAreaSize = _aSize; + if( bChanged ) setModified( true ); m_nAspect = _nAspect; } diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index a50d13d7a8db..fde1d48c69ca 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -455,7 +455,7 @@ void PropBrw::Resize() // adjust size if (m_xBrowserComponentWindow.is()) { - Size aSize = GetOutputSizePixel(); + Size aSize = GetOutputSizePixel(); m_xBrowserComponentWindow->setPosSize(0, 0, aSize.Width(), aSize.Height(), awt::PosSize::WIDTH | awt::PosSize::HEIGHT); } |