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/07 17:11:53 UTC
[openoffice] branch AOO42X updated: Fixed typo (continueing -> continuing) and some other / 2nd step
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 3e9d837031 Fixed typo (continueing -> continuing) and some other / 2nd step
3e9d837031 is described below
commit 3e9d83703125521674b13967e1c91d49d0ecf51f
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Oct 7 19:10:01 2022 +0200
Fixed typo (continueing -> continuing) and some other / 2nd step
(cherry picked from commit 09b5391526220384d8e577a933aac32143816f9a)
---
main/sw/inc/SwNumberTree.hxx | 16 +++++-----
main/sw/source/core/SwNumberTree/SwNumberTree.cxx | 14 ++++----
main/sw/source/core/unocore/unocrsrhelper.cxx | 39 +++++++++++------------
main/xmloff/source/text/XMLTextNumRuleInfo.hxx | 10 +++---
main/xmloff/source/text/txtparae.cxx | 2 +-
5 files changed, 40 insertions(+), 41 deletions(-)
diff --git a/main/sw/inc/SwNumberTree.hxx b/main/sw/inc/SwNumberTree.hxx
index c26ea65895..756ca99a76 100644
--- a/main/sw/inc/SwNumberTree.hxx
+++ b/main/sw/inc/SwNumberTree.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -170,7 +170,7 @@ public:
SwNumberTree::tSwNumTreeNumber GetNumber( bool bValidate = true ) const;
// --> OD 2008-11-26 #158694#
- bool IsContinueingPreviousSubTree() const;
+ bool IsContinuingPreviousSubTree() const;
// <--
/**
@@ -181,7 +181,7 @@ public:
SwNumberTree::tNumberVector GetNumberVector() const;
/**
- Return if numbering is restartet at this node.
+ Return if numbering is restarted at this node.
*/
virtual bool IsRestart() const = 0;
@@ -317,7 +317,7 @@ public:
/** Invalidation and notification of complete numbering tree
OD 2006-04-26 #i64010#
- Usage: on <IsCounted()> state change its needed to invalidate the
+ Usage: on <IsCounted()> state change is needed to invalidate the
complete numbering tree due to wide influence of this change.
*/
inline void InvalidateAndNotifyTree()
@@ -553,7 +553,7 @@ protected:
/**
Set this node as last valid child of its parent.
- @param bValidation see aboce
+ @param bValidation see above
*/
void SetLastValid(bool bValidating) const;
diff --git a/main/sw/source/core/SwNumberTree/SwNumberTree.cxx b/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 62183486fd..3a4d029a2f 100644
--- a/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/main/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -784,7 +784,7 @@ SwNumberTree::tSwNumTreeNumber SwNumberTreeNode::GetNumber(bool bValidate)
}
// --> OD 2008-11-26 #158694#
-bool SwNumberTreeNode::IsContinueingPreviousSubTree() const
+bool SwNumberTreeNode::IsContinuingPreviousSubTree() const
{
return mbContinueingPreviousSubTree;
}
@@ -907,8 +907,8 @@ bool SwNumberTreeNode::IsFirst() const
// --> OD 2007-10-02 #b6600435#
// If node isn't the first child, it is the second child and the
- // first child is a phanton. In this case check, if the first phantom
- // child have only phanton childs
+ // first child is a phantom. In this case check, if the first phantom
+ // child have only phantom childs
if ( bResult &&
this != *(GetParent()->mChildren.begin()) &&
!(*(GetParent()->mChildren.begin()))->HasOnlyPhantoms() )
diff --git a/main/sw/source/core/unocore/unocrsrhelper.cxx b/main/sw/source/core/unocore/unocrsrhelper.cxx
index 8e2a62a584..3dc815223a 100644
--- a/main/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/main/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -161,7 +161,7 @@ sal_Bool getCrsrPropertyValue(
if ( pTmpNode &&
pTmpNode->GetNum() &&
- pTmpNode->GetNum()->IsContinueingPreviousSubTree() )
+ pTmpNode->GetNum()->IsContinuingPreviousSubTree() )
{
bRet = true;
}
@@ -391,13 +391,13 @@ sal_Bool getCrsrPropertyValue(
//SwTable& rTable = ((SwTableNode*)pSttNode)->GetTable();
if(FN_UNO_TEXT_TABLE == rEntry.nWID)
{
- uno::Reference< XTextTable > xTable = SwXTextTables::GetObject(*pTableFmt);
+ uno::Reference< XTextTable > xTable = SwXTextTables::GetObject(*pTableFmt);
pAny->setValue(&xTable, ::getCppuType((uno::Reference<XTextTable>*)0));
}
else
{
SwTableBox* pBox = pSttNode->GetTblBox();
- uno::Reference< XCell > xCell = SwXCell::CreateXCell(pTableFmt, pBox);
+ uno::Reference< XCell > xCell = SwXCell::CreateXCell(pTableFmt, pBox);
pAny->setValue(&xCell, ::getCppuType((uno::Reference<XCell>*)0));
}
}
@@ -417,7 +417,7 @@ sal_Bool getCrsrPropertyValue(
{
if( pAny )
{
- uno::Reference< XTextFrame > xFrm = (SwXTextFrame*) SwXFrames::GetObject(*pFmt, FLYCNTTYPE_FRM);
+ uno::Reference< XTextFrame > xFrm = (SwXTextFrame*) SwXFrames::GetObject(*pFmt, FLYCNTTYPE_FRM);
pAny->setValue(&xFrm, ::getCppuType((uno::Reference<XTextFrame>*)0));
}
}
@@ -433,7 +433,7 @@ sal_Bool getCrsrPropertyValue(
{
if( pAny )
{
- uno::Reference< XTextSection > xSect = SwXTextSections::GetObject( *pSect->GetFmt() );
+ uno::Reference< XTextSection > xSect = SwXTextSections::GetObject( *pSect->GetFmt() );
pAny->setValue(&xSect, ::getCppuType((uno::Reference<XTextSection>*)0) );
}
}
@@ -478,7 +478,7 @@ sal_Bool getCrsrPropertyValue(
if( pAny )
{ // hmm... can only return 1 here
const SwFmtRefMark& rRef = (*marks.begin())->GetRefMark();
- uno::Reference< XTextContent > xRef = SwXReferenceMarks::GetObject( rPam.GetDoc(), &rRef );
+ uno::Reference< XTextContent > xRef = SwXReferenceMarks::GetObject( rPam.GetDoc(), &rRef );
pAny->setValue(&xRef, ::getCppuType((uno::Reference<XTextContent>*)0));
}
}
@@ -621,7 +621,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
if(pSwNum->GetNumRule())
{
SwNumRule aRule(*pSwNum->GetNumRule());
- const String* pNewCharStyles = pSwNum->GetNewCharStyleNames();
+ const String* pNewCharStyles = pSwNum->GetNewCharStyleNames();
const String* pBulletFontNames = pSwNum->GetBulletFontNames();
for(sal_uInt16 i = 0; i < MAXLEVEL; i++)
{
@@ -686,7 +686,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
}
UnoActionContext aAction(pDoc);
- if ( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
+ if ( rPam.GetNext() != &rPam ) // Mehrfachselektion ?
{
pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_START, NULL );
SwPamRanges aRangeArr( rPam );
@@ -731,12 +731,12 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
/* -----------------25.05.98 11:40-------------------
*
* --------------------------------------------------*/
-void getNumberingProperty(SwPaM& rPam, PropertyState& eState, Any * pAny )
+void getNumberingProperty(SwPaM& rPam, PropertyState& eState, Any * pAny )
{
const SwNumRule* pNumRule = rPam.GetDoc()->GetNumRuleAtPos( *rPam.GetPoint() );
if(pNumRule)
{
- uno::Reference< XIndexReplace > xNum = new SwXNumberingRules(*pNumRule);
+ uno::Reference< XIndexReplace > xNum = new SwXNumberingRules(*pNumRule);
if ( pAny )
pAny->setValue(&xNum, ::getCppuType((const uno::Reference<XIndexReplace>*)0));
eState = PropertyState_DIRECT_VALUE;
@@ -759,7 +759,7 @@ void GetCurPageStyle(SwPaM& rPaM, String &rString)
void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam)
{
SwDoc* pDoc = rPam.GetDoc();
- switch(rEntry.nWID)
+ switch(rEntry.nWID)
{
case FN_UNO_PARA_STYLE :
// lcl_SetTxtFmtColl(aValue, pUnoCrsr);
@@ -902,7 +902,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
if( !pMed )
return;
- // this sourcecode is not responsible for the lifetime of the shell, SfxObjectShellLock should not be used
+ // this sourcecode is not responsible for the lifetime of the shell, SfxObjectShellLock should not be used
SfxObjectShellRef aRef( pDocSh );
pDocSh->RegisterTransfer( *pMed );
@@ -912,8 +912,8 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
SwReader* pRdr;
SfxItemSet* pSet = pMed->GetItemSet();
pSet->Put(SfxBoolItem(FN_API_CALL, sal_True));
- if(sPassword.getLength())
- pSet->Put(SfxStringItem(SID_PASSWORD, sPassword));
+ if(sPassword.getLength())
+ pSet->Put(SfxStringItem(SID_PASSWORD, sPassword));
Reader *pRead = pDocSh->StartConvertFrom( *pMed, &pRdr, 0, pUnoCrsr);
if( pRead )
{
@@ -926,7 +926,7 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
SwNodeIndex aSave( pUnoCrsr->GetPoint()->nNode, -1 );
xub_StrLen nCntnt = pUnoCrsr->GetPoint()->nContent.GetIndex();
- sal_uInt32 nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen
+ sal_uInt32 nErrno = pRdr->Read( *pRead ); // und Dokument einfuegen
if(!nErrno)
{
@@ -1117,4 +1117,3 @@ bool SwAnyMapHelper::FillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, co
}
}//namespace SwUnoCursorHelper
-
diff --git a/main/xmloff/source/text/XMLTextNumRuleInfo.hxx b/main/xmloff/source/text/XMLTextNumRuleInfo.hxx
index 593786cf8c..9631229892 100644
--- a/main/xmloff/source/text/XMLTextNumRuleInfo.hxx
+++ b/main/xmloff/source/text/XMLTextNumRuleInfo.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -145,7 +145,7 @@ public:
}
// --> OD 2008-11-26 #158694#
- inline sal_Bool IsContinueingPreviousSubTree() const
+ inline sal_Bool IsContinuingPreviousSubTree() const
{
return mbContinueingPreviousSubTree;
}
diff --git a/main/xmloff/source/text/txtparae.cxx b/main/xmloff/source/text/txtparae.cxx
index c6cf4db495..46668e577e 100644
--- a/main/xmloff/source/text/txtparae.cxx
+++ b/main/xmloff/source/text/txtparae.cxx
@@ -895,7 +895,7 @@ void XMLTextParagraphExport::exportListChange(
sal_Int16 nRestartValueForContinuedRootList( -1 );
// --> OD 2008-11-26 #158694#
bool bContinuingPreviousSubList = !bRootListToBeStarted &&
- rNextInfo.IsContinueingPreviousSubTree();
+ rNextInfo.IsContinuingPreviousSubTree();
// <--
do {
GetExport().CheckAttrList();