diff options
Diffstat (limited to 'sd/source/ui/inc')
86 files changed, 171 insertions, 171 deletions
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index e07d7412e599..4f46a73309f1 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -31,7 +31,7 @@ class OutlinerView; class SdrOutliner; class SdrView; -class Window; +namespace vcl { class Window; } namespace accessibility { @@ -52,7 +52,7 @@ namespace accessibility SdrOutliner& rOutliner, SdrView& rView, OutlinerView& rOutlView, - const ::Window& rViewWindow ); + const vcl::Window& rViewWindow ); virtual ~AccessibleOutlineEditSource(); /// This method is disabled and always returns NULL @@ -81,7 +81,7 @@ namespace accessibility DECL_LINK( NotifyHdl, EENotify* ); SdrView& mrView; - const ::Window& mrWindow; + const vcl::Window& mrWindow; SdrOutliner* mpOutliner; OutlinerView* mpOutlinerView; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 2c32bb123130..f18101e1bc73 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -25,7 +25,7 @@ namespace sd { class OutlineViewShell; -class Window; +namespace vcl { class Window; } } namespace accessibility { diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index e8289060eff4..89f606efbe9d 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -34,7 +34,7 @@ #include <memory> -class Window; +namespace vcl { class Window; } namespace sd { namespace slidesorter { class SlideSorter; @@ -65,7 +65,7 @@ public: AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> & rxParent, - ::Window* pParentWindow); + vcl::Window* pParentWindow); void Init(); @@ -297,7 +297,7 @@ private: sal_uInt32 mnClientId; - ::Window* mpContentWindow; + vcl::Window* mpContentWindow; /** Check whether or not the object has been disposed (or is in the state of being disposed). If that is the case then diff --git a/sd/source/ui/inc/AnimationChildWindow.hxx b/sd/source/ui/inc/AnimationChildWindow.hxx index 0d215fdc1a2f..1c114b82e378 100644 --- a/sd/source/ui/inc/AnimationChildWindow.hxx +++ b/sd/source/ui/inc/AnimationChildWindow.hxx @@ -23,7 +23,7 @@ #include <sfx2/childwin.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } class SfxBindings; namespace sd { @@ -33,7 +33,7 @@ class AnimationChildWindow { public: AnimationChildWindow( - ::Window*, + vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx index 0669795e78d5..66110e08a9c3 100644 --- a/sd/source/ui/inc/BreakDlg.hxx +++ b/sd/source/ui/inc/BreakDlg.hxx @@ -46,7 +46,7 @@ class BreakDlg { public: BreakDlg ( - ::Window* pWindow, + vcl::Window* pWindow, DrawView* pDrView, DrawDocShell* pShell, sal_uLong nSumActionCount, diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 24f09783c46c..5f2fd28422bc 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -42,7 +42,7 @@ class Client : public SfxInPlaceClient virtual void MakeVisible() SAL_OVERRIDE; public: - Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, ::Window* pWindow); + Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, vcl::Window* pWindow); virtual ~Client (void); SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 2599bdf904aa..4c3320fedc0f 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -43,8 +43,8 @@ public: /* if the view should not do a Invalidate() on the windows, you have to overload the following two methods and do something different */ - virtual void InvalidateOneWin(::Window& rWin) SAL_OVERRIDE; - virtual void InvalidateOneWin(::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; + virtual void InvalidateOneWin(::vcl::Window& rWin) SAL_OVERRIDE; + virtual void InvalidateOneWin(::vcl::Window& rWin, const Rectangle& rRect) SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 4583ada7f556..5cfbda93dec8 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -101,7 +101,7 @@ public: virtual Size GetFirstPageSize() SAL_OVERRIDE; virtual void FillClass(SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; virtual void SetModified( bool = true ) SAL_OVERRIDE; - virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::Window *pParent, + virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( ::vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; using SotObject::GetInterface; @@ -154,7 +154,7 @@ public: a default name of a not-yet-existing slide (e.g. 'Slide 17'), sal_True is returned, but rName is set to an empty string. */ - bool CheckPageName(::Window* pWin, OUString& rName ); + bool CheckPageName(vcl::Window* pWin, OUString& rName ); void SetSlotFilter(bool bEnable = false, sal_uInt16 nCount = 0, const sal_uInt16* pSIDs = NULL) { mbFilterEnable = bEnable; mnFilterCount = nCount; mpFilterSIDs = pSIDs; } void ApplySlotFilter() const; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 15add1df9891..967c7e3ce1e5 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -87,7 +87,7 @@ public: DrawViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); @@ -261,7 +261,7 @@ public: //false. void FreshNavigatrEntry(); void FreshNavigatrTree(); - void MakeVisible(const Rectangle& rRect, ::Window& rWin); + void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin); virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData() SAL_OVERRIDE; @@ -373,7 +373,7 @@ public: /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName (void) const; diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index db095b8abfc1..0168800353ca 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -89,7 +89,7 @@ private: bool mbIsMainViewChangePending; - ::Window* mpMainViewShellWindow; + vcl::Window* mpMainViewShellWindow; /** Register at window of center pane and at the form shell that represents the form tool bar. The former informs this manager about diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 3f35b7843297..fc127e908534 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -22,7 +22,7 @@ #include "DrawViewShell.hxx" -class Window; +namespace vcl { class Window; } namespace sd { @@ -59,7 +59,7 @@ public: GraphicViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~GraphicViewShell (void); diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 8c7f19e801b8..061c2a78258c 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -37,7 +37,7 @@ class LayerTabBar public: LayerTabBar ( DrawViewShell* pDrViewSh, - ::Window* pParent); + vcl::Window* pParent); virtual ~LayerTabBar (void); /** Inform all listeners of this control that the current layer has been diff --git a/sd/source/ui/inc/NavigatorChildWindow.hxx b/sd/source/ui/inc/NavigatorChildWindow.hxx index dbf4d079ff5b..648f8ae60834 100644 --- a/sd/source/ui/inc/NavigatorChildWindow.hxx +++ b/sd/source/ui/inc/NavigatorChildWindow.hxx @@ -22,7 +22,7 @@ #include <sfx2/childwin.hxx> -class Window; +namespace vcl { class Window; } class SfxBindings; namespace sd { @@ -35,7 +35,7 @@ class NavigatorChildWindow { public: NavigatorChildWindow ( - ::Window*, + vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx index b2fe9c50bc6e..19ae1f8cad0e 100644 --- a/sd/source/ui/inc/OutlineBulletDlg.hxx +++ b/sd/source/ui/inc/OutlineBulletDlg.hxx @@ -34,7 +34,7 @@ class OutlineBulletDlg { public: OutlineBulletDlg ( - ::Window* pParent, + vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ); virtual ~OutlineBulletDlg (); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 837d1b788e4f..fb80a355f9b2 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -57,7 +57,7 @@ class OutlineView friend class OutlineViewModelChangeGuard; public: OutlineView (DrawDocShell& rDocSh, - ::Window* pWindow, + ::vcl::Window* pWindow, OutlineViewShell& rOutlineViewSh); virtual ~OutlineView (void); @@ -80,7 +80,7 @@ public: virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; - OutlinerView* GetViewByWindow(::Window* pWin) const; + OutlinerView* GetViewByWindow(::vcl::Window* pWin) const; SdrOutliner& GetOutliner() { return mrOutliner; } Paragraph* GetPrevTitle(const Paragraph* pPara); @@ -211,8 +211,8 @@ private: /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::auto_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard; - vcl::Font maPageNumberFont; - vcl::Font maBulletFont; + ::vcl::Font maPageNumberFont; + ::vcl::Font maBulletFont; SvxLRSpaceItem maLRSpaceItem; Image maSlideImage; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 7aebf2279374..ebb795c2f73d 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -56,7 +56,7 @@ public: OutlineViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~OutlineViewShell (void); diff --git a/sd/source/ui/inc/PaneChildWindows.hxx b/sd/source/ui/inc/PaneChildWindows.hxx index 70d0feff13d5..8b76b9e2ad99 100644 --- a/sd/source/ui/inc/PaneChildWindows.hxx +++ b/sd/source/ui/inc/PaneChildWindows.hxx @@ -30,7 +30,7 @@ class PaneChildWindow { public: PaneChildWindow ( - ::Window* pParentWindow, + vcl::Window* pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo, @@ -44,7 +44,7 @@ class LeftPaneImpressChildWindow : public PaneChildWindow { public: - LeftPaneImpressChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneImpressChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow); }; @@ -53,7 +53,7 @@ class LeftPaneDrawChildWindow : public PaneChildWindow { public: - LeftPaneDrawChildWindow (::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); + LeftPaneDrawChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow); }; diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 3e93c1bc2296..adba60aaf9af 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -50,7 +50,7 @@ public: PaneDockingWindow ( SfxBindings *pBindings, SfxChildWindow *pChildWindow, - ::Window* pParent, + vcl::Window* pParent, const ResId& rResId, const OUString& rsTitle); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 8fa4fcfedf3c..53bbde6cba4b 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -40,7 +40,7 @@ private: static void InitInterface_Impl(); public: - PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, ::Window* pParentWindow, FrameView* pFrameView = NULL); + PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~PresentationViewShell (void); /** This method is used by a simple class that passes some diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 69b30a5d6065..956585e3a35e 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -35,7 +35,7 @@ class Ruler public: Ruler ( DrawViewShell& rViewSh, - ::Window* pParent, + ::vcl::Window* pParent, ::sd::Window* pWin, sal_uInt16 nRulerFlags, SfxBindings& rBindings, diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 664a1e17dc73..5cfde74b3c8e 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { @@ -49,7 +49,7 @@ public: */ virtual ShellType* CreateShell ( ShellId nId, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL) = 0; /** Tell the factory that a shell is no longer in use. It may destroy diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index a26a49be234f..1af5619f968d 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -32,7 +32,7 @@ class ScrollBar; class ScrollBarBox; -class Window; +namespace vcl { class Window; } namespace sd { class ViewShell; @@ -116,7 +116,7 @@ public: static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow); + ::vcl::Window& rParentWindow); /** Return the control of the vertical scroll bar. */ @@ -170,7 +170,7 @@ public: const Size& rSize); SvBorder GetBorder (void); - bool RelocateToWindow (::Window* pWindow); + bool RelocateToWindow (::vcl::Window* pWindow); /** Set the current function at the view shell or, when it is not present, set it at the content window. This method supports the use @@ -248,7 +248,7 @@ private: SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::Window& rParentWindow); + ::vcl::Window& rParentWindow); void Init (void); /** Create the controls for the slide sorter. This are the tab bar @@ -257,7 +257,7 @@ private: This method is usually called exactly one time from the constructor. */ - void SetupControls (::Window* pParentWindow); + void SetupControls (::vcl::Window* pParentWindow); /** This method is usually called exactly one time from the constructor. diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 238e1a5005fd..e35b1eb1e36e 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -52,7 +52,7 @@ public: static ::boost::shared_ptr<SlideSorterViewShell> Create( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, FrameView* pFrameView, const bool bIsCenterPane); @@ -121,7 +121,7 @@ public: virtual void StartDrag ( const Point& rDragPt, - ::Window* pWindow ); + ::vcl::Window* pWindow ); virtual void DragFinished ( sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( @@ -182,7 +182,7 @@ public: /** Try to relocate all toplevel window elements to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; protected: @@ -200,7 +200,7 @@ private: SlideSorterViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView); void Initialize (void); diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index da48fb09917c..313a2560b880 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -35,7 +35,7 @@ class SpellDialogChildWindow { public: SpellDialogChildWindow ( - ::Window* pParent, + vcl::Window* pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index 1700921dfee5..ece600143a64 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -39,7 +39,7 @@ class TabControl //declare bIsMarked variable sal_uInt16 RrePageID; public: - TabControl (DrawViewShell* pDrViewSh, ::Window* pParent); + TabControl (DrawViewShell* pDrViewSh, vcl::Window* pParent); virtual ~TabControl (void); /** Inform all listeners of this control that the current page has been diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 4decd690db24..63493f143865 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -99,12 +99,12 @@ public: virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; virtual void SelectAll(); - virtual void DoCut(::Window* pWindow=NULL); - virtual void DoCopy(::Window* pWindow=NULL); - virtual void DoPaste(::Window* pWindow=NULL); + virtual void DoCut(vcl::Window* pWindow=NULL); + virtual void DoCopy(vcl::Window* pWindow=NULL); + virtual void DoPaste(vcl::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); - virtual void StartDrag( const Point& rStartPos, ::Window* pWindow ); + virtual void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, @@ -121,14 +121,14 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateClipboardDataObject (::sd::View*, ::Window& rWindow); + CreateClipboardDataObject (::sd::View*, vcl::Window& rWindow); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateDragDataObject (::sd::View*, ::Window& rWindow, + CreateDragDataObject (::sd::View*, vcl::Window& rWindow, const Point& rDragPos); ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable> - CreateSelectionDataObject (::sd::View*, ::Window& rWindow); + CreateSelectionDataObject (::sd::View*, vcl::Window& rWindow); void UpdateSelectionClipboard( bool bForceDeselect ); @@ -136,7 +136,7 @@ public: inline SdDrawDocument& GetDoc(void) const; inline ViewShell* GetViewShell(void) const { return mpViewSh; } - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false, + virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index c3ef058c1c69..7404aa653051 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -115,7 +115,7 @@ public: ViewShell ( SfxViewFrame *pFrame, - ::Window* pParentWindow, + ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); virtual ~ViewShell (void); @@ -145,7 +145,7 @@ public: /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::Window* GetParentWindow (void) const { return mpParentWindow; } + inline ::vcl::Window* GetParentWindow (void) const { return mpParentWindow; } inline ::sd::View* GetView (void) const { return mpView; } inline SdrView* GetDrawView (void) const; @@ -421,7 +421,7 @@ public: all views, so the return value tells the caller if the relocation was successful. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow); + virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow); /** Depending on the given request create a new page or duplicate an existing one. A new page is created behind the given slide. @@ -568,7 +568,7 @@ protected: void doShow(); private: - ::Window* mpParentWindow; + ::vcl::Window* mpParentWindow; /** This window updater is used to keep all relevant windows up to date with reference to the digit langugage used to display digits in text shapes. diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index e2c7514137cd..af33977a8e33 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -224,7 +224,7 @@ public: view and other UI elements, like scroll bars and rulers. Ownership of that window remains with the called ViewShellBase object. */ - ::Window* GetViewWindow (void); + vcl::Window* GetViewWindow (void); /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 31dab6f791e4..b259f3ffcdff 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -172,7 +172,7 @@ private: static because it must not access any of the, not yet initialized members. */ - static ::Window* GetAnchorWindow( + static vcl::Window* GetAnchorWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index a35f4fe1be5b..0a33a937b44b 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -40,11 +40,11 @@ class ViewShell; be an integer percent value. */ class Window - : public ::Window, + : public ::vcl::Window, public ::DropTargetHelper { public: - Window (::Window* pParent); + Window (vcl::Window* pParent); virtual ~Window (void); void SetViewShell (ViewShell* pViewSh); diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index aa6c95a48e7d..d768be7fb92e 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -26,7 +26,7 @@ #include <vector> -class Window; +namespace vcl { class Window; } class OutputDevice; class SdDrawDocument; @@ -62,7 +62,7 @@ public: This device is added to the device list if it is not <null/> and when it is not already a member of that list. */ - void RegisterWindow (::Window* pWindow); + void RegisterWindow (vcl::Window* pWindow); /** Remove the given device from the list of devices which will be updated when one of the monitored values changes. @@ -70,7 +70,7 @@ public: This device is removed from the device list when it is a member of that list. */ - void UnregisterWindow (::Window* pWindow); + void UnregisterWindow (vcl::Window* pWindow); /** Set the view shell whose output devices shall be kept up to date. It is used to clear the master page cache so that a redraw affects @@ -122,7 +122,7 @@ private: /** Type and data member for a list of devices that have to be kept up-to-date. */ - typedef ::std::vector< ::Window*> tWindowList; + typedef ::std::vector< vcl::Window*> tWindowList; tWindowList maWindowList; /** The central method of this class. Update the given output device. diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 9be3815bdbf9..09d94562604e 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -64,7 +64,7 @@ private: Fraction aScale; public: - SdDisplay( ::Window* pWin, SdResId Id ); + SdDisplay( vcl::Window* pWin, SdResId Id ); virtual ~SdDisplay(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; @@ -82,7 +82,7 @@ class AnimationWindow : public SfxDockingWindow public: AnimationWindow( SfxBindings* pBindings, SfxChildWindow *pCW, - ::Window* pParent, const SdResId& rSdResId ); + vcl::Window* pParent, const SdResId& rSdResId ); virtual ~AnimationWindow(); void AddObj( ::sd::View& rView ); @@ -122,7 +122,7 @@ private: HelpButton aBtnHelp; - ::Window* pWin; + vcl::Window* pWin; ::std::vector< ::std::pair<BitmapEx*, Time*> > m_FrameList; static const size_t EMPTY_FRAMELIST = ULONG_MAX; size_t m_nCurrentFrame; diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index 805e07409657..3e95415d7a9d 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -27,13 +27,13 @@ #define MAX_PAGES 10 -class Window; +namespace vcl { class Window; } class SD_DLLPUBLIC Assistent { /** contains for every page the controls, which have to be connected? correctly */ - std::vector<Window*> maPages[MAX_PAGES]; + std::vector<vcl::Window*> maPages[MAX_PAGES]; /// number of pages int mnPages; @@ -51,7 +51,7 @@ public: void DisablePage( int nPage ); /// adds a control to the specified page - bool InsertControl(int nDestPage,Window* pUsedControl); + bool InsertControl(int nDestPage, vcl::Window* pUsedControl); bool NextPage(); diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx index 97a648d7e1ef..612f2f4c80e2 100644 --- a/sd/source/ui/inc/celltempl.hxx +++ b/sd/source/ui/inc/celltempl.hxx @@ -37,7 +37,7 @@ private: virtual const SfxItemSet* GetRefreshedSet(); public: - SdPresCellTemplateDlg( SdrModel* pModel, Window* pParent, SfxStyleSheetBase& rStyleBase ); + SdPresCellTemplateDlg( SdrModel* pModel, vcl::Window* pParent, SfxStyleSheetBase& rStyleBase ); ~SdPresCellTemplateDlg(); const SfxItemSet* GetOutputItemSet() const; diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx index fb9d5fe61783..7994e0c1c08b 100644 --- a/sd/source/ui/inc/copydlg.hxx +++ b/sd/source/ui/inc/copydlg.hxx @@ -38,7 +38,7 @@ class CopyDlg : public SfxModalDialog { public: - CopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, + CopyDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const XColorListRef &pColList, ::sd::View* pView ); virtual ~CopyDlg(); diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx index a9f1a63dddd3..12c98d7337ca 100644 --- a/sd/source/ui/inc/createcustomanimationpanel.hxx +++ b/sd/source/ui/inc/createcustomanimationpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +::vcl::Window * createCustomAnimationPanel (vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createslidetransitionpanel.hxx b/sd/source/ui/inc/createslidetransitionpanel.hxx index b74a3fadd98e..6c159f9a5a38 100644 --- a/sd/source/ui/inc/createslidetransitionpanel.hxx +++ b/sd/source/ui/inc/createslidetransitionpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); +::vcl::Window* createSlideTransitionPanel (::vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); } diff --git a/sd/source/ui/inc/createtabledesignpanel.hxx b/sd/source/ui/inc/createtabledesignpanel.hxx index ceaa882cfda6..2d8f1c36f504 100644 --- a/sd/source/ui/inc/createtabledesignpanel.hxx +++ b/sd/source/ui/inc/createtabledesignpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::Window * createTableDesignPanel (::Window* pParent, ViewShellBase& rBase); +::vcl::Window * createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); } diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 1aff1d703939..7a16bf6150ff 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -55,7 +55,7 @@ private: DECL_LINK( StartShowHdl, void* ); public: - SdCustomShowDlg( Window* pWindow, SdDrawDocument& rDrawDoc ); + SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc ); virtual ~SdCustomShowDlg(); bool IsModified() const { return( bModified ); } @@ -87,7 +87,7 @@ private: public: - SdDefineCustomShowDlg( Window* pWindow, + SdDefineCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc, SdCustomShow*& rpCS ); virtual ~SdDefineCustomShowDlg(); diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index 3b31d627b0ab..fdb61e8dca23 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -40,7 +40,7 @@ protected: virtual void Modify() SAL_OVERRIDE; public: - SdPagesField( Window* pParent, + SdPagesField( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); virtual ~SdPagesField(); @@ -55,7 +55,7 @@ class SdTbxCtlDiaPages : public SfxToolBoxControl public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx index 2bb72ae9d734..3a416de52f4c 100644 --- a/sd/source/ui/inc/dlg_char.hxx +++ b/sd/source/ui/inc/dlg_char.hxx @@ -41,7 +41,7 @@ private: public: - SdCharDlg( Window* pParent, const SfxItemSet* pAttr, + SdCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ); virtual ~SdCharDlg() {}; }; diff --git a/sd/source/ui/inc/dlgass.hxx b/sd/source/ui/inc/dlgass.hxx index 028d2c9d566b..4ee19ec4abe2 100644 --- a/sd/source/ui/inc/dlgass.hxx +++ b/sd/source/ui/inc/dlgass.hxx @@ -41,7 +41,7 @@ private: AssistentDlgImpl* mpImpl; public: - AssistentDlg(Window* pParent, bool bAutoPilot); + AssistentDlg(vcl::Window* pParent, bool bAutoPilot); virtual ~AssistentDlg(); DECL_LINK( FinishHdl, void * ); diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 2d73fd52ee66..093b550431b7 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -35,7 +35,7 @@ struct FadeEffectLBImpl; class SD_DLLPUBLIC FadeEffectLB : public ListBox { public: - FadeEffectLB(Window* pParent, WinBits nStyle); + FadeEffectLB(vcl::Window* pParent, WinBits nStyle); virtual ~FadeEffectLB(); virtual void Fill(); diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index 909370fc5ffd..b458b8df84b9 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -48,7 +48,7 @@ private: DECL_LINK( LanguageChangeHdl, void * ); public: - SdModifyFieldDlg( Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); + SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ); virtual ~SdModifyFieldDlg() {} SvxFieldData* GetField(); diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx index 6fd241b34894..2cdf0c4f9bbb 100644 --- a/sd/source/ui/inc/dlgpage.hxx +++ b/sd/source/ui/inc/dlgpage.hxx @@ -43,7 +43,7 @@ private: public: - SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); + SdPageDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage = true ); virtual ~SdPageDlg() {}; virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx index f16156fb4498..ab431c856be3 100644 --- a/sd/source/ui/inc/dlgsnap.hxx +++ b/sd/source/ui/inc/dlgsnap.hxx @@ -58,7 +58,7 @@ private: DECL_LINK( ClickHdl, Button * ); public: - SdSnapLineDlg(Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); + SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView); void GetAttr(SfxItemSet& rOutAttrs); diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 3155bd992aca..b4d3b28a8c73 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -63,7 +63,7 @@ protected: void updateViewSettings(); public: - SdDocPreviewWin( Window* pParent, const WinBits nStyle ); + SdDocPreviewWin( vcl::Window* pParent, const WinBits nStyle ); virtual ~SdDocPreviewWin(); void SetObjectShell( SfxObjectShell* pObj, sal_uInt16 nShowPage = 0 ); virtual void Resize() SAL_OVERRIDE; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 4da87a1d97be..d3865bee27a7 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -53,7 +53,7 @@ public: bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false) SAL_OVERRIDE; virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const SAL_OVERRIDE; - virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin) SAL_OVERRIDE; + virtual void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin) SAL_OVERRIDE; virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); void PresPaint(const Region& rRegion); diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 7f0f3393fb69..51992e82cf87 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -30,7 +30,7 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -class Window; +namespace vcl { class Window; } namespace { @@ -74,7 +74,7 @@ public: Pane ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, - ::Window* pWindow) + vcl::Window* pWindow) throw (); virtual ~Pane (void); @@ -85,7 +85,7 @@ public: /** This method is typically used together with the XUnoTunnel to obtain a Window pointer from an XPane object. */ - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); //----- XPane ------------------------------------------------------------- @@ -135,7 +135,7 @@ public: protected: ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> mxPaneId; - ::Window* mpWindow; + vcl::Window* mpWindow; ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxWindow; ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> mxCanvas; diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 449c25ff8bdf..149fef5b48f8 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -27,7 +27,7 @@ class SdDrawDocument; namespace sd { -class Window; +namespace vcl { class Window; } class FuConstructBezierPolygon : public FuConstruct diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 0a600cd7284d..3c952c167fc1 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -31,7 +31,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * bullet functions in outline mode diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 9579423acc65..1f99701901d0 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * text functions in outline mode diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index d53b4d2079f3..7d1339919adb 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -31,7 +31,7 @@ class OutlineView; class OutlineViewShell; class View; class ViewShell; -class Window; +namespace vcl { class Window; } /** * Base class of functions of outline mode diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index ac2b947e7b6d..81b12eba87e4 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -41,7 +41,7 @@ class FuPage virtual void Activate() SAL_OVERRIDE; virtual void Deactivate() SAL_OVERRIDE; - const SfxItemSet* ExecuteDialog( Window* pParent ); + const SfxItemSet* ExecuteDialog( vcl::Window* pParent ); protected: virtual ~FuPage (void); diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index 2990385600ed..a7debedadbb7 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } class FuPresentationLayout : public FuPoor diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index 8cecd9e5377d..905542f8151c 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -29,7 +29,7 @@ namespace sd { class View; class ViewShell; -class Window; +namespace vcl { class Window; } class FuPresentationObjects : public FuPoor diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index fefe754006cf..d3b2e0a8055b 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -31,7 +31,7 @@ class GlueEscDirLB : public ListBox private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; public: - GlueEscDirLB( Window* pParent, + GlueEscDirLB( vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); virtual ~GlueEscDirLB(); @@ -51,7 +51,7 @@ private: public: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; + virtual vcl::Window* CreateItemWindow( vcl::Window *pParent ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx index 4c2bb8979902..6f19a555b962 100644 --- a/sd/source/ui/inc/headerfooterdlg.hxx +++ b/sd/source/ui/inc/headerfooterdlg.hxx @@ -67,7 +67,7 @@ private: void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); public: - HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); + HeaderFooterDialog( ViewShell* pViewShell, vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); virtual ~HeaderFooterDialog(); void ApplyToAll(); diff --git a/sd/source/ui/inc/ins_paste.hxx b/sd/source/ui/inc/ins_paste.hxx index 87f6054233ad..0cd396f4c31a 100644 --- a/sd/source/ui/inc/ins_paste.hxx +++ b/sd/source/ui/inc/ins_paste.hxx @@ -35,7 +35,7 @@ private: RadioButton* m_pRbAfter; public: - SdInsertPasteDlg( Window* pWindow ); + SdInsertPasteDlg( vcl::Window* pWindow ); bool IsInsertBefore() const; }; diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index 639ec621b35b..f7a0e12ae859 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -41,7 +41,7 @@ private: DECL_LINK( SelectObjectHdl, void * ); public: - SdInsertPagesObjsDlg( Window* pParent, + SdInsertPagesObjsDlg( vcl::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ); diff --git a/sd/source/ui/inc/layeroptionsdlg.hxx b/sd/source/ui/inc/layeroptionsdlg.hxx index c7d9f92b3012..e3ad80873223 100644 --- a/sd/source/ui/inc/layeroptionsdlg.hxx +++ b/sd/source/ui/inc/layeroptionsdlg.hxx @@ -46,7 +46,7 @@ private: public: - SdInsertLayerDlg( Window* pWindow, const SfxItemSet& rInAttrs, + SdInsertLayerDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& rStr ); void GetAttr( SfxItemSet& rOutAttrs ); }; diff --git a/sd/source/ui/inc/masterlayoutdlg.hxx b/sd/source/ui/inc/masterlayoutdlg.hxx index 4c68d66178a1..b6c216944d8b 100644 --- a/sd/source/ui/inc/masterlayoutdlg.hxx +++ b/sd/source/ui/inc/masterlayoutdlg.hxx @@ -53,7 +53,7 @@ private: void create( PresObjKind eKind ); public: - MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); + MasterLayoutDialog( vcl::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); virtual short Execute() SAL_OVERRIDE; }; diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index 3e057207136d..f23d69207d98 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -35,7 +35,7 @@ class MorphDlg { public: MorphDlg ( - ::Window* pParent, + vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); virtual ~MorphDlg (void); diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 6aec09ace31b..fa388da27ea7 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -79,7 +79,7 @@ private: }; class SdNavigatorWin - : public Window + : public vcl::Window { public: typedef ::boost::function<void(void)> UpdateRequestFunctor; @@ -92,7 +92,7 @@ public: rely on others to trigger updates. */ SdNavigatorWin( - ::Window* pParent, + vcl::Window* pParent, ::sd::NavigatorChildWindow* pChildWinContext, const SdResId& rSdResId, SfxBindings* pBindings, diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx index 6ceffa3b0844..fbf9a38e86e8 100644 --- a/sd/source/ui/inc/paragr.hxx +++ b/sd/source/ui/inc/paragr.hxx @@ -33,7 +33,7 @@ private: virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; public: - SdParagraphDlg( Window* pParent, const SfxItemSet* pAttr ); + SdParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr ); virtual ~SdParagraphDlg() {}; }; diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index de4bd53d2093..ea2fcde3e25d 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -84,7 +84,7 @@ private: OUString GetDisplayName( sal_Int32 nDisplay, DisplayType eType ); public: - SdStartPresentationDlg( Window* pWindow, + SdStartPresentationDlg( vcl::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ); diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx index e903969e8584..71c6c3f9b8ef 100644 --- a/sd/source/ui/inc/prltempl.hxx +++ b/sd/source/ui/inc/prltempl.hxx @@ -84,7 +84,7 @@ private: using SfxTabDialog::GetOutputItemSet; public: - SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); + SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, vcl::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); virtual ~SdPresLayoutTemplateDlg(); const SfxItemSet* GetOutputItemSet() const; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 62c2922c5579..9ae6631f435e 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -61,10 +61,10 @@ private: using OutputDevice::SetDrawMode; public: - SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs); + SdPrintOptions( vcl::Window* pParent, const SfxItemSet& rInAttrs); virtual ~SdPrintOptions(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 91ff008cfd38..bbb4f264d8ee 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -195,7 +195,7 @@ private: public: - SdPublishingDlg(Window* pWindow, DocumentType eDocType); + SdPublishingDlg(vcl::Window* pWindow, DocumentType eDocType); virtual ~SdPublishingDlg(); void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ); diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index 8c94f8f5c434..ea68e8de3214 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -39,7 +39,7 @@ class SdPresLayoutDlg public: SdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, - ::Window* pWindow, + vcl::Window* pWindow, const SfxItemSet& rInAttrs); virtual ~SdPresLayoutDlg (void); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 8a40c6037f45..35ff0763d4e8 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -121,7 +121,7 @@ public: protected: - Window* mpParent; + vcl::Window* mpParent; const SdDrawDocument* mpDoc; SdDrawDocument* mpBookmarkDoc; SfxMedium* mpMedium; @@ -184,8 +184,8 @@ protected: public: - SdPageObjsTLB( Window* pParent, const SdResId& rSdResId ); - SdPageObjsTLB( Window* pParent, WinBits nStyle ); + SdPageObjsTLB( vcl::Window* pParent, const SdResId& rSdResId ); + SdPageObjsTLB( vcl::Window* pParent, WinBits nStyle ); virtual ~SdPageObjsTLB(); // helper function for GetEntryAltText and GetEntryLongDescription diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 425740bb3612..fda3d8a2da9b 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -48,7 +48,7 @@ class SdDrawDocument; class KeyEvent; class Size; class Rectangle; -class Window; +namespace vcl { class Window; } class SfxRequest; class WorkWindow; struct ImplSVEvent; @@ -94,7 +94,7 @@ public: static bool StartPreview( ViewShellBase& rBase, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent = 0 ); + ::vcl::Window* pParent = 0 ); static void Stop( ViewShellBase& rBase ); @@ -110,7 +110,7 @@ public: bool startPreview( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xAnimationNode, - ::Window* pParent = 0 ); + ::vcl::Window* pParent = 0 ); // uno api @@ -194,7 +194,7 @@ private: void ThrowIfDisposed() const throw (css::uno::RuntimeException); - void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow ); + void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::vcl::Window* pParentWindow ); WorkWindow *GetWorkWindow(); // default: disabled copy/assignment diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index ce2fb8e8e860..ed57b580b0b1 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -69,7 +69,7 @@ private: virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: - SdTabTemplateDlg(Window* pParent, + SdTabTemplateDlg(vcl::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 1155dfd454e1..31d40c573bd2 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -23,7 +23,7 @@ #include <tools/gen.hxx> #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -80,7 +80,7 @@ public: Returns the window which is layouted or NULL to indicate that the object is in an invalid state. */ - virtual ::Window* GetWindow (void) = 0; + virtual vcl::Window* GetWindow (void) = 0; /** Return the minimal width of the window. */ diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index afd9c2071a9b..a57cdfb851ea 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -51,7 +51,7 @@ public: /** Create a new scroll panel which itself is the root of a TreeNode hierarchy parent. This will usually be a child window. */ - ScrollPanel (::Window& i_rParentWindow); + ScrollPanel (vcl::Window& i_rParentWindow); virtual ~ScrollPanel (void); /** Add a control to the sub panel. An title bar is added above the @@ -86,7 +86,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void ExpandControl ( @@ -98,7 +98,7 @@ public: ScrollBar& GetVerticalScrollBar (void); ScrollBar& GetHorizontalScrollBar (void); - // ::Window + // vcl::Window virtual long Notify( NotifyEvent& rNEvt ); virtual ::com::sun::star::uno::Reference< @@ -117,14 +117,14 @@ public: */ void MakeRectangleVisible ( Rectangle& aRectangle, - ::Window* pWindow); + vcl::Window* pWindow); private: ::Control maScrollWindow; ScrollBar maVerticalScrollBar; ScrollBar maHorizontalScrollBar; - ::Window maScrollBarFiller; - ::Window maScrollWindowFiller; + vcl::Window maScrollBarFiller; + vcl::Window maScrollWindowFiller; Point maScrollOffset; bool mbIsRearrangePending; bool mbIsLayoutPending; diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index f72234577ef5..e6ae9d24572b 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -36,7 +36,7 @@ #include <map> #include <vector> -class Window; +namespace vcl { class Window; } #include "svx/svdpage.hxx" #include "drawdoc.hxx" @@ -54,7 +54,7 @@ public: SlideSorterCacheDisplay (const SdDrawDocument* pDocument); virtual ~SlideSorterCacheDisplay (void); - void SetParentWindow (::Window* pParentWindow); + void SetParentWindow (vcl::Window* pParentWindow); virtual void Paint (const Rectangle& rBoundingBox); virtual void Resize (void); @@ -76,7 +76,7 @@ public: virtual Size GetPreferredSize (void); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual bool IsResizable (void); virtual bool IsExpandable (void) const; virtual bool IsExpanded (void) const; @@ -86,7 +86,7 @@ private: static void AddInstance (const SdDrawDocument* pDocument, SlideSorterCacheDisplay* pControl); static void RemoveInstance (SlideSorterCacheDisplay* pControl); - ::Window* mpWindow; + vcl::Window* mpWindow; sal_Int32 mnPageCount; sal_Int32 mnColumnCount; sal_Int32 mnRowCount; diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 90fc3044b612..2970bc2d0d1f 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -26,7 +26,7 @@ #include <vcl/scrbar.hxx> #include <vector> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -54,7 +54,7 @@ public: /** Create a new sub tool panel with the given window as its parent. This will usually be a child window. */ - SubToolPanel (Window& i_rParentWindow); + SubToolPanel (vcl::Window& i_rParentWindow); virtual ~SubToolPanel (void); virtual void Paint (const Rectangle& rRect); @@ -69,7 +69,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void ExpandControl ( @@ -83,7 +83,7 @@ public: using Window::GetWindow; private: - ::Window maWindowFiller; + vcl::Window maWindowFiller; bool mbIsRearrangePending; bool mbIsLayoutPending; sal_uInt32 mnChildrenWidth; diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx index 5ab6bc63f8ed..d80f5c49683e 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx @@ -47,10 +47,10 @@ public: Derived classes should overload InternalCreateControl. */ - ::std::auto_ptr<TreeNode> CreateControl( ::Window& i_rParent ); + ::std::auto_ptr<TreeNode> CreateControl( vcl::Window& i_rParent ); protected: - virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) = 0; + virtual TreeNode* InternalCreateControl( vcl::Window& i_rParent ) = 0; }; /** A simple helper class that realizes a ControlFactory that is able to create root controls, providing @@ -66,7 +66,7 @@ public: {} protected: - virtual TreeNode* InternalCreateControl( ::Window& i_rParent ) + virtual TreeNode* InternalCreateControl( vcl::Window& i_rParent ) { return new ControlType( i_rParent, mrArgument ); } diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index deae2e1899b3..96121085cd98 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -61,11 +61,11 @@ public: /** Return the Window pointer of a tree node. */ - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); /** Return a const pointer to the window of a tree node. */ - virtual const ::Window* GetConstWindow (void) const; + virtual const vcl::Window* GetConstWindow (void) const; /** Return the joined minimum width of all children, i.e. the largest of the minimum widths. diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index fae55b0777fa..d6910acfbebc 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -39,7 +39,7 @@ namespace sd { namespace toolpanel { control. 2) Keyboard focus is indicated by a dotted rectangle. */ class TitleBar - : public ::Window, + : public vcl::Window, public TreeNode { public: @@ -51,7 +51,7 @@ public: will be formatted according to the given type. */ TitleBar ( - ::Window* pParent, + vcl::Window* pParent, const OUString& rsTitle, TitleBarType eType, bool bIsExpandable); @@ -61,7 +61,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual sal_Int32 GetMinimumWidth (void); virtual void Paint (const Rectangle& rBoundingBox); diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 57f6c6998a12..6282a549a6a7 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -29,7 +29,7 @@ #include <memory> #include <boost/function.hpp> -class Window; +namespace vcl { class Window; } namespace sd { namespace toolpanel { @@ -39,7 +39,7 @@ class ControlContainer; control are child windows. */ class TitledControl - : public ::Window, + : public vcl::Window, public TreeNode { public: @@ -74,7 +74,7 @@ public: virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); virtual bool IsResizable (void); - virtual ::Window* GetWindow (void); + virtual vcl::Window* GetWindow (void); virtual void Resize (void); virtual void GetFocus (void); diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 329219eba972..894f5d5bad50 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -66,7 +66,7 @@ public: ToolPanelViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView); virtual ~ToolPanelViewShell (void); @@ -107,10 +107,10 @@ public: /** Relocate all toplevel controls to the given parent window. */ - virtual bool RelocateToParentWindow (::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; /// returns <TRUE/> if and only if the given window is the panel anchor window of our ToolPanelDeck - bool IsPanelAnchorWindow( const ::Window& i_rWindow ) const; + bool IsPanelAnchorWindow( const vcl::Window& i_rWindow ) const; /** creates an XUIElement for the given standard panel */ diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 305a6895354e..7bdb8401e924 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -class Window; +namespace vcl { class Window; } namespace sd { namespace tools { @@ -64,7 +64,7 @@ public: IdleStates values or-ed together that describe what the system is currently doing so that the caller can decide what to do. */ - static sal_Int32 GetIdleState (const ::Window* pWindow = NULL); + static sal_Int32 GetIdleState (const vcl::Window* pWindow = NULL); private: /** Check whether there are input events pending. @@ -75,7 +75,7 @@ private: */ static sal_Int32 CheckSlideShowRunning (void); - static sal_Int32 CheckWindowPainting (const ::Window& rWindow); + static sal_Int32 CheckWindowPainting (const vcl::Window& rWindow); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 9b2f241b4970..bb5d33b0e57a 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -44,7 +44,7 @@ class SdActionDlg : public SfxSingleTabDialog private: const SfxItemSet& rOutAttrs; public: - SdActionDlg(Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView); + SdActionDlg(vcl::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView); }; /** @@ -95,10 +95,10 @@ private: sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE ); public: - SdTPAction( Window* pParent, const SfxItemSet& rInAttrs ); + SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTPAction(); - static SfxTabPage* Create( Window*, const SfxItemSet& ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 632c0c9bf312..353b06eee46f 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -35,10 +35,10 @@ class SdTpOptionsSnap : public SvxGridTabPage { public: - SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsSnap(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; @@ -56,10 +56,10 @@ private: CheckBox* m_pCbxMoveOutline; public: - SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsContents( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsContents(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; }; @@ -129,10 +129,10 @@ protected: virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; public: - SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs ); + SdTpOptionsMisc( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsMisc(); - static SfxTabPage* Create( Window*, const SfxItemSet* ); + static SfxTabPage* Create( vcl::Window*, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx index 24e4872d8653..153343dae933 100644 --- a/sd/source/ui/inc/vectdlg.hxx +++ b/sd/source/ui/inc/vectdlg.hxx @@ -80,7 +80,7 @@ class SdVectorizeDlg : public ModalDialog public: - SdVectorizeDlg( Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); + SdVectorizeDlg( vcl::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ); virtual ~SdVectorizeDlg(); const GDIMetaFile& GetGDIMetaFile() const { return aMtf; } |