diff options
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SdtHelper.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchdestination.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdispatchflag.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 2 |
10 files changed, 21 insertions, 21 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index f1ca99fc77bf..90cb75dbbd5a 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -253,7 +253,7 @@ bool lcl_extractTableBorderProperty(const PropertyMapPtr& pTableProperties, cons void lcl_extractHoriOrient(std::vector<beans::PropertyValue>& rFrameProperties, sal_Int32& nHoriOrient) { // Shifts the frame left by the given value. - for (beans::PropertyValue & rFrameProperty : rFrameProperties) + for (const beans::PropertyValue & rFrameProperty : rFrameProperties) { if (rFrameProperty.Name == "HoriOrient") { @@ -870,7 +870,7 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl /// Do all cells in this row have a CellHideMark property? static bool lcl_hideMarks(PropertyMapVector1& rCellProperties) { - for (PropertyMapPtr & p : rCellProperties) + for (const PropertyMapPtr & p : rCellProperties) { // if anything is vertically merged, the row must not be set to fixed // as Writer's layout doesn't handle that well diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f69073781964..c53acd9cb1ee 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -692,7 +692,7 @@ void DomainMapper_Impl::IncorporateTabStop( const DeletableTabStop & rTabStop ) uno::Sequence< style::TabStop > DomainMapper_Impl::GetCurrentTabStopAndClear() { std::vector<style::TabStop> aRet; - for (DeletableTabStop& rStop : m_aCurrentTabStops) + for (const DeletableTabStop& rStop : m_aCurrentTabStops) { if (!rStop.bDeleted) aRet.push_back(rStop); diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index 395ab2e1be99..c59b13e7378c 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1226,7 +1226,7 @@ void SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& sal_Int32 nTextAreaWidth = nPageWidth - GetLeftMargin() - GetRightMargin(); std::vector<AnchoredObjectInfo>& rAnchoredObjectAnchors = rDM_Impl.m_aAnchoredObjectAnchors; - for (auto& rAnchor : rAnchoredObjectAnchors) + for (const auto& rAnchor : rAnchoredObjectAnchors) { // Ignore this paragraph when there are not enough shapes to trigger the Word bug we // emulate. @@ -1732,12 +1732,12 @@ void SectionPropertyMap::ApplyProperties_( const uno::Reference< beans::XPropert vValues.push_back( pIter->Value ); } } - for ( beans::PropertyValue & v : vCharVals ) + for ( const beans::PropertyValue & v : std::as_const(vCharVals) ) { vNames.push_back( v.Name ); vValues.push_back( v.Value ); } - for ( beans::PropertyValue & v : vParaVals ) + for ( const beans::PropertyValue & v : std::as_const(vParaVals) ) { vNames.push_back( v.Name ); vValues.push_back( v.Value ); diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 05de4b0b6788..322834de7ac9 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -200,7 +200,7 @@ sal_Int32 SdtHelper::getInteropGrabBagSize() { return m_aGrabBag.size(); } bool SdtHelper::containedInInteropGrabBag(const OUString& rValueName) { - for (beans::PropertyValue& i : m_aGrabBag) + for (const beans::PropertyValue& i : m_aGrabBag) if (i.Name == rValueName) return true; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 8864336611ce..7e10e334bcf7 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -1228,7 +1228,7 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable ) const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const OUString& sIndex) { StyleSheetEntryPtr pRet; - for(StyleSheetEntryPtr & rpEntry : m_pImpl->m_aStyleSheetEntries) + for(const StyleSheetEntryPtr & rpEntry : m_pImpl->m_aStyleSheetEntries) { if( rpEntry->sStyleIdentifierD == sIndex) { @@ -1243,7 +1243,7 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const OUString& s const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(const OUString& sIndex) { StyleSheetEntryPtr pRet; - for(StyleSheetEntryPtr & rpEntry : m_pImpl->m_aStyleSheetEntries) + for(const StyleSheetEntryPtr & rpEntry : m_pImpl->m_aStyleSheetEntries) { if( rpEntry->sConvertedStyleName == sIndex) { diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx index 0a6a5fe1d955..6cdaab12eff8 100644 --- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx +++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx @@ -362,7 +362,7 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword) case RTF_DPTXBXTEXT: { bool bPictureFrame = false; - for (auto& rProperty : m_aStates.top().getShape().getProperties()) + for (const auto& rProperty : m_aStates.top().getShape().getProperties()) { if (rProperty.first == "shapeType" && rProperty.second == OUString::number(ESCHER_ShpInst_PictureFrame)) diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx index 45e5152e3f93..b8f2ad826862 100644 --- a/writerfilter/source/rtftok/rtfdispatchflag.cxx +++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx @@ -1028,7 +1028,7 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) } std::vector<beans::PropertyValue>& rPendingProperties = m_aStates.top().getDrawingObject().getPendingProperties(); - for (auto& rPendingProperty : rPendingProperties) + for (const auto& rPendingProperty : rPendingProperties) m_aStates.top().getDrawingObject().getPropertySet()->setPropertyValue( rPendingProperty.Name, rPendingProperty.Value); m_pSdrImport->resolveDhgt(m_aStates.top().getDrawingObject().getPropertySet(), diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 14fb9f711527..c396f7fb1787 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -448,11 +448,11 @@ static void lcl_copyFlatten(RTFReferenceProperties& rProps, RTFSprms& rStyleAttr { // rPr can have both attributes and SPRMs, copy over both types. RTFSprms& rRPrSprms = rSprm.second->getSprms(); - for (auto& rRPrSprm : rRPrSprms) + for (const auto& rRPrSprm : rRPrSprms) rStyleSprms.set(rRPrSprm.first, rRPrSprm.second); RTFSprms& rRPrAttributes = rSprm.second->getAttributes(); - for (auto& rRPrAttribute : rRPrAttributes) + for (const auto& rRPrAttribute : rRPrAttributes) rStyleAttributes.set(rRPrAttribute.first, rRPrAttribute.second); } else @@ -460,7 +460,7 @@ static void lcl_copyFlatten(RTFReferenceProperties& rProps, RTFSprms& rStyleAttr } RTFSprms& rAttributes = rProps.getAttributes(); - for (auto& rAttribute : rAttributes) + for (const auto& rAttribute : rAttributes) rStyleAttributes.set(rAttribute.first, rAttribute.second); } @@ -1047,7 +1047,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS auto pExtentValue = new RTFValue(aExtentAttributes); // docpr sprm RTFSprms aDocprAttributes; - for (auto& rCharacterAttribute : m_aStates.top().getCharacterAttributes()) + for (const auto& rCharacterAttribute : m_aStates.top().getCharacterAttributes()) if (rCharacterAttribute.first == NS_ooxml::LN_CT_NonVisualDrawingProps_name || rCharacterAttribute.first == NS_ooxml::LN_CT_NonVisualDrawingProps_descr) aDocprAttributes.set(rCharacterAttribute.first, rCharacterAttribute.second); @@ -1075,7 +1075,7 @@ void RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XS NS_ooxml::LN_CT_Anchor_behindDoc, new RTFValue((m_aStates.top().getShape().getInBackground()) ? 1 : 0)); RTFSprms aAnchorSprms; - for (auto& rCharacterAttribute : m_aStates.top().getCharacterAttributes()) + for (const auto& rCharacterAttribute : m_aStates.top().getCharacterAttributes()) { if (rCharacterAttribute.first == NS_ooxml::LN_CT_WrapSquare_wrapText) aAnchorWrapAttributes.set(rCharacterAttribute.first, rCharacterAttribute.second); @@ -2218,7 +2218,7 @@ RTFError RTFDocumentImpl::popState() } break; case Destination::LISTENTRY: - for (auto& rListLevelEntry : aState.getListLevelEntries()) + for (const auto& rListLevelEntry : aState.getListLevelEntries()) aState.getTableSprms().set(rListLevelEntry.first, rListLevelEntry.second, RTFOverwrite::NO_APPEND); break; @@ -2402,7 +2402,7 @@ RTFError RTFDocumentImpl::popState() auto pValue = new RTFValue(m_aStates.top().getShape()); // Buffer wrap type. - for (auto& rCharacterSprm : m_aStates.top().getCharacterSprms()) + for (const auto& rCharacterSprm : m_aStates.top().getCharacterSprms()) { if (rCharacterSprm.first == NS_ooxml::LN_EG_WrapType_wrapNone || rCharacterSprm.first == NS_ooxml::LN_EG_WrapType_wrapTight) @@ -2419,7 +2419,7 @@ RTFError RTFDocumentImpl::popState() else if (aState.getInShapeGroup() && !aState.getInShape()) { // End of a groupshape, as we're in shapegroup, but not in a real shape. - for (auto& rGroupProperty : aState.getShape().getGroupProperties()) + for (const auto& rGroupProperty : aState.getShape().getGroupProperties()) m_pSdrImport->appendGroupProperty(rGroupProperty.first, rGroupProperty.second); aState.getShape().getGroupProperties().clear(); } diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 9a904e1058d7..2545b93c552c 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -329,7 +329,7 @@ int RTFSdrImport::initShape(uno::Reference<drawing::XShape>& o_xShape, createShape("com.sun.star.text.TextFrame", o_xShape, o_xPropSet); m_bTextFrame = true; std::vector<beans::PropertyValue> aDefaults = getTextFrameDefaults(true); - for (beans::PropertyValue& i : aDefaults) + for (const beans::PropertyValue& i : aDefaults) o_xPropSet->setPropertyValue(i.Name, i.Value); break; } diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx index 109dd20474e5..7ede5a30e2b9 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -365,7 +365,7 @@ RTFSprms RTFSprms::cloneAndDeduplicate(RTFSprms& rReference, Id const nStyleType // addition of direct formatting sprms at the paragraph level. if (bImplicitPPr && rSprm.first == NS_ooxml::LN_CT_Style_pPr) { - for (auto& i : rSprm.second->getSprms()) + for (const auto& i : rSprm.second->getSprms()) cloneAndDeduplicateSprm(i, ret, nStyleType); } else |