summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basctl/source/inc/dlgedview.hxx2
-rw-r--r--basic/source/inc/sbjsmeth.hxx2
-rw-r--r--basic/source/inc/sbjsmod.hxx2
-rw-r--r--basic/source/inc/sbunoobj.hxx4
-rw-r--r--basic/source/sbx/sbxobj.cxx2
-rw-r--r--canvas/source/vcl/spritecanvashelper.cxx5
-rw-r--r--chart2/inc/ChartModel.hxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.cxx4
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.hxx4
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx2
-rw-r--r--chart2/source/controller/main/CommandDispatch.hxx2
-rw-r--r--chart2/source/inc/OPropertySet.hxx2
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.hxx4
-rw-r--r--connectivity/source/drivers/file/FDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/sdbcx/VCollection.cxx2
-rw-r--r--connectivity/source/sdbcx/VTable.cxx4
-rw-r--r--cui/source/dialogs/SpellDialog.cxx2
-rw-r--r--cui/source/dialogs/hldoctp.cxx2
-rw-r--r--cui/source/dialogs/hlinettp.cxx2
-rw-r--r--cui/source/dialogs/hlmailtp.cxx2
-rw-r--r--cui/source/options/optfltr.cxx2
-rw-r--r--cui/source/tabpages/autocdlg.cxx2
-rw-r--r--cui/source/tabpages/tpcolor.cxx2
-rw-r--r--cui/source/tabpages/tpgradnt.cxx2
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx3
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx4
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx6
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx2
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx2
-rw-r--r--dbaccess/source/ui/app/AppView.hxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx2
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx2
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx2
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx2
-rw-r--r--dbaccess/source/ui/inc/SqlNameEdit.hxx4
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx4
-rw-r--r--dbaccess/source/ui/inc/VertSplitView.hxx2
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx2
-rw-r--r--drawinglayer/source/primitive2d/metafileprimitive2d.cxx2
-rw-r--r--editeng/source/editeng/editeng.cxx2
-rw-r--r--editeng/source/editeng/impedit3.cxx3
-rw-r--r--embeddedobj/test/Container1/NativeView.java6
-rw-r--r--extensions/source/ole/servprov.hxx4
-rw-r--r--filter/source/msfilter/msdffimp.cxx2
-rw-r--r--forms/source/component/ImageControl.cxx3
-rw-r--r--forms/source/component/clickableimage.cxx2
-rw-r--r--forms/source/inc/FormComponent.hxx4
-rw-r--r--fpicker/source/office/OfficeControlAccess.cxx4
-rw-r--r--fpicker/source/win32/filepicker/FileOpenDlg.cxx5
-rw-r--r--fpicker/source/win32/filepicker/WinFileOpenImpl.hxx2
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx2
-rw-r--r--include/basegfx/raster/rasterconvert3d.hxx6
-rw-r--r--include/comphelper/serviceinfohelper.hxx2
-rw-r--r--include/comphelper/uno3.hxx2
-rw-r--r--include/connectivity/sdbcx/VCollection.hxx2
-rw-r--r--include/cppuhelper/propshlp.hxx2
-rw-r--r--include/dbaccess/ToolBoxHelper.hxx3
-rw-r--r--include/drawinglayer/primitive2d/animatedprimitive2d.hxx5
-rw-r--r--include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/baseprimitive2d.hxx6
-rw-r--r--include/drawinglayer/primitive2d/controlprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/gridprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/helplineprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/polygonprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/primitivetools2d.hxx8
-rw-r--r--include/drawinglayer/primitive2d/sceneprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive2d/texteffectprimitive2d.hxx2
-rw-r--r--include/drawinglayer/primitive3d/baseprimitive3d.hxx6
-rw-r--r--include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx2
-rw-r--r--include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx2
-rw-r--r--include/drawinglayer/primitive3d/sdrprimitive3d.hxx2
-rw-r--r--include/drawinglayer/processor2d/baseprocessor2d.hxx2
-rw-r--r--include/editeng/editeng.hxx2
-rw-r--r--include/formula/token.hxx8
-rw-r--r--include/formula/tokenarray.hxx2
-rw-r--r--include/sfx2/objsh.hxx2
-rw-r--r--include/sfx2/shell.hxx4
-rw-r--r--include/sfx2/thumbnailview.hxx6
-rw-r--r--include/svl/numuno.hxx4
-rw-r--r--include/svtools/brwbox.hxx4
-rw-r--r--include/svtools/treelistbox.hxx2
-rw-r--r--include/svtools/valueset.hxx6
-rw-r--r--include/svx/fmgridif.hxx2
-rw-r--r--include/svx/sdr/contact/objectcontact.hxx4
-rw-r--r--include/svx/sdr/contact/objectcontactofobjlistpainter.hxx2
-rw-r--r--include/svx/sdr/contact/viewcontact.hxx4
-rw-r--r--include/svx/sdr/contact/viewcontactofsdrobj.hxx2
-rw-r--r--include/svx/sdr/contact/viewobjectcontactredirector.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayobject.hxx4
-rw-r--r--include/svx/sdr/overlay/overlayselection.hxx2
-rw-r--r--include/svx/sdr/properties/properties.hxx14
-rw-r--r--include/svx/svdedtv.hxx2
-rw-r--r--include/svx/svdedxv.hxx2
-rw-r--r--include/svx/svdmodel.hxx9
-rw-r--r--include/svx/svdmrkv.hxx2
-rw-r--r--include/svx/svdpage.hxx2
-rw-r--r--include/svx/svdtext.hxx2
-rw-r--r--include/toolkit/awt/vclxaccessiblecomponent.hxx2
-rw-r--r--include/vcl/print.hxx6
-rw-r--r--include/xmloff/prstylei.hxx4
-rw-r--r--include/xmloff/txtstyli.hxx2
-rw-r--r--include/xmloff/xmlexp.hxx28
-rw-r--r--include/xmloff/xmlmultiimagehelper.hxx2
-rw-r--r--include/xmloff/xmlnume.hxx3
-rw-r--r--include/xmloff/xmlstyle.hxx2
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java6
-rw-r--r--odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java2
-rw-r--r--qadevOOo/runner/lib/DynamicClassLoader.java2
-rw-r--r--qadevOOo/runner/util/DynamicClassLoader.java2
-rw-r--r--reportdesign/inc/RptObject.hxx2
-rw-r--r--reportdesign/source/ui/inc/DataProviderHandler.hxx2
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx2
-rw-r--r--reportdesign/source/ui/inc/GeometryHandler.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportComponentHandler.hxx2
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/SectionWindow.hxx2
-rw-r--r--reportdesign/source/ui/inc/StartMarker.hxx2
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx4
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx2
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx2
-rw-r--r--sc/inc/cellsuno.hxx10
-rw-r--r--sc/inc/dapiuno.hxx4
-rw-r--r--sc/inc/dptabdat.hxx2
-rw-r--r--sc/inc/optuno.hxx2
-rw-r--r--sc/source/core/inc/ddelink.hxx4
-rw-r--r--sc/source/filter/inc/XclExpChangeTrack.hxx6
-rw-r--r--sc/source/filter/inc/xcl97esc.hxx2
-rw-r--r--sc/source/filter/inc/xiescher.hxx2
-rw-r--r--sc/source/filter/xml/xmlstyli.hxx2
-rw-r--r--sc/source/ui/app/inputwin.cxx2
-rw-r--r--sc/source/ui/inc/AccessibleCell.hxx4
-rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx4
-rw-r--r--sc/source/ui/inc/AccessiblePageHeaderArea.hxx4
-rw-r--r--sc/source/ui/inc/AccessiblePreviewCell.hxx2
-rw-r--r--sc/source/ui/inc/AccessibleTableBase.hxx4
-rw-r--r--sc/source/ui/inc/hdrcont.hxx2
-rw-r--r--sc/source/ui/inc/instbdlg.hxx2
-rw-r--r--sc/source/ui/miscdlgs/anyrefdg.cxx2
-rw-r--r--sc/source/ui/view/colrowba.cxx6
-rw-r--r--sd/inc/sdpage.hxx2
-rw-r--r--sd/source/core/annotations/Annotation.cxx4
-rw-r--r--sd/source/core/sdpage.cxx4
-rw-r--r--sd/source/ui/dlg/tabtempl.cxx2
-rw-r--r--sd/source/ui/inc/AccessibleDocumentViewBase.hxx4
-rw-r--r--sd/source/ui/inc/ClientView.hxx2
-rw-r--r--sd/source/ui/inc/GraphicViewShell.hxx3
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx1
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx2
-rw-r--r--sd/source/ui/inc/ViewShell.hxx2
-rw-r--r--sd/source/ui/inc/framework/Pane.hxx2
-rw-r--r--sd/source/ui/inc/fupoor.hxx2
-rw-r--r--sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx6
-rw-r--r--sd/source/ui/sidebar/MasterPagesSelector.hxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx2
-rw-r--r--sd/source/ui/slideshow/showwindow.hxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.hxx2
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx2
-rw-r--r--sd/source/ui/view/clview.cxx4
-rw-r--r--sd/source/ui/view/outlnvsh.cxx2
-rw-r--r--sd/source/ui/view/sdview.cxx2
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.hxx2
-rw-r--r--setup_native/scripts/install_solaris.sh2
-rw-r--r--sfx2/source/appl/appdde.cxx18
-rw-r--r--sfx2/source/appl/childwin.cxx2
-rw-r--r--sfx2/source/control/bindings.cxx8
-rw-r--r--sfx2/source/dialog/dockwin.cxx8
-rw-r--r--sfx2/source/dialog/styledlg.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx2
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/doc/new.cxx2
-rw-r--r--sfx2/source/doc/objcont.cxx11
-rw-r--r--sfx2/source/doc/objxtor.cxx6
-rw-r--r--sfx2/source/statbar/stbitem.cxx2
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx2
-rw-r--r--sfx2/source/view/viewsh.cxx17
-rw-r--r--sot/source/sdstor/stgavl.hxx2
-rw-r--r--starmath/source/node.cxx2
-rw-r--r--svl/source/items/flagitem.cxx4
-rw-r--r--svl/source/items/poolio.cxx2
-rw-r--r--svl/source/items/poolitem.cxx2
-rw-r--r--svtools/source/config/menuoptions.cxx2
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx2
-rw-r--r--svtools/source/control/tabbar.cxx2
-rw-r--r--svx/inc/sdr/contact/objectcontactofpageview.hxx4
-rw-r--r--svx/inc/sdr/contact/viewcontactofsdrpage.hxx2
-rw-r--r--svx/inc/sdr/contact/viewobjectcontactofe3d.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dcompoundproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/e3dsceneproperties.hxx4
-rw-r--r--svx/inc/sdr/properties/groupproperties.hxx2
-rw-r--r--svx/inc/sdr/properties/pageproperties.hxx2
-rw-r--r--svx/source/dialog/SpellDialogChildWindow.cxx6
-rw-r--r--svx/source/dialog/svxruler.cxx6
-rw-r--r--svx/source/engine3d/scene3d.cxx2
-rw-r--r--svx/source/engine3d/view3d.cxx4
-rw-r--r--svx/source/form/fmobj.cxx2
-rw-r--r--svx/source/inc/fmobj.hxx2
-rw-r--r--svx/source/sdr/contact/objectcontactofpageview.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontact.cxx6
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobj.cxx2
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrpage.cxx2
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx2
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx6
-rw-r--r--svx/source/sdr/properties/properties.cxx8
-rw-r--r--svx/source/svdraw/svddrgm1.hxx2
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdouno.cxx4
-rw-r--r--sw/inc/cellfml.hxx2
-rw-r--r--sw/inc/dcontact.hxx2
-rw-r--r--sw/inc/drawdoc.hxx2
-rw-r--r--sw/inc/format.hxx4
-rw-r--r--sw/inc/frmfmt.hxx2
-rw-r--r--sw/inc/shellio.hxx2
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx2
-rw-r--r--sw/source/core/access/acccontext.cxx12
-rw-r--r--sw/source/core/attr/cellatr.cxx2
-rw-r--r--sw/source/core/attr/format.cxx4
-rw-r--r--sw/source/core/draw/dcontact.cxx4
-rw-r--r--sw/source/core/draw/dview.cxx2
-rw-r--r--sw/source/core/inc/dflyobj.hxx2
-rw-r--r--sw/source/core/inc/dview.hxx4
-rw-r--r--sw/source/core/inc/swcache.hxx3
-rw-r--r--sw/source/core/layout/atrfrm.cxx2
-rw-r--r--sw/source/filter/basflt/shellio.cxx2
-rw-r--r--sw/source/filter/writer/writer.cxx2
-rw-r--r--sw/source/filter/ww8/escher.hxx2
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx3
-rw-r--r--sw/source/uibase/app/docsh.cxx2
-rw-r--r--sw/source/uibase/app/docst.cxx2
-rw-r--r--sw/source/uibase/docvw/AnnotationMenuButton.hxx4
-rw-r--r--toolkit/source/controls/unocontrol.cxx2
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx2
-rw-r--r--unodevtools/source/skeletonmaker/cppcompskeleton.cxx6
-rw-r--r--unotools/source/config/compatibility.cxx2
-rw-r--r--unotools/source/config/moduleoptions.cxx2
-rw-r--r--unotools/source/config/printwarningoptions.cxx2
-rw-r--r--unotools/source/config/securityoptions.cxx2
-rw-r--r--vcl/inc/generic/genprn.h4
-rw-r--r--vcl/inc/generic/genpspgraphics.h2
-rw-r--r--vcl/inc/headless/svpdummies.hxx2
-rw-r--r--vcl/inc/headless/svpinst.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtkobject.hxx2
-rw-r--r--vcl/inc/unx/salbmp.h2
-rw-r--r--vcl/inc/unx/salgdi.h2
-rw-r--r--vcl/inc/unx/salobj.h2
-rw-r--r--vcl/inc/unx/saltimer.h2
-rw-r--r--vcl/inc/unx/x11/x11sys.hxx2
-rw-r--r--vcl/source/control/button.cxx2
-rw-r--r--vcl/source/control/edit.cxx2
-rw-r--r--vcl/source/window/menu.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx2
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx6
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx2
-rw-r--r--xmloff/source/draw/ximpshap.hxx2
-rw-r--r--xmloff/source/text/XMLTextFrameContext.hxx2
-rw-r--r--xmloff/source/xforms/TokenContext.hxx2
260 files changed, 410 insertions, 417 deletions
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 7ba534d24bac..0c54e5c5eb93 100644
--- a/basctl/source/inc/dlgedview.hxx
+++ b/basctl/source/inc/dlgedview.hxx
@@ -47,7 +47,7 @@ public:
virtual void MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) SAL_OVERRIDE;
protected:
- // overloaded to handle HitTest for some objects special
+ /// override to handle HitTest for some objects specially
using SdrView::CheckSingleSdrObjectHit;
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE;
};
diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx
index 2b744a0234ec..82fda816dcf7 100644
--- a/basic/source/inc/sbjsmeth.hxx
+++ b/basic/source/inc/sbjsmeth.hxx
@@ -24,7 +24,7 @@
#include <basic/sbmeth.hxx>
// basic module for JavaScript sources
-// All the basic-specific methods must be overloaded virtually and must
+// All the basic-specific methods must be overridden virtually and must
// be deactivated. The differentiation of normal modules is done by RTTI.
class SbJScriptMethod : public SbMethod
diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx
index fb655f587b25..a34ba5cb3abd 100644
--- a/basic/source/inc/sbjsmod.hxx
+++ b/basic/source/inc/sbjsmod.hxx
@@ -23,7 +23,7 @@
#include <basic/sbmod.hxx>
// basic module for JavaScript sources
-// All the basic-specific methods must be overloaded virtually and must
+// All the basic-specific methods must be overridden virtually and must
// be deactivated. The differentiation of normal modules is done by RTTI.
class SbJScriptModule : public SbModule
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 8a985d08c029..8d8aaa75144d 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -88,7 +88,7 @@ public:
SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo );
virtual ~SbUnoStructRefObject();
- // Find overloaded to support e. g. NameAccess
+ // override Find to support e. g. NameAccess
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
// Force creation of all properties for debugging
@@ -128,7 +128,7 @@ public:
// #76470 do introspection on demand
void doIntrospection( void );
- // Find overloaded to support e. g. NameAccess
+ // override Find to support e. g. NameAccess
virtual SbxVariable* Find( const OUString&, SbxClassType ) SAL_OVERRIDE;
// Force creation of all properties for debugging
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index dfe6d9966e16..35a0eb2c4858 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -295,7 +295,7 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
}
// Abbreviated version: The parent-string will be searched
-// The whole thing recursive, because Call() might be overloaded
+// The whole thing recursive, because Call() might be overridden
// Qualified names are allowed
bool SbxObject::Call( const OUString& rName, SbxArray* pParam )
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 037bc489fb22..682950534135 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -644,10 +644,7 @@ namespace vclcanvas
sal_Int32 nCount(0);
mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
- OUString text(
- OUString::number(
- // disambiguate overload...
- nCount ) );
+ OUString text( OUString::number(nCount) );
// pad with leading space
while( text.getLength() < 3 )
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 0b06d0b46f58..5b08111097b9 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -408,7 +408,7 @@ public:
const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // lang::XTypeProvider (overloaded method of WeakImplHelper)
+ // lang::XTypeProvider (override method of WeakImplHelper)
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 1379b7cb2421..b92b64cd6bba 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -152,7 +152,7 @@ OUString SAL_CALL AccessibleChartElement::getImplementationName()
return OUString( "AccessibleChartElement" );
}
-// ________ AccessibleChartElement::XAccessibleContext (overloaded) ________
+// ________ AccessibleChartElement::XAccessibleContext (override) ________
OUString SAL_CALL AccessibleChartElement::getAccessibleName()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
@@ -160,7 +160,7 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName()
GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument );
}
-// ________ AccessibleChartElement::XAccessibleContext (overloaded) ________
+// ________ AccessibleChartElement::XAccessibleContext (override) ________
OUString SAL_CALL AccessibleChartElement::getAccessibleDescription()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 18788dc81749..cfcb1594599e 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -53,7 +53,7 @@ namespace chart
<li>define the getAccessibleName() method of XAccessibleContext</li>
<li>set the ChartModel using SetChartModel() for the first node before
creating any children</li>
- <li>overload UpdateChildren()</li>
+ <li>override UpdateChildren()</li>
</ul>
*/
@@ -100,7 +100,7 @@ public:
// the following interface is implemented in AccessibleBase, however it is
// also a (non-virtual) base class of XAccessibleExtendedComponent Thus
- // these methods have to be overloaded and forward to AccessibleBase
+ // these methods have to be overridden and forward to AccessibleBase
// ________ XAccessibleComponent ________
virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 5487a3bdfa29..a0794da69994 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -144,7 +144,7 @@ protected:
*/
void RemoveState( sal_Int16 aState ) throw (::com::sun::star::uno::RuntimeException);
- /** has to be overloaded by derived classes that support child elements.
+ /** has to be overridden by derived classes that support child elements.
With this method a rescan is initiated that should result in a correct
list of children.
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index e28ec3ee96bc..e4255b2fc044 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -59,7 +59,7 @@ protected:
/** sends a status event for a specific command to all registered listeners
or only the one given when set.
- This method should be overloaded. The implementation should call
+ This method should be overridden. The implementation should call
fireStatusEventForURL and pass the xSingleListener argument to this
method unchanged.
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 9fbe44106318..697f6cfaf225 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -82,7 +82,7 @@ protected:
/** Try to convert the value <code>rValue</code> to the type required by the
property associated with <code>nHandle</code>.
- Overload this method to take influence in modification of properties.
+ Override this method to take influence in modification of properties.
If the conversion changed , </sal_True> is returned and the converted value
is in <code>rConvertedValue</code>. The former value is contained in
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index d37e870f16fe..4835b6785fa0 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -42,7 +42,7 @@ namespace chart
createDiagramByDataSource
This does the following steps using some virtual helper-methods, that may be
- overloaded by derived classes:
+ overridden by derived classes:
* creates an XDiagram via service-factory.
@@ -124,7 +124,7 @@ protected:
virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // Methods to overload for automatic creation
+ // Methods to override for automatic creation
/// returns 2 by default. Supported are 2 and 3
virtual sal_Int32 getDimension() const;
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 5ab8b44e5b54..2d2b8f99f864 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -66,7 +66,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception)
{
- SAL_WARN( "connectivity.drivers","Should be overloaded!");
+ SAL_WARN("connectivity.drivers", "ODatabaseMetaData::getColumns() should be overridden!");
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
}
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 622ccf15d889..cc886dfd3584 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -567,7 +567,7 @@ void OCollection::disposeElements()
Reference< XPropertySet > OCollection::createDescriptor()
{
- OSL_FAIL("Need to be overloaded when used!");
+ OSL_FAIL("createDescriptor() needs to be overridden when used!");
throw SQLException();
}
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 23cfca9e3baf..dffe47b8b611 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -297,8 +297,8 @@ void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference<
OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
// this is only correct for tables who haven't a schema or catalog name
- OSL_ENSURE(m_CatalogName.isEmpty(),"getName(): forgot to overload getName()!");
- OSL_ENSURE(m_SchemaName.isEmpty(),"getName(): forgot to overload getName()!");
+ OSL_ENSURE(m_CatalogName.isEmpty(),"getName(): forgot to override getName()!");
+ OSL_ENSURE(m_SchemaName.isEmpty(),"getName(): forgot to override getName()!");
return m_Name;
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 2aba722656d6..38bfb82c4730 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -985,7 +985,7 @@ bool SpellDialog::Notify( NotifyEvent& rNEvt )
* FIXME: LoseFocus and GetFocus are signals from vcl that
* a window actually got/lost the focus, it never should be
* forwarded from another window, that is simply wrong.
- * FIXME: overloading the virtual methods GetFocus and LoseFocus
+ * FIXME: overriding the virtual methods GetFocus and LoseFocus
* in SpellDialogChildWindow by making them pure is at least questionable.
* The only sensible thing would be to call the new Method differently,
* e.g. DialogGot/LostFocus or so.
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 086fd8d0d425..ce04b68ecbdc 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -60,7 +60,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
SetExchangeSupport ();
- // overload handlers
+ // set handlers
m_pBtFileopen->SetClickHdl ( LINK ( this, SvxHyperlinkDocTp, ClickFileopenHdl_Impl ) );
m_pBtBrowse->SetClickHdl ( LINK ( this, SvxHyperlinkDocTp, ClickTargetHdl_Impl ) );
m_pCbbPath->SetModifyHdl ( LINK ( this, SvxHyperlinkDocTp, ModifiedPathHdl_Impl ) );
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 0230fc0c3c41..61089258bbdd 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -69,7 +69,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
m_pBtBrowse->Enable( true );
- // overload handlers
+ // set handlers
Link aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
m_pRbtLinktypInternet->SetClickHdl( aLink );
m_pRbtLinktypFTP->SetClickHdl ( aLink );
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index fef0bbfa6c02..8e74037b732c 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -63,7 +63,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
// set defaults
m_pRbtMail->Check ();
- // overload handlers
+ // set handlers
m_pRbtMail->SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
m_pRbtNews->SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, Click_SmartProtocol_Impl ) );
m_pBtAdrBook->SetClickHdl ( LINK ( this, SvxHyperlinkMailTp, ClickAdrBookHdl_Impl ) );
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d3e7f5727256..800f02886797 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -340,7 +340,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs()
void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick()
{
- // sorting is stopped by this overloading
+ // sorting is stopped by this override
}
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 57b8b2b2607c..2e148a5bb4f9 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -800,7 +800,7 @@ SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry
void OfaACorrCheckListBox::HBarClick()
{
- // sorting is stopped by this overload
+ // sorting is stopped by this override
}
void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt )
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f5935aa66ae1..ff47c806dbb2 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -368,7 +368,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
m_pCtlPreviewOld->SetAttributes( aXFillAttr.GetItemSet() );
m_pCtlPreviewNew->SetAttributes( aXFillAttr.GetItemSet() );
- // overload handler
+ // set handler
m_pLbColor->SetSelectHdl(
LINK( this, SvxColorTabPage, SelectColorLBHdl_Impl ) );
m_pValSetColorList->SetSelectHdl(
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index f695653e2e41..46b001bd88ae 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -108,7 +108,7 @@ SvxGradientTabPage::SvxGradientTabPage
rXFSet.Put( aXGradientItem );
m_pCtlPreview->SetAttributes( aXFillAttr.GetItemSet() );
- // overload the handler
+ // set handler
m_pLbGradients->SetSelectHdl(
LINK( this, SvxGradientTabPage, ChangeGradientHdl_Impl ) );
m_pBtnAdd->SetClickHdl( LINK( this, SvxGradientTabPage, ClickAddHdl_Impl ) );
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index f1abf03c86d3..eb752280acca 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -303,7 +303,8 @@ private:
void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
- /** approve that the object given may be inserted into the container. Should be overloaded by derived classes,
+ /** approve that the object given may be inserted into the container.
+ Should be overridden by derived classes,
the default implementation just checks the object to be non-void.
@throws IllegalArgumentException
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 95c3b63c6358..e4ad394d5f7b 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -68,7 +68,7 @@ namespace dbaui
public:
OPreviewWindow(vcl::Window* _pParent);
- // window overloads
+ // Window overrides
virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE;
void setGraphic(const Graphic& _rGraphic ) { m_aGraphicObj.SetGraphic(_rGraphic); }
@@ -170,7 +170,7 @@ namespace dbaui
OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindow& _rBorderWin,PreviewMode _ePreviewMode);
virtual ~OAppDetailPageHelper();
- // window overloads
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index ac12a0d0cfe8..f90048248ce8 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -56,7 +56,7 @@ namespace dbaui
public:
OCreationList( OTasksWindow& _rParent );
- // window overloads
+ // Window overrides
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -125,7 +125,7 @@ namespace dbaui
OTasksWindow(vcl::Window* _pParent,OApplicationDetailView* _pDetailView);
virtual ~OTasksWindow();
- // window overloads
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
OApplicationDetailView* getDetailView() const { return m_pDetailView; }
@@ -160,7 +160,7 @@ namespace dbaui
public:
OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode);
virtual ~OApplicationDetailView();
- // window overloads
+ // Window overrides
virtual void GetFocus() SAL_OVERRIDE;
/** creates the tables page
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index 5c10903cf9be..c7b61c4651c6 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -43,7 +43,7 @@ namespace dbaui
public:
OApplicationSwapWindow( vcl::Window* _pParent, OAppBorderWindow& _rBorderWindow );
virtual ~OApplicationSwapWindow();
- // window overloads
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
bool isCutAllowed() SAL_OVERRIDE { return false; }
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index e33144a87395..76228b54b6cf 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -37,7 +37,7 @@ namespace dbaui
OTitleWindow(vcl::Window* _pParent,sal_uInt16 _nTitleId,WinBits _nBits,bool _bShift = true);
virtual ~OTitleWindow();
- // window overloads
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index a19118ac1917..87288117d2cd 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -56,7 +56,7 @@ namespace dbaui
OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePreviewMode);
virtual ~OAppBorderWindow();
- // window overloads
+ // Window overrides
virtual void GetFocus() SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
@@ -110,7 +110,7 @@ namespace dbaui
/// automatically creates mnemonics for the texts in our task pane
void setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics );
- // window overloads
+ // Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 605baea7b30e..6f0720d7a43b 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -67,7 +67,7 @@ public:
virtual ~OUserAdmin();
OUString GetUser();
- // must be overloaded by subclasses, but it isn't pure virtual
+ // subclasses must override this, but it isn't pure virtual
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index af8d91a8d258..005f0cb909c5 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -116,7 +116,7 @@ namespace dbaui
// nControlFlags is a combination of the CBTP_xxx-constants
virtual ~GeneratedValuesPage();
- // must be overloaded by subclasses, but it isn't pure virtual
+ // subclasses must override this, but it isn't pure virtual
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index d70246976339..fd4119bdbbfa 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -75,7 +75,7 @@ namespace dbaui
virtual ~OCommonBehaviourTabPage();
- // must be overloaded by subclasses, but it isn't pure virtual
+ // subclasses must override this, but it isn't pure virtual
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillControls</method>
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index c09a01400144..2ca5564dd6e9 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -96,7 +96,7 @@ namespace dbaui
/// late construction
virtual void Construct() SAL_OVERRIDE;
virtual void initialize() SAL_OVERRIDE;
- // window overloads
+ // Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index 4368648429d9..2c1ecd27aa9f 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx
@@ -67,7 +67,7 @@ namespace dbaui
{
}
- // Window overload
+ // Window overrides
// virtual bool PreNotify( NotifyEvent& rNEvt );
// Edit
virtual void Modify() SAL_OVERRIDE;
@@ -88,7 +88,7 @@ namespace dbaui
{
}
- // Window overload
+ // Window overrides
// Edit
virtual void Modify() SAL_OVERRIDE;
};
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index 1643aaccb037..5926f8dbe51e 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -44,7 +44,7 @@ namespace dbaui
public:
OTableBorderWindow(vcl::Window* pParent);
virtual ~OTableBorderWindow();
- // window overloads
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
@@ -78,7 +78,7 @@ namespace dbaui
OTableController& _rController);
virtual ~OTableDesignView();
- // window overloads
+ // Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx
index f34af430a936..4a91f47e05d5 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.hxx
@@ -39,7 +39,7 @@ namespace dbaui
public:
OSplitterView(vcl::Window* _pParent,bool _bVertical = true);
virtual ~OSplitterView();
- // window overloads
+ // Window overrides
virtual void GetFocus() SAL_OVERRIDE;
void setSplitter(Splitter* _pSplitter);
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 4644830f66c0..63e536a0f6c9 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -233,7 +233,7 @@ namespace dbaui
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > CreateForm();
// our default implementation simply instantiates a stardiv.one.form.component.Form service
- // (probably this needs not to be overloaded, but you may return anything you want as long as it
+ // (probably this needs not to be overridden, but you may return anything you want as long as it
// supports the ::com::sun::star::form::DatabaseForm service. For instance you may want to create an adapter here which
// is synchronized with a foreign ::com::sun::star::form::DatabaseForm you got elsewhere)
virtual bool InitializeForm(
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 3c0a550d148a..5eefcc6f97d3 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -163,7 +163,7 @@ namespace dbaui
bool IsReadOnly() { return bReadOnly;}
OFieldDescription* GetFieldDescr( long nRow );
- // window overloads
+ // Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
// IClipboardTest
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 4d56b8769ed0..e92651cdea3e 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -62,7 +62,7 @@ namespace dbaui
void SaveData( OFieldDescription* pFieldDescr );
void SetReadOnly( bool bReadOnly );
- // window overloads
+ // Window overrides
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 96ff8bdcde73..1c8365e9ee67 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -531,7 +531,7 @@ namespace drawinglayer
used to support the old XOR paint-'trick'.
It does not need an own identifier since a renderer who wants to interpret
- it itself may do so. It just overloads the decomposition of the C++
+ it itself may do so. It just overrides the decomposition of the C++
implementation class to do an alternative decomposition.
*/
class NonOverlappingFillGradientPrimitive2D : public FillGradientPrimitive2D
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 32b9adea417a..78a997e2cbbb 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1941,7 +1941,7 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
const SvxNumberFormat* EditEngine::GetNumberFormat( sal_Int32 nPara ) const
{
- // derived objects may overload this function to give access to
+ // derived objects may override this function to give access to
// bullet information (see Outliner)
(void) nPara;
return 0;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 055b198a11de..b777fc34afa5 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4233,7 +4233,8 @@ const SvxNumberFormat* ImpEditEngine::GetNumberFormat( const ContentNode *pNode
DBG_ASSERT( nPara < EE_PARA_NOT_FOUND, "node not found in array" );
if (nPara < EE_PARA_NOT_FOUND)
{
- // the called function may be overloaded by an OutlinerEditEng object to provide
+ // the called function may be overridden by an OutlinerEditEng
+ // object to provide
// access to the SvxNumberFormat of the Outliner.
// The EditEngine implementation will just return 0.
pRes = pEditEngine->GetNumberFormat( nPara );
diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java
index dcc4b6b8fca6..d53cc155a425 100644
--- a/embeddedobj/test/Container1/NativeView.java
+++ b/embeddedobj/test/Container1/NativeView.java
@@ -43,7 +43,7 @@ public class NativeView extends java.awt.Canvas
* ctor
* Does nothing really.
* We can use our JNI mechanism for an already visible
- * canvas only. So we overload the method for showing ( "setVisible()" )
+ * canvas only. So we override the method for showing ( "setVisible()" )
* and make our intialization there. BUt we try to show an empty clean
* window till there.
*/
@@ -57,7 +57,7 @@ public class NativeView extends java.awt.Canvas
/**
- * Overload this method to make necessary initializations here.
+ * Override this method to make necessary initializations here.
* ( e.g. get the window handle and necessary system information )
*
* Why here?
@@ -96,7 +96,7 @@ public class NativeView extends java.awt.Canvas
/**
- * overload paint routine to show provide against
+ * override paint routine to show provide against
* repaint errors if no office view is really plugged
* into this canvas.
* If handle is present - we shouldn't paint anything further.
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index f085e8cb5c48..24ab22f48f2b 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -65,7 +65,7 @@ public:
class declaration ProviderOleWrapper_Impl
Provides an UNO service provider as OLE class factory. Handle the
- OLE registration by overloading the abstract methods from
+ OLE registration by overriding the abstract methods from
IClassFactoryWrapper.
Acts as a COM class factory. When IClassFactory::CreateInstance is being called
@@ -109,7 +109,7 @@ protected:
class declaration OneInstanceOleWrapper_Impl
Provides an single UNO object as OLE object. Handle the
- OLE registration by overloading the abstract methods from
+ OLE registration by overriding the abstract methods from
IClassFactoryWrapper.
Acts as a COM class factory. When IClassFactory::CreateInstance is being called
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index cc19ec88bfec..2b2536935815 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6476,7 +6476,7 @@ bool SvxMSDffManager::ProcessClientData(SvStream& rStData, sal_uInt32 nDatLen,
void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader& /* rHd */ , void* /* pData */, DffObjData& /* rObj */ )
{
- return; // will be overloaded by SJ in Draw
+ return; // will be overridden by SJ in Draw
}
bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, SvStorageRef&, uno::Reference < embed::XStorage >& ) const
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 01bc858da06f..fa12c3ce0c4e 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -345,7 +345,8 @@ void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps
void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [out] */ o_rAggregateProperties ) const
{
OBoundControlModel::describeAggregateProperties( o_rAggregateProperties );
- // remove ImageURL and Graphic properties, we "overload" them. This is because our aggregate synchronizes those
+ // remove ImageURL and Graphic properties, we "override" them.
+ // This is because our aggregate synchronizes those
// two, but we have an own sychronization mechanism.
RemoveProperty( o_rAggregateProperties, PROPERTY_IMAGE_URL );
RemoveProperty( o_rAggregateProperties, PROPERTY_GRAPHIC );
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 71ad12e50887..d111fc8616fe 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -588,7 +588,7 @@ namespace frm
Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) throw (RuntimeException, std::exception)
{
// order matters:
- // we definitely want to "overload" the XImageProducer interface of our aggregate,
+ // we definitely want to "override" the XImageProducer interface of our aggregate,
// thus check OClickableImageBaseModel_Base (which provides this) first
Any aReturn = OClickableImageBaseModel_Base::queryInterface( _rType );
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 21ca7fd44e41..e5b5ffc59ff7 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -499,8 +499,8 @@ protected:
The default implementation simply asks m_xAggregateSet for its properties.
- You usually only need to overload this method if you want to filter the aggregate
- properties.
+ You usually only need to override this method if you want to filter the
+ aggregate properties.
*/
virtual void describeAggregateProperties(
::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 2c5bf9ba9996..a5bfde1241e3 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -188,7 +188,7 @@ namespace svt
// URLs should always be UTF8 encoded and escaped
OString sID( OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) );
if ( _bFileView )
- // the file view "overloaded" the SetHelpId
+ // the file view "overrides" the SetHelpId
static_cast< SvtFileView* >( _pControl )->SetHelpId( sID );
else
_pControl->SetHelpId( sID );
@@ -199,7 +199,7 @@ namespace svt
{
OString aHelpId = _pControl->GetHelpId();
if ( _bFileView )
- // the file view "overloaded" the SetHelpId
+ // the file view "overrides" the SetHelpId
aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( );
OUString sHelpURL;
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index 46334643c86c..6e4b24201504 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -34,7 +34,7 @@ namespace /* private */
// a lot of files in a large directory we may reach this
// limit and don't want to get out of memory;
// another much more elegant way would be to subclass the
- // FileOpen dialog and overload the BM_CLICK event of the
+ // FileOpen dialog and override the BM_CLICK event of the
// OK button so that we determine the size of the text
// currently in the edit field and resize our buffer
// appropriately - in the future we will do this
@@ -523,8 +523,7 @@ void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild)
OSL_ASSERT(GetParent(hwndChild) == hwndDlg);
- // calling virtual function which the
- // client can overload
+ // calling virtual function which the client can override
onInitDialog(hwndDlg);
}
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
index dd9a4c2fbf83..8c2f6ce3e6c4 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx
@@ -164,7 +164,7 @@ protected:
virtual void SAL_CALL onFolderChanged();
virtual void SAL_CALL onTypeChanged( sal_uInt32 nFilterIndex );
- // call base class method first when overloading
+ // call base class method first when overriding
virtual void SAL_CALL onInitDialog( HWND hwndDlg );
virtual sal_uInt32 SAL_CALL onCtrlCommand( HWND hwndDlg, sal_uInt16 ctrlId, sal_uInt16 notifyCode );
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index cde340f913c7..4f0fcff181b2 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -167,7 +167,7 @@ class AddonsOptions_Impl : public ConfigItem
AddonsOptions_Impl();
virtual ~AddonsOptions_Impl();
- // overloaded methods of baseclass
+ // overridden methods of baseclass
/*-****************************************************************************************************
@short called for notify of configmanager
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 92e7c03f4144..1004a2b1fd96 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -311,7 +311,7 @@ namespace basegfx
} // end of namespace basegfx
-// RasterConversionLineEntry3D for Raterconversion of 3D PolyPolygons
+// RasterConversionLineEntry3D for Rasterconversion of 3D PolyPolygons
namespace basegfx
{
@@ -408,8 +408,8 @@ namespace basegfx
} // end of namespace basegfx
-// the basic RaterConverter itself. Only one method needs to be overloaded. The
-// class itself is strictly virtual
+// the basic RasterConverter itself. Only one method needs to be overridden. The
+// class itself is pure virtual
namespace basegfx
{
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index 09ae3f2c764c..e5ee70866aec 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -27,7 +27,7 @@ namespace comphelper {
/** this class provides a basic helper for classes supporting the XServiceInfo Interface.
*
- * you can overload the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
+ * you can override the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
* you can use the static helper methods to combine your services with that of parent
* or aggregatet classes.
*/
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index b6e2dcd60cc3..533a1a7f030b 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -47,7 +47,7 @@ namespace comphelper
virtual void SAL_CALL release() throw() SAL_OVERRIDE { baseclass::release(); }
/** used for declaring UNO3-Defaults, i.e. acquire/release if you want to forward all queryInterfaces to the base class,
- (e.g. if you overload queryAggregation)
+ (e.g. if you override queryAggregation)
*/
#define DECLARE_UNO3_AGG_DEFAULTS(classname, baseclass) \
virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { baseclass::acquire(); } \
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 7573b5a462d5..3cde90b277a4 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -128,7 +128,7 @@ namespace connectivity
// called when XDrop was called
virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName);
- /** returns the name for the object. The default implementation ask for the property NAME. If this doesn't satisfy, it has to be overloaded.
+ /** returns the name for the object. The default implementation ask for the property NAME. If this doesn't satisfy, it has to be overridden.
@param _xObject The object where the name should be extracted.
@return The name of the object.
*/
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index fc1ded273699..ec769e354ac8 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -348,7 +348,7 @@ protected:
This abstract class maps the methods of the interfaces XMultiPropertySet, XFastPropertySet
and XPropertySet to the methods getInfoHelper, convertFastPropertyValue,
setFastPropertyValue_NoBroadcast and getFastPropertyValue. You must derive from
- this class and overload the methods.
+ this class and override the methods.
It provides a standard implementation of the XPropertySetInfo.
The XPropertiesChangeListener are inserted in the rBHelper.aLC structure.
The XPropertyChangeListener and XVetoableChangeListener with no names are inserted
diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx
index 6fe04d5423ac..821294bf4433 100644
--- a/include/dbaccess/ToolBoxHelper.hxx
+++ b/include/dbaccess/ToolBoxHelper.hxx
@@ -54,7 +54,8 @@ namespace dbaui
*/
virtual void setImageList(sal_Int16 _eSymbolsSize) = 0;
- /** only the member will be set, derived classes can overload this function and do what need to be done.
+ /** only the member will be set, derived classes can override
+ this function and do what need to be done.
@param _pTB
The new ToolBox.
@attention
diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
index 486434f26ef2..4b54c01eee79 100644
--- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx
@@ -88,8 +88,9 @@ namespace drawinglayer
/// provide unique ID
DeclPrimitive2DIDBlock()
- /** The getDecomposition is overloaded here since the decompose is dependent of the point in time,
- so the default implementation is nut useful here, it needs to be handled locally
+ /** Override getDecomposition() here since the decompose
+ depends on the point in time, so the default implementation is
+ not useful here, it needs to be handled locally
*/
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index 2b48c9112b4a..3b789eb00bcb 100644
--- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
@@ -73,7 +73,7 @@ namespace drawinglayer
/// provide unique ID
DeclPrimitive2DIDBlock()
- /// Overload standard getDecomposition call to be view-dependent here
+ /// Override standard getDecomposition call to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 42d586ee0a68..f72ff91b2f46 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -149,8 +149,8 @@ namespace drawinglayer
/** the ==operator is mainly needed to allow testing newly-created primitives against their last
incarnation which buffers/holds the made decompositions. The default implementation
- uses getPrimitive2DID()-calls to test if it's the same ID at last. Overloaded implementation are then
- based on this implementation
+ uses getPrimitive2DID()-calls to test if it's the same ID at last.
+ Overridden implementations are then based on this implementation
*/
virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
bool operator!=( const BasePrimitive2D& rPrimitive ) const { return !operator==(rPrimitive); }
@@ -247,7 +247,7 @@ namespace drawinglayer
/** The getDecomposition default implementation will on demand use create2DDecomposition() if
maBuffered2DDecomposition is empty. It will set maBuffered2DDecomposition to this obtained decomposition
to buffer it. If the decomposition is also ViewInformation2D-dependent, this method needs to be
- overloaded and the ViewInformation2D for the last decomposition need to be remembered, too, and
+ overridden and the ViewInformation2D for the last decomposition need to be remembered, too, and
be used in the next call to decide if the buffered decomposition may be reused or not.
*/
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
index 38a6d87b1f31..9de1e3f5b7b6 100644
--- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
@@ -100,7 +100,7 @@ namespace drawinglayer
/// provide unique ID
DeclPrimitive2DIDBlock()
- /// Overload standard getDecomposition call to be view-dependent here
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index a7648a64f3e4..51240df45c98 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -92,7 +92,7 @@ namespace drawinglayer
/// get range
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
- /// get local decomposition. Overloaded since this decomposition is view-dependent
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
/// provide unique ID
diff --git a/include/drawinglayer/primitive2d/gridprimitive2d.hxx b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
index bf2976619e00..de2f8de14613 100644
--- a/include/drawinglayer/primitive2d/gridprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/gridprimitive2d.hxx
@@ -106,7 +106,7 @@ namespace drawinglayer
/// provide unique ID
DeclPrimitive2DIDBlock()
- /// Overload standard getDecomposition call to be view-dependent here
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
index 9b101d946794..d460a418bb25 100644
--- a/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/helplineprimitive2d.hxx
@@ -101,7 +101,7 @@ namespace drawinglayer
/// provide unique ID
DeclPrimitive2DIDBlock()
- /// Overload standard getDecomposition call to be view-dependent here
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 04bef93a4cd6..62e2f20361d6 100644
--- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -132,7 +132,7 @@ namespace drawinglayer
/// get range
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
- /// get local decomposition. Overloaded since this decomposition is view-dependent
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
/// provide unique ID
diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx b/include/drawinglayer/primitive2d/primitivetools2d.hxx
index e592a956f8f8..824306e4c77b 100644
--- a/include/drawinglayer/primitive2d/primitivetools2d.hxx
+++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx
@@ -65,7 +65,7 @@ namespace drawinglayer
/// data read access
double getDiscreteUnit() const { return mfDiscreteUnit; }
- /// get local decomposition. Overloaded since this decomposition is view-dependent
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
@@ -104,7 +104,7 @@ namespace drawinglayer
/// data read access
const basegfx::B2DRange& getViewport() const { return maViewport; }
- /// get local decomposition. Overloaded since this decomposition is view-dependent
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
@@ -143,7 +143,7 @@ namespace drawinglayer
/// data read access
const basegfx::B2DHomMatrix& getViewTransformation() const { return maViewTransformation; }
- /// get local decomposition. Overloaded since this decomposition is view-dependent
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
@@ -186,7 +186,7 @@ namespace drawinglayer
const basegfx::B2DHomMatrix& getViewTransformation() const { return maViewTransformation; }
const basegfx::B2DHomMatrix& getObjectTransformation() const { return maObjectTransformation; }
- /// get local decomposition. Overloaded since this decomposition is view-dependent
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
index e0f6ca506aa5..a4109b6c769f 100644
--- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx
@@ -146,7 +146,7 @@ namespace drawinglayer
/// provide unique ID
DeclPrimitive2DIDBlock()
- /// get local decomposition. Overloaded since this decomposition is view-dependent
+ /// get local decomposition. Override since this decomposition is view-dependent
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
index 27fad99b2f0c..31ff15f76e24 100644
--- a/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/texteffectprimitive2d.hxx
@@ -93,7 +93,7 @@ namespace drawinglayer
/// provide unique ID
DeclPrimitive2DIDBlock()
- /// Overload standard getDecomposition call to be view-dependent here
+ /// Override standard getDecomposition to be view-dependent here
virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE;
};
} // end of namespace primitive2d
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 69e18b4043e7..d1ee1e213676 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -90,8 +90,8 @@ namespace drawinglayer
/** the ==operator is mainly needed to allow testing newly-created high level primitives against their last
incarnation which buffers/holds the decompositionsThe default implementation
- uses getPrimitive3DID()-calls to test if it's the same ID at last. Overloaded implementation are then
- based on this implementation.
+ uses getPrimitive3DID()-calls to test if it's the same ID at last.
+ Overridden implementation are then based on this implementation.
*/
virtual bool operator==( const BasePrimitive3D& rPrimitive ) const;
bool operator!=( const BasePrimitive3D& rPrimitive ) const { return !operator==(rPrimitive); }
@@ -168,7 +168,7 @@ namespace drawinglayer
/** The getDecomposition default implementation will on demand use create3DDecomposition() if
maBuffered3DDecomposition is empty. It will set maBuffered3DDecomposition to this obtained decomposition
to buffer it. If the decomposition is also ViewInformation-dependent, this method needs to be
- overloaded and the ViewInformation for the last decomposition needs to be remembered, too, and
+ overridden and the ViewInformation for the last decomposition needs to be remembered, too, and
be used in the next call to decide if the buffered decomposition may be reused or not.
*/
virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE;
diff --git a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
index 030144f8e91c..62457b4f074f 100644
--- a/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx
@@ -113,7 +113,7 @@ namespace drawinglayer
/// get range
virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE;
- /// Overloaded to allow for reduced line mode to decide if to buffer decomposition or not
+ /// Overridden to allow for reduced line mode to decide if to buffer decomposition or not
virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE;
/// provide unique ID
diff --git a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
index bf6dfb237a0b..a321d900253a 100644
--- a/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx
@@ -131,7 +131,7 @@ namespace drawinglayer
/// get range
virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE;
- /// Overloaded to allow for reduced line mode to decide if to buffer decomposition or not
+ /// Overridden to allow for reduced line mode to decide if to buffer decomposition or not
virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const SAL_OVERRIDE;
/// provide unique ID
diff --git a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx
index b8244f4a2a16..c8a2d329a0f3 100644
--- a/include/drawinglayer/primitive3d/sdrprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrprimitive3d.hxx
@@ -36,7 +36,7 @@ namespace drawinglayer
/** SdrPrimitive3D class
Base class for the more complicated geometric primitives, so
- derive from buffered primitive to allow overloading of
+ derive from buffered primitive to allow overriding of
create3DDecomposition there.
*/
namespace primitive3d
diff --git a/include/drawinglayer/processor2d/baseprocessor2d.hxx b/include/drawinglayer/processor2d/baseprocessor2d.hxx
index bb3502191080..70fa3b61f32a 100644
--- a/include/drawinglayer/processor2d/baseprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/baseprocessor2d.hxx
@@ -62,7 +62,7 @@ namespace drawinglayer
derived from that primitive. This is the preparation to handle unknown implementations
of the com::sun::star::graphic::XPrimitive2D interface in the future.
- So, to implement a basic processor, it is necessary to overload and implement the
+ So, to implement a basic processor, it is necessary to override and implement the
processBasePrimitive2D(..) method. A minimal renderer has to support the
Basic Primitives (see baseprimitive2d.hxx) and the Grouping Primitives (see
groupprimitive2d.hxx). These are (currently):
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index 882b0a4428ee..444a732c61de 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -492,7 +492,7 @@ public:
virtual void FieldSelected( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos );
virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor );
- // to be overloaded if access to bullet information needs to be provided
+ // override this if access to bullet information needs to be provided
virtual const SvxNumberFormat * GetNumberFormat( sal_Int32 nPara ) const;
virtual Rectangle GetBulletArea( sal_Int32 nPara );
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 09addbc7c7ff..3e2743e17cd1 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -133,17 +133,17 @@ public:
/**
Dummy methods to avoid switches and casts where possible,
- the real token classes have to overload the appropriate method[s].
- The only methods valid anytime if not overloaded are:
+ the real token classes have to override the appropriate method[s].
+ The only methods valid anytime if not overridden are:
- GetByte() since this represents the count of parameters to a function
which of course is 0 on non-functions. FormulaByteToken and ScExternal do
- overload it.
+ override it.
- HasForceArray() since also this is only used for operators and
functions and is 0 for other tokens.
- Any other non-overloaded method pops up an assertion.
+ Any other non-overridden method pops up an assertion.
*/
virtual sal_uInt8 GetByte() const;
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 9b9bc8f805bb..9c1e6ee5feee 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -226,7 +226,7 @@ public:
virtual FormulaToken* AddOpCode(OpCode e);
/** Adds the single token to array.
- Derived classes must overload it when they want to support derived classes from FormulaToken.
+ Derived classes must override it when they want to support derived classes from FormulaToken.
@return true when an error occurs
*/
virtual bool AddFormulaToken(
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index d1cd9f4138c2..10fea30971bb 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -293,7 +293,7 @@ public:
bool DoSaveAs( SfxMedium &rNewStor );
bool DoSaveObjectAs( SfxMedium &rNewStor, bool bCommit );
- // TODO/LATER: currently only overloaded in Calc, should be made non-virtual
+ // TODO/LATER: currently only overridden in Calc, should be made non-virtual
virtual bool DoSaveCompleted( SfxMedium* pNewStor=0 );
virtual bool LoadOwnFormat( SfxMedium& pMedium );
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 69d8e750442b..f0e98a5f10b1 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -176,7 +176,7 @@ public:
virtual ~SfxShell();
/**
- With this virtual method, which is automatically overloaded by each subclass
+ With this virtual method, which is automatically overridden by each subclass
with its own slots through the macro <SFX_DECL_INTERFACE>, one can access
each of the <SfxInterface> instance beloning to the subclass.
@@ -223,7 +223,7 @@ public:
If the slot does not have a Status, a SfxVoidItem is returned.
The status is set directly in this Set when pStateSet != 0 , so that
- overloaded Slots of the <SfxShell> Subclasses and also in the Status
+ overridden Slots of the <SfxShell> Subclasses and also in the Status
method of the base implementation can be called.
[Example]
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 298ea3df3157..57ce556a53ea 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -59,7 +59,7 @@ namespace drawinglayer {
should be encircled can be specified. Optional a NoSelection or name
field could be shown. By default image and color items are supported.
Items could be drawn by oneself if InsertItem() is only called with
- an ID. To achieve this the UserDraw handler needs to be overloaded. The
+ an ID. To achieve this the UserDraw handler needs to be overridden. The
description text could be specified afterwards in case of UserDraw
and any other items.
@@ -130,13 +130,13 @@ namespace drawinglayer {
--------------------------------------------------------------------------
If Drag and Drop will be called from the ValueSet the Command-Handler has to
- be overloaded. From this StartDrag needs to be called. If this method returns
+ be overridden. From this StartDrag needs to be called. If this method returns
sal_True the drag-process could be initiated by ExecuteDrag(), otherwise no
processing will take place. This method makes sure that ValueSet stops its
processing and as appropriate selects the entry. Therefore the calling of
Select-Handler within this function must be expected.
- For dropping QueryDrop() and Drop() need to be overloaded and ShowDropPos()
+ For dropping QueryDrop() and Drop() need to be overridden and ShowDropPos()
and HideDropPos() should be called within these methods.
To show the insertion point ShowDropPos() has to be called within the
QueryDrop-Handler. ShowDropPos() also scrolls the ValueSet if the passed
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index 1671dce9ef3f..940d62485394 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -62,9 +62,9 @@ public:
void SetNumberFormatter(SvNumberFormatter* pNew);
SvNumberFormatter* GetNumberFormatter() const;
- // overload to adapt attributes in the document
+ // override to adapt attributes in the document
virtual void NumberFormatDeleted(sal_uInt32 nKey);
- // overload to possibly format something anew
+ // override to possibly format something anew
virtual void SettingsChanged();
// XNumberFormatsSupplier
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 1384ff7fc23e..5fb89b0823ba 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -345,7 +345,7 @@ protected:
// software plug for database access
// RowCount is counted automatically
- // (with the help of RowInserted and RowRemoved), so overloading of
+ // (with the help of RowInserted and RowRemoved), so overriding of
// the method is needless
public:
virtual long GetRowCount() const SAL_OVERRIDE;
@@ -428,7 +428,7 @@ public:
BrowserMode nMode = 0 );
virtual ~BrowseBox();
- // inherited overloaded handler
+ // override inherited handler
virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE;
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index f4fba4daa1fc..9a6c24d80046 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -279,7 +279,7 @@ protected:
void ImplShowTargetEmphasis( SvTreeListEntry* pEntry, bool bShow);
void EnableSelectionAsDropTarget( bool bEnable = true,
bool bWithChildren = true );
- // Standard impl returns 0; must be overloaded by derived classes which support D'n'D
+ // Standard impl returns 0; derived classes which support D'n'D must override
using Window::GetDropTarget;
virtual SvTreeListEntry* GetDropTarget( const Point& );
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 10db4d5c5a03..28a74a7dbd73 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -54,7 +54,7 @@ The amount of columns drawn by the control and whether the items
should be encircled can be specified. Optional a NoSelection or name
field could be shown. By default image and color items are supported.
Items could be drawn by oneself if InsertItem() is only called with
-an ID. To achieve this the UserDraw handler needs to be overloaded. The
+an ID. To achieve this the UserDraw handler needs to be overridden. The
description text could be specified afterwards in case of UserDraw
and any other items.
@@ -152,13 +152,13 @@ activated before Paint by calling Format().
--------------------------------------------------------------------------
If Drag and Drop will be called from the ValueSet the Command-Handler has to
-be overloaded. From this StartDrag needs to be called. If this method returns
+be overridden. From this StartDrag needs to be called. If this method returns
sal_True the drag-process could be initiated by ExecuteDrag(), otherwise no
processing will take place. This method makes sure that ValueSet stops its
processing and as appropriate selects the entry. Therefore the calling of
Select-Handler within this function must be expected.
-For dropping QueryDrop() and Drop() need to be overloaded and ShowDropPos()
+For dropping QueryDrop() and Drop() need to be overridden and ShowDropPos()
and HideDropPos() should be called within these methods.
To show the insertion point ShowDropPos() has to be called within the
QueryDrop-Handler. ShowDropPos() also scrolls the ValueSet if the passed
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index a14bb5b4a960..2d31c97f3e8c 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -524,7 +524,7 @@ protected:
void UpdateDispatches(); // will connect if not already connected and just update else
/** If a derived class wants to listen at some column properties, it doesn't have
- to overload all methods affecting columns (setColumns, elementInserted, elementRemoved ...)
+ to override all methods affecting columns (setColumns, elementInserted, elementRemoved ...)
Instead it may use addColumnListeners and removeColumnListeners which are called in all
the cases.
*/
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index f10cb4a6a55e..09b63255db00 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -188,10 +188,10 @@ public:
// get Primitive2DParameters for this view
const drawinglayer::geometry::ViewInformation2D& getViewInformation2D() const { return maViewInformation2D; }
- // access to SdrPageView. May return 0L like the default implementations do. Needs to be overloaded as needed.
+ /// access to SdrPageView. May return 0L like the default implementations do. Override as needed.
virtual SdrPageView* TryToGetSdrPageView() const;
- // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
+ /// access to OutputDevice. May return 0L like the default implementations do. Override as needed.
virtual OutputDevice* TryToGetOutputDevice() const;
// reset ViewPort at internal ViewInformation2D. This is needed when the OC is used
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 9ff322ff7e33..c3f55b884fc2 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -81,7 +81,6 @@ public:
// pdf export? Default is false
virtual bool isOutputToPDFFile() const SAL_OVERRIDE;
- // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE;
};
@@ -109,7 +108,6 @@ public:
void SetStartPage(const SdrPage* pPage);
const SdrPage* GetStartPage() const { return mxStartPage.get(); }
- // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE;
};
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index dae75a50e1ac..446fb15fc10a 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -110,7 +110,7 @@ public:
// Access to possible sub-hierarchy and parent. GetObjectCount() default is 0L
// and GetViewContact default pops up an assert since it's an error if
- // GetObjectCount has a result != 0 and it's not overloaded.
+ // GetObjectCount has a result != 0 and it's not overridden.
virtual sal_uInt32 GetObjectCount() const;
virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const;
virtual ViewContact* GetParentContact() const;
@@ -123,7 +123,7 @@ public:
virtual void ActionChanged();
// access to SdrObject and/or SdrPage. May return 0L like the default
- // implementations do. Needs to be overloaded as needed.
+ // implementations do. Override as needed.
virtual SdrObject* TryToGetSdrObject() const;
virtual SdrPage* TryToGetSdrPage() const;
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index e35cf85984a3..6d21e48b0e42 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -65,7 +65,7 @@ public:
// React on changes of the object of this ViewContact
virtual void ActionChanged() SAL_OVERRIDE;
- // overload for acessing the SdrObject
+ /// override for accessing the SdrObject
virtual SdrObject* TryToGetSdrObject() const SAL_OVERRIDE;
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index 84b168946122..6dee41409975 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -42,7 +42,7 @@ public:
virtual ~ViewObjectContactRedirector();
// 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);
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index ec98225e0254..243b1c6c8a4a 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -99,7 +99,7 @@ namespace sdr
bool mbIsHittable : 1;
// Flag to hold info if this objects supports animation. Default is
- // false. If true, the Trigger() method should be overloaded
+ // false. If true, the Trigger() method should be overridden
// to implement the animation effect and to re-initiate the event.
bool mbAllowsAnimation : 1;
@@ -126,7 +126,7 @@ namespace sdr
OverlayManager* getOverlayManager() const { return mpOverlayManager; }
// the access method for Primitive2DSequence. Will use createPrimitive2DSequence and
- // setPrimitive2DSequence if needed. Overloading may be used to allow disposal of last
+ // setPrimitive2DSequence if needed. Overriding may be used to allow disposal of last
// created primitives to react on changed circumstances and to re-create primitives
virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const;
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index 1e4c136d7c00..846c6ba0ce12 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -71,7 +71,7 @@ namespace sdr
const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; }
bool getBorder() const { return mbBorder; }
- // overloaded to check conditions for last createOverlayObjectPrimitive2DSequence
+ /// override to check conditions for last createOverlayObjectPrimitive2DSequence
virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const SAL_OVERRIDE;
// data write access
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 511b74956acc..d25970d46976 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -66,7 +66,7 @@ namespace sdr
SdrObject& GetSdrObject();
// Test changeability for a single item. If a implementation wants to prevent
- // changing an item this method may be overloaded.
+ // changing an item it should override this method.
virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const = 0;
// Do the internal ItemChange. If only nWhich is given, the item needs to be cleared.
@@ -99,8 +99,8 @@ namespace sdr
// merging of ItemSets is done for e.g. Group objects.
virtual const SfxItemSet& GetObjectItemSet() const = 0;
- // get merged ItemSet. Normappl, this maps directly to GetObjectItemSet(), but may
- // be overloaded e.g for group objects to return a merged ItemSet of the object.
+ // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
+ // be overridden e.g for group objects to return a merged ItemSet of the object.
// When using this method the returned ItemSet may contain items in the state
// SfxItemState::DONTCARE which means there were several such items with different
// values.
@@ -145,12 +145,12 @@ namespace sdr
// Get the installed StyleSheet.
virtual SfxStyleSheet* GetStyleSheet() const = 0;
- // Scale the local ItemSet as far as it contains metric items. This needs to be
- // overloaded to do it for hierarchical objects like e.g. groups.
+ // Scale the local ItemSet as far as it contains metric items.
+ // Override this to do it for hierarchical objects like e.g. groups.
virtual void Scale(const Fraction& rScale);
- // Move local items to a new ItemPool. This needs to be
- // overloaded to do it for hierarchical objects like e.g. groups.
+ // Move local items to a new ItemPool.
+ // Override this to do it for hierarchical objects like e.g. groups.
virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L);
// Set new model.
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index cf7bf8f728fb..38724021fe8d 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -404,7 +404,7 @@ public:
void SetVirtualObjectBundling(bool bOn) { bBundleVirtObj=bOn; }
bool IsVirtualObjectBundling() const { return bBundleVirtObj; }
- // overloaded from SdrMarkView, for internal use
+ // override SdrMarkView, for internal use
virtual void MarkListHasChanged() SAL_OVERRIDE;
virtual void ModelHasChanged() SAL_OVERRIDE;
};
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 26158651a77d..2eb9bb1b9f5c 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -98,7 +98,7 @@ private:
protected:
// central method to get an SdrUndoManager for enhanced TextEdit. Default will
// try to return a dynamic_casted GetModel()->GetSdrUndoManager(). Applications
- // which want to use this feature will need to overload this virtual method,
+ // which want to use this feature will need to override this virtual method,
// provide their document UndoManager and derive it from SdrUndoManager.
virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index afd7908e62db..a923c78fdc46 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -297,7 +297,7 @@ public:
// Whether the model is being streamed in at the moment
bool IsLoading() const { return false /*BFS01 bLoading */; }
- // Needs to be overladed to enable the Swap/LoadOnDemand of graphics.
+ // Override this to enable the Swap/LoadOnDemand of graphics.
// If rbDeleteAfterUse is set to sal_True the SvStream instance from
// the caller will be disposed after use.
// If this method returns NULL, a temporary file will be allocated for
@@ -464,8 +464,7 @@ public:
// - not be loaded immediately when loading a document,
// but only once they are needed (e.g. displayed).
// - be pruned from memory if they are not needed.
- // For that to work, the virtual method
- // GetDocumentStream() needs to be overloaded.
+ // For that to work, override the virtual method GetDocumentStream().
// Default=FALSE. Flag is not persistent.
bool IsSwapGraphics() const { return bSwapGraphics; }
void SetSwapGraphics(bool bJa = true);
@@ -493,8 +492,8 @@ public:
// Can the model be changed at all?
// Is only evaluated by the possibility methods of the View.
// Direct manipulations on the model, ... do not respect this flag.
- // Should be overloaded and return the appriopriate ReadOnly status
- // of the files, i.e. sal_True or sal_False. (Method is called multiple
+ // Override this and return the appropriate ReadOnly status
+ // of the files, i.e. true or false. (Method is called multiple
// times, so use one flag only!)
virtual bool IsReadOnly() const;
virtual void SetReadOnly(bool bYes);
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index bf33813172af..1d7ba2e24c5e 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -431,7 +431,7 @@ public:
Point GetGridOffset() const;
// Will be always called, if the list of marked objects might be changed.
- // If you overload this method (as programmer), be sure that you call the
+ // If you override this method, be sure that you call the
// methods of the base class!
virtual void MarkListHasChanged();
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 833e0ce2383d..e6add4500019 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -592,7 +592,7 @@ public:
virtual ~StandardCheckVisisbilityRedirector();
// 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/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index f228a69fdec3..a77da32e5470 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -55,7 +55,7 @@ public:
virtual void CheckPortionInfo( SdrOutliner& rOutliner );
virtual void ReformatText();
- // default uses GetObjectItemSet, but may be overloaded to
+ // default uses GetObjectItemSet, but may be overridden to
// return a text-specific ItemSet
virtual const SfxItemSet& GetItemSet() const;
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index d27228c8a09a..62d167ba10f1 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -145,7 +145,7 @@ private:
OUString getAccessibleDescription() => VCL Window::GetAccessibleDescription
OUString getAccessibleName() => VCL Window::GetAccessibleText() => Most windows return Window::GetText()
Reference< XAccessibleRelationSet > getAccessibleRelationSet()
- Reference< XAccessibleStateSet > getAccessibleStateSet() => overload FillAccessibleStateSet( ... )
+ Reference< XAccessibleStateSet > getAccessibleStateSet() => override FillAccessibleStateSet( ... )
---------------------------------------------------------- */
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 63d412960a34..f49a1638a6fe 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -514,17 +514,17 @@ public:
*/
OUString makeEnabled( const OUString& rPropName );
- virtual int getPageCount() const = 0; // must be overloaded by the app
+ virtual int getPageCount() const = 0; /// App must override this
/* get the page parameters, namely the jobsetup that should be active for the page
(describing among others the physical page size) and the "page size". In writer
case this would probably be the same as the JobSetup since writer sets the page size
draw/impress for example print their page on the paper set on the printer,
possibly adjusting the page size to fit. That means the page size can be different from
the paper size.
+ App must override this, return page size in 1/100th mm
*/
- // must be overloaded by the app, return page size in 1/100th mm
virtual css::uno::Sequence< css::beans::PropertyValue > getPageParameters( int i_nPage ) const = 0;
- virtual void printPage( int i_nPage ) const = 0; // must be overloaded by the app
+ virtual void printPage(int i_nPage) const = 0; /// App must override this
virtual void jobStarted(); // will be called after a possible dialog has been shown and the real printjob starts
virtual void jobFinished( com::sun::star::view::PrintableState );
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 6f85fb1af756..185e6bff21ad 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -89,9 +89,9 @@ protected:
SvXMLStylesContext *GetStyles() { return static_cast<SvXMLStylesContext *>(&mxStyles); }
::std::vector< XMLPropertyState > & GetProperties() { return maProperties; }
- // This methos my be overloaded to create a new style. Its called by
+ // Override this method to create a new style. It's called by
// CreateInsert to create a style if a style with the requested family and
- // name couldn't be found. The st
+ // name couldn't be found.
virtual ::com::sun::star::uno::Reference <
::com::sun::star::style::XStyle > Create();
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index d38a09064f4d..4c06d711972e 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -96,7 +96,7 @@ public:
virtual void Finish( bool bOverwrite ) SAL_OVERRIDE;
virtual void SetDefaults() SAL_OVERRIDE;
- // overload FillPropertySet, so we can get at the combined characters
+ // override FillPropertySet, so we can get at the combined characters
virtual void FillPropertySet(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 747594250fa0..111fcae5345f 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -191,33 +191,31 @@ protected:
// get a new namespave map (used in starmath to have a default namespace)
void ResetNamespaceMap();
- // This method can be overloaded to export the content of <office:meta>.
- // There is a default implementation.
+ /// Override this method to export the content of <office:meta>.
+ /// There is a default implementation.
virtual void _ExportMeta();
- // This method can be overloaded to export the content of <office:scripts>.
- // There is a default implementation.
+ /// Override this method to export the content of <office:scripts>.
+ /// There is a default implementation.
virtual void _ExportScripts();
- // This method can be overloaded to export the font declarations
- // The default implementation will export the contents of the
- // XMLFontAutoStylePool if it has been created.
+ /// Override this method to export the font declarations
+ /// The default implementation will export the contents of the
+ /// XMLFontAutoStylePool if it has been created.
virtual void _ExportFontDecls();
- // This method should be overloaded to export the content of <style:styles>.
- // If bUsed is set, used styles should be exported only.
- // Overloaded Methods must call this method !
+ /// Override this method to export the content of <style:styles>.
+ /// If bUsed is set, used styles should be exported only.
+ /// Overriding Methods must call this method !
virtual void _ExportStyles( bool bUsed );
- // This method must be overloaded to export the contents of
- // <style:auto-styles>
+ /// Override this method to export the contents of <style:auto-styles>.
virtual void _ExportAutoStyles() = 0;
- // This method must be overloaded to export the contents of
- // <style:master-styles>
+ /// Override this method to export the contents of <style:master-styles>.
virtual void _ExportMasterStyles() = 0;
- // This method must be overloaded to export the content of <office:body>.
+ /// Override this method to export the content of <office:body>.
virtual void _ExportContent() = 0;
OUString GetSourceShellID() const;
diff --git a/include/xmloff/xmlmultiimagehelper.hxx b/include/xmloff/xmlmultiimagehelper.hxx
index d97a7038fe36..c15bdbd33bf5 100644
--- a/include/xmloff/xmlmultiimagehelper.hxx
+++ b/include/xmloff/xmlmultiimagehelper.hxx
@@ -32,7 +32,7 @@ private:
bool mbSupportsMultipleContents;
protected:
- /// helper to get the created xShape instance, needs to be overloaded
+ /// helper to get the created xShape instance, override this
virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const = 0;
virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const = 0;
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 761872cbd5e6..2301e00df6ed 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -57,8 +57,7 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport
protected:
- // This method may be overloaded to add attributes to the <list-style>
- // element.
+ /// Override this to add attributes to the <list-style> element.
SAL_DLLPRIVATE virtual void AddListStyleAttributes();
SAL_DLLPRIVATE bool exportStyle( const ::com::sun::star::uno::Reference<
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 1d757b8145fc..7b8a356aa2a1 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -230,7 +230,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- // This method must be overloaded to insert styles into the document.
+ // Override this method to insert styles into the document.
virtual void EndElement() SAL_OVERRIDE;
// This allows to add an SvXMLStyleContext to this context from extern
diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java
index 63fc3cd8392c..efd057f8d189 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java
@@ -56,7 +56,7 @@ public class NativeView extends java.awt.Canvas
* ctor
* Does nothing really.
* We can use our JNI mechanism for an already visible
- * canvas only. So we overload the method for showing ("setVisible()")
+ * canvas only. So we override the method for showing ("setVisible()")
* and make our intialization there. BUt we try to show an empty clean
* window till there.
*/
@@ -70,7 +70,7 @@ public class NativeView extends java.awt.Canvas
/**
- * Overload this method to make necessary initializations here.
+ * Override this method to make necessary initializations here.
* (e.g. get the window handle and necessary system information)
*
* Why here?
@@ -113,7 +113,7 @@ public class NativeView extends java.awt.Canvas
/**
- * overload paint routine to show provide against
+ * Override paint routine to show provide against
* repaint errors if no office view is really plugged
* into this canvas.
* If handle is present - we shouldn't paint anything further.
diff --git a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
index bc29513e73fe..521c9e08e512 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
@@ -153,7 +153,7 @@ public class PropChgHelper implements
public void propertyChange( PropertyChangeEvent aEvt )
throws com.sun.star.uno.RuntimeException
{
- // will be overloaded in derived classes
+ // will be overridden in derived classes
}
diff --git a/qadevOOo/runner/lib/DynamicClassLoader.java b/qadevOOo/runner/lib/DynamicClassLoader.java
index db62e730da93..19c536a4ff9c 100644
--- a/qadevOOo/runner/lib/DynamicClassLoader.java
+++ b/qadevOOo/runner/lib/DynamicClassLoader.java
@@ -28,7 +28,7 @@ public class DynamicClassLoader {
/**
* This method returns a class created by its name
* created by call to <code>Class.forName()</code>.<p>
- * This method must be overloaded if another loading
+ * This method must be overridden if another loading
* policy is required for Component and Interface
* testing classes.
*/
diff --git a/qadevOOo/runner/util/DynamicClassLoader.java b/qadevOOo/runner/util/DynamicClassLoader.java
index 8fdd721f1ea2..380bcec0c92c 100644
--- a/qadevOOo/runner/util/DynamicClassLoader.java
+++ b/qadevOOo/runner/util/DynamicClassLoader.java
@@ -25,7 +25,7 @@ public class DynamicClassLoader {
/**
* This method returns a class created by its name
* created by call to <code>Class.forName()</code>.<p>
- * This method must be overloaded if another loading
+ * This method must be overridden if another loading
* policy is required for Component and Interface
* testing classes.
* @param className The name of the class to create.
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 6f2cfca0da64..6235b4e9b268 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -97,7 +97,7 @@ protected:
virtual SdrPage* GetImplPage() const = 0;
virtual void SetObjectItemHelper(const SfxPoolItem& rItem);
- /** called by instances of derived classes to implement their overloading of getUnoShape
+ /** called by instances of derived classes to implement their overriding of getUnoShape
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
getUnoShapeOf( SdrObject& _rSdrObject );
diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx
index 5bd1624ffe90..ac6dc78c68e0 100644
--- a/reportdesign/source/ui/inc/DataProviderHandler.hxx
+++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx
@@ -97,7 +97,7 @@ namespace rptui
bool impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const;
void impl_updateChartTitle_throw(const ::com::sun::star::uno::Any& _aValue);
- // 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/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 047b72759b81..9c6c925cf2b0 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -100,7 +100,7 @@ namespace rptui
OReportController& _rController);
virtual ~ODesignView();
- // window overloads
+ // Window overrides
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 2c1ae5419129..89e643291547 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -279,7 +279,7 @@ namespace rptui
GeometryHandler(GeometryHandler &); // not defined
void operator =(GeometryHandler &); // not defined
- // 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/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
index 850216468405..f5ab78a4deb6 100644
--- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx
+++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx
@@ -88,7 +88,7 @@ namespace rptui
- // 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/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 0af524b81b75..171af0e38a37 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -71,7 +71,7 @@ namespace rptui
/** late ctor
*/
void initialize();
- // WINDOW overloads
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
inline ODesignView* getReportView() const { return m_pView; }
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index ce8615862cee..e0398fde5fad 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -87,7 +87,7 @@ namespace rptui
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- // windows overload
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
protected:
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index 9f85af132872..d1604ae4a28e 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -53,7 +53,7 @@ namespace rptui
// SfxListener
virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint) SAL_OVERRIDE;
- // window overloads
+ // Window overrides
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index fb8fff7cb894..05d4aa4fb73c 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -143,7 +143,7 @@ namespace rptui
void operator =(OViewsWindow&);
protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
- // windows overload
+ // Window overrides
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -154,7 +154,7 @@ namespace rptui
OReportWindow* _pReportWindow);
virtual ~OViewsWindow();
- // windows overload
+ // Window overrides
virtual void Resize() SAL_OVERRIDE;
void resize(const OSectionWindow& _rSectionWindow);
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 396daaa64979..1e2e243cd156 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -103,7 +103,7 @@ uno::Reference< uno::XInterface > SAL_CALL DataProviderHandler::create( const un
{
return *(new DataProviderHandler( _rxContext ));
}
-// 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/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index ebf42942bc98..7b788b57853f 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -281,7 +281,7 @@ uno::Reference< uno::XInterface > SAL_CALL GeometryHandler::create( const uno::R
{
return *(new GeometryHandler( _rxContext ));
}
-// 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/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index d9e9a69d6577..c1202855a0b9 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -84,7 +84,7 @@ uno::Reference< uno::XInterface > SAL_CALL ReportComponentHandler::create( const
{
return *(new ReportComponentHandler( _rxContext ));
}
-// 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/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 0ec4e6cfa5a5..12653280f607 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -816,7 +816,7 @@ public:
getCellRangeByName( const OUString& aRange, const ScAddress::Details& rDetails )
throw(::com::sun::star::uno::RuntimeException);
- // XPropertySet overloaded due to Range-Properties
+ // XPropertySet override due to Range-Properties
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -982,7 +982,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL
getTextFieldMasters() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // XPropertySet overloaded due to cell properties
+ // XPropertySet override due to cell properties
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -1247,7 +1247,7 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents()
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // XPropertySet overloaded due to sheet properties
+ // XPropertySet override due to sheet properties
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -1309,7 +1309,7 @@ public:
virtual void SAL_CALL setName( const OUString& aName )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // XPropertySet overloaded due to column properties
+ // XPropertySet override due to column properties
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -1350,7 +1350,7 @@ public:
ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab);
virtual ~ScTableRowObj();
- // XPropertySet overloaded due to row properties
+ // XPropertySet override due to row properties
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >
SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index cd2ffad67dc7..d43156c42484 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -260,7 +260,7 @@ public:
SC_DLLPUBLIC static ScDataPilotDescriptorBase* getImplementation( const com::sun::star::uno::Reference<
com::sun::star::sheet::XDataPilotDescriptor> xObj );
- // XTypeProvider (overloaded in ScDataPilotTableObj)
+ // XTypeProvider (override in ScDataPilotTableObj)
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
@@ -362,7 +362,7 @@ public:
::com::sun::star::util::XModifyListener >& aListener )
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- // XTypeProvider (overloaded)
+ // XTypeProvider (override)
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 4be896cfdb7a..9030090939ba 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -129,7 +129,7 @@ public:
virtual const ScDPFilteredCache& GetCacheTable() const = 0;
virtual void ReloadCacheTable() = 0;
- // overloaded in ScDPGroupTableData:
+ // override in ScDPGroupTableData:
virtual bool IsBaseForGroup(long nDim) const;
virtual long GetGroupBase(long nGroupDim) const;
virtual bool IsNumOrDateGroup(long nDim) const;
diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx
index b6a1da3d60b0..c71314c8bcf5 100644
--- a/sc/inc/optuno.hxx
+++ b/sc/inc/optuno.hxx
@@ -62,7 +62,7 @@ public:
ScDocOptionsObj( const ScDocOptions& rOpt );
virtual ~ScDocOptionsObj();
- // get/setPropertyValue overloaded to used stored options instead of document
+ // get/setPropertyValue override to used stored options instead of document
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx
index 54ce43d7927e..978b3ab636b2 100644
--- a/sc/source/core/inc/ddelink.hxx
+++ b/sc/source/core/inc/ddelink.hxx
@@ -58,11 +58,11 @@ public:
void Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const;
- // overloaded by SvBaseLink:
+ // SvBaseLink override:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE;
- // overloaded by SvtBroadcaster:
+ // SvtBroadcaster override:
virtual void ListenersGone() SAL_OVERRIDE;
// for interpreter:
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 12b249f87127..6706e7f8a384 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -377,9 +377,9 @@ protected:
virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE;
inline sal_Size GetHeaderByteCount() const { return 12; }
- // overload to save action data without header, called by SaveCont()
+ // override to save action data without header, called by SaveCont()
virtual void SaveActionData( XclExpStream& rStrm ) const = 0;
- // overload to get action size without header, called by GetLen()
+ // override to get action size without header, called by GetLen()
virtual sal_Size GetActionByteCount() const = 0;
// do something before writing the record
@@ -403,7 +403,7 @@ public:
inline bool ForceInfoRecord() const { return bForceInfo; }
// set own index & return new index
- // could be overloaded to use more indexes per action
+ // could override to use more indexes per action
virtual void SetIndex( sal_uInt32& rIndex );
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx
index 1b90097cbccf..a38f0edfefc4 100644
--- a/sc/source/filter/inc/xcl97esc.hxx
+++ b/sc/source/filter/inc/xcl97esc.hxx
@@ -37,7 +37,7 @@ public:
explicit XclEscherExGlobal( const XclExpRoot& rRoot );
private:
- /** Overloaded to create a new temporary file and return its stream. */
+ /** Override to create a new temporary file and return its stream. */
virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE;
private:
diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index dc2be34a7fab..337ae0ac04a4 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -845,7 +845,7 @@ protected:
virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE;
/** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */
virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE;
- /** Overloaded to do additional processing on the SdrObject. */
+ /** Override to do additional processing on the SdrObject. */
virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE;
private:
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index 6c1d483681ad..10bf52a3ae6d 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -266,7 +266,7 @@ public:
bool bDefaultStyle = false );
virtual ~ScCellTextStyleContext();
- // overload FillPropertySet to store style information
+ // override FillPropertySet to store style information
virtual void FillPropertySet(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6e4a2389bb3e..937888eb757e 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1671,7 +1671,7 @@ void ScTextWnd::LoseFocus()
OUString ScTextWnd::GetText() const
{
- // Overload to get the text via the testtool
+ // Override to get the text via the testtool
if ( pEditEngine )
return pEditEngine->GetText();
else
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx
index 03b8b22762ac..5dbce7033f37 100644
--- a/sc/source/ui/inc/AccessibleCell.hxx
+++ b/sc/source/ui/inc/AccessibleCell.hxx
@@ -107,13 +107,13 @@ public:
///===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the specified child or NULL if index is invalid.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild(sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 5b5f96345655..3d470a2fc4c6 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -96,13 +96,13 @@ public:
///===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the specified child or NULL if index is invalid.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild(sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
index 91f955e75f36..2a9bbd1b3c23 100644
--- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
+++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx
@@ -64,13 +64,13 @@ public:
///===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
/// Return the specified child or NULL if index is invalid.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild(sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx
index cc0d8ca15b44..68dd70e5f40e 100644
--- a/sc/source/ui/inc/AccessiblePreviewCell.hxx
+++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx
@@ -60,7 +60,7 @@ public:
//===== XAccessibleContext ==============================================
- // overloaded to calculate this on demand
+ // override to calculate this on demand
virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
getAccessibleChild( sal_Int32 i )
diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx
index d506b75660d9..ff3659e083df 100644
--- a/sc/source/ui/inc/AccessibleTableBase.hxx
+++ b/sc/source/ui/inc/AccessibleTableBase.hxx
@@ -196,14 +196,14 @@ public:
//===== XAccessibleContext ==============================================
/// Return the number of currently visible children.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual sal_Int32 SAL_CALL
getAccessibleChildCount(void)
throw (::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
/// Return the specified child or NULL if index is invalid.
- // is overloaded to calculate this on demand
+ /// override to calculate this on demand
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
getAccessibleChild(sal_Int32 nIndex)
throw (::com::sun::star::uno::RuntimeException,
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 5320494d7427..d5719480be41 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -67,7 +67,7 @@ private:
void DrawShadedRect( long nStart, long nEnd, const Color& rBaseColor );
protected:
- // Overloaded by Window
+ // Window overrides
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index a6361e7a6d64..7bc1dd590b7f 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -45,7 +45,7 @@ public:
ScInsertTableDlg( vcl::Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile );
virtual ~ScInsertTableDlg();
- virtual short Execute() SAL_OVERRIDE; // overloaded to set parent dialog
+ virtual short Execute() SAL_OVERRIDE; // override to set parent dialog
bool GetTablesFromFile() const { return m_pBtnFromFile->IsChecked(); }
bool GetTablesAsLink() const { return m_pBtnLink->IsChecked(); }
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 409f138d85f8..fb291b4855e3 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -910,7 +910,7 @@ void ScRefHandler::ViewShellChanged()
void ScRefHandler::AddRefEntry()
{
- // needs to be overloaded for multi-references
+ // override this for multi-references
}
bool ScRefHandler::IsTableLocked() const
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index e5608552ec0c..d56a18a8a1ea 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -206,7 +206,7 @@ OUString ScColBar::GetDragHelp( long nVal )
return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) );
}
-bool ScColBar::IsLayoutRTL() const // overloaded only for columns
+bool ScColBar::IsLayoutRTL() const // override only for columns
{
return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
}
@@ -360,14 +360,14 @@ OUString ScRowBar::GetDragHelp( long nVal )
return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) );
}
-SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) const // overloaded only for rows
+SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) const // override only for rows
{
ScDocument* pDoc = pViewData->GetDocument();
SCTAB nTab = pViewData->GetTabNo();
return pDoc->GetHiddenRowCount( nEntryNo, nTab );
}
-bool ScRowBar::IsMirrored() const // overloaded only for rows
+bool ScRowBar::IsMirrored() const // override only for rows
{
return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() );
}
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 13ec1c2c380b..9e1545101b44 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -207,7 +207,7 @@ public:
virtual SdrObject* NbcRemoveObject(size_t nObjNum) SAL_OVERRIDE;
virtual SdrObject* RemoveObject(size_t nObjNum) SAL_OVERRIDE;
- /** Also overload ReplaceObject methods to realize when
+ /** Also override ReplaceObject methods to realize when
objects are removed with this mechanism instead of RemoveObject*/
virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum) SAL_OVERRIDE;
virtual SdrObject* ReplaceObject(SdrObject* pNewObj, size_t nObjNum) SAL_OVERRIDE;
diff --git a/sd/source/core/annotations/Annotation.cxx b/sd/source/core/annotations/Annotation.cxx
index 70f2a0fc4cd8..21a096bdc56d 100644
--- a/sd/source/core/annotations/Annotation.cxx
+++ b/sd/source/core/annotations/Annotation.cxx
@@ -91,7 +91,7 @@ private:
void createChangeUndo();
- // 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.
@@ -173,7 +173,7 @@ Annotation::Annotation( const Reference< XComponentContext >& context, SdPage* p
{
}
-// 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/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 899017d73b46..4ee161e02546 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1687,7 +1687,7 @@ SdrObject* SdPage::NbcRemoveObject(size_t nObjNum)
return FmFormPage::NbcRemoveObject(nObjNum);
}
-// Also overload ReplaceObject methods to realize when
+// Also override ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
@@ -1695,7 +1695,7 @@ SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, size_t nObjNum)
return FmFormPage::NbcReplaceObject(pNewObj, nObjNum);
}
-// Also overload ReplaceObject methods to realize when
+// Also override ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, size_t nObjNum)
{
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;
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index 187a41f1bf0f..2a983fb51c27 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -53,7 +53,7 @@ namespace {
slide.
This implementation shows a preview of the slide given to the
setCurrentSlide. For showing the next slide the PresenterViewFactory
- uses a derived class that overloads the setCurrentSlide() method.
+ uses a derived class that overrides the setCurrentSlide() method.
*/
class PresenterSlidePreview
: private ::boost::noncopyable,
diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh
index f93fbe6fa42c..96c197cd338e 100644
--- a/setup_native/scripts/install_solaris.sh
+++ b/setup_native/scripts/install_solaris.sh
@@ -273,7 +273,7 @@ then
fi
#
-# the tail of the script contains a shared object for overloading the getuid()
+# the tail of the script contains a shared object for overriding the getuid()
# and a few other calls
#
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index e7d43427291e..7c0a5255256e 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -312,7 +312,7 @@ sal_Bool SfxAppEvent_Impl( const OUString& rCmd, const OUString& rEvent,
/* Description]
- This method can be overloaded by application developers, to receive
+ This method can be overridden by application developers, to receive
DDE-commands directed to their SfxApplication subclass.
The base implementation understands the API functionality of the
@@ -342,7 +342,7 @@ long SfxApplication::DdeExecute( const OUString& rCmd ) // Expressed in our B
/* [Description]
- This method can be overloaded by application developers, to receive
+ This method can be overridden by application developers, to receive
DDE-commands directed to the their SfxApplication subclass.
The base implementation does nothing and returns 0.
@@ -368,7 +368,7 @@ long SfxObjectShell::DdeExecute( const OUString& rCmd ) // Expressed in our B
/* [Description]
- This method can be overloaded by application developers, to receive
+ This method can be overridden by application developers, to receive
DDE-data-requests directed to their SfxApplication subclass.
The base implementation provides no data and returns false.
@@ -384,7 +384,7 @@ bool SfxObjectShell::DdeGetData( const OUString&, // the Item to be
/* [Description]
- This method can be overloaded by application developers, to receive
+ This method can be overridden by application developers, to receive
DDE-data directed to their SfxApplication subclass.
The base implementation is not receiving any data and returns false.
@@ -398,7 +398,7 @@ bool SfxObjectShell::DdeSetData( const OUString&, // the Item
/* [Description]
- This method can be overloaded by application developers, to establish
+ This method can be overridden by application developers, to establish
a DDE-hotlink to their SfxApplication subclass.
The base implementation is not generate a link and returns 0.
@@ -427,7 +427,7 @@ void SfxObjectShell::ReconnectDdeLinks(SfxObjectShell& rServer)
/* [Description]
- This method can be overloaded by application developers, to receive
+ This method can be overridden by application developers, to receive
DDE-commands directed to the their SfxApplication subclass.
The base implementation understands the API functionality of the
@@ -445,7 +445,7 @@ long SfxViewFrame::DdeExecute( const OUString& rCmd ) // Expressed in our BASI
/* [Description]
- This method can be overloaded by application developers, to receive
+ This method can be overridden by application developers, to receive
DDE-data-requests directed to their SfxApplication subclass.
The base implementation provides no data and returns false.
@@ -459,7 +459,7 @@ bool SfxViewFrame::DdeGetData( const OUString&, // the Item to be add
/* [Description]
- This method can be overloaded by application developers, to receive
+ This method can be overridden by application developers, to receive
DDE-data directed to their SfxApplication subclass.
The base implementation is not receiving any data and returns false.
@@ -473,7 +473,7 @@ bool SfxViewFrame::DdeSetData( const OUString&, // the Item to
/* [Description]
- This method can be overloaded by application developers, to establish
+ This method can be overridden by application developers, to establish
a DDE-hotlink to their SfxApplication subclass.
The base implementation is not generate a link and returns 0.
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index e6ce4e136d2c..ea502805cd58 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -211,7 +211,7 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
SfxChildWinFactory* pFact=0;
sal_uInt16 nOldMode = Application::GetSystemWindowMode();
- // First search for ChildWindow in SDT; "Overloading has to be realized
+ // First search for ChildWindow in SDT; Overlay windows are realized
// by using ChildWindowContext
SfxApplication *pApp = SfxGetpApp();
{
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index cb25df7e76aa..fe519483a4aa 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -772,14 +772,14 @@ void SfxBindings::Invalidate
void SfxBindings::InvalidateShell
(
- const SfxShell& rSh, /* <SfxShell>, which Slot-Ids should be
+ const SfxShell& rSh, /* <SfxShell> whose Slot-Ids should be
invalidated */
bool bDeep /* true
- also inherited slot IDs of SfxShell are invalidert
+ also the SfxShell's inherited slot IDs are invalidated
false
- the inherited and not overloaded Slot-Ids were
- invalidiert */
+ the inherited and not overridden Slot-Ids are
+ invalidated */
// for now always bDeep
)
{
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 6218e0ce8bfc..e0d73638559d 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -542,8 +542,8 @@ void SfxDockingWindow::ToggleFloatingMode()
the SfxDockingWindow and ensures the correct alignment on the parent window.
Through PrepareToggleFloatMode and Initialize it is ensured that
pImp-> GetLastAlignment() always delivers an allowed alignment. If this
- method is overloaded from a derived class, then first the
- SfxDockingWindow:: ToggleFloatingMode() must be called.
+ method is overridden by a derived class, then first the
+ SfxDockingWindow::ToggleFloatingMode() must be called.
*/
{
if ( !pImp->bConstructed || !pMgr )
@@ -625,7 +625,7 @@ void SfxDockingWindow::StartDocking()
/* [Description]
This virtual method of the DockingWindow class takes the inner and outer
- docking rectangle from the parent window. If this method is overloaded by a
+ docking rectangle from the parent window. If this method is overridden by
a derived class, then SfxDockingWindow:StartDocking() has to be called at
the end.
*/
@@ -759,7 +759,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
/* [Description]
Virtual method of the DockingWindow class ensures the correct alignment on
- the parent window. If this method is overloaded by a derived class, then
+ the parent window. If this method is overridden by a derived class, then
SfxDockingWindow::EndDocking() must be called first.
*/
{
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 2b08f1f5b483..99e9408e37fb 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -104,7 +104,7 @@ short SfxStyleDialog::Ok()
/* [Description]
- Overloaded, so that always RET_OK is returned.
+ Override so that always RET_OK is returned.
*/
{
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d533f3571a3b..773ae341751d 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -228,7 +228,7 @@ void SfxTabPage::FillUserData()
/* [Description]
Virtual method is called by the base class in the destructor to save
- specific information of the TabPage in the ini-file. When overloading a
+ specific information of the TabPage in the ini-file. When overriding a
string must be compiled, which is then flushed with the <SetUserData()>.
*/
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ab9f9900cd6b..387069a395ae 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2370,7 +2370,7 @@ void SfxTemplateDialog_Impl::LoadedFamilies()
-// Overloaded Resize-Handler ( StarView )
+// Override Resize-Handler ( StarView )
// The size of the Listboxen is adjusted
void SfxTemplateDialog_Impl::Resize()
{
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 6779c407a039..9a97255b6a02 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -75,7 +75,7 @@ void SfxPreviewWin_Impl::ImpPaint(
Size aTmpSize = pFile ? pFile->GetPrefSize() : Size(1,1 );
DBG_ASSERT( aTmpSize.Height()*aTmpSize.Width(),
- "size of first page is 0, overload GetFirstPageSize or set vis-area!" );
+ "size of first page is 0, override GetFirstPageSize or set vis-area!" );
#define FRAME 4
long nWidth = pWindow->GetOutputSize().Width() - 2*FRAME;
long nHeight = pWindow->GetOutputSize().Height() - 2*FRAME;
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 81edef6b545c..00e03330fb44 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -149,7 +149,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const
pFile->SetPrefSize( aTmpSize );
DBG_ASSERT( aTmpSize.Height()*aTmpSize.Width(),
- "size of first page is 0, overload GetFirstPageSize or set vis-area!" );
+ "size of first page is 0, override GetFirstPageSize or set vis-area!" );
pFile->Record( &aDevice );
@@ -324,11 +324,10 @@ void SfxObjectShell::LoadStyles
/* [Description]
- This method is called by the SFx if template styles are to be loaded.
- Existing styles are in this case overwritten. The document has then to be
- newly formatted. Therefore, the application of this method is usually
- overloaded and its implementation is calling the implementation in
- the base class.
+ This method is called by the SFx if styles are to be loaded from a template.
+ Existing styles are in this case overwritten. The document must then be
+ re-formatted. Therefore, applications usually override this method
+ and call the implementation in the base class.
*/
{
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index dd38c8f407f4..8c08addfa2dd 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -845,9 +845,9 @@ void SfxObjectShell::InitBasicManager_Impl()
[Note]
- This method has to be called through the overloading of
- <SvPersist::Load()> (With the PStore from the parameters of load ())
- and from the overloading of <SvPersist::InitNew()> (with PStore = 0).
+ This method has to be called by implementations of <SvPersist::Load()>
+ (with its pStor parameter) and by implementations of <SvPersist::InitNew()>
+ (with pStor = 0).
*/
{
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index fdea01e8890c..a69e3c3db5c2 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -440,7 +440,7 @@ void SfxStatusBarControl::StateChanged
The base implementation includes items of type SfxStringItem
where the text is entered in the status row field and
SfxVoidItem, where the field is emptied. The base implementation
- should not be called in overloaded methods.
+ should not be called in overriding methods.
*/
{
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index c596ee72b16a..4c49cb942aa4 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1337,7 +1337,7 @@ SfxPopupWindow* SfxPopupWindow::Clone() const
/* [Description]
- This method must be overloaded to show this Popup also in the
+ This method must be overridden to show this Popup also in the
Presentation-mode. It is called when a Show() would be meaningless
since the parent is no presentation window.
When create a new window the bew Top-Window will be used automatically,
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index deed34f7a843..cf0457b88e30 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -905,8 +905,8 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/)
/* [Description]
Virtual Method used to perform a Verb on a selected Object.
- Since this Object is just known by the derived classes, DoVerb
- must be overloaded.
+ Since this Object is only known by the derived classes, they must override
+ DoVerb.
*/
{
@@ -1089,7 +1089,7 @@ void SfxViewShell::OuterResizePixel
/* [Description]
- This Method has to be overloaded to be able to react to the size-change of
+ Override this Method to be able to react to the size-change of
the View. Thus the View is defined as the Edit window and also the
attached Tools are defined (for example the ruler).
@@ -1139,7 +1139,7 @@ void SfxViewShell::InnerResizePixel
/* [Description]
- This Method has to be overloaded to be able to react to the size-change of
+ Override this Method to be able to react to the size-change of
the Edit window.
The Edit window must not be changed either in size or position.
@@ -1318,7 +1318,7 @@ SfxViewShell::~SfxViewShell()
void SfxViewShell::Initialize()
{
- // overloaded by the application.
+ // override by the application.
}
bool SfxViewShell::PrepareClose
@@ -1406,7 +1406,7 @@ OUString SfxViewShell::GetSelectionText
/* [Description]
- This Method can be overloaded by the programmers to return a text that
+ Override this Method to return a text that
is included in the current selection. This is for example used when
sending emails.
@@ -1694,9 +1694,8 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ )
/* [Description]
- This Method has to be overloaded by the subclasses so that SFx from
- the Cursor can be switched on and off. This happes for example with
- with the running <SfxProgress>.
+ Subclasses must override this Method so that SFx can switch the
+ Cursor on and off, for example while a <SfxProgress> is running.
*/
{
diff --git a/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx
index e539c0f6af5c..c59d25af82a9 100644
--- a/sot/source/sdstor/stgavl.hxx
+++ b/sot/source/sdstor/stgavl.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SOT_SOURCE_SDSTOR_STGAVL_HXX
#define INCLUDED_SOT_SOURCE_SDSTOR_STGAVL_HXX
-// This class must be overloaded to define real, living nodes.
+// This is an abstract base class for nodes.
// Especially, the compare function must be implemented.
class StgAvlNode
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 9d8356a0e97b..8cc7f0bd0ab9 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -436,7 +436,7 @@ const SmNode * SmNode::FindRectClosestTo(const Point &rPoint) const
void SmNode::GetAccessibleText( OUStringBuffer &/*rText*/ ) const
{
- SAL_WARN("starmath", "SmNode: GetAccessibleText not overloaded");
+ SAL_WARN("starmath", "SmNode: GetAccessibleText not overridden");
}
const SmNode * SmNode::FindNodeWithAccessibleIndex(sal_Int32 nAccIdx) const
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 3ea30e125aa3..02dcdaf84de1 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -69,7 +69,7 @@ bool SfxFlagItem::GetPresentation
sal_uInt8 SfxFlagItem::GetFlagCount() const
{
- DBG_WARNING( "calling GetValueText(sal_uInt16) on SfxFlagItem -- overload!" );
+ DBG_WARNING("calling GetValueText(sal_uInt16) on SfxFlagItem -- override!");
return 0;
}
@@ -77,7 +77,7 @@ sal_uInt8 SfxFlagItem::GetFlagCount() const
SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const
{
- DBG_WARNING( "calling Create() on SfxFlagItem -- overload!" );
+ DBG_WARNING("calling Create() on SfxFlagItem -- override!");
return 0;
}
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index c3c97aeb3590..765673501d38 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -35,7 +35,7 @@
* Returns the <SfxItemPool> that is being saved.
* This should only be used in very exceptional cases e.g.
* when guaranteeing file format compatibility:
- * When overloading a <SfxPoolItem::Store()> getting additional data from the Pool
+ * When overriding a <SfxPoolItem::Store()> getting additional data from the Pool
*/
const SfxItemPool* SfxItemPool::GetStoringPool()
{
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index e45510723d30..bf26c1e04eae 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -161,7 +161,7 @@ SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
/**
* This virtual method allows to get a textual representation of the value
- * for the SfxPoolItem subclasses. It should be overloaded by all UI-relevant
+ * for the SfxPoolItem subclasses. It should be overridden by all UI-relevant
* SfxPoolItem subclasses.
*
* Because the unit of measure of the value in the SfxItemPool is only
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index c7dc8fe2d356..a295fc46ea42 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -91,7 +91,7 @@ class SvtMenuOptions_Impl : public ConfigItem
void RemoveListenerLink( const Link& rLink );
- // overloaded methods of baseclass
+ // override methods of baseclass
/*-****************************************************************************************************
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index b6f9c2a543ca..325300503f4f 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -166,7 +166,7 @@ public:
virtual ~SvtOptionsDrawinglayer_Impl();
-// overloaded methods of baseclass
+// override methods of baseclass
virtual void Commit() SAL_OVERRIDE;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 27614954a535..e3a6f15a5db8 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -238,7 +238,7 @@ void ImplTabSizer::Paint( const Rectangle& )
-// Is not named Impl. as it may be called or overloaded
+// Is not named Impl. as it may be both instantiated and derived from
// - TabBarEdit -
diff --git a/svx/inc/sdr/contact/objectcontactofpageview.hxx b/svx/inc/sdr/contact/objectcontactofpageview.hxx
index 90706b99e3de..c5e07fa0d946 100644
--- a/svx/inc/sdr/contact/objectcontactofpageview.hxx
+++ b/svx/inc/sdr/contact/objectcontactofpageview.hxx
@@ -123,10 +123,10 @@ namespace sdr
// high contrast display mode
virtual bool isDrawModeHighContrast() const SAL_OVERRIDE;
- // overloaded access to SdrPageView
+ // override access to SdrPageView
virtual SdrPageView* TryToGetSdrPageView() const SAL_OVERRIDE;
- // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed.
+ // access to OutputDevice. May return 0L like the default implementations do. Override as needed.
virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE;
/** sets all UNO controls which are associated with this ObjectContact to
diff --git a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
index 5965dcd0505c..47746ebc6d2b 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrpage.hxx
@@ -204,7 +204,7 @@ public:
// React on changes of the object of this ViewContact
virtual void ActionChanged() SAL_OVERRIDE;
- // overload for acessing the SdrPage
+ // override for acessing the SdrPage
virtual SdrPage* TryToGetSdrPage() const SAL_OVERRIDE;
protected:
diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
index fc8cbfb93e15..56276f199b87 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx
@@ -51,7 +51,7 @@ namespace sdr
// This method will not handle included hierarchies and not check geometric visibility.
drawinglayer::primitive3d::Primitive3DSequence createPrimitive3DSequence(const DisplayInfo& rDisplayInfo) const;
- // also overload the 2d method to deliver a 2d object with embedd3d 3d and the 3d transformation which is able to
+ // also override the 2d method to deliver a 2d object with embedd3d 3d and the 3d transformation which is able to
// answer the get2DRange question accordingly
virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE;
diff --git a/svx/inc/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
index fa62dd687344..c73e0814d35d 100644
--- a/svx/inc/sdr/properties/e3dcompoundproperties.hxx
+++ b/svx/inc/sdr/properties/e3dcompoundproperties.hxx
@@ -52,7 +52,7 @@ namespace sdr
virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE;
// Get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
- // be overloaded e.g for group objects to return a merged ItemSet of the object.
+ // be overridden e.g for group objects to return a merged ItemSet of the object.
// When using this method the returned ItemSet may contain items in the state
// SfxItemState::DONTCARE which means there were several such items with different
// values.
diff --git a/svx/inc/sdr/properties/e3dsceneproperties.hxx b/svx/inc/sdr/properties/e3dsceneproperties.hxx
index 9e26c37ba9dc..6d20504eb861 100644
--- a/svx/inc/sdr/properties/e3dsceneproperties.hxx
+++ b/svx/inc/sdr/properties/e3dsceneproperties.hxx
@@ -50,8 +50,8 @@ namespace sdr
// get itemset
virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE;
- // get merged ItemSet. Normappl, this maps directly to GetObjectItemSet(), but may
- // be overloaded e.g for group objects to return a merged ItemSet of the object.
+ // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
+ // be overridden e.g for group objects to return a merged ItemSet of the object.
// When using this method the returned ItemSet may contain items in the state
// SfxItemState::DONTCARE which means there were several such items with different
// values.
diff --git a/svx/inc/sdr/properties/groupproperties.hxx b/svx/inc/sdr/properties/groupproperties.hxx
index 1e842af16586..b4aef60f0ff0 100644
--- a/svx/inc/sdr/properties/groupproperties.hxx
+++ b/svx/inc/sdr/properties/groupproperties.hxx
@@ -63,7 +63,7 @@ namespace sdr
virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE;
// get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may
- // be overloaded e.g for group objects to return a merged ItemSet of the object.
+ // be overridden e.g for group objects to return a merged ItemSet of the object.
// When using this method the returned ItemSet may contain items in the state
// SfxItemState::DONTCARE which means there were several such items with different
// values.
diff --git a/svx/inc/sdr/properties/pageproperties.hxx b/svx/inc/sdr/properties/pageproperties.hxx
index 0ae85f674711..7de1a930abea 100644
--- a/svx/inc/sdr/properties/pageproperties.hxx
+++ b/svx/inc/sdr/properties/pageproperties.hxx
@@ -53,7 +53,7 @@ namespace sdr
// Clone() operator, normally just calls the local copy constructor
virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE;
- // get itemset. Overloaded here to allow creating the empty itemset
+ // get itemset. Override here to allow creating the empty itemset
// without asserting
virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE;
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 72106d4a52d5..01d34f4660fe 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -70,7 +70,7 @@ void SpellDialogChildWindow::AddAutoCorrection(
const OUString& /*rNew*/,
LanguageType /*eLanguage*/)
{
- OSL_FAIL("AutoCorrection should have been overloaded - if available");
+ OSL_FAIL("AutoCorrection should have been overridden - if available");
}
bool SpellDialogChildWindow::HasGrammarChecking()
@@ -80,13 +80,13 @@ bool SpellDialogChildWindow::HasGrammarChecking()
bool SpellDialogChildWindow::IsGrammarChecking()
{
- OSL_FAIL("Grammar checking should have been overloaded - if available");
+ OSL_FAIL("Grammar checking should have been overridden - if available");
return false;
}
void SpellDialogChildWindow::SetGrammarChecking(bool )
{
- OSL_FAIL("Grammar checking should have been overloaded - if available");
+ OSL_FAIL("Grammar checking should have been overridden - if available");
}
} // end of namespace ::svx
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index a7b287a52465..b8696891fc0b 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2541,7 +2541,7 @@ void SvxRuler::EvalModifier()
void SvxRuler::Click()
{
- /* Overloaded handler SV; sets Tab per dispatcher call */
+ /* Override handler SV; sets Tab per dispatcher call */
Ruler::Click();
if( bActive )
{
@@ -2595,7 +2595,7 @@ bool SvxRuler::CalcLimits ( long& nMax1, // minimum value to be set
{
/*
Default implementation of the virtual function; the application can be
- overloaded to implement customized limits. The values are based on the page.
+ overridden to implement customized limits. The values are based on the page.
*/
nMax1 = LONG_MIN;
nMax2 = LONG_MAX;
@@ -3346,7 +3346,7 @@ void SvxRuler::EndDrag()
void SvxRuler::ExtraDown()
{
- /* Overloaded SV method, sets the new type for the Default tab. */
+ /* Override SV method, sets the new type for the Default tab. */
// Switch Tab Type
if(mpTabStopItem.get() &&
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 71eda450209e..d746f4ecce4c 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -601,7 +601,7 @@ OUString E3dScene::TakeObjNamePlural() const
return ImpGetResStr(STR_ObjNamePluralScene3d);
}
-// The NbcRotate routine overloads the one of the SdrObject. The idea is
+// The NbcRotate routine overrides the one of the SdrObject. The idea is
// to be able to rotate the scene relative to the position of the scene
// and then the objects in the scene
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index e1e47c7ca4f5..1a506e05081c 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -230,7 +230,7 @@ E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) :
InitView ();
}
-// DrawMarkedObj overloaded, since possibly only a single 3D object is to be
+// DrawMarkedObj override, since possibly only a single 3D object is to be
// drawn
void E3dView::DrawMarkedObj(OutputDevice& rOut) const
@@ -317,7 +317,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
}
}
-// Get overloaded model, since in some 3D objects an additional scene
+// override get model, since in some 3D objects an additional scene
// must be pushed in
SdrModel* E3dView::GetMarkedObjModel() const
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index e0b756c0b6af..6e2627e3f12a 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -686,7 +686,7 @@ void FmFormObj::BrkCreate( SdrDragStat& rStat )
}
-// #i70852# overload Layer interface to force to FormColtrol layer
+// #i70852# override Layer interface to force to FormControl layer
SdrLayerID FmFormObj::GetLayer() const
{
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 96297639dbef..8663bc9e1b5d 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -100,7 +100,7 @@ protected:
SAL_DLLPRIVATE virtual bool EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void BrkCreate( SdrDragStat& rStat ) SAL_OVERRIDE;
- // #i70852# overload Layer interface to force to FormColtrol layer
+ // #i70852# override Layer interface to force to FormControl layer
SAL_DLLPRIVATE virtual SdrLayerID GetLayer() const SAL_OVERRIDE;
SAL_DLLPRIVATE virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index d3dfe2d240ef..949ac76952a8 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -163,7 +163,7 @@ namespace sdr
// #114359# save old and set clip region
OutputDevice* pOutDev = TryToGetOutputDevice();
- OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overloaded TryToGetOutputDevice wrong (!)");
+ OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overridden TryToGetOutputDevice wrong (!)");
bool bClipRegionPushed(false);
const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea());
diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx
index 7d0c249225ff..39053e8be4a9 100644
--- a/svx/source/sdr/contact/viewcontact.cxx
+++ b/svx/source/sdr/contact/viewcontact.cxx
@@ -186,7 +186,7 @@ bool ViewContact::isAnimatedInAnyViewObjectContact() const
// Access to possible sub-hierarchy and parent. GetObjectCount() default is 0L
// and GetViewContact default pops up an assert since it's an error if
-// GetObjectCount has a result != 0 and it's not overloaded.
+// GetObjectCount has a result != 0 and it's not overridden.
sal_uInt32 ViewContact::GetObjectCount() const
{
// no sub-objects
@@ -196,7 +196,7 @@ sal_uInt32 ViewContact::GetObjectCount() const
ViewContact& ViewContact::GetViewContact(sal_uInt32 /*nIndex*/) const
{
// This is the default implementation; call would be an error
- OSL_FAIL("ViewContact::GetViewContact: This call needs to be overloaded when GetObjectCount() can return results != 0 (!)");
+ OSL_FAIL("ViewContact::GetViewContact: This call needs to be overridden when GetObjectCount() can return results != 0 (!)");
return (ViewContact&)(*this);
}
@@ -240,7 +240,7 @@ void ViewContact::ActionChanged()
}
// access to SdrObject and/or SdrPage. May return 0L like the default
-// implementations do. Needs to be overloaded as needed.
+// implementations do. Override as needed.
SdrObject* ViewContact::TryToGetSdrObject() const
{
return 0L;
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index ac74b2f22d48..5e457dc4908a 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -127,7 +127,7 @@ void ViewContactOfSdrObj::ActionChanged()
ViewContact::ActionChanged();
}
-// overload for acessing the SdrObject
+// override for acessing the SdrObject
SdrObject* ViewContactOfSdrObj::TryToGetSdrObject() const
{
return &GetSdrObject();
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index e1c652b21617..9ead73a18c88 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -579,7 +579,7 @@ void ViewContactOfSdrPage::ActionChanged()
maViewContactOfHelplinesFront.ActionChanged();
}
-// overload for acessing the SdrPage
+// override for acessing the SdrPage
SdrPage* ViewContactOfSdrPage::TryToGetSdrPage() const
{
return &GetSdrPage();
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index d80b309207a2..9164d7512905 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -44,7 +44,7 @@ const SdrOle2Obj& ViewObjectContactOfSdrOle2Obj::getSdrOle2Object() const
drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfSdrOle2Obj::createPrimitive2DSequence(
const DisplayInfo& /*rDisplayInfo*/) const
{
- // this method is overloaded to do some things the old SdrOle2Obj::DoPaintObject did.
+ // override this method to do some things the old SdrOle2Obj::DoPaintObject did.
// In the future, some of these may be solved different, but ATM try to stay compatible
// with the old behaviour
drawinglayer::primitive2d::Primitive2DSequence xRetval;
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index bb09f9e602ba..6e3604648742 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -31,7 +31,7 @@ namespace sdr
// create a new itemset
SfxItemSet* PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
- // overloaded to legally return a valid ItemSet
+ // override to legally return a valid ItemSet
return new SfxItemSet(rPool);
}
@@ -54,7 +54,7 @@ namespace sdr
return *(new PageProperties(*this, rObj));
}
- // get itemset. Overloaded here to allow creating the empty itemset
+ // get itemset. Override here to allow creating the empty itemset
// without asserting
const SfxItemSet& PageProperties::GetObjectItemSet() const
{
@@ -75,7 +75,7 @@ namespace sdr
SfxStyleSheet* PageProperties::GetStyleSheet() const
{
- // overloaded to legally return a 0L pointer here
+ // override to legally return a 0L pointer here
return 0L;
}
diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx
index f4fd9c881b23..f95b83e4f0c2 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -86,27 +86,27 @@ namespace sdr
void BaseProperties::Scale(const Fraction& /*rScale*/)
{
- // default implementation does nothing; overload where
+ // default implementation does nothing; override where
// an ItemSet is implemented.
}
void BaseProperties::MoveToItemPool(SfxItemPool* /*pSrcPool*/, SfxItemPool* /*pDestPool*/, SdrModel* /*pNewModel*/)
{
// Move properties to a new ItemPool. Default implementation does nothing.
- // Overload where an ItemSet is implemented.
+ // Override where an ItemSet is implemented.
}
void BaseProperties::SetModel(SdrModel* /*pOldModel*/, SdrModel* /*pNewModel*/)
{
// Set new model. Default implementation does nothing.
- // Overload where an ItemSet is implemented.
+ // Override where an ItemSet is implemented.
}
void BaseProperties::ForceStyleToHardAttributes()
{
// force all attributes which come from styles to hard attributes
// to be able to live without the style. Default implementation does nothing.
- // Overload where an ItemSet is implemented.
+ // Override where an ItemSet is implemented.
}
void BaseProperties::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems)
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index 4845fba2c3bf..b49aa0eb2945 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -33,7 +33,7 @@ class SdrDragView;
class SdrDragMovHdl : public SdrDragMethod
{
protected:
- // define nothing, overload to do so
+ // define nothing, override to do so
virtual void createSdrDragEntries() SAL_OVERRIDE;
public:
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 048ceb911455..264c6179b7a4 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -1378,7 +1378,7 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
// #i97878#
// TRGetBaseGeometry/TRSetBaseGeometry needs to be based on two positions,
-// same as line geometry in SdrPathObj. Thus needs to be overloaded and
+// same as line geometry in SdrPathObj. Thus needs to be overridden and
// implemented since currently it is derived from SdrTextObj which uses
// a functionality based on SnapRect which is not useful here
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 33c0d67c918f..ebbacf522052 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -352,8 +352,8 @@ bool SdrUnoObj::hasSpecialDrag() const
bool SdrUnoObj::supportsFullDrag() const
{
- // overloaded to have the possibility to enable/disable in debug and
- // to ckeck some things out. Current solution is working, so default is
+ // override to have the possibility to enable/disable in debug and
+ // to check some things out. Current solution is working, so default is
// enabled
static bool bDoSupportFullDrag(true);
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 9e6523ca4919..9f06a1afbb3a 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -92,7 +92,7 @@ protected:
// find the node in which the formula is located
// TextFeld -> TextNode,
// BoxAttribut -> BoxStartNode
- // !!! has to be overloaded by every derivation !!!
+ // !!! every derived class must override this !!!
virtual const SwNode* GetNodeOfFormula() const = 0;
SwTableFormula( const OUString& rFormula );
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 5dcc8ca3e691..fedf84454b19 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -272,7 +272,7 @@ class SwDrawVirtObj : public SdrVirtObj
virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE;
- /// All overloaded methods which need to use the offset
+ /// All overridden methods which need to use the offset
virtual void RecalcBoundRect() SAL_OVERRIDE;
virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE;
virtual ::basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE;
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index 2bc65c6c0362..6afd3fd042fe 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -43,7 +43,7 @@ public:
virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const SAL_OVERRIDE;
protected:
- /// overload of <SdrModel::createUnoModel()> is needed to provide corresponding uno model.
+ /// override of <SdrModel::createUnoModel()> is needed to provide corresponding uno model.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE;
};
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 321bd8846dee..6fe3f0a76c11 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -311,7 +311,7 @@ public:
/** SwFmt::IsBackgroundTransparent
Virtual method to determine, if background of format is transparent.
- Default implementation returns false. Thus, subclasses have to overload
+ Default implementation returns false. Thus, subclasses have to override
method, if the specific subclass can have a transparent background.
@author OD
@@ -323,7 +323,7 @@ public:
/** SwFmt::IsShadowTransparent
Virtual method to determine, if shadow of format is transparent.
- Default implementation returns false. Thus, subclasses have to overload
+ Default implementation returns false. Thus, subclasses have to override
method, if the specific subclass can have a transparent shadow.
@author OD
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index e4c6e58b61ad..84baec5e1a86 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -197,7 +197,7 @@ public:
/** SwFlyFrmFmt::IsBackgroundTransparent
- Overloading virtual method and its default implementation,
+ Override virtual method and its default implementation,
because format of fly frame provides transparent backgrounds.
Method determines, if background of fly frame is transparent.
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 6b97b2f739e3..b7b33e258f11 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -263,7 +263,7 @@ private:
virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &)=0;
// Everyone who does not need the streams / storages open
- // has to overload the method (W4W!!).
+ // has to override the method (W4W!!).
virtual bool SetStrmStgPtr();
};
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 30b642cc5d42..e1840dd3054a 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -268,7 +268,7 @@ protected:
}
/**
- * Function overloaded by unit test. See DECLARE_SW_*_TEST macros
+ * Function overridden by unit test. See DECLARE_SW_*_TEST macros
*/
virtual void verify()
{
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 8021c1908a98..414bf5141473 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -680,8 +680,8 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void)
OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void)
throw (uno::RuntimeException, std::exception)
{
- OSL_ENSURE( false, "description needs to be overloaded" );
- THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" );
+ OSL_ENSURE(false, "description needs to be overriden");
+ THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overridden)" );
}
OUString SAL_CALL SwAccessibleContext::getAccessibleName (void)
@@ -988,9 +988,9 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
OUString SAL_CALL SwAccessibleContext::getImplementationName()
throw( uno::RuntimeException, std::exception )
{
- OSL_ENSURE( false, "implementation name needs to be overloaded" );
+ OSL_ENSURE( false, "implementation name needs to be overridden" );
- THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overloaded" )
+ THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overridden" )
}
sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceName)
@@ -1002,8 +1002,8 @@ sal_Bool SAL_CALL SwAccessibleContext::supportsService (const OUString& ServiceN
uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames()
throw( uno::RuntimeException, std::exception )
{
- OSL_ENSURE( false, "supported services names needs to be overloaded" );
- THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overloaded" )
+ OSL_ENSURE( false, "supported services names needs to be overridden" );
+ THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overridden" )
}
void SwAccessibleContext::DisposeShape( const SdrObject *pObj,
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 8586cdf480da..2ef00af60f7e 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -75,7 +75,7 @@ SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
E.g. TextFeld -> TextNode, or
BoxAttribute -> BoxStartNode
- Caution: Has to be overloaded when inheriting.
+ Caution: Must override when inheriting.
*/
const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
{
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 036f9451ffab..0a2d85d7b3fe 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -766,7 +766,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
/** SwFmt::IsBackgroundTransparent
Virtual method to determine, if background of format is transparent.
- Default implementation returns false. Thus, subclasses have to overload
+ Default implementation returns false. Thus, subclasses have to override
method, if the specific subclass can have a transparent background.
@return false, default implementation
@@ -779,7 +779,7 @@ bool SwFmt::IsBackgroundTransparent() const
/** SwFmt::IsShadowTransparent
Virtual method to determine, if shadow of format is transparent.
- Default implementation returns false. Thus, subclasses have to overload
+ Default implementation returns false. Thus, subclasses have to override
method, if the specific subclass can have a transparent shadow.
@return false, default implementation
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 7d9364287ae5..9d10d293bee7 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -753,7 +753,7 @@ SdrObject* SwDrawContact::GetMaster()
}
/**
- * @note Overloading <SwContact::SetMaster(..)> in order to assert, if the
+ * @note Override <SwContact::SetMaster(..)> in order to assert, if the
* 'master' drawing object is replaced. The latter is correctly handled,
* if handled by method <SwDrawContact::ChangeMasterObject(..)>. Thus,
* assert only, if a debug level is given.
@@ -2525,7 +2525,7 @@ bool SwDrawVirtObj::HasTextEdit() const
return rRefObj.HasTextEdit();
}
-// overloaded 'layer' methods for 'virtual' drawing object to assure,
+// override 'layer' methods for 'virtual' drawing object to assure
// that layer of 'virtual' object is the layer of the referenced object.
SdrLayerID SwDrawVirtObj::GetLayer() const
{
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 77355c3ec781..b7f28fcb6bd4 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -192,7 +192,7 @@ SdrObject* SwDrawView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTo
if(pRetval)
{
- // overloaded to allow extra handling when picking SwVirtFlyDrawObj's
+ // override to allow extra handling when picking SwVirtFlyDrawObj's
pRetval = impLocalHitCorrection(pRetval, rPnt, nTol, GetMarkedObjectList());
}
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 058e64c13d8e..4afba0e1b51a 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -83,7 +83,7 @@ public:
SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly);
virtual ~SwVirtFlyDrawObj();
- // overloaded method of base class SdrVirtObj
+ // override method of base class SdrVirtObj
virtual void TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const SAL_OVERRIDE;
// we treat the size calculation completely on ourself here
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index f556a8bca5dc..4c5ec084dcb1 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -71,7 +71,7 @@ protected:
// add custom handles (used by other apps, e.g. AnchorPos)
virtual void AddCustomHdl() SAL_OVERRIDE;
- // overloaded to allow extra handling when picking SwVirtFlyDrawObj's
+ // override to allow extra handling when picking SwVirtFlyDrawObj's
using FmFormView::CheckSingleSdrObjectHit;
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uLong nOptions, const SetOfByte* pMVisLay) const SAL_OVERRIDE;
@@ -87,7 +87,7 @@ public:
virtual void MarkListHasChanged() SAL_OVERRIDE;
// #i7672#
- // Overload to resue edit background color in active text edit view (OutlinerView)
+ // Override to resue edit background color in active text edit view (OutlinerView)
virtual void ModelHasChanged() SAL_OVERRIDE;
virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 0eee0c13f982..6657b1ca85f7 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -215,7 +215,8 @@ public:
virtual bool IsAvailable() const;
- /// Shorthand for those who know, that they did not overload isAvailable()
+ /// Shorthand for those who know that they did not override isAvailable()
+ /// FIXME: wtf?
bool IsAvail() const { return pObj != 0; }
};
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a0f0bd2eb487..ec3c2945f2ff 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3093,7 +3093,7 @@ OUString SwFlyFrmFmt::GetObjDescription() const
/** SwFlyFrmFmt::IsBackgroundTransparent - for #99657#
- OD 22.08.2002 - overloading virtual method and its default implementation,
+ OD 22.08.2002 - overriding virtual method and its default implementation,
because format of fly frame provides transparent backgrounds.
Method determines, if background of fly frame is transparent.
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 5065816cdff3..29e88fc1bf31 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -573,7 +573,7 @@ void Reader::MakeHTMLDummyTemplateDoc()
}
// Users that do not need to open these Streams / Storages,
-// have to overload this method
+// have to override this method
bool Reader::SetStrmStgPtr()
{
OSL_ENSURE( pMedium, "Where is the Media??" );
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index 8b5b0ed8f291..d71d7c3bba7e 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -283,7 +283,7 @@ void Writer::SetupFilterOptions(SfxMedium& /*rMedium*/)
sal_uLong Writer::Write( SwPaM& rPam, SfxMedium& rMedium, const OUString* pFileName )
{
SetupFilterOptions(rMedium);
- // This method must be overloaded in SwXMLWriter a storage from medium will be used there.
+ // This method must be overridden in SwXMLWriter a storage from medium will be used there.
// The microsoft format can write to storage but the storage will be based on the stream.
return Write( rPam, *rMedium.GetOutStream(), pFileName );
}
diff --git a/sw/source/filter/ww8/escher.hxx b/sw/source/filter/ww8/escher.hxx
index a03ff22cdfe9..5c345615b179 100644
--- a/sw/source/filter/ww8/escher.hxx
+++ b/sw/source/filter/ww8/escher.hxx
@@ -80,7 +80,7 @@ public:
virtual ~SwEscherExGlobal();
private:
- /** Overloaded to create a new memory stream for picture data. */
+ /** Override to create a new memory stream for picture data. */
virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE;
private:
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 09dd0dca96bd..2e405b083486 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -1431,8 +1431,7 @@ public:
};
/** The class MSWordAttrIter is a helper class to build the Fkp.chpx.
- This class may be overloaded for output the SwTxtAttrs and the
- EditEngineTxtAttrs.
+ This is a base class to output the SwTxtAttrs and the EditEngineTxtAttrs.
*/
class MSWordAttrIter
{
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index bcaa39ca24c1..285b5a07d1d0 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -799,7 +799,7 @@ bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor
return bRet;
}
-// Draw()-Overload for OLE2 (Sfx)
+// Draw()-Override for OLE2 (Sfx)
void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
sal_uInt16 nAspect )
{
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 05914a78b074..dcd14a2341e7 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -1247,7 +1247,7 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocu
This method is called by SFx if Styles have to be reloaded from a
document-template. Existing Styles should be overwritten by that.
That's why the document has to be reformatted. Therefore applications
- will usually overload this method and call the baseclass' implementation
+ will usually override this method and call the baseclass' implementation
in their implementation.
*/
// When the source is our document, we do the checking ourselves
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
index 603dbb62c26b..1bc2c13a56c1 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
@@ -34,10 +34,10 @@ class AnnotationMenuButton : public MenuButton
AnnotationMenuButton( sw::sidebarwindows::SwSidebarWin& rSidebarWin );
virtual ~AnnotationMenuButton();
- // overloaded <MenuButton> methods
+ // override MenuButton methods
virtual void Select() SAL_OVERRIDE;
- // overloaded <vcl::Window> methods
+ // override vcl::Window methods
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 46bbe3d3a5c2..0e7e92433c83 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1420,7 +1420,7 @@ sal_Bool UnoControl::isTransparent( ) throw(RuntimeException, std::exception)
// XServiceInfo
OUString UnoControl::getImplementationName( ) throw(RuntimeException, std::exception)
{
- OSL_FAIL( "This method should be overloaded!" );
+ OSL_FAIL( "This method should be overridden!" );
return OUString();
}
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index d7f8f5d948f8..911b2a6ddfcf 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1024,7 +1024,7 @@ void UnoControlModel::read( const ::com::sun::star::uno::Reference< ::com::sun::
// ::com::sun::star::lang::XServiceInfo
OUString UnoControlModel::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- OSL_FAIL( "This method should be overloaded!" );
+ OSL_FAIL( "This method should be overridden!" );
return OUString();
}
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 947340c2bff2..1a6346144a14 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -668,7 +668,7 @@ OString generateClassDefinition(std::ostream& o,
// << "\n css::uno::Reference< css::uno::XComponentContext > const & "
// << "context);\n\n";
- // overload queryInterface
+ // override queryInterface
if (propertyhelper.getLength() > 1) {
o << " // css::uno::XInterface:\n"
" virtual css::uno::Any SAL_CALL queryInterface("
@@ -720,7 +720,7 @@ OString generateClassDefinition(std::ostream& o,
}
if (supportxcomponent) {
- o << " // overload WeakComponentImplHelperBase::disposing()\n"
+ o << " // override WeakComponentImplHelperBase::disposing()\n"
" // This function is called upon disposing the component,\n"
" // if your component needs special work when it becomes\n"
" // disposed, do it here.\n"
@@ -835,7 +835,7 @@ OString generateClassDefinition(std::ostream& o,
// generateServiceHelper(o, options.implname, classname, services);
if (supportxcomponent) {
- o << "// overload WeakComponentImplHelperBase::disposing()\n"
+ o << "// override WeakComponentImplHelperBase::disposing()\n"
"// This function is called upon disposing the component,\n"
"// if your component needs special work when it becomes\n"
"// disposed, do it here.\n"
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 3915c5dcdc6e..005b1ee1a686 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -219,7 +219,7 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
void SetDefault( const OUString & sName, bool bValue );
- // overloaded methods of baseclass
+ // override methods of baseclass
/*-****************************************************************************************************
@short called for notify of configmanager
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 564c7b18af0a..7f351df8843b 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -287,7 +287,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
SvtModuleOptions_Impl();
virtual ~SvtModuleOptions_Impl();
- // overloaded methods of baseclass
+ // override methods of baseclass
virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames ) SAL_OVERRIDE;
virtual void Commit( ) SAL_OVERRIDE;
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index 99b29d3fcdfa..b1e519dc922d 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -57,7 +57,7 @@ public:
SvtPrintWarningOptions_Impl();
virtual ~SvtPrintWarningOptions_Impl();
-// overloaded methods of baseclass
+// override methods of baseclass
virtual void Commit() SAL_OVERRIDE;
virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE;
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index a699c1d37cd9..b3b92562ce43 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -109,7 +109,7 @@ class SvtSecurityOptions_Impl : public ConfigItem
SvtSecurityOptions_Impl();
virtual ~SvtSecurityOptions_Impl();
- // overloaded methods of baseclass
+ // override methods of baseclass
/*-****************************************************************************************************
@short called for notify of configmanager
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index 8097b6d3a1c8..4a55f340a62b 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -37,7 +37,7 @@ public:
PspSalInfoPrinter();
virtual ~PspSalInfoPrinter();
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
virtual void ReleaseGraphics( SalGraphics* pGraphics ) SAL_OVERRIDE;
virtual bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) SAL_OVERRIDE;
@@ -72,7 +72,7 @@ public:
PspSalPrinter( SalInfoPrinter *pPrinter );
virtual ~PspSalPrinter();
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual bool StartJob( const OUString* pFileName,
const OUString& rJobName,
const OUString& rAppName,
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 18a434fa67b5..34782382afb1 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -70,7 +70,7 @@ public:
static void AnnounceFonts( PhysicalFontCollection*,
const psp::FastPrintFontInfo& );
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual SalGraphicsImpl*GetImpl() const SAL_OVERRIDE { return NULL; };
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE;
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 839568b13091..2fe017677430 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -36,7 +36,7 @@ public:
SvpSalObject();
virtual ~SvpSalObject();
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual void ResetClipRegion() SAL_OVERRIDE;
virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE;
virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 800fbc130ab6..c64d461bddfa 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -49,7 +49,7 @@ public:
SvpSalTimer( SvpSalInstance* pInstance ) : m_pInstance( pInstance ) {}
virtual ~SvpSalTimer();
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual void Start( sal_uLong nMS ) SAL_OVERRIDE;
virtual void Stop() SAL_OVERRIDE;
};
diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 11a38e940b34..5426eee77919 100644
--- a/vcl/inc/unx/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -43,7 +43,7 @@ public:
GtkSalObject( GtkSalFrame* pParent, bool bShow = true );
virtual ~GtkSalObject();
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual void ResetClipRegion() SAL_OVERRIDE;
virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE;
virtual void BeginSetClipRegion( sal_uLong nRects ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index d840aee6c115..0403b5a2fdaa 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -111,7 +111,7 @@ public:
X11SalBitmap();
virtual ~X11SalBitmap();
- // overload pure virtual methods
+ // override pure virtual methods
virtual bool Create(
const Size& rSize,
sal_uInt16 nBitCount,
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 29697a9f9e89..44f3a3d049bf 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -144,7 +144,7 @@ public:
SalX11Screen GetScreenNumber() const { return m_nXScreen; }
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) SAL_OVERRIDE;
virtual sal_uInt16 GetBitCount() const SAL_OVERRIDE;
virtual long GetGraphicsWidth() const SAL_OVERRIDE;
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 83dc856f5113..4fc5a0867b7a 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -71,7 +71,7 @@ public:
X11SalObject();
virtual ~X11SalObject();
- // overload all pure virtual methods
+ // override all pure virtual methods
virtual void ResetClipRegion() SAL_OVERRIDE;
virtual sal_uInt16 GetClipRegionType() SAL_OVERRIDE;
virtual void BeginSetClipRegion( sal_uIntPtr nRects ) SAL_OVERRIDE;
diff --git a/vcl/inc/unx/saltimer.h b/vcl/inc/unx/saltimer.h
index 45692f766d43..e3c302512f1d 100644
--- a/vcl/inc/unx/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -30,7 +30,7 @@ public:
X11SalTimer( SalXLib *pXLib ) : mpXLib( pXLib ) {}
virtual ~X11SalTimer();
- // overload all pure virtual methods
+ // override all pure virtual methods
void Start( sal_uIntPtr nMS ) SAL_OVERRIDE;
void Stop() SAL_OVERRIDE;
};
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 47c37de7e755..994354975316 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -31,7 +31,7 @@ public:
X11SalSystem() {}
virtual ~X11SalSystem();
- // overload pure virtual methods
+ // override pure virtual methods
virtual unsigned int GetDisplayScreenCount() SAL_OVERRIDE;
virtual bool IsUnifiedDisplay() SAL_OVERRIDE;
virtual unsigned int GetDisplayBuiltInScreen() SAL_OVERRIDE;
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 78936b84b4af..d3c56f3d1df1 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3837,7 +3837,7 @@ void DisclosureButton::ImplDrawCheckBoxState()
/* HACK: DisclosureButton is currently assuming, that the disclosure sign
will fit into the rectangle occupied by a normal checkbox on all themes.
If this does not hold true for some theme, ImplGetCheckImageSize
- would have to be overloaded for DisclosureButton; also GetNativeControlRegion
+ would have to be overridden for DisclosureButton; also GetNativeControlRegion
for CTRL_LISTNODE would have to be implemented and taken into account
*/
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index a0212e7eb07c..b499dfd99305 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2634,7 +2634,7 @@ void Edit::Undo()
void Edit::SetText( const OUString& rStr )
{
if ( mpSubEdit )
- mpSubEdit->SetText( rStr ); // not directly ImplSetText if SetText overloaded
+ mpSubEdit->SetText( rStr ); // not directly ImplSetText if SetText overridden
else
{
Selection aNewSel( 0, 0 ); // prevent scrolling
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 539c7520b6ef..81d031ee1bed 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2847,7 +2847,7 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const Rectangle& rRect, sal_
ImplDelData aDelData;
pW->ImplAddDel( &aDelData );
- bInCallback = true; // set it here, if Activate overloaded
+ bInCallback = true; // set it here, if Activate overridden
Activate();
bInCallback = false;
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 1af25afcc9ae..eb3bf182e194 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -473,7 +473,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b
}
else
bStayActive = false;
- pMenu->bInCallback = true; // set here if Activate overloaded
+ pMenu->bInCallback = true; // set here if Activate overridden
pMenu->Activate();
pMenu->bInCallback = false;
bJustActivated = true;
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index dad1fccbf455..9f616cc73c43 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -105,7 +105,7 @@ public:
virtual void show( bool bShow, I18NStatus::ShowReason eReason ) SAL_OVERRIDE;
virtual void toggle( bool bOn ) SAL_OVERRIDE;
- // overload WorkWindow::DataChanged
+ // override WorkWindow::DataChanged
virtual void DataChanged( const DataChangedEvent& rEvt ) SAL_OVERRIDE;
};
@@ -314,9 +314,9 @@ public:
virtual void toggle( bool bOn ) SAL_OVERRIDE;
void layout();
- // overload Window focus handler
+ // override Window focus handler
virtual void GetFocus() SAL_OVERRIDE;
- // overload WorkWindow::DataChanged
+ // override WorkWindow::DataChanged
virtual void DataChanged( const DataChangedEvent& rEvt ) SAL_OVERRIDE;
};
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index aa2172656889..e87237ef88d8 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -860,7 +860,7 @@ void SdXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<c
}
}
-// #80365# overload this method to read and use the hint value from the
+// #80365# override this method to read and use the hint value from the
// written meta information. If no info is found, guess 10 draw objects
//void SdXMLImport::SetStatisticAttributes(const uno::Reference<xml::sax::XAttributeList>& xAttrList)
void SdXMLImport::SetStatistics(
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index ff4ae6a81661..ac95e7d66cab 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -569,7 +569,7 @@ private:
SvXMLImportContextRef mxReplImplContext;
protected:
- /// helper to get the created xShape instance, needs to be overloaded
+ /// helper to get the created xShape instance, needs to be overridden
virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const SAL_OVERRIDE;
virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const SAL_OVERRIDE;
diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx
index 6eede3c8f9ef..affb9bbf4d99 100644
--- a/xmloff/source/text/XMLTextFrameContext.hxx
+++ b/xmloff/source/text/XMLTextFrameContext.hxx
@@ -58,7 +58,7 @@ class XMLTextFrameContext : public SvXMLImportContext, public MultiImageImportHe
::com::sun::star::beans::XPropertySet >& rPropSet );
protected:
- /// helper to get the created xShape instance, needs to be overloaded
+ /// helper to get the created xShape instance, needs to be overridden
virtual OUString getGraphicURLFromImportContext(const SvXMLImportContext& rContext) const SAL_OVERRIDE;
virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const SAL_OVERRIDE;
diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx
index 156b80305758..072174a573d3 100644
--- a/xmloff/source/xforms/TokenContext.hxx
+++ b/xmloff/source/xforms/TokenContext.hxx
@@ -76,7 +76,7 @@ public:
/** Create a warning for all non-namespace character
* content. Classes that wish to deal with character content have
- * to overload this method anyway, and will thus get rid of the
+ * to override this method anyway, and will thus get rid of the
* warnings. */
virtual void Characters( const OUString& rChars ) SAL_OVERRIDE;