diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /salhelper | |
parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'salhelper')
-rw-r--r-- | salhelper/source/timer.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index 899d6c325d6a..e4c34d8db1cf 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -87,16 +87,16 @@ Timer::Timer() { } -Timer::Timer( const TTimeValue& Time ) - : m_aTimeOut( Time ), +Timer::Timer( const TTimeValue& rTime ) + : m_aTimeOut( rTime ), m_aExpired( 0 ), m_aRepeatDelta( 0 ), m_pNext( NULL ) { } -Timer::Timer( const TTimeValue& Time, const TTimeValue& Repeat ) - : m_aTimeOut( Time ), +Timer::Timer( const TTimeValue& rTime, const TTimeValue& Repeat ) + : m_aTimeOut( rTime ), m_aExpired( 0 ), m_aRepeatDelta( Repeat ), m_pNext( NULL ) |