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 /sfx2/source/dialog/dialoghelper.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 'sfx2/source/dialog/dialoghelper.cxx')
-rw-r--r-- | sfx2/source/dialog/dialoghelper.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dialoghelper.cxx b/sfx2/source/dialog/dialoghelper.cxx index 8221d3af3866..4c4242390c38 100644 --- a/sfx2/source/dialog/dialoghelper.cxx +++ b/sfx2/source/dialog/dialoghelper.cxx @@ -81,7 +81,7 @@ Size SFX2_DLLPUBLIC getPreviewOptionsSize(const vcl::Window *pReference) OUString SFX2_DLLPUBLIC getWidestTime(const LocaleDataWrapper& rWrapper) { Date aDate(22, 12, 2000); - Time aTime(22, 59, 59); + tools::Time aTime(22, 59, 59); DateTime aDateTime(aDate, aTime); return formatTime(aDateTime, rWrapper); } |