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 /vcl/win/source | |
| 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 'vcl/win/source')
| -rw-r--r-- | vcl/win/source/app/salinst.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index b1d33e498792..52e33db6fe16 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -340,8 +340,8 @@ SalData::SalData() mpDitherDiff = 0; // Dither mapping table mpDitherLow = 0; // Dither mapping table mpDitherHigh = 0; // Dither mapping table - mnTimerMS = 0; // Current Time (in MS) of the Timer - mnTimerOrgMS = 0; // Current Original Time (in MS) + mnTimerMS = 0; // Current tools::Time (in MS) of the Timer + mnTimerOrgMS = 0; // Current Original tools::Time (in MS) mnNextTimerTime = 0; mnLastEventTime = 0; mnTimerId = 0; // windows timer id |