diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-23 11:20:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-23 14:11:39 +0300 |
| commit | 827c46e7d75000cb03b0ce21759f9d0825f0c096 (patch) | |
| tree | 3a84ccc45d54607c61328b18f58f914c1d6ec240 /sfx2/source/dialog/recfloat.cxx | |
| parent | 7cbbefae224ab85343accb42b03f9431ec693a83 (diff) | |
fdo#82577: Handle Window
Put the VCL Window class in the vcl namespace. Avoids clash with the X11
Window typedef.
Change-Id: Ib1beb7ab4ad75562a42aeb252732a073d25eff1a
Diffstat (limited to 'sfx2/source/dialog/recfloat.cxx')
| -rw-r--r-- | sfx2/source/dialog/recfloat.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 2b0b42944553..12f3540ad0a1 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -124,7 +124,7 @@ static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const uno:: SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, SID_RECORDING_FLOATWINDOW ); -SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( Window* pParentWnd , +SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* pParentWnd , sal_uInt16 nId , SfxBindings* pBind , SfxChildWinInfo* pInfo ) @@ -163,7 +163,7 @@ bool SfxRecordingFloatWrapper_Impl::QueryClose() SfxRecordingFloat_Impl::SfxRecordingFloat_Impl( SfxBindings* pBind , SfxChildWindow* pChildWin , - Window* pParent ) + vcl::Window* pParent ) : SfxFloatingWindow( pBind, pChildWin, pParent, @@ -230,7 +230,7 @@ void SfxRecordingFloat_Impl::StateChanged( StateChangedType nStateChange ) if ( nStateChange == STATE_CHANGE_INITSHOW ) { SfxViewFrame *pFrame = GetBindings().GetDispatcher_Impl()->GetFrame(); - Window* pEditWin = pFrame->GetViewShell()->GetWindow(); + vcl::Window* pEditWin = pFrame->GetViewShell()->GetWindow(); Point aPoint = pEditWin->OutputToScreenPixel( pEditWin->GetPosPixel() ); aPoint = GetParent()->ScreenToOutputPixel( aPoint ); |