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 /sc/source/ui/dbgui | |
| 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 'sc/source/ui/dbgui')
| -rw-r--r-- | sc/source/ui/dbgui/scendlg.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 9ba5f255481b..8c210054bc23 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -86,7 +86,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( vcl::Window* pParent, const OUString& rName, OUString aComment(sCreatedBy + " " + aUserOpt.GetFirstName() + " " +aUserOpt.GetLastName() + ", " + sOn + " " + ScGlobal::GetpLocaleData()->getDate(Date(Date::SYSTEM)) - + ", " + ScGlobal::GetpLocaleData()->getTime(Time(Time::SYSTEM))); + + ", " + ScGlobal::GetpLocaleData()->getTime(tools::Time(tools::Time::SYSTEM))); m_pEdComment->SetText(aComment); m_pEdName->SetText(rName); |