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 /sw/source/filter/basflt/shellio.cxx | |
| 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 'sw/source/filter/basflt/shellio.cxx')
| -rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 9c7898f93037..497d11c3015f 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -426,7 +426,7 @@ SwReader::SwReader( const uno::Reference < embed::XStorage > &rStg, const OUStri Reader::Reader() : pTemplate(0), aDStamp( Date::EMPTY ), - aTStamp( Time::EMPTY ), + aTStamp( tools::Time::EMPTY ), aChkDateTime( DateTime::EMPTY ), pStrm(0), pMedium(0), bInsertMode(false), bTmplBrowseMode(false), bReadUTF8(false), bBlockMode(false), bOrganizerMode(false), @@ -467,7 +467,7 @@ SwDoc* Reader::GetTemplateDoc() if( !pTemplate || aCurrDateTime >= aChkDateTime ) { Date aTstDate( Date::EMPTY ); - Time aTstTime( Time::EMPTY ); + tools::Time aTstTime( tools::Time::EMPTY ); if( FStatHelper::GetModifiedDateTimeOfFile( aTDir.GetMainURL( INetURLObject::NO_DECODE ), &aTstDate, &aTstTime ) && @@ -480,7 +480,7 @@ SwDoc* Reader::GetTemplateDoc() // only one minute later check if it has changed aChkDateTime = aCurrDateTime; - aChkDateTime += Time( 0L, 1L ); + aChkDateTime += tools::Time( 0L, 1L ); } if( bLoad ) |