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/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 'sc/inc')
| -rw-r--r-- | sc/inc/editutil.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/externalrefmgr.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 4acb1834b590..142650fa9fa1 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -196,7 +196,7 @@ struct ScHeaderFieldData OUString aShortDocName; // pure file name OUString aTabName; Date aDate; - Time aTime; + tools::Time aTime; long nPageNo; long nTotalPages; SvxNumType eNumType; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 383186ef715f..8a2d3a4dcfa4 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -419,9 +419,9 @@ private: struct SrcShell { SfxObjectShellRef maShell; - Time maLastAccess; + tools::Time maLastAccess; - SrcShell() : maLastAccess( Time::SYSTEM ) {} + SrcShell() : maLastAccess( tools::Time::SYSTEM ) {} }; typedef ::boost::unordered_map<sal_uInt16, SrcShell> DocShellMap; |