sw/source/core/inc/drawfont.hxx | 20 ++++++++++----------
sw/source/core/txtnode/fntcache.cxx | 6 +++---
sw/source/core/txtnode/swfont.cxx | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 21215562cde2378245a3641457c00e5fad82981a
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Tue Jan 18 12:41:47 2022 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Tue Jan 18 17:09:42 2022 +0100
sw: rename Sperren to CharacterSpacing in code
Sperren is a German typography word related to Sperrsatz, which
refers to increased space between characters. German UI calls it
Zeichenabstand, English one "Character spacing". The English
Wikipedia has an alias "tracking", but that seems as obscure as
Sperren for most programmers.
Change-Id: I2066bccac5e430b9ac2708559a6f2f262f2dea52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128554
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index c6d834fdb253..e777784c7d1e 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -65,7 +65,7 @@ class SW_DLLPUBLIC SwDrawTextInfo
sal_uInt16 m_nWidth;
sal_uInt16 m_nAscent;
sal_uInt16 m_nCompress;
- tools::Long m_nSperren;
+ tools::Long m_nCharacterSpacing;
tools::Long m_nSpace;
tools::Long m_nKern;
TextFrameIndex m_nNumberOfBlanks;
@@ -98,7 +98,7 @@ public:
bool m_bKana : 1;
bool m_bOfst : 1;
bool m_bAscent: 1;
- bool m_bSperr : 1;
+ bool m_bCharacterSpacing : 1;
bool m_bSpace : 1;
bool m_bNumberOfBlanks : 1;
bool m_bUppr : 1;
@@ -149,7 +149,7 @@ public:
m_nKanaDiff = 0;
m_nOfst = 0;
m_nAscent = 0;
- m_nSperren = 0;
+ m_nCharacterSpacing = 0;
m_nSpace = 0;
m_bUpper = false;
m_bDrawSpace = false;
@@ -161,7 +161,7 @@ public:
m_bPos = m_bWrong = m_bGrammarCheck = m_bSize = m_bFnt = m_bAscent =
m_bSpace = m_bNumberOfBlanks = m_bUppr =
m_bDrawSp = m_bKana = m_bOfst = m_bHyph =
- m_bSperr = false;
+ m_bCharacterSpacing = false;
#endif
}
@@ -312,12 +312,12 @@ public:
return m_nCompress;
}
- tools::Long GetSperren() const
+ tools::Long GetCharacterSpacing() const
{
#ifdef DBG_UTIL
- OSL_ENSURE( m_bSperr, "DrawTextInfo: Undefined >Sperren<" );
+ OSL_ENSURE( m_bCharacterSpacing, "DrawTextInfo: Undefined
CharacterSpacing" );
#endif
- return m_nSperren;
+ return m_nCharacterSpacing;
}
tools::Long GetKern() const
@@ -525,17 +525,17 @@ public:
{
if( nNew < 0 )
{
- m_nSperren = -nNew;
+ m_nCharacterSpacing = -nNew;
m_nSpace = 0;
}
else
{
m_nSpace = nNew;
- m_nSperren = 0;
+ m_nCharacterSpacing = 0;
}
#ifdef DBG_UTIL
m_bSpace = true;
- m_bSperr = true;
+ m_bCharacterSpacing = true;
#endif
}
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index c19832743250..cb68f6535635 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2124,11 +2124,11 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
TextFrameIndex SwFntObj::GetModelPositionForViewPoint(SwDrawTextInfo &rInf)
{
tools::Long nSpaceAdd = rInf.GetSpace() / SPACING_PRECISION_FACTOR;
- const tools::Long nSperren = -rInf.GetSperren() / SPACING_PRECISION_FACTOR;
+ const tools::Long nCharacterSpacing = -rInf.GetCharacterSpacing() /
SPACING_PRECISION_FACTOR;
tools::Long nKern = rInf.GetKern();
- if( 0 != nSperren )
- nKern -= nSperren;
+ if( 0 != nCharacterSpacing )
+ nKern -= nCharacterSpacing;
std::vector<sal_Int32> aKernArray;
diff --git a/sw/source/core/txtnode/swfont.cxx
b/sw/source/core/txtnode/swfont.cxx
index e0b64c24ef52..028f20d14386 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1148,7 +1148,7 @@ void SwSubFont::DrawText_( SwDrawTextInfo &rInf, const
bool bGrey )
CalcEsc( rInf, aPos );
rInf.SetPos( aPos );
- rInf.SetKern( CheckKerning() + rInf.GetSperren() /
SPACING_PRECISION_FACTOR );
+ rInf.SetKern( CheckKerning() + rInf.GetCharacterSpacing() /
SPACING_PRECISION_FACTOR );
if( IsCapital() )
DrawCapital( rInf );
@@ -1274,7 +1274,7 @@ void SwSubFont::DrawStretchText_( SwDrawTextInfo &rInf )
if( GetEscapement() )
CalcEsc( rInf, aPos );
- rInf.SetKern( CheckKerning() + rInf.GetSperren() /
SPACING_PRECISION_FACTOR );
+ rInf.SetKern( CheckKerning() + rInf.GetCharacterSpacing() /
SPACING_PRECISION_FACTOR );
rInf.SetPos( aPos );
if( IsCapital() )
