summaryrefslogtreecommitdiff
path: root/reportdesign/source
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2018-06-11 13:14:07 +0300
committerTor Lillqvist <tml@collabora.com>2018-06-12 07:35:25 +0200
commit51aa57cd8ed46d28262e0d315328231f0fa814f4 (patch)
treea1b850e365eea2a80307e59febe3b20272e14d97 /reportdesign/source
parentf9e9012e75afe4418f4ebe652fa99a1fa2348a71 (diff)
tdf#96099 Remove some trivial std::vector typedefs
Cleanup package, reportdesign, sal. Change-Id: I8622465886f7ec97700b00740ea37d40767ec98e Reviewed-on: https://gerrit.libreoffice.org/55616 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'reportdesign/source')
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx5
2 files changed, 8 insertions, 9 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 80f25884cf28..6e11dc0d32e5 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -493,7 +493,7 @@ void lcl_calculate(const ::std::vector<sal_Int32>& _aPosX,const ::std::vector<sa
}
}
-void ORptExport::collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames)
+void ORptExport::collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, std::vector<OUString>& _rStyleNames)
{
::std::vector< XMLPropertyState > aPropertyStates;
aPropertyStates.emplace_back(0);
@@ -570,9 +570,9 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp)
).first;
lcl_calculate(aColumnPos,aRowPos,aInsert->second);
- TGridStyleMap::iterator aPos = m_aColumnStyleNames.emplace(_xProp.get(),TStringVec()).first;
+ TGridStyleMap::iterator aPos = m_aColumnStyleNames.emplace(_xProp.get(),std::vector<OUString>()).first;
collectStyleNames(XML_STYLE_FAMILY_TABLE_COLUMN,aColumnPos,aPos->second);
- aPos = m_aRowStyleNames.emplace(_xProp.get(),TStringVec()).first;
+ aPos = m_aRowStyleNames.emplace(_xProp.get(),std::vector<OUString>()).first;
collectStyleNames(XML_STYLE_FAMILY_TABLE_ROW,aRowPos,aPos->second);
sal_Int32 x1 = 0;
@@ -737,8 +737,8 @@ void ORptExport::exportTableColumns(const Reference< XSection>& _xSection)
if ( aColFind == m_aColumnStyleNames.end() )
return;
- TStringVec::const_iterator aColIter = aColFind->second.begin();
- TStringVec::const_iterator aColEnd = aColFind->second.end();
+ auto aColIter = aColFind->second.cbegin();
+ auto aColEnd = aColFind->second.cend();
for (; aColIter != aColEnd; ++aColIter)
{
AddAttribute( m_sTableStyle,*aColIter );
@@ -760,7 +760,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
TGrid::const_iterator aRowEnd = aFind->second.end();
TGridStyleMap::const_iterator aRowFind = m_aRowStyleNames.find(_xSection.get());
- TStringVec::const_iterator aHeightIter = aRowFind->second.begin();
+ auto aHeightIter = aRowFind->second.cbegin();
OSL_ENSURE(aRowFind->second.size() == aFind->second.size(),"Different count for rows");
bool bShapeHandled = false;
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index 07bdc342e811..aef3f6cad58c 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -83,9 +83,8 @@ public:
{}
};
typedef ::std::pair< OUString ,OUString> TStringPair;
- typedef ::std::vector< OUString> TStringVec;
typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap;
- typedef ::std::map< Reference<XPropertySet> , TStringVec> TGridStyleMap;
+ typedef ::std::map< Reference<XPropertySet> , std::vector<OUString>> TGridStyleMap;
typedef ::std::vector< TCell > TRow;
typedef ::std::vector< ::std::pair< bool, TRow > > TGrid;
typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid;
@@ -130,7 +129,7 @@ private:
void exportAutoStyle(const Reference<XSection>& _xProp);
void exportReportComponentAutoStyles(const Reference<XSection>& _xProp);
void collectComponentStyles();
- void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames);
+ void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, std::vector<OUString>& _rStyleNames);
void exportParagraph(const Reference< XReportControlModel >& _xReportElement);
bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula);
void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups);