[Libreoffice-commits] core.git: sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 5 15:12:39 UTC 2019
sw/source/core/access/acccontext.cxx | 6 +++---
sw/source/core/access/acccontext.hxx | 6 +++---
sw/source/core/access/accdoc.hxx | 2 +-
sw/source/core/access/accmap.cxx | 6 +++---
sw/source/core/access/accnotextframe.hxx | 2 +-
sw/source/core/access/acctable.hxx | 2 +-
sw/source/core/bastyp/swregion.cxx | 2 +-
sw/source/core/crsr/pam.cxx | 2 +-
sw/source/core/graphic/ndgrf.cxx | 2 +-
sw/source/core/layout/atrfrm.cxx | 2 +-
sw/source/core/text/itrcrsr.cxx | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 09084404383ca34f638abb983cd22be51bc14054
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 5 12:04:38 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 5 17:11:52 2019 +0200
Fix typos
Change-Id: Id45d6586cae8c80291e961e98698e5c64e40c35d
Reviewed-on: https://gerrit.libreoffice.org/76974
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index fd80eedc99f8..69e9587988c8 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1077,7 +1077,7 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrameOrOb
IsShowing( *(GetMap()), rChildFrameOrObj ) ||
!SwAccessibleChild( GetFrame() ).IsVisibleChildrenOnly() )
{
- // If the object could have existed before, than there is nothing to do,
+ // If the object could have existed before, then there is nothing to do,
// because no wrapper exists now and therefore no one is interested to
// get notified of the movement.
if( rChildFrameOrObj.GetSwFrame() )
@@ -1173,7 +1173,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
( rOldFrame.Left() == 0 && rOldFrame.Top() == 0 );
if( IsShowing( *(GetMap()), rChildFrameOrObj ) )
{
- // If the object could have existed before, than there is nothing to do,
+ // If the object could have existed before, then there is nothing to do,
// because no wrapper exists now and therefore no one is interested to
// get notified of the movement.
if( bNew || (bVisibleChildrenOnly && !IsShowing( rOldFrame )) )
@@ -1211,7 +1211,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
}
else
{
- // If the frame was visible before, than a child event for the parent
+ // If the frame was visible before, then a child event for the parent
// needs to be send. However, there is no wrapper existing, and so
// no notifications for grandchildren are required. If the are
// grandgrandchildren, they would be notified by the layout.
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 048619b957dd..fbdcab48cb44 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -290,10 +290,10 @@ public:
// thread safe C++ interface
- // The object is not visible an longer and should be destroyed
+ // The object is not visible any longer and should be destroyed
virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true);
- // The child object is not visible an longer and should be destroyed
+ // The child object is not visible any longer and should be destroyed
virtual void DisposeChild(const sw::access::SwAccessibleChild& rFrameOrObj, bool bRecursive, bool bCanSkipInvisible);
// The object has been moved by the layout
@@ -344,7 +344,7 @@ public:
return Select( nullptr, pObj, bAdd );
}
- //This method is used to updated the selected state and fire the selected state changed event.
+ //This method is used to update the selected state and fire the selected state changed event.
virtual bool SetSelectedState(bool bSeleted);
bool IsSeletedInDoc() { return m_isSelectedInDoc; }
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index e815ebf3682d..6f117c825b7e 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -165,7 +165,7 @@ public:
// thread safe C++ interface
- // The object is not visible an longer and should be destroyed
+ // The object is not visible any longer and should be destroyed
virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override;
// XAccessibleComponent
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 5d60c0020804..28910e2b5cb5 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1442,7 +1442,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
}
}
-//Marge with DoInvalidateShapeFocus
+//Merge with DoInvalidateShapeFocus
void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=false*/)
{
std::unique_ptr<SwAccessibleObjShape_Impl[]> pShapes;
@@ -1607,7 +1607,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa
}
}
-//Marge with DoInvalidateShapeSelection
+//Merge with DoInvalidateShapeSelection
/*
void SwAccessibleMap::DoInvalidateShapeFocus()
{
@@ -2601,7 +2601,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
if( xAcc.is() )
xOldAcc = xAcc; // avoid extra invalidation
else
- xAcc = xOldAcc; // make sure ate least one
+ xAcc = xOldAcc; // make sure at least one
}
if( !xAcc.is() )
xAcc = GetContext( aFrameOrObj.GetSwFrame() );
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 374f1ee29a18..6363bd9dcda4 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -85,7 +85,7 @@ public:
virtual sal_Int32 SAL_CALL
getAccessibleImageWidth( ) override;
- // The object is not visible an longer and should be destroyed
+ // The object is not visible any longer and should be destroyed
virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override;
virtual sal_Int32 SAL_CALL getCaretPosition( ) override;
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index d9d6424ee7a8..df805c3ed080 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -181,7 +181,7 @@ public:
// The object has been moved by the layout
virtual void InvalidatePosOrSize( const SwRect& rOldBox ) override;
- // The object is not visible an longer and should be destroyed
+ // The object is not visible any longer and should be destroyed
virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override;
virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrameOrObj,
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index a97d1e6bb822..e67dac264082 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -169,7 +169,7 @@ void SwRegionRects::Compress()
// For combining as much as possible (and for having less single
// paints), the area of the union can be a little bit larger:
// ( 9622 * 141.5 = 1361513 ~= a quarter (1/4) centimeter wider
- // than the width of a A4 page
+ // than the width of an A4 page
const long nFuzzy = 1361513;
SwRect aUnion( (*this)[i] );
aUnion.Union( (*this)[j] );
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 6dcd0192df5d..2fb3c5c9006b 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -874,7 +874,7 @@ void GoEndSection( SwPosition * pPos )
nLevel--;
do { SwNodes::GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
- // now on a EndNode, thus to the previous ContentNode
+ // now on an EndNode, thus to the previous ContentNode
if( GoPreviousNds( &pPos->nNode, true ) )
pPos->nNode.GetNode().GetContentNode()->MakeEndIndex( &pPos->nContent );
}
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 1b32c727734b..fdeaf2491a2d 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -164,7 +164,7 @@ bool SwGrfNode::ReRead(
if( !sURLLink.isEmpty() )
{
- // Note: If there is DDE in the FltName, than it is a DDE-linked graphic
+ // Note: if there is DDE in the FltName, then it is a DDE-linked graphic
OUString sCmd( sURLLink );
if( !rFltName.isEmpty() )
{
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index a23c3209ad14..4c4e494708f1 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -3156,7 +3156,7 @@ OUString SwFlyFrameFormat::GetObjDescription() const
Method determines, if background of fly frame is transparent.
@return true, if background color is transparent, but not "no fill"
- or the transparency of a existing background graphic is set.
+ or the transparency of an existing background graphic is set.
*/
bool SwFlyFrameFormat::IsBackgroundTransparent() const
{
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 664ccdca6f7b..4baadcf57f25 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -462,7 +462,7 @@ void SwTextCursor::GetEndCharRect(SwRect* pOrig, const TextFrameIndex nOfst,
// internal function, called by SwTextCursor::GetCharRect() to calculate
// the relative character position in the current line.
-// pOrig referes to x and y coordinates, width and height of the cursor
+// pOrig refers to x and y coordinates, width and height of the cursor
// pCMS is used for restricting the cursor, if there are different font
// heights in one line ( first value = offset to y of pOrig, second
// value = real height of (shortened) cursor
More information about the Libreoffice-commits
mailing list