[Libreoffice-commits] core.git: sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jul 24 17:36:13 UTC 2021
sw/source/core/edit/edtox.cxx | 2 +-
sw/source/core/inc/rootfrm.hxx | 2 +-
sw/source/core/layout/layact.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9d340a32104c01b15d901e6328641223c74d55dd
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Jul 23 07:38:14 2021 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Jul 24 19:35:41 2021 +0200
Fix typo
Change-Id: Ia9f0965a26defed4d68cb4fdce82ca860d36bd29
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119398
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index b03dc5088f8c..ebd201fd7efb 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -173,7 +173,7 @@ void SwEditShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet)
rTOXSect.SetPosAtStartEnd(*GetCursor()->GetPoint());
// start formatting
- // tdf#139426 ..but allow supression of AssertFlyPages
+ // tdf#139426 ...but allow suppression of AssertFlyPages
GetLayout()->SetTableUpdateInProgress(true);
CalcLayout();
GetLayout()->SetTableUpdateInProgress(false);
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 00fd1522d291..6e79b4aa941d 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -114,7 +114,7 @@ class SW_DLLPUBLIC SwRootFrame final : public SwLayoutFrame
bool mbBrowseWidthValid :1; // Is mnBrowseWidth valid?
bool mbTurboAllowed :1;
bool mbAssertFlyPages :1; // Insert more Pages for Flys if needed?
- bool mbTableUpdateInProgress : 1; // tdf#139426 to allow supression of AssertFlyPages during TableUpdate
+ bool mbTableUpdateInProgress : 1; // tdf#139426 to allow suppression of AssertFlyPages during TableUpdate
bool mbIsVirtPageNum :1; // Do we have a virtual pagenumber?
bool mbIsNewLayout :1; // Layout loaded or newly created
bool mbCallbackActionEnabled:1; // No Action in Notification desired
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 0d381ac00314..95a48df5efda 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -657,7 +657,7 @@ void SwLayAction::InternalAction(OutputDevice* pRenderContext)
if ((bTakeShortcut || !pPage) && !IsInterrupt() &&
(m_pRoot->IsSuperfluous() || m_pRoot->IsAssertFlyPages()) )
{
- // tdf#139426 allow supression of AssertFlyPages
+ // tdf#139426 allow suppression of AssertFlyPages
if ( m_pRoot->IsAssertFlyPages() && !m_pRoot->IsTableUpdateInProgress())
{
m_pRoot->AssertFlyPages();
More information about the Libreoffice-commits
mailing list