summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2016-10-29 12:43:54 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2016-10-31 03:48:49 +0000
commitb589c4cd8765b0611afe435354364df891d78852 (patch)
tree4dbfacf74480e2154a2e38c3fd41fe9d34f08fc3 /sdext
parent3d83c42008ab51202c0577f493e8ed3fde0310b7 (diff)
Omit comparator which is the same as default std::less<key_type>
Change-Id: I72a0b618577caececaaf3eb4df53d4cb192251da Reviewed-on: https://gerrit.libreoffice.org/30369 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/minimizer/configurationaccess.cxx2
-rw-r--r--sdext/source/minimizer/configurationaccess.hxx9
-rw-r--r--sdext/source/minimizer/optimizationstats.cxx4
-rw-r--r--sdext/source/minimizer/optimizationstats.hxx9
4 files changed, 5 insertions, 19 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx
index 49f34809e93a..f87acfa1908a 100644
--- a/sdext/source/minimizer/configurationaccess.cxx
+++ b/sdext/source/minimizer/configurationaccess.cxx
@@ -162,7 +162,7 @@ ConfigurationAccess::~ConfigurationAccess()
OUString ConfigurationAccess::getString( const PPPOptimizerTokenEnum eToken ) const
{
- std::map< PPPOptimizerTokenEnum, OUString, Compare >::const_iterator aIter( maStrings.find( eToken ) );
+ std::map< PPPOptimizerTokenEnum, OUString >::const_iterator aIter( maStrings.find( eToken ) );
return aIter != maStrings.end() ? ((*aIter).second) : OUString();
}
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 8cae507ecea9..72bc1034ba1e 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -102,14 +102,7 @@ class ConfigurationAccess
private:
- struct Compare
- {
- bool operator()( const PPPOptimizerTokenEnum s1, const PPPOptimizerTokenEnum s2 ) const
- {
- return s1 < s2;
- }
- };
- std::map < PPPOptimizerTokenEnum, OUString, Compare > maStrings;
+ std::map < PPPOptimizerTokenEnum, OUString > maStrings;
std::vector< OptimizerSettings > maSettings;
std::vector< OptimizerSettings > maInitialSettings;
diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx
index 04567a19e36c..b3f25bdd9a17 100644
--- a/sdext/source/minimizer/optimizationstats.cxx
+++ b/sdext/source/minimizer/optimizationstats.cxx
@@ -45,7 +45,7 @@ void OptimizationStats::SetStatusValue( const PPPOptimizerTokenEnum eStat, const
const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum eStat ) const
{
- std::map< PPPOptimizerTokenEnum, uno::Any, Compare >::const_iterator aIter( maStats.find( eStat ) );
+ std::map< PPPOptimizerTokenEnum, uno::Any >::const_iterator aIter( maStats.find( eStat ) );
return aIter != maStats.end() ? &((*aIter).second) : nullptr;
}
@@ -54,7 +54,7 @@ css::beans::PropertyValues OptimizationStats::GetStatusSequence()
{
int i = 0;
uno::Sequence< PropertyValue > aStatsSequence( maStats.size() );
- std::map< PPPOptimizerTokenEnum, uno::Any, Compare >::iterator aIter( maStats.begin() );
+ std::map< PPPOptimizerTokenEnum, uno::Any >::iterator aIter( maStats.begin() );
while( aIter != maStats.end() )
{
aStatsSequence[ i ].Name = TKGet( (*aIter).first );
diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx
index 29a15aa0afa2..29824dae06be 100644
--- a/sdext/source/minimizer/optimizationstats.hxx
+++ b/sdext/source/minimizer/optimizationstats.hxx
@@ -28,14 +28,7 @@
class OptimizationStats
{
- struct Compare
- {
- bool operator()( const PPPOptimizerTokenEnum s1, const PPPOptimizerTokenEnum s2 ) const
- {
- return s1 < s2;
- }
- };
- std::map < PPPOptimizerTokenEnum, css::uno::Any, Compare > maStats;
+ std::map < PPPOptimizerTokenEnum, css::uno::Any > maStats;
public: