diff options
Diffstat (limited to 'sfx2/source/sidebar')
31 files changed, 86 insertions, 86 deletions
diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx index ff24c9df16c4..4071d981746e 100644 --- a/sfx2/source/sidebar/ControlFactory.cxx +++ b/sfx2/source/sidebar/ControlFactory.cxx @@ -27,12 +27,12 @@ namespace sfx2 { namespace sidebar { -CheckBox* ControlFactory::CreateMenuButton (Window* pParentWindow) +CheckBox* ControlFactory::CreateMenuButton (vcl::Window* pParentWindow) { return new MenuButton(pParentWindow); } -ImageRadioButton* ControlFactory::CreateTabItem (Window* pParentWindow) +ImageRadioButton* ControlFactory::CreateTabItem (vcl::Window* pParentWindow) { return new TabItem(pParentWindow); } diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx index 8a2b86470d26..16d4acaa4391 100644 --- a/sfx2/source/sidebar/ControllerFactory.cxx +++ b/sfx2/source/sidebar/ControllerFactory.cxx @@ -105,7 +105,7 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController( if (rxParentWindow.is()) { Reference<awt::XWindow> xItemWindow (xController->createItemWindow(rxParentWindow)); - Window* pItemWindow = VCLUnoHelper::GetWindow(xItemWindow); + vcl::Window* pItemWindow = VCLUnoHelper::GetWindow(xItemWindow); if (pItemWindow != NULL) { WindowType nType = pItemWindow->GetType(); diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 20fdb19e7bc7..e5baf1c9d9bd 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -42,7 +42,7 @@ namespace sfx2 { namespace sidebar { Deck::Deck ( const DeckDescriptor& rDeckDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction) : Window(pParentWindow, 0), msId(rDeckDescriptor.msId), @@ -52,9 +52,9 @@ Deck::Deck ( mnMinimalWidth(0), maPanels(), mpTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, this, rCloserAction)), - mpScrollClipWindow(new Window(this)), + mpScrollClipWindow(new vcl::Window(this)), mpScrollContainer(new ScrollContainerWindow(mpScrollClipWindow.get())), - mpFiller(new Window(this)), + mpFiller(new vcl::Window(this)), mpVerticalScrollBar(new ScrollBar(this)) { SetBackground(Wallpaper()); @@ -254,7 +254,7 @@ void Deck::RequestLayout (void) *mpVerticalScrollBar); } -::Window* Deck::GetPanelParentWindow (void) +vcl::Window* Deck::GetPanelParentWindow (void) { return mpScrollContainer.get(); } @@ -291,7 +291,7 @@ void Deck::ShowPanel (const Panel& rPanel) -const OUString GetWindowClassification (const Window* pWindow) +const OUString GetWindowClassification (const vcl::Window* pWindow) { const OUString& rsName (pWindow->GetText()); if (!rsName.isEmpty()) @@ -305,7 +305,7 @@ const OUString GetWindowClassification (const Window* pWindow) } -void Deck::PrintWindowSubTree (Window* pRoot, int nIndentation) +void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation) { static const char* sIndentation = " "; const Point aLocation (pRoot->GetPosPixel()); @@ -345,7 +345,7 @@ IMPL_LINK(Deck, HandleVerticalScrollBarChange,void*, EMPTYARG) //----- Deck::ScrollContainerWindow ------------------------------------------- -Deck::ScrollContainerWindow::ScrollContainerWindow (Window* pParentWindow) +Deck::ScrollContainerWindow::ScrollContainerWindow (vcl::Window* pParentWindow) : Window(pParentWindow), maSeparators() { diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index a88e2589738f..c071f1d3a5d2 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -40,12 +40,12 @@ class DeckTitleBar; It displays the deck title. */ class Deck - : public Window + : public vcl::Window { public: Deck ( const DeckDescriptor& rDeckDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction); virtual ~Deck (void); @@ -57,7 +57,7 @@ public: void SetPanels (const SharedPanelContainer& rPanels); const SharedPanelContainer& GetPanels (void) const { return maPanels;} void RequestLayout (void); - ::Window* GetPanelParentWindow (void); + vcl::Window* GetPanelParentWindow (void); /** Try to make the panel completely visible. When the whole panel does not fit then make its top visible @@ -70,14 +70,14 @@ public: virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; void PrintWindowTree(); - static void PrintWindowSubTree (Window* pRoot, int nIndentation); + static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation); sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; } - class ScrollContainerWindow : public Window + class ScrollContainerWindow : public vcl::Window { public: - ScrollContainerWindow (Window* pParentWindow); + ScrollContainerWindow (vcl::Window* pParentWindow); virtual ~ScrollContainerWindow (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; void SetSeparators (const ::std::vector<sal_Int32>& rSeparators); @@ -94,9 +94,9 @@ private: sal_Int32 mnMinimalWidth; SharedPanelContainer maPanels; ::boost::scoped_ptr<DeckTitleBar> mpTitleBar; - ::boost::scoped_ptr<Window> mpScrollClipWindow; + ::boost::scoped_ptr<vcl::Window> mpScrollClipWindow; ::boost::scoped_ptr<ScrollContainerWindow> mpScrollContainer; - ::boost::scoped_ptr<Window> mpFiller; + ::boost::scoped_ptr<vcl::Window> mpFiller; ::boost::scoped_ptr<ScrollBar> mpVerticalScrollBar; DECL_LINK(HandleVerticalScrollBarChange,void*); diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index c4a425945cf0..a7639fbd6aac 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -50,10 +50,10 @@ void DeckLayouter::LayoutDeck ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, - Window& rDeckTitleBar, - Window& rScrollClipWindow, - Window& rScrollContainer, - Window& rFiller, + vcl::Window& rDeckTitleBar, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, + vcl::Window& rFiller, ScrollBar& rVerticalScrollBar) { if (aContentArea.GetWidth()<=0 || aContentArea.GetHeight()<=0) @@ -89,8 +89,8 @@ Rectangle DeckLayouter::LayoutPanels ( const Rectangle aContentArea, sal_Int32& rMinimalWidth, ::std::vector<LayoutItem>& rLayoutItems, - Window& rScrollClipWindow, - Window& rScrollContainer, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, ScrollBar& rVerticalScrollBar, const bool bShowVerticalScrollBar) { @@ -197,7 +197,7 @@ sal_Int32 DeckLayouter::PlacePanels ( ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, const LayoutMode eMode, - Window& rScrollContainer) + vcl::Window& rScrollContainer) { ::std::vector<sal_Int32> aSeparators; const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight)); @@ -429,7 +429,7 @@ void DeckLayouter::DistributeHeights ( Rectangle DeckLayouter::PlaceDeckTitle ( - Window& rDeckTitleBar, + vcl::Window& rDeckTitleBar, const Rectangle& rAvailableSpace) { if (static_cast<DockingWindow*>(rDeckTitleBar.GetParent()->GetParent())->IsFloatingMode()) @@ -504,7 +504,7 @@ void DeckLayouter::SetupVerticalScrollBar( void DeckLayouter::UpdateFiller ( - Window& rFiller, + vcl::Window& rFiller, const Rectangle& rBox) { if (rBox.GetHeight() > 0) diff --git a/sfx2/source/sidebar/DeckLayouter.hxx b/sfx2/source/sidebar/DeckLayouter.hxx index 10a90e676528..fa2b5ea8bcda 100644 --- a/sfx2/source/sidebar/DeckLayouter.hxx +++ b/sfx2/source/sidebar/DeckLayouter.hxx @@ -28,7 +28,7 @@ #include <vector> class ScrollBar; -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -45,10 +45,10 @@ public: const Rectangle aContentArea, sal_Int32& rMinimalWidth, SharedPanelContainer& rPanels, - Window& pDeckTitleBar, - Window& pScrollClipWindow, - Window& pScrollContainer, - Window& pFiller, + vcl::Window& pDeckTitleBar, + vcl::Window& pScrollClipWindow, + vcl::Window& pScrollContainer, + vcl::Window& pFiller, ScrollBar& pVerticalScrollBar); private: @@ -80,8 +80,8 @@ private: const Rectangle aContentArea, sal_Int32& rMinimalWidth, ::std::vector<LayoutItem>& rLayoutItems, - Window& rScrollClipWindow, - Window& rScrollContainer, + vcl::Window& rScrollClipWindow, + vcl::Window& rScrollContainer, ScrollBar& pVerticalScrollBar, const bool bShowVerticalScrollBar); static void GetRequestedSizes ( @@ -98,9 +98,9 @@ private: ::std::vector<LayoutItem>& rLayoutItems, const sal_Int32 nWidth, const LayoutMode eMode, - Window& rScrollContainer); + vcl::Window& rScrollContainer); static Rectangle PlaceDeckTitle ( - Window& rTittleBar, + vcl::Window& rTittleBar, const Rectangle& rAvailableSpace); static Rectangle PlaceVerticalScrollBar ( ScrollBar& rVerticalScrollBar, @@ -111,7 +111,7 @@ private: const sal_Int32 nContentHeight, const sal_Int32 nVisibleHeight); static void UpdateFiller ( - Window& rFiller, + vcl::Window& rFiller, const Rectangle& rBox); }; diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index fb1a6a0b7848..9a476f804b4f 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -37,7 +37,7 @@ static const sal_Int32 gaRightGripPadding (3); DeckTitleBar::DeckTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction) : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()), mnCloserItemIndex(1), diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx index dae392f16616..6717ca28caa4 100644 --- a/sfx2/source/sidebar/DeckTitleBar.hxx +++ b/sfx2/source/sidebar/DeckTitleBar.hxx @@ -32,7 +32,7 @@ class DeckTitleBar public: DeckTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const ::boost::function<void(void)>& rCloserAction); virtual ~DeckTitleBar (void); diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 244fc9413412..f7bf4f0492c2 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -174,7 +174,7 @@ void FocusManager::SetButtons (const ::std::vector<Button*>& rButtons) -void FocusManager::RegisterWindow (Window& rWindow) +void FocusManager::RegisterWindow (vcl::Window& rWindow) { rWindow.AddEventListener(LINK(this, FocusManager, WindowEventListener)); } @@ -182,7 +182,7 @@ void FocusManager::RegisterWindow (Window& rWindow) -void FocusManager::UnregisterWindow (Window& rWindow) +void FocusManager::UnregisterWindow (vcl::Window& rWindow) { rWindow.RemoveEventListener(LINK(this, FocusManager, WindowEventListener)); } @@ -190,7 +190,7 @@ void FocusManager::UnregisterWindow (Window& rWindow) -FocusManager::FocusLocation FocusManager::GetFocusLocation (const Window& rWindow) const +FocusManager::FocusLocation FocusManager::GetFocusLocation (const vcl::Window& rWindow) const { // Check the deck title. if (mpDeckTitleBar != NULL) @@ -309,7 +309,7 @@ void FocusManager::FocusPanel ( void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex) { - Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); + vcl::Window* pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow()); if (pWindow != NULL) { mbObservingContentControlFocus = true; @@ -342,7 +342,7 @@ void FocusManager::ClickButton (const sal_Int32 nButtonIndex) -void FocusManager::RemoveWindow (Window& rWindow) +void FocusManager::RemoveWindow (vcl::Window& rWindow) { ::std::vector<Panel*>::iterator iPanel (::std::find(maPanels.begin(), maPanels.end(), &rWindow)); if (iPanel != maPanels.end()) @@ -435,7 +435,7 @@ bool FocusManager::MoveFocusInsideDeckTitle ( void FocusManager::HandleKeyEvent ( const vcl::KeyCode& rKeyCode, - const Window& rWindow) + const vcl::Window& rWindow) { const FocusLocation aLocation (GetFocusLocation(rWindow)); mpLastFocusedWindow = NULL; @@ -594,7 +594,7 @@ IMPL_LINK(FocusManager, WindowEventListener, VclSimpleEvent*, pEvent) return 0; VclWindowEvent* pWindowEvent = static_cast<VclWindowEvent*>(pEvent); - Window* pSource = pWindowEvent->GetWindow(); + vcl::Window* pSource = pWindowEvent->GetWindow(); if (pSource == NULL) return 0; @@ -635,7 +635,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) return 0; VclWindowEvent* pWindowEvent = static_cast<VclWindowEvent*>(pEvent); - Window* pSource = pWindowEvent->GetWindow(); + vcl::Window* pSource = pWindowEvent->GetWindow(); if (pSource == NULL) return 0; @@ -647,7 +647,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclSimpleEvent*, pEvent) // Go up the window hierarchy to find out whether the // parent of the event source is known to us. - Window* pWindow = pSource; + vcl::Window* pWindow = pSource; FocusLocation aLocation (PC_None, -1); while (true) { diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx index d0d9c2c2a5b2..f8dba00ebcf4 100644 --- a/sfx2/source/sidebar/FocusManager.hxx +++ b/sfx2/source/sidebar/FocusManager.hxx @@ -73,8 +73,8 @@ private: ::std::vector<Button*> maButtons; const ::boost::function<void(const Panel&)> maShowPanelFunctor; bool mbObservingContentControlFocus; - Window* mpFirstFocusedContentControl; - Window* mpLastFocusedWindow; + vcl::Window* mpFirstFocusedContentControl; + vcl::Window* mpLastFocusedWindow; enum PanelComponent { @@ -105,12 +105,12 @@ private: /** Let the focus manager listen for window events for the given window. */ - void RegisterWindow (Window& rWindow); - void UnregisterWindow (Window& rWindow); + void RegisterWindow (vcl::Window& rWindow); + void UnregisterWindow (vcl::Window& rWindow); /** Remove the window from the panel or the button container. */ - void RemoveWindow (Window& rWindow); + void RemoveWindow (vcl::Window& rWindow); void FocusDeckTitle (void); bool IsDeckTitleVisible (void) const; @@ -141,9 +141,9 @@ private: void HandleKeyEvent ( const vcl::KeyCode& rKeyCode, - const Window& rWindow); + const vcl::Window& rWindow); - FocusLocation GetFocusLocation (const Window& rWindow) const; + FocusLocation GetFocusLocation (const vcl::Window& rWindow) const; }; diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx index f2e9a438fabf..7bccc4f87b26 100644 --- a/sfx2/source/sidebar/MenuButton.cxx +++ b/sfx2/source/sidebar/MenuButton.cxx @@ -31,7 +31,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -MenuButton::MenuButton (Window* pParentWindow) +MenuButton::MenuButton (vcl::Window* pParentWindow) : CheckBox(pParentWindow), mbIsLeftButtonDown(false), mePaintType(PT_Theme) diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx index 268eff9a3da6..0077c2417dbe 100644 --- a/sfx2/source/sidebar/MenuButton.hxx +++ b/sfx2/source/sidebar/MenuButton.hxx @@ -28,7 +28,7 @@ class MenuButton : public CheckBox { public: - MenuButton (Window* pParentWindow); + MenuButton (vcl::Window* pParentWindow); virtual ~MenuButton (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx index b96b439c0167..bc89d9b45a9f 100644 --- a/sfx2/source/sidebar/Panel.cxx +++ b/sfx2/source/sidebar/Panel.cxx @@ -47,7 +47,7 @@ namespace sfx2 { namespace sidebar { Panel::Panel ( const PanelDescriptor& rPanelDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const ::boost::function<void(void)>& rDeckLayoutTrigger, const ::boost::function<Context(void)>& rContextAccess) diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index 7196a77dd3e5..2fea00bcfd56 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -39,12 +39,12 @@ class PanelTitleBar; class Panel - : public Window + : public vcl::Window { public: Panel ( const PanelDescriptor& rPanelDescriptor, - Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const ::boost::function<void(void)>& rDeckLayoutTrigger, const ::boost::function<Context(void)>& rContextAccess); diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx index 5f722cb700bb..983b25de38ab 100644 --- a/sfx2/source/sidebar/PanelTitleBar.cxx +++ b/sfx2/source/sidebar/PanelTitleBar.cxx @@ -43,7 +43,7 @@ static const sal_Int32 gaRightIconPadding (5); PanelTitleBar::PanelTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, Panel* pPanel) : TitleBar(rsTitle, pParentWindow, GetBackgroundPaint()), mbIsLeftButtonDown(false), diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx index 2e2adbb9510c..57f9469dfa64 100644 --- a/sfx2/source/sidebar/PanelTitleBar.hxx +++ b/sfx2/source/sidebar/PanelTitleBar.hxx @@ -35,7 +35,7 @@ class PanelTitleBar public: PanelTitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, Panel* pPanel ); virtual ~PanelTitleBar (void); diff --git a/sfx2/source/sidebar/PopupContainer.cxx b/sfx2/source/sidebar/PopupContainer.cxx index 9167dd61d965..97566fba0a7a 100644 --- a/sfx2/source/sidebar/PopupContainer.cxx +++ b/sfx2/source/sidebar/PopupContainer.cxx @@ -22,7 +22,7 @@ namespace sfx2 { namespace sidebar { -PopupContainer::PopupContainer (Window* pParent) +PopupContainer::PopupContainer (vcl::Window* pParent) : FloatingWindow(pParent, WB_SYSTEMWINDOW | WB_3DLOOK) { } diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index fc78ac712c82..f6aa2fdf5222 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -34,7 +34,7 @@ SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR); SidebarChildWindow::SidebarChildWindow ( - Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) @@ -61,7 +61,7 @@ SidebarChildWindow::SidebarChildWindow ( -sal_Int32 SidebarChildWindow::GetDefaultWidth (Window* pWindow) +sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window* pWindow) { if (pWindow != NULL) { diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ed8861764a63..540de5b49d85 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -330,7 +330,7 @@ void SidebarController::NotifyResize (void) return; } - Window* pParentWindow = mpTabBar->GetParent(); + vcl::Window* pParentWindow = mpTabBar->GetParent(); sal_Int32 nTabBarDefaultWidth = TabBar::GetDefaultWidth() * mpTabBar->GetDPIScaleFactor(); const sal_Int32 nWidth (pParentWindow->GetSizePixel().Width()); @@ -720,7 +720,7 @@ void SidebarController::SwitchToDeck ( SharedPanel SidebarController::CreatePanel ( const OUString& rsPanelId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext) { @@ -1096,7 +1096,7 @@ sal_Int32 SidebarController::SetChildWindowWidth (const sal_Int32 nNewWidth) pSplitWindow->GetWindowPos(mpParentWindow, nColumn, nRow); const long nColumnWidth (pSplitWindow->GetLineSize(nColumn)); - Window* pWindow = mpParentWindow; + vcl::Window* pWindow = mpParentWindow; const Size aWindowSize (pWindow->GetSizePixel()); pSplitWindow->MoveWindow( diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 31306b2300ce..33cfea65e15a 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -184,7 +184,7 @@ private: to indicate that when the current mouse drag operation ends, the sidebar will only show the tab bar. */ - ::boost::scoped_ptr<Window> mpCloseIndicator; + ::boost::scoped_ptr<vcl::Window> mpCloseIndicator; DECL_LINK(WindowEventHandler, VclWindowEvent*); /** Make maRequestedContext the current context. @@ -198,7 +198,7 @@ private: const Context& rContext); SharedPanel CreatePanel ( const ::rtl::OUString& rsPanelId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext); void SwitchToDeck ( diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index d6c91db1ce50..1a39746f810d 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -34,7 +34,7 @@ namespace sfx2 { namespace sidebar { SidebarDockingWindow::SidebarDockingWindow( SfxBindings* pSfxBindings, SidebarChildWindow& rChildWindow, - Window* pParentWindow, + vcl::Window* pParentWindow, WinBits nBits) : SfxDockingWindow(pSfxBindings, &rChildWindow, pParentWindow, nBits), mpSidebarController() diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx index 0fde50e6e8b0..2c46e41cc31e 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.hxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx @@ -36,7 +36,7 @@ public: SidebarDockingWindow( SfxBindings* pBindings, SidebarChildWindow& rChildWindow, - Window* pParent, + vcl::Window* pParent, WinBits nBits); virtual ~SidebarDockingWindow (void); diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx index 8e4c9b0f3d12..74f3c0e9d859 100644 --- a/sfx2/source/sidebar/SidebarPanelBase.cxx +++ b/sfx2/source/sidebar/SidebarPanelBase.cxx @@ -37,7 +37,7 @@ namespace sfx2 { namespace sidebar { Reference<ui::XUIElement> SidebarPanelBase::Create ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize) { Reference<ui::XUIElement> xUIElement ( @@ -55,7 +55,7 @@ Reference<ui::XUIElement> SidebarPanelBase::Create ( SidebarPanelBase::SidebarPanelBase ( const ::rtl::OUString& rsResourceURL, const css::uno::Reference<css::frame::XFrame>& rxFrame, - Window* pWindow, + vcl::Window* pWindow, const css::ui::LayoutSize& rLayoutSize) : SidebarPanelBaseInterfaceBase(m_aMutex), mxFrame(rxFrame), diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index f6f1e5c0c5cf..0f038a13c79b 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -38,7 +38,7 @@ using ::rtl::OUString; namespace sfx2 { namespace sidebar { -SidebarToolBox::SidebarToolBox (Window* pParentWindow) +SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow) : ToolBox(pParentWindow, 0), maItemSeparator(Theme::GetImage(Theme::Image_ToolBoxItemSeparator)), maControllers(), @@ -53,7 +53,7 @@ SidebarToolBox::SidebarToolBox (Window* pParentWindow) #endif } -extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarToolBox(Window *pParent, VclBuilder::stringmap &) +extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarToolBox(vcl::Window *pParent, VclBuilder::stringmap &) { return new SidebarToolBox(pParent); } diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index c64f0eaeeed8..563b5feb12c8 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -44,7 +44,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { TabBar::TabBar ( - Window* pParentWindow, + vcl::Window* pParentWindow, const Reference<frame::XFrame>& rxFrame, const ::boost::function<void(const ::rtl::OUString&)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider) diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index ffef7729759a..b9cdc556f9a5 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -45,7 +45,7 @@ class TabItem; /** The tab bar is the container for the individual tabs. */ class TabBar - : public Window + : public vcl::Window { public: /** DeckMenuData has entries for display name, deck id, and a flag: @@ -65,7 +65,7 @@ public: const Rectangle&, const ::std::vector<DeckMenuData>& rMenuData)> PopupMenuProvider; TabBar ( - Window* pParentWindow, + vcl::Window* pParentWindow, const css::uno::Reference<css::frame::XFrame>& rxFrame, const ::boost::function<void(const ::rtl::OUString&rsDeckId)>& rDeckActivationFunctor, const PopupMenuProvider& rPopupMenuProvider); diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx index 1d5bc994e34e..a7037da0f73a 100644 --- a/sfx2/source/sidebar/TabItem.cxx +++ b/sfx2/source/sidebar/TabItem.cxx @@ -32,7 +32,7 @@ using namespace css::uno; namespace sfx2 { namespace sidebar { -TabItem::TabItem (Window* pParentWindow) +TabItem::TabItem (vcl::Window* pParentWindow) : ImageRadioButton(pParentWindow), mbIsLeftButtonDown(false), mePaintType(PT_Theme) diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx index 32ee7d5394cb..9872d379ee5d 100644 --- a/sfx2/source/sidebar/TabItem.hxx +++ b/sfx2/source/sidebar/TabItem.hxx @@ -23,7 +23,7 @@ #include "DeckDescriptor.hxx" -class Window; +namespace vcl { class Window; } namespace sfx2 { namespace sidebar { @@ -33,7 +33,7 @@ class TabItem : public ImageRadioButton { public: - TabItem (Window* pParentWindow); + TabItem (vcl::Window* pParentWindow); virtual ~TabItem (void); virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index 3295859d3066..ca59c4b1c3df 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -39,7 +39,7 @@ namespace sfx2 { namespace sidebar { TitleBar::TitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint) : Window(pParentWindow), maToolBox(this), diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index a499bca14563..a6bdedf0ff79 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -28,12 +28,12 @@ namespace sfx2 { namespace sidebar { class TitleBar - : public Window + : public vcl::Window { public: TitleBar ( const ::rtl::OUString& rsTitle, - Window* pParentWindow, + vcl::Window* pParentWindow, const sidebar::Paint& rInitialBackgroundPaint); virtual ~TitleBar (void); diff --git a/sfx2/source/sidebar/ToolBox.hxx b/sfx2/source/sidebar/ToolBox.hxx index 72e5850b3583..94e91f7dd505 100644 --- a/sfx2/source/sidebar/ToolBox.hxx +++ b/sfx2/source/sidebar/ToolBox.hxx @@ -28,7 +28,7 @@ class ToolBox : public ::ToolBox { public: - MenuButton (Window* pParentWindow); + MenuButton (vcl::Window* pParentWindow); virtual ~MenuButton (void); virtual void Paint (const Rectangle& rUpdateArea); |