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/unx/generic/window/salframe.cxx | |
| 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/unx/generic/window/salframe.cxx')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 0c072ce36913..0e11e9a227c6 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -622,7 +622,7 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP XSync( GetXDisplay(), False ); setXEmbedInfo(); - XLIB_Time nUserTime = (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_TOOLWINDOW) ) == 0 ? + Time nUserTime = (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_TOOLWINDOW) ) == 0 ? pDisplay_->GetLastUserEventTime() : 0; pDisplay_->getWMAdaptor()->setUserTime( this, nUserTime ); @@ -1225,7 +1225,7 @@ void X11SalFrame::Show( bool bVisible, bool bNoActivate ) ); } - XLIB_Time nUserTime = 0; + Time nUserTime = 0; if( ! bNoActivate && (nStyle_ & (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) == 0 ) nUserTime = pDisplay_->GetLastUserEventTime( true ); GetDisplay()->getWMAdaptor()->setUserTime( this, nUserTime ); |