diff options
Diffstat (limited to 'sd/source/ui/inc')
24 files changed, 40 insertions, 48 deletions
diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index e3d519a9ccc8..5ae89ae20f51 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -23,10 +23,7 @@ #include "AccessibleDocumentViewBase.hxx" #include <svx/AccessibleTextHelper.hxx> -namespace sd { -class OutlineViewShell; -namespace vcl { class Window; } -} +namespace sd { class OutlineViewShell; } namespace accessibility { diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 055fd8eb6802..5e9c85debf61 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 override the following two methods and do something different */ - virtual void InvalidateOneWin(::vcl::Window& rWin) SAL_OVERRIDE; - virtual void InvalidateOneWin(::vcl::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 df7e337c1f1b..3d15c4d5fd85 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -102,7 +102,7 @@ public: virtual Size GetFirstPageSize() SAL_OVERRIDE; virtual void FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const SAL_OVERRIDE; virtual void SetModified( bool = true ) SAL_OVERRIDE; - virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( ::vcl::Window *pParent, + virtual VclPtr<SfxDocumentInfoDialog> CreateDocumentInfoDialog( vcl::Window *pParent, const SfxItemSet &rSet ) SAL_OVERRIDE; using SfxObjectShell::GetVisArea; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index a54937f2fabf..120fbeb5aa93 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -88,7 +88,7 @@ public: DrawViewShell ( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); @@ -260,7 +260,7 @@ public: //false. void FreshNavigatrEntry(); void FreshNavigatrTree(); - void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin); + void MakeVisible(const Rectangle& rRect, vcl::Window& rWin); virtual void ReadFrameViewData(FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData() SAL_OVERRIDE; @@ -372,7 +372,7 @@ public: /** Relocation to a new parent window is not supported for DrawViewShell objects so this method always returns <FALSE/>. */ - virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; OUString GetSidebarContextName() const; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index e5002ec52fe2..779b07669180 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, - ::vcl::Window* pWindow, + vcl::Window* pWindow, OutlineViewShell& rOutlineViewSh); virtual ~OutlineView(); @@ -80,7 +80,7 @@ public: virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE; virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE; - OutlinerView* GetViewByWindow(::vcl::Window* pWin) const; + OutlinerView* GetViewByWindow(vcl::Window* pWin) const; SdrOutliner& GetOutliner() { return mrOutliner; } Paragraph* GetPrevTitle(const Paragraph* pPara); @@ -206,8 +206,8 @@ private: /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */ std::unique_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 9bf1d45c1b2a..3a25cc58ff1b 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, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView = NULL); virtual ~OutlineViewShell(); diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 03f4da28376d..3136604cf9c5 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, - ::vcl::Window* pParent, + vcl::Window* pParent, ::sd::Window* pWin, SvxRulerSupportFlags nRulerFlags, SfxBindings& rBindings, diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 940ec902a27d..42dc811b68c4 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -115,7 +115,7 @@ public: static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow); + vcl::Window& rParentWindow); /** Return the control of the vertical scroll bar. */ @@ -168,7 +168,7 @@ public: const Point& rOffset, const Size& rSize); - bool RelocateToWindow (::vcl::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 @@ -246,7 +246,7 @@ private: SlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, - ::vcl::Window& rParentWindow); + vcl::Window& rParentWindow); void Init(); /** Create the controls for the slide sorter. This are the tab bar @@ -255,7 +255,7 @@ private: This method is usually called exactly one time from the constructor. */ - void SetupControls (::vcl::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 292993522034..dd382c39a414 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, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, FrameView* pFrameView, const bool bIsCenterPane); @@ -119,7 +119,7 @@ public: void StartDrag ( const Point& rDragPt, - ::vcl::Window* pWindow ); + vcl::Window* pWindow ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, @@ -178,7 +178,7 @@ public: /** Try to relocate all toplevel window elements to the given parent window. */ - virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; + virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; protected: diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index f0e3c436df09..79207b406159 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -93,7 +93,7 @@ public: ViewShell* pViewSh=NULL); virtual ~View(); - void CompleteRedraw( OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw( OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); @@ -137,7 +137,7 @@ public: inline SdDrawDocument& GetDoc() const; inline ViewShell* GetViewShell() const { return mpViewSh; } - virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::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 8bc7c6b2ea92..5019f3cca85e 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -115,7 +115,7 @@ public: ViewShell ( SfxViewFrame *pFrame, - ::vcl::Window* pParentWindow, + vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); virtual ~ViewShell(); @@ -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 ::vcl::Window* GetParentWindow() const { return mpParentWindow; } + inline vcl::Window* GetParentWindow() const { return mpParentWindow; } inline ::sd::View* GetView() const { return mpView; } inline SdrView* GetDrawView() const; @@ -418,7 +418,7 @@ public: all views, so the return value tells the caller if the relocation was successful. */ - virtual bool RelocateToParentWindow (::vcl::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: - VclPtr< ::vcl::Window> mpParentWindow; + VclPtr<vcl::Window> mpParentWindow; /** This window updater is used to keep all relevant windows up to date with reference to the digit language used to display digits in text shapes. diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 14d8aafb5b03..b26917e89d7c 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -40,7 +40,7 @@ class ViewShell; be an integer percent value. */ class Window - : public ::vcl::Window, + : public vcl::Window, public ::DropTargetHelper { public: @@ -172,7 +172,7 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual void PrePaint() SAL_OVERRIDE; - virtual void Paint(::vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/createcustomanimationpanel.hxx b/sd/source/ui/inc/createcustomanimationpanel.hxx index 12c98d7337ca..e397ec6b8d32 100644 --- a/sd/source/ui/inc/createcustomanimationpanel.hxx +++ b/sd/source/ui/inc/createcustomanimationpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::vcl::Window * createCustomAnimationPanel (vcl::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 6c159f9a5a38..f6431aeecefd 100644 --- a/sd/source/ui/inc/createslidetransitionpanel.hxx +++ b/sd/source/ui/inc/createslidetransitionpanel.hxx @@ -24,7 +24,7 @@ namespace sd { -::vcl::Window* createSlideTransitionPanel (::vcl::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 7f5394767b0e..880966846e90 100644 --- a/sd/source/ui/inc/createtabledesignpanel.hxx +++ b/sd/source/ui/inc/createtabledesignpanel.hxx @@ -25,7 +25,7 @@ namespace sd { -VclPtr< ::vcl::Window> createTableDesignPanel (::vcl::Window* pParent, ViewShellBase& rBase); +VclPtr<vcl::Window> createTableDesignPanel (vcl::Window* pParent, ViewShellBase& rBase); } diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index d9fc8b5b7ec1..7f6553f171ad 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -42,7 +42,7 @@ public: virtual ~DrawView(); virtual void MarkListHasChanged() SAL_OVERRIDE; - void CompleteRedraw(OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) SAL_OVERRIDE; @@ -53,10 +53,10 @@ 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, ::vcl::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 ::vcl::Region& rRegion); + void PresPaint(const vcl::Region& rRegion); virtual void DeleteMarked() SAL_OVERRIDE; // from SdrView protected: diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 149fef5b48f8..8889f7e5c1ab 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -27,8 +27,6 @@ class SdDrawDocument; namespace sd { -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 3c952c167fc1..8ffbb194632d 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -31,7 +31,6 @@ namespace sd { class View; class ViewShell; -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 1f99701901d0..9f8e137fb748 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -25,11 +25,12 @@ class SdDrawDocument; class SfxRequest; +namespace vcl { class Window; } + namespace sd { class View; class ViewShell; -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 7d1339919adb..4fce58046b16 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -31,7 +31,6 @@ class OutlineView; class OutlineViewShell; class View; class ViewShell; -namespace vcl { class Window; } /** * Base class of functions of outline mode diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index a7debedadbb7..25aa75ab3ae6 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -29,7 +29,6 @@ namespace sd { class View; class ViewShell; -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 905542f8151c..78bc0a069c58 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -29,7 +29,6 @@ namespace sd { class View; class ViewShell; -namespace vcl { class Window; } class FuPresentationObjects : public FuPoor diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index af0b1ef22f9c..b8c1178a7ac2 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -96,7 +96,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, - ::vcl::Window* pParent = 0 ); + vcl::Window* pParent = 0 ); static void Stop( ViewShellBase& rBase ); @@ -112,7 +112,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, - ::vcl::Window* pParent = 0 ); + vcl::Window* pParent = 0 ); // uno api @@ -198,7 +198,7 @@ private: void ThrowIfDisposed() const throw (css::uno::RuntimeException); - void CreateController( ViewShell* pViewSh, ::sd::View* pView, ::vcl::Window* pParentWindow ); + void CreateController( ViewShell* pViewSh, ::sd::View* pView, vcl::Window* pParentWindow ); WorkWindow *GetWorkWindow(); SlideShow(const SlideShow&) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index b9c17ac4ba4e..43444b83c1b9 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -81,7 +81,7 @@ class SD_DLLPUBLIC SdXImpressDocument : public SfxBaseModel, // implements SfxLi public ::com::sun::star::ucb::XAnyCompareFactory, public ::com::sun::star::presentation::XHandoutMasterSupplier, public ::com::sun::star::view::XRenderable, - public ::vcl::ITiledRenderable + public vcl::ITiledRenderable { friend class SdDrawPagesAccess; friend class SdMasterPagesAccess; |