[Libreoffice-commits] core.git: sfx2/source sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 1 07:10:27 UTC 2020
sfx2/source/appl/workwin.cxx | 2 +-
sfx2/source/dialog/dockwin.cxx | 4 ++--
sw/source/filter/ww8/ww8par2.cxx | 2 +-
sw/source/filter/ww8/ww8par2.hxx | 2 +-
sw/source/filter/ww8/ww8par6.cxx | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 9ab308c9383c8a323a3210dd3009bb1a86a717fd
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Mon Aug 31 15:42:43 2020 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Sep 1 09:09:48 2020 +0200
Fix typo in code
It passed "make check" on Linux
Change-Id: I8e36c4204ae9a2e2968f8006fd6830cd1f6d3905
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101786
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 63c7e106a2e3..9c50a657c097 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1609,7 +1609,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
}
if ( n < aSortedList.size() )
- // sometimes called while toggeling float mode
+ // sometimes called while toggling float mode
nPos = aSortedList[n];
switch ( eConfig )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index dcde3dbbe4f6..f3f79598e927 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -853,7 +853,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
aStr.clear();
}
- // get last alignment (for toggeling)
+ // get last alignment (for toggling)
nPos = aStr.indexOf(',');
if ( nPos != -1 )
{
@@ -903,7 +903,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
}
// detect floating mode
- // toggeling mode will not execute code in handlers, because pImpl->bConstructed is not set yet
+ // toggling mode will not execute code in handlers, because pImpl->bConstructed is not set yet
bool bFloatMode = IsFloatingMode();
if ( bFloatMode != (GetAlignment() == SfxChildAlignment::NOALIGNMENT) )
{
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index e58455a253e3..d80ffa6f885d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2449,7 +2449,7 @@ void WW8TabDesc::CreateSwTable()
if ( m_pIo->m_xSFlyPara && !m_pIo->m_xSFlyPara->pFlyFormat )
{
// Get the table orientation from the fly
- // Do we also need to check m_pIo->m_xSFlyPara->bToggelPos/IsPosToggle()? [Probably not - layout-only concern]
+ // Do we also need to check m_pIo->m_xSFlyPara->bTogglePos/IsPosToggle()? [Probably not - layout-only concern]
const bool bAdjustMargin = m_pIo->m_xSFlyPara->eHRel == text::RelOrientation::PAGE_FRAME || m_pIo->m_xSFlyPara->nXPos;
const bool bIsInsideMargin = m_bIsBiDi ? m_pIo->m_xSFlyPara->eHAlign == text::HoriOrientation::RIGHT
: m_pIo->m_xSFlyPara->eHAlign == text::HoriOrientation::LEFT;
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 22ca540b54a9..ba22f768232e 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -69,7 +69,7 @@ struct WW8SwFlyPara
std::unique_ptr<SwPosition> xMainTextPos; // to return to main text after apo
sal_uInt16 nLineSpace; // line space in tw for graf apos
bool bAutoWidth;
- bool bToggelPos;
+ bool bTogglePos;
// add parameter <nWWPgTop> - WW8's page top margin
WW8SwFlyPara( SwPaM& rPaM,
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 2d81fa4ba612..711b11113e2a 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1883,7 +1883,7 @@ nYBind(( rWW.nSp29 & 0x30 ) >> 4),
nNewNetWidth(MINFLY),
nLineSpace(0),
bAutoWidth(false),
-bToggelPos(false)
+bTogglePos(false)
{
//#i119466 mapping "Around" wrap setting to "Parallel" for table
const bool bIsTable = rIo.m_xPlcxMan->HasParaSprm(NS_sprm::PFInTable::val).pSprm;
@@ -1980,11 +1980,11 @@ bToggelPos(false)
break; // right
case -12:
eHAlign = text::HoriOrientation::LEFT;
- bToggelPos = true;
+ bTogglePos = true;
break; // inside
case -16:
eHAlign = text::HoriOrientation::RIGHT;
- bToggelPos = true;
+ bTogglePos = true;
break; // outside
default:
nXPos = rWW.nSp26 + static_cast<short>(nIniFlyDx);
@@ -2131,7 +2131,7 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
sal_Int16 eHRel = pFS->eHRel;
rReader.MiserableRTLGraphicsHack(nXPos, pFS->nWidth, pFS->eHAlign, eHRel);
/*Above can all go when we have from left in rtl mode*/
- Put( SwFormatHoriOrient(nXPos, pFS->eHAlign, pFS->eHRel, pFS->bToggelPos ));
+ Put( SwFormatHoriOrient(nXPos, pFS->eHAlign, pFS->eHRel, pFS->bTogglePos ));
Put( SwFormatVertOrient( pFS->nYPos, pFS->eVAlign, pFS->eVRel ) );
if (pFS->nLeMgn || pFS->nRiMgn) // set borders
More information about the Libreoffice-commits
mailing list