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 | |
| 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')
| -rw-r--r-- | sw/inc/AnnotationWin.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/SidebarWin.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/docufld.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/flddat.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/shellio.hxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 7932c07cc03a..b0c527af522f 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -45,7 +45,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin virtual OUString GetAuthor() SAL_OVERRIDE; virtual Date GetDate() SAL_OVERRIDE; - virtual Time GetTime() SAL_OVERRIDE; + virtual tools::Time GetTime() SAL_OVERRIDE; virtual sal_uInt32 MoveCaret() SAL_OVERRIDE; diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 3944f1b75654..290f8bbc42f9 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -103,7 +103,7 @@ class SwSidebarWin : public vcl::Window virtual OUString GetAuthor() = 0; virtual Date GetDate() = 0; - virtual Time GetTime() = 0; + virtual tools::Time GetTime() = 0; void ExecuteCommand(sal_uInt16 nSlot); void InitControls(); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 250be7f7fe46..a70c885f63dd 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -465,7 +465,7 @@ public: inline const DateTime GetDateTime() const { return aDateTime; } inline const Date GetDate() const { return aDateTime.GetDate(); } - inline const Time GetTime() const { return aDateTime.GetTime(); } + inline const tools::Time GetTime() const { return aDateTime.GetTime(); } /// Author virtual OUString GetPar1() const SAL_OVERRIDE; 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); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 3a0259b62d06..154e35008d1e 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -194,7 +194,7 @@ class SW_DLLPUBLIC Reader OUString aTemplateNm; Date aDStamp; - Time aTStamp; + tools::Time aTStamp; DateTime aChkDateTime; protected: |