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/inc/flddat.hxx | |
| 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/inc/flddat.hxx')
| -rw-r--r-- | sw/inc/flddat.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 8593b8d6d86b..2bfbec12cc6f 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -24,7 +24,7 @@ class DateTime; class Date; -class Time; +namespace tools { class Time; } enum SwDateFormat { @@ -115,7 +115,7 @@ public: inline long GetOffset() const { return nOffset; } Date GetDate(bool bUseOffset = false) const; - Time GetTime(bool bUseOffset = false) const; + tools::Time GetTime(bool bUseOffset = false) const; void SetDateTime(const DateTime& rDT); static double GetDateTime(SwDoc* pDoc, const DateTime& rDT); |