[Libreoffice-commits] core.git: svx/source sw/qa sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jul 23 21:39:57 UTC 2018
svx/source/sdr/properties/attributeproperties.cxx | 4 ++--
svx/source/unodraw/unoshap2.cxx | 2 +-
sw/qa/extras/uiwriter/uiwriter.cxx | 2 +-
sw/source/core/crsr/crsrsh.cxx | 2 +-
sw/source/core/layout/laycache.cxx | 2 +-
sw/source/core/layout/tabfrm.cxx | 10 +++++-----
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 73ed7a5179df6543fd3b34d82b5feb9b7277b688
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Tue Jul 17 23:18:09 2018 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Jul 23 23:39:34 2018 +0200
Fix typos
Change-Id: Ia11646ac8f2f57225a1cf37725c5e0742a8489d9
Reviewed-on: https://gerrit.libreoffice.org/57605
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Jenkins
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index ebd3f8c14780..ae498d03803c 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -187,11 +187,11 @@ namespace sdr
// be the case already (SdrModel::Merge and SdDrawDocument::InsertBookmarkAsPage
// have already cloned the StyleSheets to the target-SdrModel when used in Draw/impress).
// If none is found, ImpGetDefaultStyleSheet will be used to set a 'default'
- // StyleSheet as StyleSheet implicitely later (that's what happened in the task,
+ // StyleSheet as StyleSheet implicitly later (that's what happened in the task,
// thus the FillStyle changed to the 'default' Blue).
// Note: It *may* be necessary to do more for StyleSheets, e.g. clone/copy the
// StyleSheet Hierarchy from the source SdrModel and/or add the Items from there
- // as hard attibutes. If needed, have a look at the older AttributeProperties::SetModel
+ // as hard attributes. If needed, have a look at the older AttributeProperties::SetModel
// implementation from e.g. libreoffice-6-0.
SfxStyleSheetBasePool* pTargetStyleSheetPool(rObj.getSdrModelFromSdrObject().GetStyleSheetPool());
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 4aad6e1ec6ee..20040a4ec4f4 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -208,7 +208,7 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape
// pSdrShape->SetModel(GetSdrObject()->GetModel());
// #85922# It makes no sense to set the layer asked
- // from the group object since these is an iteration
+ // from the group object since this is an iteration
// over the contained objects. In consequence, this
// statement erases all layer information from the draw
// objects. Layers need to be set at draw objects directly
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index c4a67c96fce4..dbbacfa82639 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -6393,7 +6393,7 @@ void SwUiWriterTest::testFontEmbedding()
// CASE 2 - font embedding enabled, but embed used fonts disabled
- // Enable font embedding, diable embedding used font only
+ // Enable font embedding, disable embedding used font only
xProps->setPropertyValue("EmbedFonts", uno::makeAny(true));
xProps->setPropertyValue("EmbedOnlyUsedFonts", uno::makeAny(false));
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 6c64ad10a0d1..ccb5ffc84ccf 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -293,7 +293,7 @@ void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
void SwCursorShell::SttCursorMove()
{
#ifdef DBG_UTIL
- OSL_ENSURE( m_nCursorMove < USHRT_MAX, "To many nested CursorMoves." );
+ OSL_ENSURE( m_nCursorMove < USHRT_MAX, "Too many nested CursorMoves." );
#endif
++m_nCursorMove;
StartAction();
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 73c38c19f4eb..675d103b3acd 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -1192,7 +1192,7 @@ void SwLayCacheIoImpl::CloseFlagRec()
}
else
{
- OSL_ENSURE( pStream->Tell() <= nFlagRecEnd, "To many data read" );
+ OSL_ENSURE( pStream->Tell() <= nFlagRecEnd, "Too many data read" );
if( pStream->Tell() != nFlagRecEnd )
pStream->Seek( nFlagRecEnd );
}
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 7c62601414f0..73ca3241d909 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2861,7 +2861,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
if ( nRightOffset > 0 )
{
// surrounding fly frames on the right
- // -> right indent is maximun of given right offset
+ // -> right indent is maximum of given right offset
// and wished right offset.
nRightSpacing = nRightLine + std::max( nRightOffset, nWishRight );
}
@@ -2892,7 +2892,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
if ( nLeftOffset > 0 )
{
// surrounding fly frames on the left
- // -> right indent is maximun of given left offset
+ // -> right indent is maximum of given left offset
// and wished left offset.
nLeftSpacing = nLeftLine + std::max( nLeftOffset, nWishLeft );
}
@@ -2942,7 +2942,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
{
// OD 07.03.2003 #i9040# - surround fly frames only, if
// they overlap with the table.
- // Thus, take maximun of left spacing and left offset.
+ // Thus, take maximum of left spacing and left offset.
// OD 10.03.2003 #i9040# - consider left line attribute.
nLeftSpacing = std::max( nLeftSpacing, ( nLeftOffset + nLeftLine ) );
}
@@ -2952,7 +2952,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
{
// OD 07.03.2003 #i9040# - surround fly frames only, if
// they overlap with the table.
- // Thus, take maximun of right spacing and right offset.
+ // Thus, take maximum of right spacing and right offset.
// OD 10.03.2003 #i9040# - consider right line attribute.
nRightSpacing = std::max( nRightSpacing, ( nRightOffset + nRightLine ) );
}
@@ -2968,7 +2968,7 @@ void SwTabFrame::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderA
{
// OD 10.03.2003 #i9040# - surround fly frames only, if
// they overlap with the table.
- // Thus, take maximun of right spacing and right offset.
+ // Thus, take maximum of right spacing and right offset.
// OD 10.03.2003 #i9040# - consider left line attribute.
nLeftSpacing = std::max( nLeftSpacing, ( pAttrs->CalcLeftLine() + nLeftOffset ) );
}
More information about the Libreoffice-commits
mailing list