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/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 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/saldisp.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/unx/salframe.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 075cf79503fe..5f0e8941f710 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -276,7 +276,7 @@ protected: bool m_bUseRandRWrapper; // don't use randr on gtk, use gdk signals there - mutable XLIB_Time m_nLastUserEventTime; // mutable because changed on first access + mutable Time m_nLastUserEventTime; // mutable because changed on first access virtual bool Dispatch( XEvent *pEvent ) = 0; void InitXinerama(); @@ -353,7 +353,7 @@ public: const Pair &GetResolution() const { return aResolution_; } sal_uLong GetProperties() const { return PROPERTY_DEFAULT; } sal_uLong GetMaxRequestSize() const { return nMaxRequestSize_; } - XLIB_Time GetLastUserEventTime( bool bAlwaysReget = false ) const; + Time GetLastUserEventTime( bool bAlwaysReget = false ) const; bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const; SalXLib* GetXLib() const { return pXLib_; } diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index d85363a7aad8..637ef677a221 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -76,7 +76,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame X11SalGraphics *pGraphics_; // current frame graphics X11SalGraphics *pFreeGraphics_; // first free frame graphics - XLIB_Time nReleaseTime_; // timestamp of last key release + Time nReleaseTime_; // timestamp of last key release sal_uInt16 nKeyCode_; // last key code sal_uInt16 nKeyState_; // last key state int nCompose_; // compose state |