diff options
Diffstat (limited to 'sc/source/ui/cctrl')
| -rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/editfield.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 570117ea5caf..dd3e57d364f2 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -71,7 +71,7 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999; -ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : +ScMenuFloatingWindow::ScMenuFloatingWindow(vcl::Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : PopupMenuFloatingWindow(pParent), maOpenTimer(this), maCloseTimer(this), @@ -852,7 +852,7 @@ void ScCheckListMenuWindow::CancelButton::Click() ::CancelButton::Click(); } -ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) : +ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc) : ScMenuFloatingWindow(pParent, pDoc), maChecks(this, WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ), maChkToggleAll(this, 0), @@ -1210,7 +1210,7 @@ void ScCheckListMenuWindow::Paint(const Rectangle& rRect) DrawRect(Rectangle(aPos,aSize)); } -Window* ScCheckListMenuWindow::GetPreferredKeyInputWindow() +vcl::Window* ScCheckListMenuWindow::GetPreferredKeyInputWindow() { return maTabStopCtrls[mnCurTabStop]; } @@ -1327,7 +1327,7 @@ void ScCheckListMenuWindow::addMember(const OUString& rName, bool bVisible) maMembers.push_back(aMember); } -ScCheckListBox::ScCheckListBox( Window* pParent, WinBits nWinStyle ) +ScCheckListBox::ScCheckListBox( vcl::Window* pParent, WinBits nWinStyle ) : SvTreeListBox( pParent, nWinStyle ), mpCheckButton( NULL ) { Init(); diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 6c8755cfe4fd..59da99c4933b 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -41,12 +41,12 @@ sal_Unicode lclGetGroupSep() } // namespace -ScDoubleField::ScDoubleField( Window* pParent, WinBits nStyle ) : +ScDoubleField::ScDoubleField( vcl::Window* pParent, WinBits nStyle ) : Edit( pParent, nStyle ) { } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScDoubleField(Window *pParent, VclBuilder::stringmap &rMap) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeScDoubleField(vcl::Window *pParent, VclBuilder::stringmap &rMap) { VclBuilder::ensureDefaultWidthChars(rMap); return new ScDoubleField(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index bf00d6d6d462..6e2e8bc501c0 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -79,7 +79,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState } } -Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) +vcl::Window* ScZoomSliderControl::CreateItemWindow( vcl::Window *pParent ) { // #i98000# Don't try to get a value via SfxViewFrame::Current here. // The view's value is always notified via StateChanged later. @@ -216,7 +216,7 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } -ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, +ScZoomSliderWnd::ScZoomSliderWnd( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ): Window( pParent ), mpImpl( new ScZoomSliderWnd_Impl( nCurrentZoom ) ), |