diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/dlg/tabtempl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/ClientView.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/GraphicViewShell.hxx | 3 | ||||
-rw-r--r-- | sd/source/ui/inc/OutlineViewShell.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/inc/SlideSorterViewShell.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShell.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/framework/Pane.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/fupoor.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/showwindow.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/clview.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdview.cxx | 2 |
19 files changed, 23 insertions, 23 deletions
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 409d4bf477b0..2c875ef0a784 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -76,7 +76,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( vcl::Window* pParent, , m_nTabId(0) , m_nAsianTypoId(0) { - // fill Listbox and overload Select-Handler + // fill Listbox and set Select-Handler m_nLineId = AddTabPage("line", RID_SVXPAGE_LINE); m_nAreaId = AddTabPage("area", RID_SVXPAGE_AREA); diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 24916f6ab0b8..ef4c08b2c11b 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -132,9 +132,9 @@ public: //===== IAccessibleViewForwarderListener ================================ /** A view forwarder change is signalled for instance when any of the - window events is received. Thus, instead of overloading the four + window events is received. Thus, instead of overriding the four windowResized... methods it will be sufficient in most cases just to - overload this method. + override this method. */ virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 48357380557b..c2713af809f3 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -42,7 +42,7 @@ public: virtual void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; /* if the view should not do a Invalidate() on the windows, you have to - overload the following two methods and do something different */ + 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; }; diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index fc127e908534..7077e3714568 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -64,8 +64,7 @@ public: virtual ~GraphicViewShell (void); - /** This method is overloaded in order to have the layer mode always - active. + /** Override this method in order to have the layer mode always active. */ virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index b35833fe8983..1a737b5c65e0 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -90,6 +90,7 @@ public: void ExecCtrl(SfxRequest &rReq); void GetCtrlState(SfxItemSet &rSet); + // FIXME non-virtual override??? void GetMenuState(SfxItemSet &rSet); void GetAttrState(SfxItemSet &rSet); void GetState (SfxItemSet& rSet); diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index e35b1eb1e36e..4f6e7abd5054 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -188,7 +188,7 @@ protected: virtual SvBorder GetBorder (bool bOuterResize); - /** This method is overloaded to handle a missing tool bar correctly. + /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ virtual ::svl::IUndoManager* ImpGetUndoManager (void) const SAL_OVERRIDE; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index ff43e50132f5..8aa15c43b290 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -289,7 +289,7 @@ public: virtual void VisAreaChanged(const Rectangle& rRect); /** Create an accessible object representing the specified window. - Overload this method to provide view mode specific objects. The + Override this method to provide view mode specific objects. The default implementation returns an empty reference. @param pWindow Make the document displayed in this window accessible. diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 51992e82cf87..b4ee242f32bf 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -139,7 +139,7 @@ protected: ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> mxWindow; ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> mxCanvas; - /** Overload this method, not getCanvas(), when you want to provide a + /** Override this method, not getCanvas(), when you want to provide a different canvas. */ virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index b86905753fb3..50261d972616 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -106,7 +106,7 @@ public: // #i33136# /** Decide if the object to be created should be created orthogonal. Default implementation uses nSlotID - to decide. May be overloaded to use other criteria + to decide. May be overridden to use other criteria for this decision @returns true if the to be created object should be orthogonal. diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 797b7545a3fc..5c1111f5e06b 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -129,13 +129,13 @@ public: */ virtual TaskPaneShellManager* GetShellManager (void); - /** You will rarely need to overload this method. To supply your own - accessible object you should overload CreateAccessible() instead. + /** You will rarely need to override this method. To supply your own + accessible object you should override CreateAccessible() instead. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetAccessibleObject (void); - /** Overload this method in order to supply a class specific accessible + /** Override this method in order to supply a class specific accessible object. The default implementation will return a new instance of AccessibleTreeNode. diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index c64a103be368..d61fdcac9ca3 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -103,7 +103,7 @@ public: void FillPageSet (void); /** Make the selector empty. This method clear the value set from any - entries. Overload this method to add functionality, especially to + entries. Override this method to add functionality, especially to destroy objects set as data items at the value set. */ void ClearPageSet (void); diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 82af6de95587..a750a07c9a53 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -623,7 +623,7 @@ void ShowWindow::AddWindowToPaintView() GetChild( nChild )->Show( true ); } -// Overload the sd::Window's CreateAccessible to create a different accessible object +// Override the sd::Window's CreateAccessible to create a different accessible object ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> ShowWindow::CreateAccessible (void) diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 3fbbcef0dd79..4cd0315386e7 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -77,7 +77,7 @@ public: virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; - //Overload the sd::Window's CreateAccessible to create a different accessible object + /// Override the sd::Window's CreateAccessible to create a different accessible object virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index dcb5dbc22f1f..1192989e3a47 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -69,7 +69,7 @@ using namespace ::com::sun::star::animations; using namespace ::com::sun::star::drawing::framework; namespace { - /** This local version of the work window overloads DataChanged() so that it + /** This local version of the work window overrides DataChanged() so that it can restart the slide show when a display is added or removed. */ class FullScreenWorkWindow : public WorkWindow diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 317e075d54d0..b8673460d9e1 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -240,7 +240,7 @@ private: virtual ~SlideshowImpl(); - // overload WeakComponentImplHelperBase::disposing() + // override WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, // if your component needs special work when it becomes // disposed, do it here. diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index b461f8751787..e92f32802a79 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1540,7 +1540,7 @@ public: virtual ~ImplRenderPaintProc(); // all default implementations just call the same methods at the original. To do something - // different, overload the method and at least do what the method does. + // different, override the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index 312f1697764d..9fff091c0060 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -47,7 +47,7 @@ ClientView::~ClientView() /** * If View should not Invalidate() the windows, this method has - * to be overloaded and properly handled. + * to be overridden and properly handled. */ void ClientView::InvalidateOneWin(vcl::Window& rWin) @@ -58,7 +58,7 @@ void ClientView::InvalidateOneWin(vcl::Window& rWin) /** * If View should not Invalidate() the windows, this method has - * to be overloaded and properly handled. + * to be overridden and properly handled. */ void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 76628fa70d35..425145032504 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -933,7 +933,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) GetDoc()->SetChanged(true); } - // the status has to be set here because of overloading + // the status has to be set here because of overriding if( !GetDocSh()->IsModified() ) { rSet.DisableItem( SID_SAVEDOC ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 7716320dac3f..ff3c6668e2ae 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -179,7 +179,7 @@ public: virtual ~ViewRedirector(); // all default implementations just call the same methods at the original. To do something - // different, overload the method and at least do what the method does. + // different, override the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; |