clang-tidy modernize-loop-convert in writerfilter to xmlsecurity

Change-Id: I334411c6b57c028ffb41b5deb72002f9d54038c3
Reviewed-on: https://gerrit.libreoffice.org/24923
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

13 files changed, 65 insertions, 72 deletions

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 89369371d261..176998295193 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -284,11 +284,11 @@ 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 (size_t i = 0; i < rFrameProperties.size(); ++i)
+    for (beans::PropertyValue & rFrameProperty : rFrameProperties)
     {
-        if (rFrameProperties[i].Name == "HoriOrient")
+        if (rFrameProperty.Name == "HoriOrient")
         {
-            sal_Int32 nValue = rFrameProperties[i].Value.get<sal_Int32>();
+            sal_Int32 nValue = rFrameProperty.Value.get<sal_Int32>();
             if (nValue != text::HoriOrientation::NONE)
                 nHoriOrient = nValue;
             return;
@@ -301,9 +301,8 @@ void lcl_extractHoriOrient(std::vector<beans::PropertyValue>& rFrameProperties,
 void lcl_DecrementHoriOrientPosition(std::vector<beans::PropertyValue>& rFrameProperties, sal_Int32 nAmount)
 {
     // Shifts the frame left by the given value.
-    for (size_t i = 0; i < rFrameProperties.size(); ++i)
+    for (beans::PropertyValue & rPropertyValue : rFrameProperties)
     {
-        beans::PropertyValue& rPropertyValue = rFrameProperties[i];
         if (rPropertyValue.Name == "HoriOrientPosition")
         {
             sal_Int32 nValue = rPropertyValue.Value.get<sal_Int32>();
@@ -720,10 +719,10 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                     {
                         PROP_TOP_BORDER, PROP_LEFT_BORDER, PROP_BOTTOM_BORDER, PROP_RIGHT_BORDER
                     };
-                    for (size_t i = 0; i < SAL_N_ELEMENTS(pBorders); ++i)
+                    for (const PropertyIds& rBorder : pBorders)
                     {
-                        boost::optional<PropertyMap::Property> oStyleCellBorder = pStyleProps->getProperty(pBorders[i]);
-                        boost::optional<PropertyMap::Property> oDirectCellBorder = (*aCellIterator)->getProperty(pBorders[i]);
+                        boost::optional<PropertyMap::Property> oStyleCellBorder = pStyleProps->getProperty(rBorder);
+                        boost::optional<PropertyMap::Property> oDirectCellBorder = (*aCellIterator)->getProperty(rBorder);
                         if (oStyleCellBorder && oDirectCellBorder)
                         {
                             // We have a cell border from the table style and as direct formatting as well.
@@ -733,12 +732,12 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                             {
                                 // The style one would be visible, but then cleared away as direct formatting.
                                 // Delete both, so that table formatting can become visible.
-                                pStyleProps->Erase(pBorders[i]);
-                                (*aCellIterator)->Erase(pBorders[i]);
+                                pStyleProps->Erase(rBorder);
+                                (*aCellIterator)->Erase(rBorder);
                             }
                             else
                             {
-                                boost::optional<PropertyMap::Property> oTableBorder = rInfo.pTableBorders->getProperty(pBorders[i]);
+                                boost::optional<PropertyMap::Property> oTableBorder = rInfo.pTableBorders->getProperty(rBorder);
                                 if (oTableBorder)
                                 {
                                     table::BorderLine2 aTableBorder = oTableBorder->second.get<table::BorderLine2>();
@@ -747,8 +746,8 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
                                     if (aTableBorder.LineStyle != table::BorderLineStyle::NONE && bNoCellBorder)
                                     {
                                         // But at a table-level, there is a border, then again delete both cell properties.
-                                        pStyleProps->Erase(pBorders[i]);
-                                        (*aCellIterator)->Erase(pBorders[i]);
+                                        pStyleProps->Erase(rBorder);
+                                        (*aCellIterator)->Erase(rBorder);
                                     }
                                 }
                             }
@@ -862,8 +861,8 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl
 /// Do all cells in this row have a CellHideMark property?
 bool lcl_hideMarks(PropertyMapVector1& rCellProperties)
 {
-    for (size_t nCell = 0; nCell < rCellProperties.size(); ++nCell)
-        if (!rCellProperties[nCell]->isSet(PROP_CELL_HIDE_MARK))
+    for (PropertyMapPtr & p : rCellProperties)
+        if (!p->isSet(PROP_CELL_HIDE_MARK))
             return false;
     return true;
 }
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 900688ba56ea..b558afd381d6 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -623,8 +623,8 @@ void DomainMapperTableManager::endOfRowAction()
     // a grid of "20:40:20" and it doesn't have to do something with the tableWidth
     // -> so we have get the sum of each grid entry for the fullWidthRelative:
     int nFullWidthRelative = 0;
-    for (size_t i = 0 ; i < (*pTableGrid.get()).size(); i++ )
-        nFullWidthRelative += (*pTableGrid.get())[ i ];
+    for (sal_Int32 i : (*pTableGrid.get()))
+        nFullWidthRelative += i;
 
     if( pTableGrid->size() == ( m_nGridBefore + nGrids + m_nGridAfter ) && m_nCell.back( ) > 0 )
     {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 59526fda0d41..f5db807046da 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1357,8 +1357,8 @@ void DomainMapper_Impl::appendOLE( const OUString& rStreamName, const OLEHandler
                 OUString("VertOrient"),
                 OUString("VertOrientPosition")
             };
-            for (size_t i = 0; i < SAL_N_ELEMENTS(pProperties); ++i)
-                xOLEProperties->setPropertyValue(pProperties[i], xReplacementProperties->getPropertyValue(pProperties[i]));
+            for (const OUString & s : pProperties)
+                xOLEProperties->setPropertyValue(s, xReplacementProperties->getPropertyValue(s));
         }
         else
             // mimic the treatment of graphics here.. it seems anchoring as character
@@ -2167,11 +2167,11 @@ style::NumberingType::
     CHARS_CYRILLIC_LOWER_LETTER_N_SR*/
 
         };
-        for( sal_uInt32 nNum = 0; nNum < SAL_N_ELEMENTS(aNumberingPairs); ++nNum)
+        for(const NumberingPairs& rNumberingPair : aNumberingPairs)
         {
-            if( /*sCommand*/sNumber.equalsAscii(aNumberingPairs[nNum].cWordName ))
+            if( /*sCommand*/sNumber.equalsAscii(rNumberingPair.cWordName ))
             {
-                nRet = aNumberingPairs[nNum].nType;
+                nRet = rNumberingPair.nType;
                 break;
             }
         }
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index f97fe259aa66..04849c1bbbc4 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1162,8 +1162,8 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
                 PROP_BOTTOM_BORDER
             };
 
-            for( sal_Int32 nBorder = 0; nBorder < 4; ++nBorder )
-                xGraphicObjectProperties->setPropertyValue(getPropertyName( aBorderProps[nBorder]), uno::makeAny(aBorderLine));
+            for(PropertyIds & rBorderProp : aBorderProps)
+                xGraphicObjectProperties->setPropertyValue(getPropertyName(rBorderProp), uno::makeAny(aBorderLine));
 
             // setting graphic object shadow proerties
             if (m_pImpl->bShadow)
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index f3552ea1ef9b..0cbd6db7a704 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -306,8 +306,8 @@ uno::Sequence< beans::PropertyValue > ListLevel::GetLevelProperties( )
         PROP_ADJUST, PROP_INDENT_AT, PROP_FIRST_LINE_INDENT,
             PROP_FIRST_LINE_OFFSET, PROP_LEFT_MARGIN
     };
-    for(int i=0; i<nIds; ++i) {
-        boost::optional<PropertyMap::Property> aProp = getProperty(aReadIds[i]);
+    for(PropertyIds & rReadId : aReadIds) {
+        boost::optional<PropertyMap::Property> aProp = getProperty(rReadId);
         if (aProp)
             aNumberingProperties.push_back(
                     beans::PropertyValue( getPropertyName(aProp->first), 0, aProp->second, beans::PropertyState_DIRECT_VALUE )
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index a140a754f648..f9fe9685692b 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -133,10 +133,9 @@ void PageBordersHandler::lcl_sprm( Sprm& rSprm )
 
 void PageBordersHandler::SetBorders( SectionPropertyMap* pSectContext )
 {
-    for ( int i = 0, length = m_aBorders.size( ); i < length; i++ )
+    for (const PgBorder& rBorder : m_aBorders)
     {
-        PgBorder aBorder = m_aBorders[i];
-        pSectContext->SetBorder( aBorder.m_ePos, aBorder.m_nDistance, aBorder.m_rLine, aBorder.m_bShadow );
+        pSectContext->SetBorder( rBorder.m_ePos, rBorder.m_nDistance, rBorder.m_rLine, rBorder.m_bShadow );
     }
 }
 
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index f4655817fd92..31001c182bf4 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1101,10 +1101,8 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
     // Text area width is known at the end of a section: decide if tables should be converted or not.
     std::vector<FloatingTableInfo>& rPendingFloatingTables = rDM_Impl.m_aPendingFloatingTables;
     uno::Reference<text::XTextAppendAndConvert> xBodyText( rDM_Impl.GetBodyText(), uno::UNO_QUERY );
-    for (size_t i = 0; i < rPendingFloatingTables.size(); ++i)
+    for (FloatingTableInfo & rInfo : rPendingFloatingTables)
     {
-        FloatingTableInfo& rInfo = rPendingFloatingTables[i];
-
         if (FloatingTableConversion(rInfo))
             xBodyText->convertToTextFrame(rInfo.m_xStart, rInfo.m_xEnd, rInfo.m_aFrameProperties);
     }
@@ -1437,15 +1435,15 @@ void SectionPropertyMap::ApplyProperties_(
                 vValues.push_back(pIter->Value);
             }
         }
-        for (beans::PropertyValue* iter = vCharVals.begin(); iter!=vCharVals.end(); ++iter)
+        for (beans::PropertyValue & v : vCharVals)
         {
-            vNames.push_back(iter->Name);
-            vValues.push_back(iter->Value);
+            vNames.push_back(v.Name);
+            vValues.push_back(v.Value);
         }
-        for (beans::PropertyValue* iter = vParaVals.begin(); iter!=vParaVals.end(); ++iter)
+        for (beans::PropertyValue & v : vParaVals)
         {
-            vNames.push_back(iter->Name);
-            vValues.push_back(iter->Value);
+            vNames.push_back(v.Name);
+            vValues.push_back(v.Value);
         }
     }
     if (xMultiSet.is())
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index a9449f1b7ed5..293ff4f4199b 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -29,9 +29,9 @@ awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString& r
 {
     OUString aLongest = rDefault;
     sal_Int32 nHeight = 0;
-    for (std::size_t i = 0; i < rItems.size(); ++i)
-        if (rItems[i].getLength() > aLongest.getLength())
-            aLongest = rItems[i];
+    for (const OUString & rItem : rItems)
+        if (rItem.getLength() > aLongest.getLength())
+            aLongest = rItem;
 
     MapMode aMap(MAP_100TH_MM);
     OutputDevice* pOut = Application::GetDefaultDevice();
@@ -190,8 +190,8 @@ sal_Int32 SdtHelper::getInteropGrabBagSize()
 
 bool SdtHelper::containedInInteropGrabBag(const OUString& rValueName)
 {
-    for (std::size_t i=0; i < m_aGrabBag.size(); ++i)
-        if (m_aGrabBag[i].Name == rValueName)
+    for (beans::PropertyValue & i : m_aGrabBag)
+        if (i.Name == rValueName)
             return true;
 
     return false;
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 57fcf24818e1..30590cb75936 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -232,11 +232,11 @@ PropertyMapPtr TableStyleSheetEntry::GetLocalPropertiesFromMask( sal_Int32 nMask
 
     // Get the properties applying according to the mask
     PropertyMapPtr pProps( new PropertyMap( ) );
-    for (size_t i = 0; i < SAL_N_ELEMENTS(aOrderedStyleTable); ++i)
+    for (const TblStyleTypeAndMask & i : aOrderedStyleTable)
     {
-        TblStylePrs::iterator pIt = m_aStyles.find( aOrderedStyleTable[ i ].type );
-        if ( ( nMask & aOrderedStyleTable[ i ].mask ) && ( pIt != m_aStyles.end( ) ) )
-            lcl_mergeProps( pProps, pIt->second, aOrderedStyleTable[ i ].type );
+        TblStylePrs::iterator pIt = m_aStyles.find( i.type );
+        if ( ( nMask & i.mask ) && ( pIt != m_aStyles.end( ) ) )
+            lcl_mergeProps( pProps, pIt->second, i.type );
     }
     return pProps;
 }
@@ -1195,11 +1195,11 @@ void StyleSheetTable::ApplyStyleSheets( const FontTablePtr& rFontTable )
 const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const OUString& sIndex)
 {
     StyleSheetEntryPtr pRet;
-    for( size_t nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
+    for(StyleSheetEntryPtr & rpEntry : m_pImpl->m_aStyleSheetEntries)
     {
-        if( m_pImpl->m_aStyleSheetEntries[nPos]->sStyleIdentifierD == sIndex)
+        if( rpEntry->sStyleIdentifierD == sIndex)
         {
-            pRet = m_pImpl->m_aStyleSheetEntries[nPos];
+            pRet = rpEntry;
             break;
         }
     }
@@ -1210,11 +1210,11 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByISTD(const OUString& s
 const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const OUString& sIndex)
 {
     StyleSheetEntryPtr pRet;
-    for( size_t nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
+    for(StyleSheetEntryPtr & rpEntry : m_pImpl->m_aStyleSheetEntries)
     {
-        if( m_pImpl->m_aStyleSheetEntries[nPos]->sStyleName == sIndex)
+        if( rpEntry->sStyleName == sIndex)
         {
-            pRet = m_pImpl->m_aStyleSheetEntries[nPos];
+            pRet = rpEntry;
             break;
         }
     }
@@ -1225,11 +1225,11 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByStyleName(const OUStri
 const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(const OUString& sIndex)
 {
     StyleSheetEntryPtr pRet;
-    for( size_t nPos = 0; nPos < m_pImpl->m_aStyleSheetEntries.size(); ++nPos )
+    for(StyleSheetEntryPtr & rpEntry : m_pImpl->m_aStyleSheetEntries)
     {
-        if( m_pImpl->m_aStyleSheetEntries[nPos]->sConvertedStyleName == sIndex)
+        if( rpEntry->sConvertedStyleName == sIndex)
         {
-            pRet = m_pImpl->m_aStyleSheetEntries[nPos];
+            pRet = rpEntry;
             break;
         }
     }
@@ -1240,9 +1240,8 @@ const StyleSheetEntryPtr StyleSheetTable::FindStyleSheetByConvertedStyleName(con
 const StyleSheetEntryPtr StyleSheetTable::FindDefaultParaStyle()
 {
     StyleSheetEntryPtr pRet;
-    for (size_t i = 0; i < m_pImpl->m_aStyleSheetEntries.size(); ++i)
+    for (StyleSheetEntryPtr & pEntry : m_pImpl->m_aStyleSheetEntries)
     {
-        StyleSheetEntryPtr pEntry = m_pImpl->m_aStyleSheetEntries[i];
         if (pEntry->bIsDefaultStyle && pEntry->nStyleTypeCode == STYLE_TYPE_PARA)
         {
             pRet = pEntry;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index e0c9f07d5f86..4e8d4d497436 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -129,9 +129,9 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref
                 "wps",
                 "wpg",
             };
-            for (size_t i = 0; i < SAL_N_ELEMENTS(aFeatures); ++i)
+            for (const char *p : aFeatures)
             {
-                if (aRequires.equalsAscii(aFeatures[i]))
+                if (aRequires.equalsAscii(p))
                 {
                     m_bTookChoice = true;
                     return false;
@@ -1407,8 +1407,8 @@ void OOXMLFastContextHandlerTextTableRow::handleGridBefore( const OOXMLValue::Po
                 OOXMLPropertySet::Pointer_t pBorderProps( new OOXMLPropertySet );
                 static Id borders[] = { NS_ooxml::LN_CT_TcBorders_top, NS_ooxml::LN_CT_TcBorders_bottom,
                     NS_ooxml::LN_CT_TcBorders_start, NS_ooxml::LN_CT_TcBorders_end };
-                for( size_t j = 0; j < SAL_N_ELEMENTS( borders ); ++j )
-                    pBorderProps->add( fakeNoBorder( borders[ j ] ));
+                for(sal_uInt32 border : borders)
+                    pBorderProps->add( fakeNoBorder( border ));
                 OOXMLValue::Pointer_t pValue( new OOXMLPropertySetValue( pBorderProps ));
                 OOXMLProperty::Pointer_t pProp
                     (new OOXMLProperty(NS_ooxml::LN_CT_TcPrBase_tcBorders, pValue, OOXMLProperty::SPRM));
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index 81e52ace7594..73dd505ffdb3 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -354,10 +354,8 @@ void OOXMLPropertySet::resolve(Properties & rHandler)
     // be appended to mProperties. I don't think it can cause elements
     // to be deleted. But let's check with < here just to be safe that
     // the indexing below works.
-    for (size_t nIt = 0; nIt < mProperties.size(); ++nIt)
+    for (OOXMLProperty::Pointer_t& pProp : mProperties)
     {
-        OOXMLProperty::Pointer_t pProp = mProperties[nIt];
-
         if (pProp.get() != nullptr)
             pProp->resolve(rHandler);
     }
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 43056acedce4..8793d4fe2536 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1458,9 +1458,9 @@ void RTFDocumentImpl::replayRowBuffer(
         rCellsSrpms.pop_front();
         rCellsAttributes.pop_front();
     }
-    for (std::size_t i = 0; i < rBuffer.size(); ++i)
+    for (Buf_t & i : rBuffer)
     {
-        SAL_WARN_IF(BUFFER_CELLEND == std::get<0>(rBuffer[i]),
+        SAL_WARN_IF(BUFFER_CELLEND == std::get<0>(i),
                     "writerfilter.rtf", "dropping table cell!");
     }
     assert(0 == rCellsSrpms.size());
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 598bddd4c7fb..5e919d3039dd 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -140,14 +140,14 @@ void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, const uno::Referenc
         {
             "TopBorder", "LeftBorder", "BottomBorder", "RightBorder"
         };
-        for (unsigned int i = 0; i < SAL_N_ELEMENTS(aBorders); ++i)
+        for (const char* pBorder : aBorders)
         {
-            table::BorderLine2 aBorderLine = xPropertySet->getPropertyValue(OUString::createFromAscii(aBorders[i])).get<table::BorderLine2>();
+            table::BorderLine2 aBorderLine = xPropertySet->getPropertyValue(OUString::createFromAscii(pBorder)).get<table::BorderLine2>();
             if (rLineColor.hasValue())
                 aBorderLine.Color = rLineColor.get<sal_Int32>();
             if (rLineWidth.hasValue())
                 aBorderLine.LineWidth = rLineWidth.get<sal_Int32>();
-            xPropertySet->setPropertyValue(OUString::createFromAscii(aBorders[i]), uno::makeAny(aBorderLine));
+            xPropertySet->setPropertyValue(OUString::createFromAscii(pBorder), uno::makeAny(aBorderLine));
         }
     }
 }
@@ -298,8 +298,8 @@ 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 (std::size_t j = 0; j < aDefaults.size(); ++j)
-                o_xPropSet->setPropertyValue(aDefaults[j].Name, aDefaults[j].Value);
+            for (beans::PropertyValue & i : aDefaults)
+                o_xPropSet->setPropertyValue(i.Name, i.Value);
             break;
         }
         SAL_FALLTHROUGH;