diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-03 10:53:57 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-03 14:15:37 +0200 |
commit | 31d4562ca9e21f7b04960ac083765733e9a55118 (patch) | |
tree | 977b0cdd4a768a2eed9fef6a0f79ecff0b3250e6 /comphelper | |
parent | bce779932b59990fbdf8278993f8bb9514781de2 (diff) |
use begin()/end() when working with Sequence
Change-Id: Icf9da6a24d72c073338f6fbb513d7250b3898015
Reviewed-on: https://gerrit.libreoffice.org/39469
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'comphelper')
-rw-r--r-- | comphelper/source/property/propertycontainerhelper.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 7a57de445f98..a32b8d8def87 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -478,18 +478,18 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) } // as our property vector is sorted by handles, not by name, we have to sort aOwnProps - std::sort(aOwnProps.getArray(), aOwnProps.getArray() + aOwnProps.getLength(), PropertyCompareByName()); + std::sort(aOwnProps.begin(), aOwnProps.end(), PropertyCompareByName()); // unfortunately the STL merge function does not allow the output range to overlap one of the input ranges, // so we need an extra sequence Sequence< Property > aOutput; aOutput.realloc(_rProps.getLength() + aOwnProps.getLength()); // do the merge - std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1 - aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(), // input 2 - aOutput.getArray(), // output - PropertyCompareByName() // compare operator - ); + std::merge( _rProps.begin(), _rProps.end(), // input 1 + aOwnProps.begin(), aOwnProps.end(), // input 2 + aOutput.getArray(), // output + PropertyCompareByName() // compare operator + ); // copy the output _rProps = aOutput; |