Kaydet (Commit) 9fa6dadc authored tarafından Takeshi Abe's avatar Takeshi Abe

Omit the default comparator for std::sort()

Change-Id: Ib865bdf911b53d809fc2979f524da3735bb39ce5
Reviewed-on: https://gerrit.libreoffice.org/30432Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarTakeshi Abe <tabe@fixedpoint.jp>
üst 39501668
...@@ -723,14 +723,6 @@ bool hasUnhiddenData( const uno::Reference< chart2::XDataSeries >& xSeries ) ...@@ -723,14 +723,6 @@ bool hasUnhiddenData( const uno::Reference< chart2::XDataSeries >& xSeries )
return false; return false;
} }
struct lcl_LessIndex
{
inline bool operator() ( sal_Int32 first, sal_Int32 second ) const
{
return ( first < second );
}
};
sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Reference< chart2::data::XDataSequence >& xDataSequence, bool bTranslate ) sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Reference< chart2::data::XDataSequence >& xDataSequence, bool bTranslate )
{ {
if( !bTranslate ) if( !bTranslate )
...@@ -746,7 +738,7 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere ...@@ -746,7 +738,7 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere
if( aHiddenIndicesSeq.getLength() ) if( aHiddenIndicesSeq.getLength() )
{ {
::std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) ); ::std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) );
::std::sort( aHiddenIndices.begin(), aHiddenIndices.end(), lcl_LessIndex() ); ::std::sort( aHiddenIndices.begin(), aHiddenIndices.end() );
sal_Int32 nHiddenCount = static_cast<sal_Int32>(aHiddenIndices.size()); sal_Int32 nHiddenCount = static_cast<sal_Int32>(aHiddenIndices.size());
for( sal_Int32 nN = 0; nN < nHiddenCount; ++nN) for( sal_Int32 nN = 0; nN < nHiddenCount; ++nN)
......
...@@ -107,9 +107,6 @@ struct ScDPOutLevelData ...@@ -107,9 +107,6 @@ struct ScDPOutLevelData
namespace { namespace {
bool lcl_compareColfuc ( SCCOL i, SCCOL j) { return (i<j); }
bool lcl_compareRowfuc ( SCROW i, SCROW j) { return (i<j); }
class ScDPOutputImpl class ScDPOutputImpl
{ {
ScDocument* mpDoc; ScDocument* mpDoc;
...@@ -154,8 +151,8 @@ void ScDPOutputImpl::OutputDataArea() ...@@ -154,8 +151,8 @@ void ScDPOutputImpl::OutputDataArea()
bool bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() ); bool bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() );
std::sort( mnCols.begin(), mnCols.end(), lcl_compareColfuc ); std::sort( mnCols.begin(), mnCols.end() );
std::sort( mnRows.begin(), mnRows.end(), lcl_compareRowfuc ); std::sort( mnRows.begin(), mnRows.end() );
for( SCCOL nCol = 0; nCol < (SCCOL)mnCols.size()-1; nCol ++ ) for( SCCOL nCol = 0; nCol < (SCCOL)mnCols.size()-1; nCol ++ )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment