[Libreoffice-commits] core.git: chart2/source include/comphelper sfx2/source svx/inc toolkit/source vcl/unx
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Jan 27 07:45:23 UTC 2018
chart2/source/tools/LifeTime.cxx | 2 +-
include/comphelper/numberedcollection.hxx | 2 +-
sfx2/source/view/viewfrm.cxx | 4 ++--
svx/inc/sdr/properties/customshapeproperties.hxx | 2 +-
svx/inc/sdr/properties/emptyproperties.hxx | 2 +-
toolkit/source/controls/controlmodelcontainerbase.cxx | 8 ++++----
vcl/unx/generic/print/common_gfx.cxx | 6 +++---
7 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 72c68a3d1768ea2e05671aee3b2a0db8d87c9e86
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Fri Jan 26 11:37:23 2018 +0100
Fix typos
Change-Id: I914ac70f39028caebafb874e871f11017fda7795
Reviewed-on: https://gerrit.libreoffice.org/48682
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 6ffe8849f1da..b16da9df71e1 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -404,7 +404,7 @@ bool CloseableLifeTimeManager::impl_canStartApiCall()
bool LifeTimeGuard::startApiCall(bool bLongLastingCall)
{
//Mutex needs to be acquired exactly ones; will be released inbetween
- //mutex is requiered due to constructor of LifeTimeGuard
+ //mutex is required due to constructor of LifeTimeGuard
OSL_ENSURE( !m_bCallRegistered, "this method is only allowed ones" );
if(m_bCallRegistered)
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 638641568d21..f004e0a31dcf 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -126,7 +126,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
private:
- /** @short trys to find an unique number not already used within this collection.
+ /** @short tries to find an unique number not already used within this collection.
@descr It reuses the smallest number which isn't used by any component
of this collection. (fragmentation!) If collection is full (means there
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index dd265c2769a6..7a5a536bb46e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -827,7 +827,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
else
{
// If any ChildFrame is reloadable, the slot is enabled,
- // so you can perfom CTRL-Reload
+ // so you can perform CTRL-Reload
rSet.Put( SfxBoolItem( nWhich, false));
}
@@ -2062,7 +2062,7 @@ void SfxViewFrame::ExecView_Impl
return;
}
- // Get ViewData of FrameSets recursivly.
+ // Get ViewData of FrameSets recursively.
GetFrame().GetViewData_Impl();
SfxMedium* pMed = GetObjectShell()->GetMedium();
diff --git a/svx/inc/sdr/properties/customshapeproperties.hxx b/svx/inc/sdr/properties/customshapeproperties.hxx
index e056f21a106f..4abe7a50861a 100644
--- a/svx/inc/sdr/properties/customshapeproperties.hxx
+++ b/svx/inc/sdr/properties/customshapeproperties.hxx
@@ -53,7 +53,7 @@ namespace sdr
virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
// clear single item direct, do not do any notifies or things like that.
- // Also supports complete deleteion of items when default parameter 0 is used.
+ // Also supports complete deletion of items when default parameter 0 is used.
virtual void ClearObjectItemDirect(const sal_uInt16 nWhich) override;
public:
diff --git a/svx/inc/sdr/properties/emptyproperties.hxx b/svx/inc/sdr/properties/emptyproperties.hxx
index 4da4be720ef3..8163eacfc4f0 100644
--- a/svx/inc/sdr/properties/emptyproperties.hxx
+++ b/svx/inc/sdr/properties/emptyproperties.hxx
@@ -72,7 +72,7 @@ namespace sdr
virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) override;
// clear single item direct, do not do any notifies or things like that.
- // Also supports complete deleteion of items when default parameter 0 is used.
+ // Also supports complete deletion of items when default parameter 0 is used.
virtual void ClearObjectItemDirect(const sal_uInt16 nWhich) override;
// set complete item set
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 88012e542899..1135c52c68fe 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -494,7 +494,7 @@ void ControlModelContainerBase::replaceByName( const OUString& aName, const Any&
{
// remove old control (and children) from global list of containers
updateUserFormChildren( xAllChildren, aName, Remove, uno::Reference< XControlModel >() );
- // Add new control (and containees if they exist)
+ // Add new control (and containers if they exist)
updateUserFormChildren( xAllChildren, aName, Insert, xNewModel );
}
// stop listening at the old model
@@ -589,7 +589,7 @@ void ControlModelContainerBase::insertByName( const OUString& aName, const Any&
// hierarchy of the added control could contain a name clash, if we have access to the
// list of global names then we need to recursively check for previously existing
// names (we need to do this obviously before the 'this' objects container is updated)
- // remove old control (and children) from global list of containees
+ // remove old control (and children) from global list of containers
Reference< XNameContainer > xAllChildren( getPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ) ), UNO_QUERY );
if ( xAllChildren.is() )
@@ -1840,7 +1840,7 @@ ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContain
{
Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY );
// container control is being removed from this container, reset the
- // global list of containees
+ // global list of containers
if ( xProps.is() )
xProps->setPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( uno::Reference< XNameContainer >() ) );
Sequence< OUString > aChildNames = xChildContainer->getElementNames();
@@ -1855,7 +1855,7 @@ ControlModelContainerBase::updateUserFormChildren( const Reference< XNameContain
if ( xChildContainer.is() )
{
// container control is being added from this container, reset the
- // global list of containees to point to the correct global list
+ // global list of containers to point to the correct global list
Reference< XPropertySet > xProps( xChildContainer, UNO_QUERY );
if ( xProps.is() )
xProps->setPropertyValue( GetPropertyName( BASEPROPERTY_USERFORMCONTAINEES ), uno::makeAny( xAllChildren ) );
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 0bd2ffa2ea82..85984e835736 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -500,7 +500,7 @@ PrinterGfx::DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const Po
else //Otherwise we're drawing a spline
{
if (i+2 >= nPoints)
- return; //Error: wrong sequence of contol/normal points somehow
+ return; //Error: wrong sequence of control/normal points somehow
if ((pFlgAry[i] == PolyFlags::Control) && (pFlgAry[i+1] == PolyFlags::Control) &&
(pFlgAry[i+2] != PolyFlags::Control))
{
@@ -545,7 +545,7 @@ PrinterGfx::DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const Pol
else
{
if (i+2 >= nPoints)
- return; //Error: wrong sequence of contol/normal points somehow
+ return; //Error: wrong sequence of control/normal points somehow
if ((pFlgAry[i] == PolyFlags::Control) && (pFlgAry[i+1] == PolyFlags::Control) &&
(pFlgAry[i+2] != PolyFlags::Control))
{
@@ -609,7 +609,7 @@ PrinterGfx::DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32 * pPoints,
else
{
if (j+2 >= nPoints)
- break; //Error: wrong sequence of contol/normal points somehow
+ break; //Error: wrong sequence of control/normal points somehow
if ((pFlgAry[i][j] == PolyFlags::Control) && (pFlgAry[i][j+1] == PolyFlags::Control) && (pFlgAry[i][j+2] != PolyFlags::Control))
{
snprintf(pString, nBezString, "%li %li %li %li %li %li curveto\n",
More information about the Libreoffice-commits
mailing list