You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/10/13 09:35:49 UTC
[openoffice] branch trunk updated: Fixed typo (continueing -> continuing) / final step
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ed2dba9c5c Fixed typo (continueing -> continuing) / final step
ed2dba9c5c is described below
commit ed2dba9c5c53094e7aa84277c25e9c183d2ec4ab
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Oct 13 11:35:32 2022 +0200
Fixed typo (continueing -> continuing) / final step
---
main/sw/inc/SwNumberTree.hxx | 4 ++--
main/sw/source/core/SwNumberTree/SwNumberTree.cxx | 10 +++++-----
main/xmloff/source/text/XMLTextNumRuleInfo.cxx | 6 +++---
main/xmloff/source/text/XMLTextNumRuleInfo.hxx | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/main/sw/inc/SwNumberTree.hxx b/main/sw/inc/SwNumberTree.hxx
index 756ca99a76..55f973e700 100644
--- a/main/sw/inc/SwNumberTree.hxx
+++ b/main/sw/inc/SwNumberTree.hxx
@@ -463,8 +463,8 @@ protected:
// 1. kshdkjfs
// 1.1. lskjf
// sdfjlksaf <-- not counted parent node
- // 1.2. lfjlaskf <-- <mbContinueingPreviousSubTree = true>
- mutable bool mbContinueingPreviousSubTree;
+ // 1.2. lfjlaskf <-- <mbContinuingPreviousSubTree = true>
+ mutable bool mbContinuingPreviousSubTree;
// <--
/**
diff --git a/main/sw/source/core/SwNumberTree/SwNumberTree.cxx b/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 3a4d029a2f..3a991f42ae 100644
--- a/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -41,7 +41,7 @@ SwNumberTreeNode::SwNumberTreeNode()
mpParent( 0 ),
mnNumber( 0 ),
// --> OD 2008-11-26 #158694#
- mbContinueingPreviousSubTree( false ),
+ mbContinuingPreviousSubTree( false ),
// <--
mbPhantom( false ),
mItLastValid()
@@ -191,7 +191,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
{
aIt = mChildren.begin();
// --> OD 2008-11-26 #158694#
- (*aIt)->mbContinueingPreviousSubTree = false;
+ (*aIt)->mbContinuingPreviousSubTree = false;
// <--
// determine default start value
@@ -223,7 +223,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
if ( pPrevNode->GetChildCount() > 0 )
{
// --> OD 2008-11-26 #158694#
- (*aIt)->mbContinueingPreviousSubTree = true;
+ (*aIt)->mbContinuingPreviousSubTree = true;
// <--
nTmpNumber = (*(pPrevNode->mChildren.rbegin()))->GetNumber();
// --> OD 2005-10-27 #126009#
@@ -255,7 +255,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
{
++aIt;
// --> OD 2008-11-26 #158694#
- (*aIt)->mbContinueingPreviousSubTree = false;
+ (*aIt)->mbContinuingPreviousSubTree = false;
// <--
// --> OD 2005-10-19 #126009# - only for counted nodes the number
@@ -786,7 +786,7 @@ SwNumberTree::tSwNumTreeNumber SwNumberTreeNode::GetNumber(bool bValidate)
// --> OD 2008-11-26 #158694#
bool SwNumberTreeNode::IsContinuingPreviousSubTree() const
{
- return mbContinueingPreviousSubTree;
+ return mbContinuingPreviousSubTree;
}
// <--
diff --git a/main/xmloff/source/text/XMLTextNumRuleInfo.cxx b/main/xmloff/source/text/XMLTextNumRuleInfo.cxx
index 9892b90041..7127b1f771 100644
--- a/main/xmloff/source/text/XMLTextNumRuleInfo.cxx
+++ b/main/xmloff/source/text/XMLTextNumRuleInfo.cxx
@@ -54,7 +54,7 @@ XMLTextNumRuleInfo::XMLTextNumRuleInfo()
, msPropNameListId(RTL_CONSTASCII_USTRINGPARAM("ListId"))
, msPropNameStartWith(RTL_CONSTASCII_USTRINGPARAM("StartWith"))
// --> OD 2008-11-26 #158694#
- , msContinuingPreviousSubTree(RTL_CONSTASCII_USTRINGPARAM("ContinueingPreviousSubTree"))
+ , msContinuingPreviousSubTree(RTL_CONSTASCII_USTRINGPARAM("ContinueingPreviousSubTree")) // misspelling kept for compatibility
, msListLabelStringProp(RTL_CONSTASCII_USTRINGPARAM("ListLabelString"))
// <--
, mxNumRules()
@@ -168,10 +168,10 @@ void XMLTextNumRuleInfo::Set(
}
// --> OD 2008-11-26 #158694#
- mbContinueingPreviousSubTree = sal_False;
+ mbContinuingPreviousSubTree = sal_False;
if( xPropSetInfo->hasPropertyByName( msContinuingPreviousSubTree ) )
{
- xPropSet->getPropertyValue( msContinuingPreviousSubTree ) >>= mbContinueingPreviousSubTree;
+ xPropSet->getPropertyValue( msContinuingPreviousSubTree ) >>= mbContinuingPreviousSubTree;
}
// <--
diff --git a/main/xmloff/source/text/XMLTextNumRuleInfo.hxx b/main/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 525b624f62..85cfa23034 100644
--- a/main/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/main/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -77,7 +77,7 @@ class XMLTextNumRuleInfo
// <--
// --> OD 2008-11-26 #158694#
- sal_Bool mbContinueingPreviousSubTree;
+ sal_Bool mbContinuingPreviousSubTree;
::rtl::OUString msListLabelString;
// <--
public:
@@ -147,7 +147,7 @@ public:
// --> OD 2008-11-26 #158694#
inline sal_Bool IsContinuingPreviousSubTree() const
{
- return mbContinueingPreviousSubTree;
+ return mbContinuingPreviousSubTree;
}
inline const ::rtl::OUString& ListLabelString() const
{
@@ -170,7 +170,7 @@ inline XMLTextNumRuleInfo& XMLTextNumRuleInfo::operator=(
mbOutlineStyleAsNormalListStyle = rInfo.mbOutlineStyleAsNormalListStyle;
// <--
// --> OD 2008-11-26 #158694#
- mbContinueingPreviousSubTree = rInfo.mbContinueingPreviousSubTree;
+ mbContinuingPreviousSubTree = rInfo.mbContinuingPreviousSubTree;
msListLabelString = rInfo.msListLabelString;
// <--
@@ -189,7 +189,7 @@ inline void XMLTextNumRuleInfo::Reset()
mbOutlineStyleAsNormalListStyle = sal_False;
// <--
// --> OD 2008-11-26 #158694#
- mbContinueingPreviousSubTree = sal_False;
+ mbContinuingPreviousSubTree = sal_False;
msListLabelString = ::rtl::OUString();
// <--
}