[Libreoffice-commits] core.git: 3 commits - basctl/source basic/source canvas/source chart2/inc chart2/source connectivity/source cui/source dbaccess/source drawinglayer/source editeng/source embeddedobj/test extensions/source filter/source forms/source fpicker/source framework/source include/basegfx include/comphelper include/connectivity include/cppuhelper include/dbaccess include/drawinglayer include/editeng include/formula include/sfx2 include/svl include/svtools include/svx include/toolkit include/vcl include/xmloff odk/examples qadevOOo/runner reportdesign/inc reportdesign/source sc/inc sc/sdi sc/source sdext/source sd/inc sd/source setup_native/scripts sfx2/source sot/source starmath/source svl/source svtools/source svx/inc svx/source sw/inc sw/qa sw/source toolkit/source unodevtools/source unotools/source vcl/inc vcl/source vcl/unx xmloff/source
Michael Stahl
mstahl at redhat.com
Thu Jan 8 15:07:25 PST 2015
basctl/source/inc/dlgedview.hxx | 2
basic/source/inc/sbjsmeth.hxx | 2
basic/source/inc/sbjsmod.hxx | 2
basic/source/inc/sbunoobj.hxx | 4 -
basic/source/sbx/sbxobj.cxx | 2
canvas/source/vcl/spritecanvashelper.cxx | 5 -
chart2/inc/ChartModel.hxx | 2
chart2/source/controller/accessibility/AccessibleChartElement.cxx | 4 -
chart2/source/controller/accessibility/AccessibleChartElement.hxx | 4 -
chart2/source/controller/inc/AccessibleBase.hxx | 2
chart2/source/controller/main/CommandDispatch.hxx | 2
chart2/source/inc/OPropertySet.hxx | 2
chart2/source/model/template/ChartTypeTemplate.hxx | 4 -
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 2
connectivity/source/sdbcx/VCollection.cxx | 2
connectivity/source/sdbcx/VTable.cxx | 4 -
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/hldoctp.cxx | 2
cui/source/dialogs/hlinettp.cxx | 2
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/inc/optlingu.hxx | 1
cui/source/options/optfltr.cxx | 2
cui/source/options/optlingu.cxx | 18 -----
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tpgradnt.cxx | 2
dbaccess/source/core/inc/definitioncontainer.hxx | 3
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 4 -
dbaccess/source/ui/app/AppDetailView.hxx | 6 -
dbaccess/source/ui/app/AppSwapWindow.hxx | 2
dbaccess/source/ui/app/AppTitleWindow.hxx | 2
dbaccess/source/ui/app/AppView.hxx | 4 -
dbaccess/source/ui/dlg/UserAdmin.hxx | 2
dbaccess/source/ui/dlg/advancedsettings.hxx | 2
dbaccess/source/ui/dlg/detailpages.hxx | 2
dbaccess/source/ui/inc/QueryDesignView.hxx | 2
dbaccess/source/ui/inc/SqlNameEdit.hxx | 4 -
dbaccess/source/ui/inc/TableDesignView.hxx | 4 -
dbaccess/source/ui/inc/VertSplitView.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 2
dbaccess/source/ui/tabledesign/TEditControl.hxx | 2
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/impedit3.cxx | 3
embeddedobj/test/Container1/NativeView.java | 6 -
extensions/source/ole/servprov.hxx | 4 -
filter/source/msfilter/msdffimp.cxx | 2
forms/source/component/ImageControl.cxx | 3
forms/source/component/clickableimage.cxx | 2
forms/source/inc/FormComponent.hxx | 4 -
fpicker/source/office/OfficeControlAccess.cxx | 4 -
fpicker/source/win32/filepicker/FileOpenDlg.cxx | 5 -
fpicker/source/win32/filepicker/WinFileOpenImpl.hxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 2
include/basegfx/raster/rasterconvert3d.hxx | 6 -
include/comphelper/serviceinfohelper.hxx | 2
include/comphelper/uno3.hxx | 2
include/connectivity/sdbcx/VCollection.hxx | 2
include/cppuhelper/propshlp.hxx | 2
include/dbaccess/ToolBoxHelper.hxx | 3
include/drawinglayer/primitive2d/animatedprimitive2d.hxx | 5 -
include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 2
include/drawinglayer/primitive2d/baseprimitive2d.hxx | 6 -
include/drawinglayer/primitive2d/controlprimitive2d.hxx | 2
include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx | 2
include/drawinglayer/primitive2d/gridprimitive2d.hxx | 2
include/drawinglayer/primitive2d/helplineprimitive2d.hxx | 2
include/drawinglayer/primitive2d/polygonprimitive2d.hxx | 2
include/drawinglayer/primitive2d/primitivetools2d.hxx | 8 +-
include/drawinglayer/primitive2d/sceneprimitive2d.hxx | 2
include/drawinglayer/primitive2d/texteffectprimitive2d.hxx | 2
include/drawinglayer/primitive3d/baseprimitive3d.hxx | 6 -
include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx | 2
include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx | 2
include/drawinglayer/primitive3d/sdrprimitive3d.hxx | 2
include/drawinglayer/processor2d/baseprocessor2d.hxx | 2
include/editeng/editeng.hxx | 2
include/formula/token.hxx | 8 +-
include/formula/tokenarray.hxx | 2
include/sfx2/objsh.hxx | 2
include/sfx2/shell.hxx | 4 -
include/sfx2/thumbnailview.hxx | 6 -
include/svl/numuno.hxx | 4 -
include/svtools/brwbox.hxx | 4 -
include/svtools/treelistbox.hxx | 2
include/svtools/valueset.hxx | 6 -
include/svx/fmgridif.hxx | 2
include/svx/sdr/contact/objectcontact.hxx | 4 -
include/svx/sdr/contact/objectcontactofobjlistpainter.hxx | 2
include/svx/sdr/contact/viewcontact.hxx | 4 -
include/svx/sdr/contact/viewcontactofsdrobj.hxx | 2
include/svx/sdr/contact/viewobjectcontactredirector.hxx | 2
include/svx/sdr/overlay/overlayobject.hxx | 4 -
include/svx/sdr/overlay/overlayselection.hxx | 2
include/svx/sdr/properties/properties.hxx | 14 ++--
include/svx/svdedtv.hxx | 2
include/svx/svdedxv.hxx | 2
include/svx/svdmodel.hxx | 9 +-
include/svx/svdmrkv.hxx | 2
include/svx/svdorect.hxx | 4 -
include/svx/svdpage.hxx | 2
include/svx/svdpntv.hxx | 5 -
include/svx/svdtext.hxx | 2
include/toolkit/awt/vclxaccessiblecomponent.hxx | 2
include/toolkit/controls/unocontrolmodel.hxx | 2
include/vcl/print.hxx | 6 -
include/xmloff/prstylei.hxx | 4 -
include/xmloff/txtstyli.hxx | 2
include/xmloff/xmlexp.hxx | 28 ++++----
include/xmloff/xmlmultiimagehelper.hxx | 2
include/xmloff/xmlnume.hxx | 3
include/xmloff/xmlstyle.hxx | 2
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java | 6 -
odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java | 2
qadevOOo/runner/lib/DynamicClassLoader.java | 2
qadevOOo/runner/util/DynamicClassLoader.java | 2
reportdesign/inc/RptObject.hxx | 2
reportdesign/source/ui/inc/DataProviderHandler.hxx | 2
reportdesign/source/ui/inc/DesignView.hxx | 2
reportdesign/source/ui/inc/GeometryHandler.hxx | 2
reportdesign/source/ui/inc/ReportComponentHandler.hxx | 2
reportdesign/source/ui/inc/ReportWindow.hxx | 2
reportdesign/source/ui/inc/SectionWindow.hxx | 2
reportdesign/source/ui/inc/StartMarker.hxx | 2
reportdesign/source/ui/inc/ViewsWindow.hxx | 4 -
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2
reportdesign/source/ui/inspection/GeometryHandler.cxx | 2
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2
sc/inc/cellsuno.hxx | 10 +--
sc/inc/dapiuno.hxx | 4 -
sc/inc/dptabdat.hxx | 2
sc/inc/optuno.hxx | 2
sc/sdi/tabvwsh.sdi | 1
sc/source/core/inc/ddelink.hxx | 4 -
sc/source/filter/inc/XclExpChangeTrack.hxx | 6 -
sc/source/filter/inc/xcl97esc.hxx | 2
sc/source/filter/inc/xiescher.hxx | 2
sc/source/filter/xml/xmlstyli.hxx | 2
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 32 ----------
sc/source/ui/inc/AccessibleCell.hxx | 4 -
sc/source/ui/inc/AccessibleEditObject.hxx | 4 -
sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 4 -
sc/source/ui/inc/AccessiblePreviewCell.hxx | 2
sc/source/ui/inc/AccessibleTableBase.hxx | 4 -
sc/source/ui/inc/hdrcont.hxx | 2
sc/source/ui/inc/instbdlg.hxx | 2
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/view/colrowba.cxx | 6 -
sd/inc/sdpage.hxx | 2
sd/source/core/annotations/Annotation.cxx | 4 -
sd/source/core/sdpage.cxx | 4 -
sd/source/ui/dlg/tabtempl.cxx | 2
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 4 -
sd/source/ui/inc/ClientView.hxx | 2
sd/source/ui/inc/GraphicViewShell.hxx | 3
sd/source/ui/inc/OutlineViewShell.hxx | 1
sd/source/ui/inc/SlideSorterViewShell.hxx | 2
sd/source/ui/inc/ViewShell.hxx | 2
sd/source/ui/inc/framework/Pane.hxx | 2
sd/source/ui/inc/fupoor.hxx | 2
sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx | 6 -
sd/source/ui/sidebar/MasterPagesSelector.hxx | 2
sd/source/ui/slideshow/showwin.cxx | 2
sd/source/ui/slideshow/showwindow.hxx | 2
sd/source/ui/slideshow/slideshow.cxx | 2
sd/source/ui/slideshow/slideshowimpl.hxx | 2
sd/source/ui/unoidl/unomodel.cxx | 2
sd/source/ui/view/clview.cxx | 4 -
sd/source/ui/view/outlnvsh.cxx | 2
sd/source/ui/view/sdview.cxx | 2
sdext/source/presenter/PresenterSlidePreview.hxx | 2
setup_native/scripts/install_solaris.sh | 2
sfx2/source/appl/appdde.cxx | 18 ++---
sfx2/source/appl/childwin.cxx | 2
sfx2/source/control/bindings.cxx | 8 +-
sfx2/source/dialog/dockwin.cxx | 8 +-
sfx2/source/dialog/styledlg.cxx | 2
sfx2/source/dialog/tabdlg.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/doc/new.cxx | 2
sfx2/source/doc/objcont.cxx | 11 +--
sfx2/source/doc/objxtor.cxx | 6 -
sfx2/source/statbar/stbitem.cxx | 2
sfx2/source/toolbox/tbxitem.cxx | 2
sfx2/source/view/viewsh.cxx | 17 ++---
sot/source/sdstor/stgavl.hxx | 2
starmath/source/node.cxx | 2
svl/source/items/flagitem.cxx | 4 -
svl/source/items/poolio.cxx | 2
svl/source/items/poolitem.cxx | 2
svtools/source/config/menuoptions.cxx | 2
svtools/source/config/optionsdrawinglayer.cxx | 2
svtools/source/control/tabbar.cxx | 2
svx/inc/sdr/contact/objectcontactofpageview.hxx | 4 -
svx/inc/sdr/contact/viewcontactofsdrpage.hxx | 2
svx/inc/sdr/contact/viewobjectcontactofe3d.hxx | 2
svx/inc/sdr/properties/e3dcompoundproperties.hxx | 2
svx/inc/sdr/properties/e3dsceneproperties.hxx | 4 -
svx/inc/sdr/properties/groupproperties.hxx | 2
svx/inc/sdr/properties/pageproperties.hxx | 2
svx/source/dialog/SpellDialogChildWindow.cxx | 6 -
svx/source/dialog/svxruler.cxx | 6 -
svx/source/engine3d/scene3d.cxx | 2
svx/source/engine3d/view3d.cxx | 4 -
svx/source/form/fmobj.cxx | 2
svx/source/inc/fmobj.hxx | 2
svx/source/sdr/contact/objectcontactofpageview.cxx | 2
svx/source/sdr/contact/viewcontact.cxx | 6 -
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 2
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 2
svx/source/sdr/properties/pageproperties.cxx | 6 -
svx/source/sdr/properties/properties.cxx | 8 +-
svx/source/svdraw/svddrgm1.hxx | 2
svx/source/svdraw/svdomeas.cxx | 2
svx/source/svdraw/svdouno.cxx | 4 -
sw/inc/cellfml.hxx | 2
sw/inc/dcontact.hxx | 2
sw/inc/drawdoc.hxx | 2
sw/inc/format.hxx | 4 -
sw/inc/frmfmt.hxx | 2
sw/inc/shellio.hxx | 2
sw/qa/extras/inc/swmodeltestbase.hxx | 2
sw/source/core/access/acccontext.cxx | 12 +--
sw/source/core/attr/cellatr.cxx | 2
sw/source/core/attr/format.cxx | 4 -
sw/source/core/draw/dcontact.cxx | 4 -
sw/source/core/draw/dview.cxx | 2
sw/source/core/inc/dflyobj.hxx | 2
sw/source/core/inc/dview.hxx | 4 -
sw/source/core/inc/swcache.hxx | 3
sw/source/core/layout/atrfrm.cxx | 2
sw/source/core/txtnode/ndtxt.cxx | 8 --
sw/source/filter/basflt/shellio.cxx | 2
sw/source/filter/html/svxcss1.hxx | 15 ++--
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/ww8/escher.hxx | 2
sw/source/filter/ww8/wrtww8.hxx | 3
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docst.cxx | 2
sw/source/uibase/docvw/AnnotationMenuButton.hxx | 4 -
toolkit/source/controls/unocontrol.cxx | 2
toolkit/source/controls/unocontrolmodel.cxx | 2
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 6 -
unotools/source/config/compatibility.cxx | 2
unotools/source/config/moduleoptions.cxx | 2
unotools/source/config/printwarningoptions.cxx | 2
unotools/source/config/securityoptions.cxx | 2
vcl/inc/generic/genprn.h | 4 -
vcl/inc/generic/genpspgraphics.h | 2
vcl/inc/headless/svpdummies.hxx | 2
vcl/inc/headless/svpinst.hxx | 2
vcl/inc/unx/gtk/gtkobject.hxx | 2
vcl/inc/unx/salbmp.h | 2
vcl/inc/unx/salgdi.h | 2
vcl/inc/unx/salobj.h | 2
vcl/inc/unx/saltimer.h | 2
vcl/inc/unx/x11/x11sys.hxx | 2
vcl/source/control/button.cxx | 2
vcl/source/control/edit.cxx | 2
vcl/source/window/menu.cxx | 2
vcl/source/window/menubarwindow.cxx | 2
vcl/unx/generic/app/i18n_status.cxx | 6 -
xmloff/source/draw/sdxmlimp.cxx | 2
xmloff/source/draw/ximpshap.hxx | 2
xmloff/source/text/XMLTextFrameContext.hxx | 2
xmloff/source/xforms/TokenContext.hxx | 2
269 files changed, 427 insertions(+), 486 deletions(-)
New commits:
commit 3f34668673e012860b971e24a7633c300df0c4d1
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 8 23:49:39 2015 +0100
cui: SvxLinguTabPage::GetRanges() is dead, remove it
That's what the comment on it said before it was translated.
Change-Id: I8812f99253bd4a14cb1109abf72b11d650f56003
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 2856fec..8529393 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -148,7 +148,6 @@ private:
public:
virtual ~SvxLinguTabPage();
static SfxTabPage* Create( vcl::Window* pParent, const SfxItemSet* rSet );
- static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index af4e1fc..43b7f1d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -150,13 +150,6 @@ static void lcl_OpenURL( const OUString& _sURL )
}
}
-static const sal_uInt16 pRanges[] =
-{
- SID_ATTR_SPELL,
- SID_ATTR_SPELL,
- 0
-};
-
bool KillFile_Impl( const OUString& rURL )
{
bool bRet = true;
@@ -1133,17 +1126,6 @@ SvxLinguTabPage::~SvxLinguTabPage()
delete pLinguData;
}
-
-
-// don't throw away overloaded
-const sal_uInt16* SvxLinguTabPage::GetRanges()
-{
- //TL???
- return pRanges;
-}
-
-
-
SfxTabPage* SvxLinguTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet )
{
commit 2f69e16c723aab48ad59d17397d8946ec0a48138
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 8 23:08:34 2015 +0100
override the overloading of "overload" to decrease cognitive (over-)load
Change-Id: I4d0e1de89d0bbdbea23bc5a46bf75ae0ce4e2796
diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx
index 7ba534d..0c54e5c 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 2b744a0..82fda81 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 fb655f5..a34ba5c 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 8a985d0..8d8aaa7 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 dfe6d99..35a0eb2 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 037bc48..6829505 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 0b06d0b..5b08111 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 1379b7c..b92b64c 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 18788dc..cfcb159 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 5487a3b..a0794da 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 e28ec3e..e4255b2 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 9fbe441..697f6cf 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 d37e870..4835b67 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 5ab8b44..2d2b8f9 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 622ccf1..cc886df 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 23cfca9..dffe47b 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 2aba722..38bfb82 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 086fd8d..ce04b68 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 0230fc0..6108925 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 fef0bbf..8e74037 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 d3e7f57..800f028 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 57b8b2b..2e148a5 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 f5935aa..ff47c80 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 f695653..46b001b 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 f1abf03..eb75228 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 95c3b63..e4ad394 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 ac12a0d..f900482 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 5c10903..c7b61c4 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 e33144a..76228b5 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 a19118a..8728811 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 605baea..6f0720d 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 af8d91a..005f0cb 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 d702469..fd4119b 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 c09a014..2ca5564 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 4368648..2c1ecd2 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 1643aac..5926f8d 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 f34af43..4a91f47 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 4644830..63e536a 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 3c0a550..5eefcc6 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 4d56b87..e92651c 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 96ff8bd..1c8365e 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 32b9ade..78a997e 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 055b198..b777fc3 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 dcc4b6b..d53cc15 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 f085e8c..24ab22f 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 cc19ec8..2b25369 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 01bc858..fa12c3c 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 71ad12e..d111fc8 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 21ca7fd..e5b5ffc 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 2c5bf9b..a5bfde1 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 46334643c..6e4b242 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 dd9a4c2..8c2f6ce 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 cde340f..4f0fcff 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 92e7c03..1004a2b 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 09ae3f2..e5ee708 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 b6e2dcd..533a1a7 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 7573b5a..3cde90b 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 fc1ded2..ec769e3 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 6fe04d5..821294b 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 486434f..4b54c01 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 2b48c91..3b789eb 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 42d586e..f72ff91 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 38a6d87..9de1e3f 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 a7648a6..51240df 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 bf29766..de2f8de 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 9b101d9..d460a41 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 04bef93..62e2f20 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 e592a95..824306e 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 e0f6ca5..a4109b6 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 27fad99..31ff15f 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 69e18b4..d1ee1e2 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 030144f..62457b4 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 bf6dfb2..a321d90 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 b8244f4..c8a2d32 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 bb35021..70fa3b6 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 882b0a4..444a732 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 09addbc..3e2743e 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 9b9bc8f..9c1e6ee 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 d1cd9f4..10fea30 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 69d8e75..f0e98a5 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 298ea3d..57ce556 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 1671dce..940d624 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 1384ff7..5fb89b0 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 f4fba4d..9a6c24d 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 10db4d5..28a74a7 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 a14bb5b..2d31c97 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 f10cb4a..09b6325 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 9ff322f..c3f55b8 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 dae75a5..446fb15 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 e35cf85..6d21e48 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 84b1689..6dee414 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 ec98225..243b1c6 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 1e4c136..846c6ba 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 511b749..d25970d 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 cf7bf8f..3872402 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 2615865..2eb9bb1 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 afd7908..a923c78 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 bf33813..1d7ba2e 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 833e0ce..e6add45 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 f228a69..a77da32 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 d27228c..62d167b 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 63d4129..f49a163 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 6f85fb1..185e6bf 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 d38a090..4c06d71 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 7475942..111fcae 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 d97a703..c15bdbd 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 761872c..2301e00d 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 1d757b8..7b8a356 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 63fc3cd..efd057f 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 bc29513..521c9e0 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 db62e73..19c536a 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 8fdd721..380bcec 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 6f2cfca..6235b4e 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 5bd1624..ac6dc78 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 047b727..9c6c925 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();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list