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 /include/svx | |
| 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 'include/svx')
| -rw-r--r-- | include/svx/ctredlin.hxx | 12 | ||||
| -rw-r--r-- | include/svx/galmisc.hxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 685696106672..eca260ae844a 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -120,8 +120,8 @@ public: void SetDateTimeMode(sal_uInt16 nMode); void SetFirstDate(const Date&); void SetLastDate(const Date&); - void SetFirstTime(const Time&); - void SetLastTime(const Time&); + void SetFirstTime(const tools::Time&); + void SetLastTime(const tools::Time&); void SetFilterAuthor(bool bFlag=true); void SetAuthor(const OUString &); void SetFilterComment(bool bFlag=true); @@ -209,13 +209,13 @@ public: Date GetFirstDate() const; void SetFirstDate(const Date &aDate); - Time GetFirstTime() const; - void SetFirstTime(const Time &aTime); + tools::Time GetFirstTime() const; + void SetFirstTime(const tools::Time &aTime); Date GetLastDate() const; void SetLastDate(const Date &aDate); - Time GetLastTime() const; - void SetLastTime(const Time &aTime); + tools::Time GetLastTime() const; + void SetLastTime(const tools::Time &aTime); void SetDateMode(sal_uInt16 nMode); sal_uInt16 GetDateMode(); diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 4feff17a0f2c..5336de75ebb2 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -39,12 +39,12 @@ struct ExchangeData GalleryTheme* pTheme; OUString aEditedTitle; Date aThemeChangeDate; - Time aThemeChangeTime; + tools::Time aThemeChangeTime; ExchangeData() : pTheme(NULL) , aThemeChangeDate( Date::EMPTY ) - , aThemeChangeTime( Time::EMPTY ) + , aThemeChangeTime( tools::Time::EMPTY ) { } }; |