diff options
Diffstat (limited to 'sd/source/ui/view')
23 files changed, 76 insertions, 76 deletions
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 3d2cb47c0a3b..5a72e6691027 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -37,7 +37,7 @@ class FormShellManagerFactory { public: FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager); - virtual FmFormShell* CreateShell (ShellId nId, ::Window* pParentWindow, FrameView* pFrameView) SAL_OVERRIDE; + virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView) SAL_OVERRIDE; virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: @@ -302,7 +302,7 @@ FormShellManagerFactory::FormShellManagerFactory ( FmFormShell* FormShellManagerFactory::CreateShell ( ::sd::ShellId nId, - ::Window*, + vcl::Window*, ::sd::FrameView*) { FmFormShell* pShell = NULL; diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 8b9676634119..ccca4876a8f2 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -104,7 +104,7 @@ public: void ProvideOutlinerView ( Outliner& rOutliner, const ::boost::shared_ptr<ViewShell>& rpViewShell, - ::Window* pWindow); + vcl::Window* pWindow); /** This method is called when the OutlinerView is no longer used. */ @@ -1582,7 +1582,7 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) // while the message box is being shown. We also have to take into // account that we are called during a spell check and the search dialog // is not available. - ::Window* pSearchDialog = NULL; + vcl::Window* pSearchDialog = NULL; SfxChildWindow* pChildWindow = NULL; switch (meMode) { @@ -1643,7 +1643,7 @@ Outliner::Implementation::~Implementation (void) void Outliner::Implementation::ProvideOutlinerView ( Outliner& rOutliner, const ::boost::shared_ptr<ViewShell>& rpViewShell, - ::Window* pWindow) + vcl::Window* pWindow) { if (rpViewShell.get() != NULL) { diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index ae6832b33c6a..723a6d814ed7 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -139,7 +139,7 @@ public: the content window. It does not include the ViewTabBar. */ - ::boost::scoped_ptr< ::Window> mpViewWindow; + ::boost::scoped_ptr< vcl::Window> mpViewWindow; ::boost::shared_ptr<ToolBarManager> mpToolBarManager; ::boost::shared_ptr<ViewShellManager> mpViewShellManager; ::boost::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer; @@ -199,10 +199,10 @@ namespace { window of the main view shell. With the key press it forwards the focus so that it is not called very often. */ -class FocusForwardingWindow : public ::Window +class FocusForwardingWindow : public vcl::Window { public: - FocusForwardingWindow (::Window& rParentWindow, ViewShellBase& rBase); + FocusForwardingWindow (vcl::Window& rParentWindow, ViewShellBase& rBase); virtual ~FocusForwardingWindow (void); virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; @@ -955,7 +955,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB mpImpl->mpViewTabBar = rViewTabBar; } -::Window* ViewShellBase::GetViewWindow (void) +::vcl::Window* ViewShellBase::GetViewWindow (void) { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1375,9 +1375,9 @@ void CurrentPageSetter::operator() (bool) namespace sd { namespace { FocusForwardingWindow::FocusForwardingWindow ( - ::Window& rParentWindow, + vcl::Window& rParentWindow, ViewShellBase& rBase) - : ::Window(&rParentWindow, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), + : vcl::Window(&rParentWindow, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), mrBase(rBase) { OSL_TRACE("created FocusForwardingWindow at %x", this); @@ -1393,7 +1393,7 @@ void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt) ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); if (pViewShell.get() != NULL) { - ::Window* pWindow = pViewShell->GetActiveWindow(); + vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != NULL) { // Forward the focus so that the window is called directly the @@ -1410,7 +1410,7 @@ void FocusForwardingWindow::Command (const CommandEvent& rEvent) ::boost::shared_ptr<ViewShell> pViewShell = mrBase.GetMainViewShell(); if (pViewShell.get() != NULL) { - ::Window* pWindow = pViewShell->GetActiveWindow(); + vcl::Window* pWindow = pViewShell->GetActiveWindow(); if (pWindow != NULL) { pWindow->Command(rEvent); diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index f52e89bb5776..d2508afe311b 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -59,7 +59,7 @@ public: ShellDescriptor (const ShellDescriptor& rDescriptor); ShellDescriptor& operator= (const ShellDescriptor& rDescriptor); bool IsMainViewShell (void) const; - ::Window* GetWindow (void) const; + ::vcl::Window* GetWindow (void) const; }; /** This functor can be used to search for a shell in an STL container when the @@ -218,7 +218,7 @@ private: ShellDescriptor CreateSubShell ( SfxShell* pShell, ShellId nShellId, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView); void DestroyViewShell (ShellDescriptor& rDescriptor); void DestroySubShell ( @@ -417,7 +417,7 @@ void ViewShellManager::Implementation::ActivateViewShell (ViewShell* pViewShell) // window can be moved to the top of the shell stack. if (aResult.mpShell != NULL) { - ::Window* pWindow = aResult.GetWindow(); + ::vcl::Window* pWindow = aResult.GetWindow(); if (pWindow != NULL) { pWindow->AddEventListener( @@ -966,7 +966,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, { if (pEvent != NULL) { - ::Window* pEventWindow + ::vcl::Window* pEventWindow = static_cast<VclWindowEvent*>(pEvent)->GetWindow(); switch (pEvent->GetId()) @@ -977,7 +977,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, aI!=maActiveViewShells.end(); aI++) { - if (pEventWindow == static_cast< ::Window*>(aI->GetWindow())) + if (pEventWindow == static_cast< ::vcl::Window*>(aI->GetWindow())) { MoveToTop(*aI->mpShell); break; @@ -1013,7 +1013,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*, ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( SfxShell* pParentShell, ShellId nShellId, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView) { ::osl::MutexGuard aGuard (maMutex); @@ -1050,7 +1050,7 @@ void ViewShellManager::Implementation::DestroyViewShell ( if (rDescriptor.mbIsListenerAddedToWindow) { rDescriptor.mbIsListenerAddedToWindow = false; - ::Window* pWindow = rDescriptor.GetWindow(); + ::vcl::Window* pWindow = rDescriptor.GetWindow(); if (pWindow != NULL) { pWindow->RemoveEventListener( @@ -1237,7 +1237,7 @@ bool ShellDescriptor::IsMainViewShell (void) const return false; } -::Window* ShellDescriptor::GetWindow (void) const +vcl::Window* ShellDescriptor::GetWindow (void) const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); if (pViewShell != NULL) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 01058ddcb4ec..1cc8abaecd88 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -68,7 +68,7 @@ class TabBarControl : public ::TabControl { public: TabBarControl ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar); virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; virtual void ActivatePage (void) SAL_OVERRIDE; @@ -174,11 +174,11 @@ void ViewTabBar::disposing (void) mxController = NULL; } -::Window* ViewTabBar::GetAnchorWindow( +vcl::Window* ViewTabBar::GetAnchorWindow( const Reference<XResourceId>& rxViewTabBarId, const Reference<frame::XController>& rxController) { - ::Window* pWindow = NULL; + vcl::Window* pWindow = NULL; ViewShellBase* pBase = NULL; // Tunnel through the controller and use the ViewShellBase to obtain the @@ -559,7 +559,7 @@ void ViewTabBar::UpdateTabBarButtons (void) //===== TabBarControl ========================================================= TabBarControl::TabBarControl ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar) : ::TabControl(pParentWindow), mpViewTabBar(rpViewTabBar) diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 391e1c33be36..1c308f21652d 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -44,7 +44,7 @@ WindowUpdater::~WindowUpdater (void) throw () maCTLOptions.RemoveListener(this); } -void WindowUpdater::RegisterWindow (::Window* pWindow) +void WindowUpdater::RegisterWindow (vcl::Window* pWindow) { if (pWindow != NULL) { @@ -60,7 +60,7 @@ void WindowUpdater::RegisterWindow (::Window* pWindow) } } -void WindowUpdater::UnregisterWindow (::Window* pWindow) +void WindowUpdater::UnregisterWindow (vcl::Window* pWindow) { tWindowList::iterator aWindowIterator ( ::std::find ( diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index cf0b5b1f0462..f8900caba5eb 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -50,7 +50,7 @@ ClientView::~ClientView() * to be overloaded and properly handled. */ -void ClientView::InvalidateOneWin(::Window& rWin) +void ClientView::InvalidateOneWin(vcl::Window& rWin) { Region aRegion; CompleteRedraw(&rWin, aRegion); @@ -61,7 +61,7 @@ void ClientView::InvalidateOneWin(::Window& rWin) * to be overloaded and properly handled. */ -void ClientView::InvalidateOneWin(::Window& rWin, const Rectangle& rRect) +void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) { CompleteRedraw(&rWin, Region(rRect)); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 69dcb5d9b0a5..043abbbcddff 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -515,7 +515,7 @@ bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const * Make passed region visible (scrolling if necessary) */ -void DrawView::MakeVisible(const Rectangle& rRect, ::Window& rWin) +void DrawView::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { if (!rRect.IsEmpty() && mpDrawViewShell) { diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index d754afecf0fc..ad8233ac5cc2 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -290,7 +290,7 @@ void DrawViewShell::ExecBmpMask( SfxRequest& rReq ) if( pNewObj->IsLinkedGraphic() ) { - MessageDialog aQueryBox( (Window*) GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); + MessageDialog aQueryBox( (vcl::Window*) GetActiveWindow(),"QueryUnlinkImageDialog","modules/sdraw/ui/queryunlinkimagedialog.ui"); if (RET_YES == aQueryBox.Execute()) pNewObj->ReleaseGraphicLink(); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index d183d947e817..53c73ed65f6e 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -107,7 +107,7 @@ void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventOb mpParent->ScannerEvent( rEventObject ); } -DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) +DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, PageKind ePageKind, FrameView* pFrameViewArgument ) : ViewShell (pFrame, pParentWindow, rViewShellBase) , maTabControl(this, pParentWindow) , mbIsLayerModeActive(false) @@ -415,7 +415,7 @@ css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubCo return xSubController; } -bool DrawViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool DrawViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { // DrawViewShells can not be relocated to a new parent window at the // moment, so return <FALSE/> except when the given parent window is the diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 373a2bcde9a3..f7999e8e0c92 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -125,7 +125,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView) for(sal_Int32 a(0); a < aInputString.getLength(); a++) { sal_Char aChar = (sal_Char)aInputString[a]; - vcl::KeyCode aKeyCode; + ::vcl::KeyCode aKeyCode; KeyEvent aKeyEvent(aChar, aKeyCode); // add actual character @@ -866,7 +866,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) if (pOLV) { - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); pOLV->PostKeyEvent(aKEvt); } @@ -878,7 +878,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) } else { - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode); bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt ); diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 70f5bccf379a..8c043e3c0ae7 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -59,7 +59,7 @@ bool DrawViewShell::GotoBookmark(const OUString& rBookmark) |* \************************************************************************/ -void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin) +void DrawViewShell::MakeVisible(const Rectangle& rRect, vcl::Window& rWin) { // In older versions, if in X or Y the size of the object was // smaller than the visible area, the user-defined zoom was diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index fcdc1da0522a..1f94f01bd8a8 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -32,7 +32,7 @@ namespace sd { GraphicViewShell::GraphicViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView) : DrawViewShell ( pFrame, diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 802cadb880e7..0ad65d417d69 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -190,7 +190,7 @@ Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (vo OutlineViewShell::OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameViewArgument) : ViewShell(pFrame, pParentWindow, rViewShellBase), pOlView(NULL), @@ -541,7 +541,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) { OutlineViewPageChangesGuard aGuard2(pOlView); - vcl::KeyCode aKCode(KEY_DELETE); + ::vcl::KeyCode aKCode(KEY_DELETE); KeyEvent aKEvt( 0, aKCode ); pOutlView->PostKeyEvent(aKEvt); @@ -1445,7 +1445,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin) Invalidate(SID_STYLE_FAMILY5); // check and distinguish cursor movements- or input-keys - vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); + ::vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() ); if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) || (GetActualPage() != pLastPage) ) { diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index d9855be75126..7b0384ea9524 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -86,7 +86,7 @@ struct SdParaAndPos TYPEINIT1( OutlineView, ::sd::View ); -OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewShell& rOutlineViewShell) +OutlineView::OutlineView( DrawDocShell& rDocSh, vcl::Window* pWindow, OutlineViewShell& rOutlineViewShell) : ::sd::View(*rDocSh.GetDoc(), pWindow, &rOutlineViewShell) , mrOutlineViewShell(rOutlineViewShell) , mrOutliner(*mrDoc.GetOutliner(true)) @@ -279,7 +279,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) { bool bRemoved = false; sal_uInt16 nView = 0; - ::Window* pWindow; + vcl::Window* pWindow; while (nView < MAX_OUTLINERVIEWS && !bRemoved) { @@ -305,7 +305,7 @@ void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin) /** * Return a pointer to the OutlinerView corresponding to the window */ -OutlinerView* OutlineView::GetViewByWindow (::Window* pWin) const +OutlinerView* OutlineView::GetViewByWindow (vcl::Window* pWin) const { OutlinerView* pOlView = NULL; for (sal_uInt16 nView = 0; nView < MAX_OUTLINERVIEWS; nView++) @@ -1444,7 +1444,7 @@ void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ ) { mpOutlinerView[nView]->SetBackgroundColor( aDocColor ); - ::Window* pWindow = mpOutlinerView[nView]->GetWindow(); + vcl::Window* pWindow = mpOutlinerView[nView]->GetWindow(); if( pWindow ) pWindow->SetBackground( Wallpaper( aDocColor ) ); diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index 6454b1436115..7ac22abfa48c 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -76,7 +76,7 @@ void PresentationViewShell::InitInterface_Impl() TYPEINIT1( PresentationViewShell, DrawViewShell ); -PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView) +PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView) : DrawViewShell( pFrame, rViewShellBase, pParentWindow, PK_STANDARD, pFrameView) { if( GetDocSh() && GetDocSh()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 2e4006a6aaaf..2df86286e921 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -68,7 +68,7 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt } } -Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) +Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle) : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle) , pSdView(NULL) , pSdWin(pWin) diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index effd7c2f582b..2871b5baa1da 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -660,7 +660,7 @@ void OutlinerMasterViewFilter::End() } bool View::SdrBeginTextEdit( - SdrObject* pObj, SdrPageView* pPV, ::Window* pWin, + SdrObject* pObj, SdrPageView* pPV, vcl::Window* pWin, bool bIsNewObj, SdrOutliner* pOutl, OutlinerView* pGivenOutlinerView, bool bDontDeleteOutliner, bool bOnlyOneView, bool bGrabFocus ) @@ -1319,7 +1319,7 @@ void View::ChangeMarkedObjectsBulletsNumbering( const bool bSwitchOff ) { SdrModel* pSdrModel = GetModel(); - Window* pWindow = dynamic_cast< Window* >(GetFirstOutputDevice()); + vcl::Window* pWindow = dynamic_cast< vcl::Window* >(GetFirstOutputDevice()); if (!pSdrModel || !pWindow) return; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 9d754052d58a..cb986360164e 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -94,7 +94,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent {} }; -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, ::Window& ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, vcl::Window& ) { // since SdTransferable::CopyToClipboard is called, this // dynamically created object ist destroyed automatically @@ -157,7 +157,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, vcl::Window& rWindow, const Point& rDragPos ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, false ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); @@ -206,7 +206,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent return xRet; } -::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow ) +::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, vcl::Window& rWindow ) { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > xRet( pTransferable ); @@ -245,7 +245,7 @@ void View::UpdateSelectionClipboard( bool bForceDeselect ) } } -void View::DoCut(::Window* ) +void View::DoCut(vcl::Window* ) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -262,7 +262,7 @@ void View::DoCut(::Window* ) } } -void View::DoCopy (::Window* pWindow) +void View::DoCopy (vcl::Window* pWindow) { const OutlinerView* pOLV = GetTextEditOutlinerView(); @@ -275,7 +275,7 @@ void View::DoCopy (::Window* pWindow) } } -void View::DoPaste (::Window* pWindow) +void View::DoPaste (vcl::Window* pWindow) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( mpViewSh->GetActiveWindow() ) ); if( !aDataHelper.GetTransferable().is() ) @@ -354,7 +354,7 @@ void View::DoPaste (::Window* pWindow) } } -void View::StartDrag( const Point& rStartPos, ::Window* pWindow ) +void View::StartDrag( const Point& rStartPos, vcl::Window* pWindow ) { if( AreObjectsMarked() && IsAction() && mpViewSh && pWindow && !mpDragSrcMarkList ) { diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 6e26ba91747e..b9af542b4354 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -50,8 +50,8 @@ namespace sd { #define MIN_ZOOM 5 ///< minimal zoom factor #define MAX_ZOOM 3000 ///< maximal zoom factor -Window::Window(::Window* pParent) - : ::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), +Window::Window(vcl::Window* pParent) + : vcl::Window(pParent, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)), DropTargetHelper( this ), mpShareWin(NULL), maWinPos(0, 0), // precautionary; but the values should be set @@ -74,7 +74,7 @@ Window::Window(::Window* pParent) aMap.SetMapUnit(MAP_100TH_MM); SetMapMode(aMap); - // whit it, the ::WindowColor is used in the slide mode + // whit it, the vcl::WindowColor is used in the slide mode SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetWindowColor() ) ); // adjust contrast mode initially @@ -192,7 +192,7 @@ long Window::GetZoom (void) const void Window::Resize() { - ::Window::Resize(); + vcl::Window::Resize(); CalcMinZoom(); if( mpViewShell && mpViewShell->GetViewFrame() ) @@ -221,7 +221,7 @@ void Window::KeyInput(const KeyEvent& rKEvt) } else { - ::Window::KeyInput(rKEvt); + vcl::Window::KeyInput(rKEvt); } } } @@ -260,7 +260,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) nResult = mpViewShell->Notify(rNEvt, this); } if( !nResult ) - nResult = ::Window::Notify( rNEvt ); + nResult = vcl::Window::Notify( rNEvt ); return nResult; } @@ -270,10 +270,10 @@ void Window::RequestHelp(const HelpEvent& rEvt) if ( mpViewShell ) { if( !mpViewShell->RequestHelp( rEvt, this) ) - ::Window::RequestHelp( rEvt ); + vcl::Window::RequestHelp( rEvt ); } else - ::Window::RequestHelp( rEvt ); + vcl::Window::RequestHelp( rEvt ); } /** @@ -699,7 +699,7 @@ double Window::GetScrlPageHeight() void Window::LoseFocus() { mnTicks = 0; - ::Window::LoseFocus (); + vcl::Window::LoseFocus (); } /** @@ -708,12 +708,12 @@ void Window::LoseFocus() void Window::GrabFocus() { mnTicks = 0; - ::Window::GrabFocus (); + vcl::Window::GrabFocus (); } void Window::DataChanged( const DataChangedEvent& rDCEvt ) { - ::Window::DataChanged( rDCEvt ); + vcl::Window::DataChanged( rDCEvt ); /* Omit PRINTER by all documents which are not using a printer. Omit FONTS and FONTSUBSTITUTION if no text output is available or if the @@ -930,7 +930,7 @@ void Window::DropScroll(const Point& rMousePos) // If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. if (mpViewShell && mpViewShell->ISA(PresentationViewShell)) { - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) @@ -946,7 +946,7 @@ void Window::DropScroll(const Point& rMousePos) else { OSL_TRACE ("::sd::Window::CreateAccessible: no view shell"); - return ::Window::CreateAccessible (); + return vcl::Window::CreateAccessible (); } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 92896b965821..45e395d76552 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -63,7 +63,7 @@ void TabControl::TabControlTransferable::DragFinished( sal_Int8 nDropAction ) mrParent.DragFinished( nDropAction ); } -TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : +TabControl::TabControl(DrawViewShell* pViewSh, vcl::Window* pParent) : TabBar( pParent, WinBits( WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_SIZEABLE | WB_DRAG) ), DragSourceHelper( this ), DropTargetHelper( this ), diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index ec952a8e0cfe..3cd27c9f5eab 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -201,7 +201,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt) OUString aHelpText( aResId ); Rectangle aScreenRect( pDev->LogicToPixel( GetPos() ), maImageSize ); - mnTip = Help::ShowTip( static_cast< ::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; + mnTip = Help::ShowTip( static_cast< vcl::Window* >( pHdlList->GetView()->GetFirstOutputDevice() ), aScreenRect, aHelpText, 0 ) ; } Touch(); } diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 9cc670bb992e..258bc88f9415 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -95,7 +95,7 @@ public: virtual ~ViewShellObjectBarFactory (void); virtual SfxShell* CreateShell ( ::sd::ShellId nId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, ::sd::FrameView* pFrameView) SAL_OVERRIDE; virtual void ReleaseShell (SfxShell* pShell) SAL_OVERRIDE; private: @@ -133,7 +133,7 @@ SfxViewFrame* ViewShell::GetViewFrame (void) const /// declare SFX-Slotmap and standard interface TYPEINIT1(ViewShell, SfxShell); -ViewShell::ViewShell( SfxViewFrame*, ::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) +ViewShell::ViewShell( SfxViewFrame*, vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter) : SfxShell(&rViewShellBase) , mbCenterAllowed(bAllowCenter) , mpParentWindow(pParentWindow) @@ -237,7 +237,7 @@ void ViewShell::construct(void) void ViewShell::doShow(void) { mpContentWindow->Show(); - static_cast< ::Window*>(mpContentWindow.get())->Resize(); + static_cast< vcl::Window*>(mpContentWindow.get())->Resize(); OSL_TRACE("content window has size %d %d", mpContentWindow->GetSizePixel().Width(), mpContentWindow->GetSizePixel().Height()); @@ -1400,7 +1400,7 @@ void ViewShell::ShowUIControls (bool bVisible) mpContentWindow->Show( bVisible ); } -bool ViewShell::RelocateToParentWindow (::Window* pParentWindow) +bool ViewShell::RelocateToParentWindow (vcl::Window* pParentWindow) { mpParentWindow = pParentWindow; @@ -1472,7 +1472,7 @@ ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void) SfxShell* ViewShellObjectBarFactory::CreateShell ( ::sd::ShellId nId, - ::Window*, + vcl::Window*, ::sd::FrameView* ) { SfxShell* pShell = NULL; |