[Libreoffice-commits] core.git: sw/source writerfilter/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 5 08:50:50 UTC 2019
sw/source/core/text/itrform2.hxx | 2 +-
sw/source/core/text/porlay.cxx | 6 +++---
sw/source/core/text/pormulti.cxx | 4 ++--
sw/source/core/text/portxt.cxx | 6 +++---
sw/source/core/text/txtfrm.cxx | 6 +++---
sw/source/core/text/widorp.cxx | 2 +-
sw/source/core/txtnode/fntcap.cxx | 4 ++--
sw/source/core/txtnode/ndtxt.cxx | 2 +-
sw/source/core/undo/unovwr.cxx | 2 +-
sw/source/core/unocore/unostyle.cxx | 2 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 +-
11 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 1e18f94ff38124716de36315e7ba45de5bbb86e8
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 5 10:42:23 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Mon Aug 5 10:50:11 2019 +0200
Fix typos
Change-Id: I63ab268d908477f8847b315f44f6ffd543b17794
Reviewed-on: https://gerrit.libreoffice.org/76969
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index 53db28c7e179..64fc52e80cd6 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -97,7 +97,7 @@ class SwTextFormatter : public SwTextPainter
// Calculates the ascent and the height from the fontmetric
void CalcAscent( SwTextFormatInfo &rInf, SwLinePortion *pPor );
- // determines, if a optimized repaint rectangle is allowed
+ // determines, if an optimized repaint rectangle is allowed
bool AllowRepaintOpt() const;
// Is called by FormatLine
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index eea5dbd4a622..07f8c4b8a608 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -1036,7 +1036,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode,
}
++nCnt;
- // if current script is asian, we search for compressable characters
+ // if current script is asian, we search for compressible characters
// in this range
if ( CharCompressType::NONE != aCompEnum &&
i18n::ScriptType::ASIAN == nScript )
@@ -1072,7 +1072,7 @@ void SwScriptInfo::InitScriptInfo(const SwTextNode& rNode,
eState = ( 0x3040 <= cChar && 0x3100 > cChar ) ? KANA : NONE;
}
- // insert range of compressable characters
+ // insert range of compressible characters
if( ePrevState != eState )
{
if ( ePrevState != NONE )
@@ -1684,7 +1684,7 @@ SwScriptInfo::CompType SwScriptInfo::DbgCompType(const TextFrameIndex nPos) cons
}
#endif
-// returns, if there are compressable kanas or specials
+// returns, if there are compressible kanas or specials
// between nStart and nEnd
size_t SwScriptInfo::HasKana(TextFrameIndex const nStart, TextFrameIndex const nLen) const
{
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index ee3f89035e9d..6fcc5814bd7c 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -1110,7 +1110,7 @@ std::unique_ptr<SwMultiCreator> SwTextSizeInfo::GetMultiCreator(TextFrameIndex &
// position with the same brackets as the winner-attribute.
// In the following loop rPos is the critical position and it will be
- // evaluated, if at rPos starts a interrupting or a maintaining
+ // evaluated, if at rPos starts an interrupting or a maintaining
// continuity attribute.
// iterAtStartOfNode is positioned to the first hint of the node
@@ -2145,7 +2145,7 @@ bool SwTextFormatter::BuildMultiPortion( SwTextFormatInfo &rInf,
{
// For Solaris, this optimization can causes trouble:
// Setting this to the portion width ( = rMulti.Width() )
- // can make GetTextBreak inside SwTextGuess::Guess return to small
+ // can make GetTextBreak inside SwTextGuess::Guess return too small
// values. Therefore we add some extra twips.
if( nActWidth > nTmpX + rMulti.Width() + 6 )
nActWidth = nTmpX + rMulti.Width() + 6;
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 5dd92da11576..d5f51c7e054a 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -83,8 +83,8 @@ static TextFrameIndex lcl_AddSpace(const SwTextSizeInfo &rInf,
g_pBreakIt->GetBreakIter()->getScriptType(*pStr, sal_Int32(nPos)));
// Note: rInf.GetIdx() can differ from nPos,
- // e.g., when rPor is a field portion. nPos referes to the string passed
- // to the function, rInf.GetIdx() referes to the original string.
+ // e.g., when rPor is a field portion. nPos refers to the string passed
+ // to the function, rInf.GetIdx() refers to the original string.
// We try to find out which justification mode is required. This is done by
// evaluating the script type and the language attribute set for this portion
@@ -171,7 +171,7 @@ static TextFrameIndex lcl_AddSpace(const SwTextSizeInfo &rInf,
// We still have to examine the next character:
// If the next character is ASIAN and not KOREAN we have
// to add an extra space
- // nPos referes to the original string, even if a field string has
+ // nPos refers to the original string, even if a field string has
// been passed to this function
nPos = rInf.GetIdx() + rPor.GetLen();
if (nPos < TextFrameIndex(rInf.GetText().getLength()))
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 6d3e78bb9c79..32f03bb301cf 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2892,7 +2892,7 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
// If we're flowing back and own a Footnote, the Footnote also flows
// with us. So that it doesn't obstruct us, we send ourselves
- // a ADJUST_FRM.
+ // an ADJUST_FRM.
// pVoid != 0 means MoveBwd()
const sal_uInt16 nWhich = pHt->Which();
if (RES_TXTATR_FIELD == nWhich ||
@@ -3568,9 +3568,9 @@ void SwTextFrame::CalcHeightOfLastLine( const bool _bUseFont )
// determine height of last line
if ( _bUseFont || pIDSA->get(DocumentSettingId::OLD_LINE_SPACING ) )
{
- // former determination of last line height for proprotional line
+ // former determination of last line height for proportional line
// spacing - take height of font set at the paragraph
- // FIXME actually ... must the font match across all nodes?
+ // FIXME actually... must the font match across all nodes?
SwFont aFont( &GetTextNodeForParaProps()->GetSwAttrSet(), pIDSA );
// we must ensure that the font is restored correctly on the OutputDevice
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index d049fc79b0c0..904744c6bf02 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -107,7 +107,7 @@ bool SwTextFrameBreak::IsInside( SwTextMargin const &rLine ) const
SwSwapIfSwapped swap(m_pFrame);
SwRectFnSet aRectFnSet(m_pFrame);
- // nOrigin is an absolute value, rLine referes to the swapped situation.
+ // nOrigin is an absolute value, rLine refers to the swapped situation.
SwTwips nTmpY;
if ( m_pFrame->IsVertical() )
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index dc090742b0e2..dac54161c7d3 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -54,7 +54,7 @@ public:
// rOrigString: The original string
// nOfst: Position of the substring in rOrigString
// nLen: Length if the substring in rOrigString
-// nIdx: Referes to a position in the display string and should be mapped
+// nIdx: Refers to a position in the display string and should be mapped
// to a position in rOrigString
TextFrameIndex sw_CalcCaseMap(const SwFont& rFnt,
const OUString& rOrigString,
@@ -92,7 +92,7 @@ class SwDoCapitals
{
protected:
SwDrawTextInfo &rInf;
- SwCapitalInfo* pCapInf; // referes to additional information
+ SwCapitalInfo* pCapInf; // refers to additional information
// required by the ::Do function
explicit SwDoCapitals ( SwDrawTextInfo &rInfo ) : rInf( rInfo ), pCapInf( nullptr ) { }
~SwDoCapitals() {}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index d7a80654ff11..0b7557ba65a3 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2998,7 +2998,7 @@ SwTextNode* SwTextNode::MakeNewTextNode( const SwNodeIndex& rPos, bool bNext,
SetCountedInList(true);
}
- // In case the numbering caused a style form the pool to be assigned to
+ // In case the numbering caused a style from the pool to be assigned to
// the new node, don't overwrite that here!
if( pColl != pNode->GetTextColl() ||
( bChgFollow && pColl != GetTextColl() ))
diff --git a/sw/source/core/undo/unovwr.cxx b/sw/source/core/undo/unovwr.cxx
index bf64fc3fca5f..6738c5b44314 100644
--- a/sw/source/core/undo/unovwr.cxx
+++ b/sw/source/core/undo/unovwr.cxx
@@ -195,7 +195,7 @@ void SwUndoOverwrite::UndoImpl(::sw::UndoRedoContext & rContext)
pDoc->SetAutoCorrExceptWord( nullptr );
}
- // If there was not only a overwrite but also an insert, delete the surplus
+ // If there was not only an overwrite but also an insert, delete the surplus
if( aInsStr.getLength() > aDelStr.getLength() )
{
rIdx += aDelStr.getLength();
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index ab7e4f7adc3e..0808994413c2 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2833,7 +2833,7 @@ void SwXStyle::PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet
SetStyleProperty(rEntry, rPropSet, rVal, rBaseImpl);
}
- // reset paret at ItemSet from SetItem
+ // reset parent at ItemSet from SetItem
rSetSet.SetParent(nullptr);
// set the new SvxSetItem at the real target and delete it
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index fab77099ae56..0d2e5cd17f83 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -962,7 +962,7 @@ public:
void appendGrabBag(std::vector<css::beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, const OUString& aValue);
void appendGrabBag(std::vector<css::beans::PropertyValue>& rInteropGrabBag, const OUString& aKey, std::vector<css::beans::PropertyValue>& rValue);
- /// Enable, disable an check status of grabbags
+ /// Enable, disable and check status of grabbags
void enableInteropGrabBag(const OUString& aName);
void disableInteropGrabBag();
bool isInteropGrabBagEnabled();
More information about the Libreoffice-commits
mailing list