ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Factor out DateTime::NormalizeTimeRemainderAndApply(tools::Time& rTime)

Browse Source 
Change-Id: Ie520b10baaeb4c94973c44435c3241e5d2254968
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152345
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
This commit is contained in:
Eike Rathke
2023-05-28 03:49:55 +02:00
parent 20873f073a
commit 7e3ddf1e5a
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tools/datetime.hxx
+3
View File
@@ -83,6 +83,9 @@ public:
void AddTime( double fTimeInDays );
DateTime& operator +=( const tools::Time& rTime );
DateTime& operator -=( const tools::Time& rTime );
private:
void NormalizeTimeRemainderAndApply( tools::Time& rTime );
public:
TOOLS_DLLPUBLIC friend DateTime operator +( const DateTime& rDateTime, sal_Int32 nDays );
TOOLS_DLLPUBLIC friend DateTime operator -( const DateTime& rDateTime, sal_Int32 nDays );
tools/source/datetime/datetime.cxx
+15 -33
View File
@@ -94,33 +94,37 @@ sal_Int64 DateTime::GetSecFromDateTime( const Date& rDate ) const
}
}
DateTime& DateTime::operator +=( const tools::Time& rTime )
void DateTime::NormalizeTimeRemainderAndApply( tools::Time& rTime )
{
tools::Time aTime = *this;
aTime += rTime;
sal_uInt16 nHours = aTime.GetHour();
if ( aTime.GetTime() > 0 )
sal_uInt16 nHours = rTime.GetHour();
if ( rTime.GetTime() > 0 )
{
if (nHours >= 24)
{
AddDays( nHours / 24 );
nHours %= 24;
aTime.SetHour( nHours );
rTime.SetHour( nHours );
}
}
else if ( aTime.GetTime() != 0 )
else if ( rTime.GetTime() != 0 )
{
if (nHours >= 24)
{
AddDays( -static_cast<sal_Int32>(nHours) / 24 );
nHours %= 24;
aTime.SetHour( nHours );
rTime.SetHour( nHours );
}
Date::operator--();
aTime = Time( 24, 0, 0 )+aTime;
rTime = Time( 24, 0, 0 ) + rTime;
}
tools::Time::operator=( aTime );
tools::Time::operator=( rTime );
}
DateTime& DateTime::operator +=( const tools::Time& rTime )
{
tools::Time aTime = *this;
aTime += rTime;
NormalizeTimeRemainderAndApply(aTime);
return *this;
}
@@ -128,29 +132,7 @@ DateTime& DateTime::operator -=( const tools::Time& rTime )
{
tools::Time aTime = *this;
aTime -= rTime;
sal_uInt16 nHours = aTime.GetHour();
if ( aTime.GetTime() > 0 )
{
if (nHours >= 24)
{
AddDays( nHours / 24 );
nHours %= 24;
aTime.SetHour( nHours );
}
}
else if ( aTime.GetTime() != 0 )
{
if (nHours >= 24)
{
AddDays( -static_cast<sal_Int32>(nHours) / 24 );
nHours %= 24;
aTime.SetHour( nHours );
}
Date::operator--();
aTime = Time( 24, 0, 0 )+aTime;
}
tools::Time::operator=( aTime );
NormalizeTimeRemainderAndApply(aTime);
return *this;
}