mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

std::set->o3tl::sorted_vector in xmloff

Browse Source 
Change-Id: Iba07a9905f37c2fb00d59ac00703744e5f81b1c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104906
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-10-27 21:23:53 +02:00
committed by Noel Grandin
parent 4b6ebf3b4f
commit 917401207e
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xmloff/source/chart/SchXMLExport.cxx
View File

@@ -44,6 +44,7 @@
#include <xmloff/xmluconv.hxx> #include <xmloff/xmluconv.hxx>
#include <xmloff/SchXMLSeriesHelper.hxx> #include <xmloff/SchXMLSeriesHelper.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
#include <o3tl/sorted_vector.hxx>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@@ -3363,9 +3364,11 @@ void SchXMLExportHelper_Impl::exportDataPoints(
// collect elements // collect elements
if( bVaryColorsByPoint && xColorScheme.is() ) if( bVaryColorsByPoint && xColorScheme.is() )
{ {
::std::set< sal_Int32 > aAttrPointSet; o3tl::sorted_vector< sal_Int32 > aAttrPointSet;
aAttrPointSet.insert( pPoints, pPoints + aDataPointSeq.getLength() ); aAttrPointSet.reserve(aDataPointSeq.getLength());
const ::std::set< sal_Int32 >::const_iterator aEndIt( aAttrPointSet.end()); for (auto p = pPoints; p < pPoints + aDataPointSeq.getLength(); ++p)
aAttrPointSet.insert( *p );
const auto aEndIt = aAttrPointSet.end();
for( nElement = 0; nElement < nSeriesLength; ++nElement ) for( nElement = 0; nElement < nSeriesLength; ++nElement )
{ {
aPropertyStates.clear(); aPropertyStates.clear();

4
xmloff/source/draw/sdxmlexp_impl.hxx
View File

@@ -25,7 +25,7 @@
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPage.hpp>
#include <set> #include <o3tl/sorted_vector.hxx>
#include <vector> #include <vector>
namespace tools { class Rectangle; } namespace tools { class Rectangle; }
@@ -54,7 +54,7 @@ enum XmlPlaceholder
XmlPlaceholderVerticalOutline XmlPlaceholderVerticalOutline
}; };
typedef std::set<sal_Int32> SdXMLFormatMap; typedef o3tl::sorted_vector<sal_Int32> SdXMLFormatMap;
struct HeaderFooterPageSettingsImpl struct HeaderFooterPageSettingsImpl
{ {

4
xmloff/source/forms/elementexport.cxx
View File

@@ -1293,7 +1293,7 @@ namespace xmloff
++pValues; ++pValues;
} }
Int16Set::iterator aSelectedPos = aSelection.find(i); Int16Set::const_iterator aSelectedPos = aSelection.find(i);
if (aSelection.end() != aSelectedPos) if (aSelection.end() != aSelectedPos)
{ // the item at this position is selected { // the item at this position is selected
AddAttribute( AddAttribute(
@@ -1304,7 +1304,7 @@ namespace xmloff
aSelection.erase(aSelectedPos); aSelection.erase(aSelectedPos);
} }
Int16Set::iterator aDefaultSelectedPos = aDefaultSelection.find(i); Int16Set::const_iterator aDefaultSelectedPos = aDefaultSelection.find(i);
if (aDefaultSelection.end() != aDefaultSelectedPos) if (aDefaultSelection.end() != aDefaultSelectedPos)
{ // the item at this position is selected as default { // the item at this position is selected as default
AddAttribute( AddAttribute(

4
xmloff/source/forms/elementexport.hxx
View File

@@ -23,7 +23,7 @@
#include <sal/config.h> #include <sal/config.h>
#include <memory> #include <memory>
#include <set> #include <o3tl/sorted_vector.hxx>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/script/ScriptEventDescriptor.hpp> #include <com/sun/star/script/ScriptEventDescriptor.hpp>
@@ -88,7 +88,7 @@ namespace xmloff
,public OElementExport ,public OElementExport
{ {
protected: protected:
typedef std::set<sal_Int16> Int16Set; typedef o3tl::sorted_vector<sal_Int16> Int16Set;
// used below // used below
OUString m_sControlId; // the control id to use when exporting OUString m_sControlId; // the control id to use when exporting