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

tdf#157665 Use <=> operator for date

Browse Source 
Change-Id: I3527b7fde74f09f6ce4a887ca353ba05a8e14742
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177211
Tested-by: Jenkins
Reviewed-by: Hossein   <hossein@libreoffice.org>
This commit is contained in:
Mohamed Ali
2024-11-24 17:03:02 +02:00
committed by Hossein
parent df6fe96163
commit 6802590b3a
4 changed files with 21 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/tools/date.hxx
View File

@@ -25,6 +25,8 @@
#include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Date.hpp>
#include <compare>
namespace com::sun::star::util { struct DateTime; } namespace com::sun::star::util { struct DateTime; }
enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, enum DayOfWeek { MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY,
@@ -207,18 +209,7 @@ public:
{ return ((mnDate >= rFrom.mnDate) && { return ((mnDate >= rFrom.mnDate) &&
(mnDate <= rTo.mnDate)); } (mnDate <= rTo.mnDate)); }
bool operator ==( const Date& rDate ) const auto operator <=> ( const Date& rDate ) const = default;
{ return (mnDate == rDate.mnDate); }
bool operator !=( const Date& rDate ) const
{ return (mnDate != rDate.mnDate); }
bool operator >( const Date& rDate ) const
{ return (mnDate > rDate.mnDate); }
bool operator <( const Date& rDate ) const
{ return (mnDate < rDate.mnDate); }
bool operator >=( const Date& rDate ) const
{ return (mnDate >= rDate.mnDate); }
bool operator <=( const Date& rDate ) const
{ return (mnDate <= rDate.mnDate); }
Date& operator =( const Date& rDate ) Date& operator =( const Date& rDate )
{ mnDate = rDate.mnDate; return *this; } { mnDate = rDate.mnDate; return *this; }

22
include/tools/datetime.hxx
View File

@@ -64,21 +64,21 @@ public:
bool IsEqualIgnoreNanoSec( const DateTime& rDateTime ) const bool IsEqualIgnoreNanoSec( const DateTime& rDateTime ) const
{ {
if ( Date::operator!=( rDateTime ) ) if ( GetDate() != rDateTime.GetDate() )
return false; return false;
return Time::IsEqualIgnoreNanoSec( rDateTime ); return Time::IsEqualIgnoreNanoSec( rDateTime );
} }
bool operator ==( const DateTime& rDateTime ) const auto operator <=>( const DateTime& rDateTime ) const
{ return (Date::operator==( rDateTime ) && {
Time::operator==( rDateTime )); } if (auto cmp = Date::operator<=>(rDateTime); cmp != 0)
bool operator !=( const DateTime& rDateTime ) const return cmp;
{ return (Date::operator!=( rDateTime ) || return tools::Time::operator<=>(rDateTime);
Time::operator!=( rDateTime )); } }
bool operator >( const DateTime& rDateTime ) const; bool operator==(const DateTime& rDateTime) const
bool operator <( const DateTime& rDateTime ) const; {
bool operator >=( const DateTime& rDateTime ) const; return (Date::operator==(rDateTime) && tools::Time::operator==(rDateTime));
bool operator <=( const DateTime& rDateTime ) const; }
sal_Int64 GetSecFromDateTime( const Date& rDate ) const; sal_Int64 GetSecFromDateTime( const Date& rDate ) const;

17
include/tools/time.hxx
View File

@@ -26,6 +26,8 @@
#include <tools/toolsdllapi.h> #include <tools/toolsdllapi.h>
#include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/Time.hpp>
#include <compare>
namespace com::sun::star::util { struct DateTime; } namespace com::sun::star::util { struct DateTime; }
/** /**
@@ -131,18 +133,9 @@ public:
bool IsEqualIgnoreNanoSec( const tools::Time& rTime ) const; bool IsEqualIgnoreNanoSec( const tools::Time& rTime ) const;
bool operator ==( const tools::Time& rTime ) const bool operator==(const Time& rTime) const = default;
{ return (nTime == rTime.nTime); }
bool operator !=( const tools::Time& rTime ) const auto operator <=> ( const Time& rTime ) const = default;
{ return (nTime != rTime.nTime); }
bool operator >( const tools::Time& rTime ) const
{ return (nTime > rTime.nTime); }
bool operator <( const tools::Time& rTime ) const
{ return (nTime < rTime.nTime); }
bool operator >=( const tools::Time& rTime ) const
{ return (nTime >= rTime.nTime); }
bool operator <=( const tools::Time& rTime ) const
{ return (nTime <= rTime.nTime); }
static Time GetUTCOffset(); static Time GetUTCOffset();

27
tools/source/datetime/datetime.cxx
View File

@@ -20,6 +20,7 @@
#include <tools/duration.hxx> #include <tools/duration.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
#include <sal/log.hxx> #include <sal/log.hxx>
#include <compare>
#include <systemdatetime.hxx> #include <systemdatetime.hxx>
@@ -56,33 +57,9 @@ bool DateTime::IsBetween( const DateTime& rFrom, const DateTime& rTo ) const
return (*this >= rFrom) && (*this <= rTo); return (*this >= rFrom) && (*this <= rTo);
} }
bool DateTime::operator >( const DateTime& rDateTime ) const
{
return (Date::operator>( rDateTime )) ||
(Date::operator==( rDateTime ) && tools::Time::operator>( rDateTime ));
}
bool DateTime::operator <( const DateTime& rDateTime ) const
{
return (Date::operator<( rDateTime )) ||
(Date::operator==( rDateTime ) && tools::Time::operator<( rDateTime ));
}
bool DateTime::operator >=( const DateTime& rDateTime ) const
{
return (Date::operator>( rDateTime )) ||
(Date::operator==( rDateTime ) && tools::Time::operator>=( rDateTime ));
}
bool DateTime::operator <=( const DateTime& rDateTime ) const
{
return (Date::operator<( rDateTime )) ||
(Date::operator==( rDateTime ) && tools::Time::operator<=( rDateTime ));
}
sal_Int64 DateTime::GetSecFromDateTime( const Date& rDate ) const sal_Int64 DateTime::GetSecFromDateTime( const Date& rDate ) const
{ {
if ( Date::operator<( rDate ) ) if (*this < rDate)
return 0; return 0;
else else
{ {