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 /sw/source/uibase/ribbar/workctrl.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 'sw/source/uibase/ribbar/workctrl.cxx')
| -rw-r--r-- | sw/source/uibase/ribbar/workctrl.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index aed90d456adf..ff70be3516b6 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -450,12 +450,12 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] = HID_NID_NEXT }; -SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, Window *pParent) +SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window *pParent) : SfxPopupWindow(nId, pParent, "FloatingNavigation", "modules/swriter/ui/floatingnavigation.ui", rFrame), aIList(SW_RES(IL_VALUES)) { - m_pToolBox = new SwScrollNaviToolBox(get<Window>("box"), 0); + m_pToolBox = new SwScrollNaviToolBox(get<vcl::Window>("box"), 0); get(m_pInfoField, "label"); sal_uInt16 i; @@ -600,7 +600,7 @@ class SwZoomBox_Impl : public ComboBox public: SwZoomBox_Impl( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nSlot, const Reference< XDispatchProvider >& rDispatchProvider ); virtual ~SwZoomBox_Impl(); @@ -614,7 +614,7 @@ protected: }; SwZoomBox_Impl::SwZoomBox_Impl( - Window* pParent, + vcl::Window* pParent, sal_uInt16 nSlot, const Reference< XDispatchProvider >& rDispatchProvider ): ComboBox( pParent, SW_RES(RID_PVIEW_ZOOM_LB)), @@ -694,7 +694,7 @@ bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) } else if ( EVENT_LOSEFOCUS == rNEvt.GetType() ) { - Window* pFocusWin = Application::GetFocusWindow(); + vcl::Window* pFocusWin = Application::GetFocusWindow(); if ( !HasFocus() && GetSubEdit() != pFocusWin ) SetText( GetSavedValue() ); } @@ -713,7 +713,7 @@ void SwZoomBox_Impl::ReleaseFocus() if ( pCurSh ) { - Window* pShellWnd = pCurSh->GetWindow(); + vcl::Window* pShellWnd = pCurSh->GetWindow(); if ( pShellWnd ) pShellWnd->GrabFocus(); @@ -750,7 +750,7 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, } } -Window* SwPreviewZoomControl::CreateItemWindow( Window *pParent ) +vcl::Window* SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent ) { SwZoomBox_Impl* pRet = new SwZoomBox_Impl( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY )); return pRet; |