[Libreoffice-commits] core.git: sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Wed Aug 7 09:36:42 UTC 2019
sw/source/core/SwNumberTree/SwNodeNum.cxx | 2 +-
sw/source/core/access/accframebase.hxx | 2 +-
sw/source/core/access/acctable.cxx | 4 ++--
sw/source/core/attr/format.cxx | 2 +-
sw/source/core/crsr/viscrs.cxx | 2 +-
sw/source/core/doc/CntntIdxStore.cxx | 2 +-
sw/source/core/doc/DocumentContentOperationsManager.cxx | 8 ++++----
sw/source/core/doc/docbm.cxx | 2 +-
sw/source/core/doc/docglbl.cxx | 2 +-
sw/source/core/doc/htmltbl.cxx | 2 +-
sw/source/core/doc/notxtfrm.cxx | 2 +-
sw/source/core/doc/poolfmt.cxx | 2 +-
sw/source/core/doc/swserv.cxx | 4 ++--
sw/source/core/docnode/nodes.cxx | 6 +++---
sw/source/core/edit/edfcol.cxx | 2 +-
sw/source/core/edit/edtab.cxx | 4 ++--
sw/source/core/frmedt/feshview.cxx | 4 ++--
sw/source/core/inc/UndoDraw.hxx | 2 +-
sw/source/core/inc/environmentofanchoredobject.hxx | 2 +-
sw/source/core/inc/rootfrm.hxx | 2 +-
sw/source/core/inc/txtfrm.hxx | 2 +-
sw/source/core/layout/anchoreddrawobject.cxx | 4 ++--
sw/source/core/layout/findfrm.cxx | 2 +-
sw/source/core/layout/flowfrm.cxx | 6 +++---
sw/source/core/layout/flylay.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 2 +-
sw/source/core/layout/layact.cxx | 2 +-
sw/source/core/layout/laycache.cxx | 2 +-
sw/source/core/layout/paintfrm.cxx | 12 ++++++------
sw/source/core/layout/softpagebreak.cxx | 2 +-
sw/source/core/layout/tabfrm.cxx | 8 ++++----
sw/source/core/layout/trvlfrm.cxx | 8 ++++----
sw/source/core/layout/virtoutp.cxx | 2 +-
sw/source/core/layout/wsfrm.cxx | 2 +-
sw/source/core/ole/ndole.cxx | 4 ++--
sw/source/core/table/swnewtable.cxx | 2 +-
sw/source/core/undo/untbl.cxx | 6 +++---
sw/source/core/unocore/unoframe.cxx | 2 +-
sw/source/core/unocore/unoparagraph.cxx | 2 +-
39 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit a654a8afa6bddc1b77740442ba8c4ed9ea9d793d
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Tue Aug 6 18:42:22 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Wed Aug 7 11:36:01 2019 +0200
Fix typos
Change-Id: Ie48d61e07ce44a3022b92cd295527b65532a64e7
Reviewed-on: https://gerrit.libreoffice.org/76773
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index cc0c4732940e..cece7b00d807 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -50,7 +50,7 @@ SwNodeNum::~SwNodeNum()
void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
{
OSL_ENSURE( GetNumRule() && GetTextNode(),
- "<SwNodeNum::ChangeNumRule(..)> - missing list style and/or text node. Serious defect -> please informm OD." );
+ "<SwNodeNum::ChangeNumRule(..)> - missing list style and/or text node. Serious defect -> please inform OD." );
if ( GetNumRule() && GetTextNode() )
{
GetNumRule()->RemoveTextNode( *(GetTextNode()) );
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index ad45a6396c47..cc4fb0c0058f 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -56,7 +56,7 @@ public:
static SwNodeType GetNodeType( const SwFlyFrame *pFlyFrame );
- // The object is not visible an longer and should be destroyed
+ // The object is not visible any longer and should be destroyed
virtual void Dispose(bool bRecursive, bool bCanSkipInvisible = true) override;
virtual bool SetSelectedState( bool bSeleted ) override;
};
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 63e0c406765b..c2bf54540ef3 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -552,9 +552,9 @@ void SwAccAllTableSelHander_Impl::Unselect( sal_Int32 nRowOrCol,
sal_Int32 nExt )
{
OSL_ENSURE( static_cast< size_t >( nRowOrCol ) < m_aSelected.size(),
- "index to large" );
+ "index too large" );
OSL_ENSURE( static_cast< size_t >( nRowOrCol+nExt ) <= m_aSelected.size(),
- "extent to large" );
+ "extent too large" );
while( nExt )
{
if( m_aSelected[static_cast< size_t >( nRowOrCol )] )
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 300118c72abb..10655bd5b62d 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -215,7 +215,7 @@ void SwFormat::CopyAttrs( const SwFormat& rFormat )
SwFormat::~SwFormat()
{
- // This happens at a ObjectDying message. Thus put all dependent
+ // This happens at an ObjectDying message. Thus put all dependent
// ones on DerivedFrom.
if( HasWriterListeners() )
{
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index f4272cacd354..e2e165f3f28f 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -688,7 +688,7 @@ short SwShellCursor::MaxReplaceArived()
}
}
else
- // otherwise from the Basic, and than switch to RET_YES
+ // otherwise from the Basic, and then switch to RET_YES
nRet = RET_YES;
return nRet;
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 240b14e2d56a..09ca19e52dec 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -47,7 +47,7 @@ using namespace ::sw::mark;
namespace
{
- // #i59534: If a paragraph will be splitted we have to restore some redline positions
+ // #i59534: If a paragraph will be split we have to restore some redline positions
// This help function checks a position compared with a node and a content index
static const int BEFORE_NODE = 0; // Position before the given node index
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index bc632acfdb1e..207cb005d9a2 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1546,7 +1546,7 @@ namespace //local functions originally from docfmt.cxx
//current setting attribute set is a character range properties set and comes from a MS Word
//binary file, and the setting range include a paragraph end position (0X0D);
//more specifications, as such property inside the character range properties set recorded in
- //MS Word binary file are dealed and inserted into data model (SwDoc) one by one, so we
+ //MS Word binary file are dealt and inserted into data model (SwDoc) one by one, so we
//only dealing the scenario that the char properties set with 1 item inside;
if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1 )
@@ -1678,7 +1678,7 @@ namespace //local functions originally from docfmt.cxx
//current setting attribute set is a character range properties set and comes from a MS Word
//binary file, and the setting range include a paragraph end position (0X0D);
//more specifications, as such property inside the character range properties set recorded in
- //MS Word binary file are dealed and inserted into data model (SwDoc) one by one, so we
+ //MS Word binary file are dealt and inserted into data model (SwDoc) one by one, so we
//only dealing the scenario that the char properties set with 1 item inside;
if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1)
{
@@ -1904,7 +1904,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
// Move hard page brakes to the following Node.
bool bSavePageBreak = false, bSavePageDesc = false;
- /* #i9185# This whould lead to a segmentation fault if not caught above. */
+ /* #i9185# This would lead to a segmentation fault if not caught above. */
sal_uLong nNextNd = rEnd.nNode.GetIndex() + 1;
SwTableNode *const pTableNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode();
@@ -4662,7 +4662,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
}
else if( bCanMoveBack )
- { //Insertion at the first position of a text node. It will not be splitted, the table
+ { // Insertion at the first position of a text node. It will not be split, the table
// will be inserted before the text node.
// See below, before the SetInsertRange function of the undo object will be called,
// the CpyPam would be moved to the next content position. This has to be avoided
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 571c219faec9..01a0927587c8 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1471,7 +1471,7 @@ namespace sw { namespace mark
OUString sTmp;
// try the name "<rName>XXX" (where XXX is a number starting from 1) unless there is
- // a unused name. Due to performance-reasons (especially in mailmerge-scenarios) there
+ // an unused name. Due to performance-reasons (especially in mailmerge-scenarios) there
// is a map m_aMarkBasenameMapUniqueOffset which holds the next possible offset (XXX) for
// rName (so there is no need to test for nCnt-values smaller than the offset).
sal_Int32 nCnt = 1;
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 771512cd2ede..0d37bfc0d2c0 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -172,7 +172,7 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
if ( !bOutline) {
if( pSplitColl )
{
- // If it isn't a OutlineNumbering, then use an own array and collect the Nodes.
+ // If it isn't an OutlineNumbering, then use an own array and collect the Nodes.
if( pSplitColl->GetAttrOutlineLevel() == 0 )
{
xTmpOutlNds.reset(new SwOutlineNodes);
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 346c67c552fe..cac3b22e05fa 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1180,7 +1180,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv
m_nMin > MAX_TABWIDTH )
{
// If
- // - a inner table's minimum is larger than the available space, or
+ // - an inner table's minimum is larger than the available space, or
// - a top table's minimum is larger than USHORT_MAX the table
// has to be adapted to the available space or USHORT_MAX.
// We preserve the widths' ratio amongst themselves, however.
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 3fd9f05ffc83..45c32b51a1b3 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -556,7 +556,7 @@ void SwNoTextFrame::MakeAll(vcl::RenderContext* pRenderContext)
// set the SwFrameAreaDefinition(s) back to BoundAreas of
// the transformed SwFrame. All needed information is part
// of the already correctly created Transformations of the
- // upper frame, so it can bre re-created on the fly
+ // upper frame, so it can be re-created on the fly
if(pUpperFly->isTransformableSwFrame())
{
pUpperFly->getTransformableSwFrame()->adaptFrameAreasToTransformations();
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 30ba42f2a577..811099a7cc99 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -159,7 +159,7 @@ const OUString* SwDoc::GetDocPattern(size_t const nPos) const
}
// Look for the style name's position. If it doesn't exist,
-// insert a anew
+// insert an anew
size_t SwDoc::SetDocPattern(const OUString& rPatternName)
{
OSL_ENSURE( !rPatternName.isEmpty(), "no Document style name" );
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 5dfe6d92b36b..c78b5883c18c 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -274,7 +274,7 @@ void SwServerObject::SetDdeBookmark( ::sw::mark::IMark& rBookmark)
}
else
OSL_FAIL("SwServerObject::SetNoServer(..)"
- " - setting an bookmark that is not DDE-capable");
+ " - setting a bookmark that is not DDE-capable");
}
SwDataChanged::SwDataChanged( const SwPaM& rPam )
@@ -300,7 +300,7 @@ SwDataChanged::~SwDataChanged()
for( const auto& rpLinkSrc : aTemp )
{
::sfx2::SvLinkSourceRef refObj( rpLinkSrc );
- // Any one else interested in the Object?
+ // Anyone else interested in the Object?
if( refObj->HasDataLinks() && dynamic_cast<const SwServerObject*>( refObj.get() ) != nullptr)
{
SwServerObject& rObj = *static_cast<SwServerObject*>( refObj.get() );
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 37011a20e78e..f73be41d8ad2 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -934,7 +934,7 @@ void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp )
/** increase level of the given range
*
* The range contained in pRange will be lifted to the next higher level.
- * This is done by adding a end node at pRange.start and a start node at
+ * This is done by adding an end node at pRange.start and a start node at
* pRange.end. Furthermore all indices for this range will be updated.
*
* After this method call, the start node of pRange will be pointing to the
@@ -1161,7 +1161,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong nNodes)
nLevel--;
}
- // after deletion, aEnd might point to a EndNode...
+ // after deletion, aEnd might point to an EndNode...
// delete all empty start/end node pairs
SwNode* pTmpNode = aRg.aEnd.GetNode().GetEndNode();
--aRg.aEnd;
@@ -1712,7 +1712,7 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
// when inserting into the source range, nothing need to be done
OSL_ENSURE( &aRg.aStart.GetNodes() == this,
- "aRg should use thisnodes array" );
+ "aRg should use this node array" );
OSL_ENSURE( &aRg.aStart.GetNodes() == &aRg.aEnd.GetNodes(),
"Range across different nodes arrays? You deserve punishment!");
if( &rIndex.GetNodes() == &aRg.aStart.GetNodes() &&
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index cd9bdd6281eb..5856527a1c8d 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -432,7 +432,7 @@ lcl_MakeParagraphSignatureFieldText(const uno::Reference<frame::XModel>& xModel,
return lcl_MakeParagraphSignatureFieldText(aDescr, utf8Text);
}
-/// Generate the next valid ID for the a new signature on this paragraph.
+/// Generate the next valid ID for the new signature on this paragraph.
OUString lcl_getNextSignatureId(const uno::Reference<frame::XModel>& xModel,
const uno::Reference<text::XTextContent>& xParagraph)
{
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index ba028980c623..fa522c6f301f 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -52,7 +52,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-//Added for bug #i119954# Application crashed if undo/redo covert nest table to text
+//Added for bug #i119954# Application crashed if undo/redo convert nest table to text
static bool ConvertTableToText( const SwTableNode *pTableNode, sal_Unicode cCh );
static void ConvertNestedTablesToText( const SwTableLines &rTableLines, sal_Unicode cCh )
@@ -163,7 +163,7 @@ bool SwEditShell::TableToText( sal_Unicode cCh )
pCursor->SetMark();
pCursor->DeleteMark();
- //Modified for bug #i119954# Application crashed if undo/redo covert nest table to text
+ //Modified for bug #i119954# Application crashed if undo/redo convert nest table to text
StartUndo();
bRet = ConvertTableToText( pTableNd, cCh );
EndUndo();
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 736b10235109..72c9e5443275 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1239,7 +1239,7 @@ void SwFEShell::EndTextEdit()
// is deleted. All other objects marked are preserved.
OSL_ENSURE( Imp()->HasDrawView() && Imp()->GetDrawView()->IsTextEdit(),
- "EndTextEdit an no Object" );
+ "EndTextEdit a no Object" );
StartAllAction();
SdrView *pView = Imp()->GetDrawView();
@@ -1331,7 +1331,7 @@ SdrObject* SwFEShell::GetObjAt( const Point& rPt )
return pRet;
}
-// Test if there is a object at that position and if it should be selected.
+// Test if there is an object at that position and if it should be selected.
bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
{
SET_CURR_SHELL(this);
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 0cd836e1280e..d85c0540e407 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -67,7 +67,7 @@ public:
void SetGroupFormat( SwDrawFrameFormat* );
};
-// Action "ungroup drawing object" is now splitted into three parts - see
+// Action "ungroup drawing object" is now split into three parts - see
// method <SwDoc::UnGroupSelection(..)>:
// - creation for <SwDrawFrameFormat> instances for the group members of the
// selected group objects
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 69a5955d3075..9a4f277115c6 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -39,7 +39,7 @@ namespace objectpositioning
this environment is instantiated, follow the text flow or not
@param _bLayoutInCell
input parameter - indicates, if the anchored object should be
- layed out within a (table) cell
+ laid out within a (table) cell
*/
SwEnvironmentOfAnchoredObject( const bool _bFollowTextFlow,
const bool _bLayoutInCell = false );
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index b1d459e1bb44..c3e5d7e48a69 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -205,7 +205,7 @@ public:
void DeRegisterShell( SwViewShell *pSh );
/**
- * Set up Start-/EndAction for all Shells on a as high as possible
+ * Set up Start-/EndAction for all Shells on an as high as possible
* (Shell section) level.
* For the StarONE binding, which does not know the Shells directly.
* The ChangeLinkd of the CursorShell (UI notifications) is called
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index afe590517923..e317f231087e 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -682,7 +682,7 @@ public:
void SwitchHorizontalToVertical( Point& rPoint ) const;
/**
- * Calculates the a limit value when switching from
+ * Calculates the limit value when switching from
* horizontal to vertical layout
*/
long SwitchHorizontalToVertical( long nLimit ) const;
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index de969773d8b9..630aaeccfaf8 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -355,7 +355,7 @@ void SwAnchoredDrawObject::MakeObjPos()
}
}
-/** method for the intrinsic positioning of a at-paragraph|at-character
+/** method for the intrinsic positioning of an at-paragraph|at-character
anchored drawing object
#i32795# - helper method for method <MakeObjPos>
@@ -449,7 +449,7 @@ void SwAnchoredDrawObject::MakeObjPosAnchoredAtPara()
}
}
-/** method for the intrinsic positioning of a at-page|at-frame anchored
+/** method for the intrinsic positioning of an at-page|at-frame anchored
drawing object
#i32795# - helper method for method <MakeObjPos>
diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx
index 4bd1a5dde202..a35af84d54a1 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1755,7 +1755,7 @@ const SwRowFrame* SwFrame::IsInSplitTableRow() const
const SwTabFrame* pTab = static_cast<const SwTabFrame*>(pRow->GetUpper());
// If most upper row frame is a headline row, the current frame
- // can't be in a splitted table row. Thus, add corresponding condition.
+ // can't be in a split table row. Thus, add corresponding condition.
if ( pRow->GetNext() ||
pTab->GetTable()->IsHeadline(
*(static_cast<const SwRowFrame*>(pRow)->GetTabLine()) ) ||
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index b7461e038356..0b09ff3680ac 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1462,7 +1462,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs *pAttrs,
// #i102458#
// Correction:
// A proportional line spacing of the previous text frame
- // is added up to a own leading line spacing.
+ // is added up to an own leading line spacing.
// Otherwise, the maximum of the leading line spacing
// of the previous text frame and the own leading line
// spacing is built.
@@ -1508,7 +1508,7 @@ SwTwips SwFlowFrame::CalcUpperSpace( const SwBorderAttrs *pAttrs,
// #i102458#
// Correction:
// A proportional line spacing of the previous text frame
- // is added up to a own leading line spacing.
+ // is added up to an own leading line spacing.
// Otherwise, the maximum of the leading line spacing
// of the previous text frame and the own leading line
// spacing is built.
@@ -2110,7 +2110,7 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
}
else if ( IsPageBreak( true ) ) // Do we have to respect a PageBreak?
{
- // If the previous page doesn't have an Frame in the body,
+ // If the previous page doesn't have a Frame in the body,
// flowing back makes sense despite the PageBreak (otherwise,
// we'd get an empty page).
// Of course we need to overlook empty pages!
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 49afefe7a828..4a7030ea241e 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -279,7 +279,7 @@ void SwFlyFreeFrame::MakeAll(vcl::RenderContext* /*pRenderContext*/)
{
// RotateFlyFrame3: Also need to clear ContourCache (if used),
// usually done in SwFlyFrame::NotifyDrawObj, but there relies on
- // being in transform mode which is already resetted then
+ // being in transform mode which is already reset then
if(isTransformableSwFrame())
{
::ClrContourCache(GetVirtDrawObj());
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 3a762e6ce885..9bc74e575247 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1435,7 +1435,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
// for e.g. while inserting a table
{
SwSectionFrame* pSct = pLay->FindSctFrame();
- // If content will be inserted in a footnote, which in an column area,
+ // If content will be inserted in a footnote, which in a column area,
// the column area it is not allowed to be broken up.
// Only if in the inner of the footnote lies an area, is this a candidate
// for pActualSection.
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 83172f70e56f..2adde3af3022 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2313,7 +2313,7 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pI ) :
#ifdef DBG_UTIL
if ( m_bIndicator && pImp->GetShell()->GetWin() )
{
- // Do not invalidate indicator, this may cause a endless loop. Instead, just repaint it
+ // Do not invalidate indicator, this may cause an endless loop. Instead, just repaint it
// This should be replaced by an overlay object in the future, anyways. Since it's only for debug
// purposes, it is not urgent.
m_bIndicator = false; SHOW_IDLE( COL_LIGHTGREEN );
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 1242fcb91fc0..1f4f35b933b8 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -1110,7 +1110,7 @@ void SwLayCacheIoImpl::CloseRec()
else
{
sal_uInt32 n = aRecords.back().size;
- OSL_ENSURE( n >= nPos, "CloseRec: to much data read" );
+ OSL_ENSURE( n >= nPos, "CloseRec: too much data read" );
if( n != nPos )
{
pStream->Seek( n );
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index e17d38550eec..a0a6f50db291 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -1586,7 +1586,7 @@ static void lcl_implDrawGraphicBackgrd( const SvxBrushItem& _rBackgrdBrush,
* Method introduced for bug fix #103876# in order to optimize drawing tiled
* background graphics. Previously, this code was integrated in method
* <lcl_DrawGraphic>.
- * Method implemented as a inline, checking the conditions and calling method
+ * Method implemented as an inline, checking the conditions and calling method
* method <lcl_implDrawGraphicBackgrd(..)> for the intrinsic drawing.
*
* @param _rBackgrdBrush
@@ -1964,7 +1964,7 @@ void DrawGraphic(
pOutDev->Push( PushFlags::FILLCOLOR|PushFlags::LINECOLOR );
pOutDev->SetLineColor();
- // check, if a existing background graphic (not filling the complete
+ // check, if an existing background graphic (not filling the complete
// background) is transparent drawn and the background color is
// "no fill" respectively "auto fill", if background transparency
// has to be considered.
@@ -5126,7 +5126,7 @@ void SwFrame::PaintSwFrameShadowAndBorder(
if(rAttrs.JoinedWithPrev(*this))
{
- // tdf#115296 re-add adaption of vert distance to close the evtl.
+ // tdf#115296 re-add adaptation of vert distance to close the evtl.
// existing gap to previous frame
const SwFrame* pPrevFrame(GetPrev());
(aRect.*_rRectFn->fnSetTop)( (pPrevFrame->*_rRectFn->fnGetPrtBottom)() );
@@ -5137,7 +5137,7 @@ void SwFrame::PaintSwFrameShadowAndBorder(
if(rAttrs.JoinedWithNext(*this))
{
- // tdf#115296 re-add adaption of vert distance to close the evtl.
+ // tdf#115296 re-add adaptation of vert distance to close the evtl.
// existing gap to next frame
const SwFrame* pNextFrame(GetNext());
(aRect.*_rRectFn->fnSetBottom)( (pNextFrame->*_rRectFn->fnGetPrtTop)() );
@@ -6531,7 +6531,7 @@ static void lcl_RefreshLine( const SwLayoutFrame *pLay,
// OD 19.12.2002 #106318# - do *not* consider fly frames with
// a transparent background.
// OD 2004-02-12 #110582#-2 - do *not* consider fly frame, which
- // belongs to a invisible layer
+ // belongs to an invisible layer
if ( pFly->IsBackgroundTransparent() ||
!pFly->GetFormat()->GetDoc()->getIDocumentDrawModelAccess().IsVisibleLayerId( pObj->GetLayer() ) )
{
@@ -7120,7 +7120,7 @@ void SwFrame::Retouch( const SwPageFrame * pPage, const SwRect &rRect ) const
* which has a background graphic. But there are some special cases:
* (1) No background brush is taken from a page frame, if view option "IsPageBack"
* isn't set.
- * (2) Background brush from a index section is taken under special conditions.
+ * (2) Background brush from an index section is taken under special conditions.
* In this case parameter <rpCol> is set to the index shading color.
* (3) New (OD 20.08.2002) - Background brush is taken, if on background drawing
* of the frame transparency is considered and its color is not "no fill"/"auto fill"
diff --git a/sw/source/core/layout/softpagebreak.cxx b/sw/source/core/layout/softpagebreak.cxx
index c1fda882bd77..daed905a1826 100644
--- a/sw/source/core/layout/softpagebreak.cxx
+++ b/sw/source/core/layout/softpagebreak.cxx
@@ -79,7 +79,7 @@ void SwTextNode::fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const
pFirst2 = static_cast<const SwLayoutFrame*>(pCell)->ContainsContent();
if( pFirst2 == pFrame )
{ // Here we are: a first content inside a cell
- // inside the splitted row => soft page break
+ // inside the split row => soft page break
auto const pos(pFrame->MapViewToModel(pFrame->GetOfst()));
if (pos.first == this)
{
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 960bb9462007..1332fe1e3dda 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2339,7 +2339,7 @@ void SwTabFrame::MakeAll(vcl::RenderContext* pRenderContext)
// First try to split the table. Condition:
// 1. We have at least one non headline row
// 2. If this row wants to keep, we need an additional row
- // 3. The table is allowed to split or we do not have an pIndPrev:
+ // 3. The table is allowed to split or we do not have a pIndPrev:
SwFrame* pIndPrev = GetIndPrev();
const SwRowFrame* pFirstNonHeadlineRow = GetFirstNonHeadlineRow();
// #i120016# if this row wants to keep, allow split in case that all rows want to keep with next,
@@ -2709,8 +2709,8 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
// fly frame rectangle overlaps with <aRect>
// - no check, if bottom of anchor frame is prior the top of
// the table, because Writer fly frames can be negative positioned.
- // - correct check, if the Writer fly frame is an lower of the
- // table, because table lines/rows can split and a at-character
+ // - correct check, if the Writer fly frame is a lower of the
+ // table, because table lines/rows can split and an at-character
// anchored Writer fly frame could be positioned in the follow
// flow line.
// - add condition, that an existing anchor character text frame
@@ -3365,7 +3365,7 @@ SwFrame *SwTabFrame::FindLastContentOrTable()
#if OSL_DEBUG_LEVEL > 0
SwSectionFrame* pSect = pRet->FindSctFrame();
OSL_ENSURE( pSect, "Where does this column come from?");
- OSL_ENSURE( IsAnLower( pSect ), "Splitted cell?" );
+ OSL_ENSURE( IsAnLower( pSect ), "Split cell?" );
#endif
return pRet->FindSctFrame()->FindLastContent();
}
diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx
index a0c99131f416..8bb146470119 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -545,7 +545,7 @@ bool SwFlyFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint,
bool bInside = getFrameArea().IsInside( rPoint ) && Lower();
bool bRet = false;
- //If an Frame contains a graphic, but only text was requested, it basically
+ //If a Frame contains a graphic, but only text was requested, it basically
//won't accept the Cursor.
if ( bInside && pCMS && pCMS->m_eState == MV_SETONLYTEXT &&
(!Lower() || Lower()->IsNoTextFrame()) )
@@ -985,7 +985,7 @@ sal_uInt16 SwRootFrame::GetCurrPage( const SwPaM *pActualCursor ) const
/** Returns a PaM which sits at the beginning of the requested page.
*
* Formatting is done as far as necessary.
- * The PaM sits on the last page, if the page number was chosen to big.
+ * The PaM sits on the last page, if the page number was chosen too big.
*
* @return Null, if the operation was not possible.
*/
@@ -1357,7 +1357,7 @@ const SwContentFrame *SwLayoutFrame::GetContentPos( Point& rPoint,
pActual->getFramePrintArea().Right() ) );
}
- //Bring the Point in to the PrtArea
+ //Bring the Point into the PrtArea
const SwRect aRect( pActual->getFrameArea().Pos() + pActual->getFramePrintArea().Pos(),
aActualSize );
if ( aPoint.Y() < aRect.Top() )
@@ -1561,7 +1561,7 @@ Point SwRootFrame::GetNextPrevContentPos( const Point& rPoint, bool bNext ) cons
/** Returns the absolute document position of the desired page.
*
* Formatting is done only as far as needed and only if bFormat=true.
- * Pos is set to the one of the last page, if the page number was chosen to big.
+ * Pos is set to the one of the last page, if the page number was chosen too big.
*
* @return Null, if the operation failed.
*/
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index ccc7f6744776..4e89432139cc 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -67,7 +67,7 @@ bool SwRootFrame::HasSameRect( const SwRect& rRect )
the virtual output device
*/
// define to control, if old or new solution for setting the mapping for
-// an virtual output device is used.
+// a virtual output device is used.
static void SetMappingForVirtDev( const Point& _rNewOrigin,
const vcl::RenderContext* _pOrgOutDev,
vcl::RenderContext* _pVirDev )
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 452ad6cf42f2..62eca76b99a8 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -1317,7 +1317,7 @@ void SwLayoutFrame::Paste( SwFrame* pParent, SwFrame* pSibling)
// There are the following cases:
// (A) Header and footer frames both in vertical and in horizontal layout
// have to size the width to the upper/parent. A dimension in the height
- // has to cause a adjustment/grow of the upper/parent.
+ // has to cause an adjustment/grow of the upper/parent.
// --> <fnRect> = fnRectHori
// (B) Cell and column frames in vertical layout, the width has to be the
// same as upper/parent and a dimension in height causes adjustment/grow
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index dc4fc1317e82..33bbb3c95681 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -257,7 +257,7 @@ bool SwOLENode::RestorePersistentData()
SfxObjectShell* p = GetDoc()->GetPersist();
if( !p )
{
- // TODO/LATER: Isn't a EmbeddedObjectContainer sufficient here?
+ // TODO/LATER: Isn't an EmbeddedObjectContainer sufficient here?
// What happens to this document?
OSL_ENSURE( false, "Why are we creating a DocShell here?" );
p = new SwDocShell( GetDoc(), SfxObjectCreateMode::INTERNAL );
@@ -857,7 +857,7 @@ void SwOLEObj::SetNode( SwOLENode* pNode )
SfxObjectShell* p = pDoc->GetPersist();
if( !p )
{
- // TODO/LATER: Isn't a EmbeddedObjectContainer sufficient here?
+ // TODO/LATER: Isn't an EmbeddedObjectContainer sufficient here?
// What happens to the document?
OSL_ENSURE( false, "Why are we creating a DocShell here??" );
p = new SwDocShell( pDoc, SfxObjectCreateMode::INTERNAL );
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 37f5bb739283..fd6c60952e78 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -831,7 +831,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
// box of the selection and because the new master cell _is_ the top-left
// box, the left and right border does not need to be changed.
// The right and bottom border instead has to be derived from the right-
- // bottom box of the selection. If this is a overlapped cell,
+ // bottom box of the selection. If this is an overlapped cell,
// the appropriate master box.
SwTableBox* pLastBox = nullptr; // the right-bottom (master) cell
SwDoc* pDoc = GetFrameFormat()->GetDoc();
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index ef3f14d189ff..fb617fd6e2aa 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -715,7 +715,7 @@ void SwUndoTextToTable::UndoImpl(::sw::UndoRedoContext & rContext)
sal_uLong nTableNd = m_nSttNode;
if( m_nSttContent )
- ++nTableNd; // Node was splitted previously
+ ++nTableNd; // Node was split previously
SwNodeIndex aIdx( rDoc.GetNodes(), nTableNd );
SwTableNode *const pTNd = aIdx.GetNode().GetTableNode();
OSL_ENSURE( pTNd, "Could not find a TableNode" );
@@ -1578,7 +1578,7 @@ void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd,
// find the source box. It must be one in rBoxes.
// We found the right one if it's in the same column as pBox.
- // No, if more than one selected cell in the same column has been splitted,
+ // No, if more than one selected cell in the same column has been split,
// we have to look for the nearest one (i65201)!
const SwTableBox* pSourceBox = nullptr;
const SwTableBox* pCheckBox = nullptr;
@@ -1604,7 +1604,7 @@ void SwUndoTableNdsChg::SaveNewBoxes( const SwTableNode& rTableNd,
// find the line number difference
// (to help determine bNodesMoved flag below)
nLineDiff = nLineDiff - nLineNo;
- OSL_ENSURE( pSourceBox, "Splitted source box not found!" );
+ OSL_ENSURE( pSourceBox, "Split source box not found!" );
// find out how many nodes the source box used to have
// (to help determine bNodesMoved flag below)
size_t nNdsPos = 0;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 7ddce70a4793..4f974a3230d3 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -293,7 +293,7 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
// use brush items, but *only* if no FillStyle properties are used; if both are used and when applying both
// in the obvious order some attributes may be wrong since they are set by the 1st set, but not
// redefined as needed by the 2nd set when they are default (and thus no tset) in the 2nd set. If
- // it is necessary for any reason to set both (it should not) a in-between step will be needed
+ // it is necessary for any reason to set both (it should not) an in-between step will be needed
// that resets the items for FillAttributes in rToSet to default.
// Note: There are other mechanisms in XMLOFF to pre-sort this relationship already, but this version
// was used initially, is tested and works. Keep it to be able to react when another feed adds attributes
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index c88dc6850400..2b632ab78e79 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -750,7 +750,7 @@ SwXParagraph::Impl::GetPropertyValuesTolerant_Impl(
for (const OUString& rProp : rPropertyNames)
{
- OSL_ENSURE( nIdx < nProps, "index out ouf bounds" );
+ OSL_ENSURE( nIdx < nProps, "index out of bounds" );
beans::GetDirectPropertyTolerantResult &rResult = pResult[nIdx];
try
More information about the Libreoffice-commits
mailing list