diff options
Diffstat (limited to 'reportdesign/source/filter/xml')
4 files changed, 25 insertions, 31 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 1a1416994f05..ce77628ea17c 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -355,14 +355,13 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR OSL_ENSURE(aDetailFields.getLength() == aMasterFields.getLength(),"not equal length for master and detail fields!"); const OUString* pDetailFieldsIter = aDetailFields.getConstArray(); - const OUString* pIter = aMasterFields.getConstArray(); - const OUString* pEnd = pIter + aMasterFields.getLength(); - for(;pIter != pEnd;++pIter,++pDetailFieldsIter) + for(const OUString& rMasterField : aMasterFields) { - AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , *pIter ); + AddAttribute( XML_NAMESPACE_REPORT, XML_MASTER , rMasterField ); if ( !pDetailFieldsIter->isEmpty() ) AddAttribute( XML_NAMESPACE_REPORT, XML_DETAIL , *pDetailFieldsIter ); SvXMLElementExport aPair(*this,XML_NAMESPACE_REPORT, XML_MASTER_DETAIL_FIELD, true, true); + ++pDetailFieldsIter; } } } diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 00cb0508e706..2116ca0c0893 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -321,14 +321,14 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any > if ( xDataProvider.is() ) { m_aColumns.realloc(1); - uno::Sequence< OUString > aColumnNames = xDataProvider->getColumnDescriptions(); - for(sal_Int32 i = 0 ; i < aColumnNames.getLength();++i) + const uno::Sequence< OUString > aColumnNames = xDataProvider->getColumnDescriptions(); + for(const auto& rColumnName : aColumnNames) { - if ( !aColumnNames[i].isEmpty() ) + if ( !rColumnName.isEmpty() ) { sal_Int32 nCount = m_aColumns.getLength(); m_aColumns.realloc(nCount+1); - m_aColumns[nCount] = aColumnNames[i]; + m_aColumns[nCount] = rColumnName; } } } @@ -388,9 +388,9 @@ void ExportDocumentHandler::exportTableRows() m_xDelegatee->endElement(sCell); } } - for(sal_Int32 i = 0; i < nCount ; ++i) + for(const auto& rColumn : std::as_const(m_aColumns)) { - OUString sFormula = "field:[" + m_aColumns[i] + "]"; + OUString sFormula = "field:[" + rColumn + "]"; SvXMLAttributeList* pList = new SvXMLAttributeList(); uno::Reference< xml::sax::XAttributeList > xAttribs = pList; pList->AddAttribute(sFormulaAttrib,sFormula); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 43a68a40e482..d71379715fb2 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -121,13 +121,12 @@ void SAL_CALL ImportDocumentHandler::endDocument() uno::Reference< chart2::data::XDataSource > xDataSource(m_xModel, uno::UNO_QUERY); if( xDataSource.is()) { - uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aSequences(xDataSource->getDataSequences()); - const sal_Int32 nCount( aSequences.getLength()); - for( sal_Int32 nIdx=0; nIdx<nCount; ++nIdx ) + const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aSequences(xDataSource->getDataSequences()); + for( const auto& rSequence : aSequences ) { - if( aSequences[nIdx].is() ) + if( rSequence.is() ) { - uno::Reference< beans::XPropertySet > xSeqProp( aSequences[nIdx]->getValues(), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xSeqProp( rSequence->getValues(), uno::UNO_QUERY ); OUString aRole; if ( xSeqProp.is() && ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index c7cc090755f2..00f7fe86a9c5 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -397,28 +397,24 @@ bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Reference< embed::XStorage > xStorage; uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier; - const PropertyValue* pIter = rDescriptor.getConstArray(); - const PropertyValue* pEnd = pIter + rDescriptor.getLength(); - for(;pIter != pEnd;++pIter) + for(const PropertyValue& rProp : rDescriptor) { - if ( pIter->Name == "FileName" ) - pIter->Value >>= sFileName; - else if ( pIter->Name == "Storage" ) - pIter->Value >>= xStorage; - else if ( pIter->Name == "ComponentData" ) + if ( rProp.Name == "FileName" ) + rProp.Value >>= sFileName; + else if ( rProp.Name == "Storage" ) + rProp.Value >>= xStorage; + else if ( rProp.Name == "ComponentData" ) { Sequence< PropertyValue > aComponent; - pIter->Value >>= aComponent; + rProp.Value >>= aComponent; const PropertyValue* pComponentIter = aComponent.getConstArray(); const PropertyValue* pComponentEnd = pComponentIter + aComponent.getLength(); - for(;pComponentIter != pComponentEnd;++pComponentIter) + pComponentIter = std::find_if(pComponentIter, pComponentEnd, + [](const PropertyValue& rComponent) { return rComponent.Name == "ActiveConnection"; }); + if (pComponentIter != pComponentEnd) { - if ( pComponentIter->Name == "ActiveConnection" ) - { - uno::Reference<sdbc::XConnection> xCon(pComponentIter->Value,uno::UNO_QUERY); - xNumberFormatsSupplier = ::dbtools::getNumberFormats(xCon); - break; - } + uno::Reference<sdbc::XConnection> xCon(pComponentIter->Value, uno::UNO_QUERY); + xNumberFormatsSupplier = ::dbtools::getNumberFormats(xCon); } } } |