[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
Andrea Gelmini
andrea.gelmini at gelma.net
Sat Mar 25 16:14:12 UTC 2017
sw/inc/dbmgr.hxx | 2 +-
sw/inc/doc.hxx | 2 +-
sw/inc/editsh.hxx | 4 ++--
sw/inc/expfld.hxx | 2 +-
sw/inc/swtypes.hxx | 2 +-
sw/inc/unochart.hxx | 2 +-
sw/qa/core/uwriter.cxx | 2 +-
sw/qa/extras/mailmerge/mailmerge.cxx | 2 +-
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 2 +-
sw/qa/extras/rtfimport/rtfimport.cxx | 2 +-
sw/qa/extras/uiwriter/uiwriter.cxx | 2 +-
sw/qa/python/check_table.py | 2 +-
sw/source/core/access/accportions.cxx | 2 +-
sw/source/core/access/acctextframe.hxx | 2 +-
sw/source/core/crsr/crsrsh.cxx | 6 +++---
sw/source/core/doc/docdesc.cxx | 2 +-
sw/source/core/doc/docfmt.cxx | 4 ++--
sw/source/core/doc/htmltbl.cxx | 2 +-
sw/source/core/docnode/nodes.cxx | 2 +-
sw/source/core/edit/edsect.cxx | 2 +-
sw/source/core/inc/SwGrammarMarkUp.hxx | 2 +-
sw/source/core/inc/frminf.hxx | 2 +-
sw/source/core/inc/rootfrm.hxx | 2 +-
sw/source/core/inc/scriptinfo.hxx | 2 +-
sw/source/core/layout/atrfrm.cxx | 2 +-
sw/source/core/layout/frmtool.cxx | 2 +-
sw/source/core/layout/pagechg.cxx | 2 +-
sw/source/core/layout/sectfrm.cxx | 4 ++--
sw/source/core/layout/tabfrm.cxx | 4 ++--
sw/source/core/layout/wsfrm.cxx | 2 +-
30 files changed, 36 insertions(+), 36 deletions(-)
New commits:
commit 402aa305b7e37c3d3e1432613f59c905933a97cd
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Fri Mar 24 17:06:02 2017 +0100
Fix typos
Change-Id: Ia87318cb323d403cdff947da0b70e0d2aabaacd4
Reviewed-on: https://gerrit.libreoffice.org/35657
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index e97d400267e6..3cf00ef249a9 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -166,7 +166,7 @@ struct SwMergeDescriptor
/**
* Basename incl. the path for the generated files.
*
- * The final filename will be created by concating a number to prevent
+ * The final filename will be created by concatenating a number to prevent
* overwriting an existing file and the extension based on the filter
* settings.
*/
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index cf7b340bcda4..6fc96f312452 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -344,7 +344,7 @@ private:
sal_Int32 mReferenceCount;
bool mbDtor : 1; /**< TRUE: is in SwDoc DTOR.
- and unfortunately temorarily also in
+ and unfortunately temporarily also in
SwSwgReader::InLayout() when flawed
frames need deletion. */
bool mbCopyIsMove : 1; //< TRUE: Copy is a hidden Move.
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 762389448461..d706e823c607 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -284,7 +284,7 @@ public:
void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCursor = nullptr );
void GCAttr();
- /// @return the scripttpye of the selection.
+ /// @return the scripttype of the selection.
SvtScriptType GetScriptType() const;
/// @return the language at current cursor position.
@@ -863,7 +863,7 @@ public:
bool IsMoveLeftMargin( bool bRight, bool bModulus = true ) const;
void MoveLeftMargin( bool bRight, bool bModulus = true );
- /// Query NumberFormater from document.
+ /// Query NumberFormatter from document.
SvNumberFormatter* GetNumberFormatter();
const SvNumberFormatter* GetNumberFormatter() const
{ return const_cast<SwEditShell*>(this)->GetNumberFormatter(); }
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 51cf4f6f1c75..11629562e8ea 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -359,7 +359,7 @@ public:
void PushCursor();
void PopCursor();
- /** Put all that are new into SortLst for updating. @return true if not empty.
+ /** Put all that are new into SortList for updating. @return true if not empty.
(For Glossary: only update its input-fields).
Compare TmpLst with current fields. */
bool BuildSortLst();
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 33ba955f3743..0e986947c28f 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -133,7 +133,7 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
// fields before INIT_FLDTYPES.
#define INIT_SEQ_FLDTYPES 4
-// The former Rendevouz-IDs live on:
+// The former Rendezvous-IDs live on:
// There are IDs for the anchors (SwFormatAnchor) and some others
// that are only of importance for interfaces (SwDoc).
enum class RndStdIds
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 680db85abdd1..c5168a45e3a8 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -182,7 +182,7 @@ public:
void AddDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence );
void RemoveDataSequence( const SwTable &rTable, css::uno::Reference< css::chart2::data::XDataSequence > &rxDataSequence );
- // will send modifdied events for all data-sequences of the table
+ // will send modified events for all data-sequences of the table
void InvalidateTable( const SwTable *pTable );
bool DeleteBox( const SwTable *pTable, const SwTableBox &rBox );
void DisposeAllDataSequences( const SwTable *pTable );
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 23265c032e2f..e0df520be313 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1463,7 +1463,7 @@ namespace
SwClient::SwClientNotify(rModify, rHint);
}
};
- // sad copypasta as tools/rtti.hxxs little brain can't cope with templates
+ // sad copypasta as tools/rtti.hxx little brain can't cope with templates
struct OtherTestClient : SwClient
{
int m_nModifyCount;
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 8abf06e12a06..a8f55d9cafdf 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -556,7 +556,7 @@ DECLARE_SHELL_MAILMERGE_TEST(testTdf92623, "tdf92623.odt", "10-testing-addresses
DECLARE_SHELL_MAILMERGE_TEST_SELECTION(testTdf95292, "linked-labels.odt", "10-testing-addresses.ods", "testing-addresses", 5)
{
- // A document with two labes merged with 5 datasets should result in three pages
+ // A document with two labels merged with 5 datasets should result in three pages
executeMailMerge();
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>( mxComponent.get() );
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 3380ad684bd4..4614e3fb2780 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -709,7 +709,7 @@ DECLARE_OOXMLEXPORT_TEST(testCellGridSpan, "cell-grid-span.docx")
{
// The problem was during export gridSpan value for 1st & 2nd cells for test document
// used to get set wrongly to 5 and 65532 respectively which was the reason for crash during save operation
- // Varifying gridSpan element is not present in RoundTripped Document (As it's Default value is 1).
+ // Verifying gridSpan element is not present in RoundTripped Document (As it's Default value is 1).
xmlDocPtr pXmlDoc = parseExport();
if (!pXmlDoc)
return;
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 68d71db01710..2ee47bfd8cee 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2073,7 +2073,7 @@ DECLARE_RTFIMPORT_TEST(testFdo82071, "fdo82071.rtf")
DECLARE_RTFIMPORT_TEST(testFdo83464, "fdo83464.rtf")
{
- // Problem was that the text in the textfrme had wrong font.
+ // Problem was that the text in the textframe had wrong font.
uno::Reference<text::XTextRange> xFrameText(getShape(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Hello"), xFrameText->getString());
// This was Times New Roman.
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index e6e4aa3ae38e..1bd2b02f1d6e 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -3751,7 +3751,7 @@ void SwUiWriterTest::testTdf96536()
CPPUNIT_ASSERT(parseDump("/root/page[1]/infos/bounds", "height").toInt32() >= 2 * nSingleParaPageHeight);
discardDumpedLayout();
- // ... and then delete the 2nd paragraph, which shriks the page to the previous size.
+ // ... and then delete the 2nd paragraph, which shrinks the page to the previous size.
uno::Reference<lang::XComponent> xParagraph(getParagraph(2), uno::UNO_QUERY);
xParagraph->dispose();
calcLayout();
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 04d15ea60da9..8cc7fc7caa84 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -500,7 +500,7 @@ class CheckTable(unittest.TestCase):
xDispatcher.executeDispatch(xDocFrame, '.uno:InsertText', '', 0,
(PropertyValue('Text', 0, '15-10-30', 0),))
xDispatcher.executeDispatch(xDocFrame, '.uno:JumpToNextCell', '', 0, ())
- # Without number recognition 15-10-30 should not be interpretated as a date
+ # Without number recognition 15-10-30 should not be interpreted as a date
self.assertEqual(xTable.getCellByPosition(0, 0).getString(), '15-10-30')
self.assertEqual(xTable.getCellByPosition(0, 0).getValue(), 0)
# Activate number recognition
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 3f1093fa0024..60caf0a05035 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -606,7 +606,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos(
(m_pTextNode->GetText()[nModelPos] != m_sAccessibleString[nPos]))
{
// case 1: a one-character, non-text portion
- // reference position is the first accessibilty for our
+ // reference position is the first accessibility for our
// core portion
nRefPos = m_aAccessiblePositions[ nCorePortionNo ];
nExtend = SwSPExtendRange::NONE;
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index 659e0ab3d499..3e85d0830297 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -102,7 +102,7 @@ public:
// XAccessibleContext::getAccessibleRelationSet
// text frame may have accessible relations to their
- // predocesor/successor frames
+ // predecesor/successor frames
private:
// helper methods for getAccessibleRelationSet:
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index dc6898b8e3c5..b08b066e02b1 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -265,7 +265,7 @@ void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
m_pVisibleCursor->Show();
// If there is still a ChgCall and just the "basic
- // parenthiszing(?) (Basic-Klammerung)" exists, call it. This
+ // parenthising(?)" exists, call it. This
// decouples the internal with the Basic-parenthising, the
// Shells are switched.
if( !BasicActionPend() )
@@ -304,7 +304,7 @@ void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
if( !m_nCursorMove ||
( 1 == m_nCursorMove && m_bInCMvVisportChgd ) )
- // display Cursor & Selektions again
+ // display Cursor & Selections again
ShowCursors( m_bSVCursorVis );
}
// call ChgCall if there is still one
@@ -1867,7 +1867,7 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
}
}
- m_eMvState = MV_NONE; // state for cursor tavelling - GetCursorOfst
+ m_eMvState = MV_NONE; // state for cursor travelling - GetCursorOfst
if( pFrame && Imp()->IsAccessible() )
Imp()->InvalidateAccessibleCursorPosition( pFrame );
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 52e5600fa6b7..108496c9677f 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -95,7 +95,7 @@ static void lcl_DefaultPageFormat( sal_uInt16 nPoolFormatId,
}
else if (!utl::ConfigManager::IsAvoidConfig() && MEASURE_METRIC == SvtSysLocale().GetLocaleData().getMeasurementSystemEnum() )
{
- nMinTop = nMinBottom = nMinLeft = nMinRight = 1134; // 2 centimetres
+ nMinTop = nMinBottom = nMinLeft = nMinRight = 1134; // 2 centimeters
}
else
{
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index b8e2d6ebb6b5..6da1589e257d 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -518,7 +518,7 @@ static bool lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth,
SvxTabStopItem& rChgTabStop )
{
// Set the default values of all TabStops to the new value.
- // Attention: we always work with the PoolAttribut here, so that
+ // Attention: we always work with the PoolAttribute here, so that
// we don't calculate the same value on the same TabStop (pooled!) for all sets.
// We send a FormatChg to modify.
@@ -626,7 +626,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet )
static_cast<const SvxTabStopItem*>(pTmpItem)->Count() )
{
// Set the default values of all TabStops to the new value.
- // Attention: we always work with the PoolAttribut here, so that
+ // Attention: we always work with the PoolAttribute here, so that
// we don't calculate the same value on the same TabStop (pooled!) for all sets.
// We send a FormatChg to modify.
SwTwips nNewWidth = (*static_cast<const SvxTabStopItem*>(pTmpItem))[ 0 ].GetTabPos(),
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index de8e83857a08..b4c1d6229763 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -1078,7 +1078,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv
sal_uInt16 nAbsRightSpace,
sal_uInt16 nParentInhAbsSpace )
{
- // For a start we do a lot of plausability tests
+ // For a start we do a lot of plausibility tests
// An absolute width always has to be passed
OSL_ENSURE( nAbsAvail, "AutoLayout pass 2: No absolute width given" );
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index fd5edbf0bfaa..2b609e97a361 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -247,7 +247,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
if( pTextNd )
{
SwpHints * const pHts = pTextNd->GetpSwpHints();
- // OultineNodes set the new nodes in the array
+ // OutlineNodes set the new nodes in the array
if (bInsOutlineIdx && pTextNd->IsOutline())
{
rNds.m_pOutlineNodes->insert( pTextNd );
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index b7606eedbd80..eebced1e1962 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -368,7 +368,7 @@ static const SwNode* lcl_SpecialInsertNode(const SwPosition* pCurrentPos)
++aEnd;
bool bEnd = ( aEnd == pInnermostNode->EndOfSectionNode()->GetIndex() );
- // evalutate result: if both start + end, end is preferred
+ // evaluate result: if both start + end, end is preferred
if( bEnd )
pReturn = pInnermostNode->EndOfSectionNode();
else if ( bStart )
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx
index 032dc6d70e40..ac4e91632b72 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -52,7 +52,7 @@ public:
void JoinGrammarList( SwGrammarMarkUp* pNext, sal_Int32 nInsertPos );
/* SwWrongList::ClearList() + handling of maSentence */
void ClearGrammarList( sal_Int32 nSentenceEnd = COMPLETE_STRING );
- /* setSentence to define the start positionof a sentence,
+ /* setSentence to define the start position of a sentence,
at the moment the end position is given by the next start position */
void setSentence( sal_Int32 nStart );
/* getSentenceStart returns the last start position of a sentence
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 8ec58e1a94d9..dbae9fbaeeef 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -54,7 +54,7 @@ public:
// Is a bullet point/symbol/etc. at the first text position?
bool IsBullet( sal_Int32 nTextPos ) const;
- // determine intentation for first line
+ // determine indentation for first line
SwTwips GetFirstIndent() const;
const SwTextFrame* GetFrame() const { return pFrame; }
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index f67665eafbb7..15efe013af46 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -139,7 +139,7 @@ class SwRootFrame: public SwLayoutFrame
* and will be activated by the last d'tor of CurrShell.
* One other problem is the destruction of a shell while it is active.
* The pointer mpCurrShell is then reset to an arbitrary other shell.
- * If at the time of the destruction of a shell, which is still referneced
+ * If at the time of the destruction of a shell, which is still referenced
* by a curshell object, that will be cleaned up as well.
*/
friend class CurrShell;
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 8ff8bcca6279..3a5fed064586 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -301,7 +301,7 @@ public:
/** retrieves kashida opportunities for a given text range.
pKashidaPositions: buffer to receive the char indices of the
- kashida opportunties relative to the paragraph
+ kashida opportunities relative to the paragraph
*/
void GetKashidaPositions(sal_Int32 nStt, sal_Int32 nLen,
sal_Int32* pKashidaPosition);
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index c48c8ca64b22..63584585268a 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -934,7 +934,7 @@ void SwFormatCol::SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct )
void SwFormatCol::Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct )
{
// Deleting seems to be a bit radical on the first sight; but otherwise we
- // have to initialize all values of the remaining SwCloumns.
+ // have to initialize all values of the remaining SwColumns.
if ( !m_aColumns.empty() )
m_aColumns.clear();
for ( sal_uInt16 i = 0; i < nNumCols; ++i )
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 2a449affe36c..4c608c60f6c3 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1158,7 +1158,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
//immediately.
//The advantage is, that on one hand already a nearly realistic number of
//pages are created, but above all there are no almost endless long chain
- //of paragraphs, which must be moved expensively until it reaches a tolarable
+ //of paragraphs, which must be moved expensively until it reaches a tolerable
//reduced level.
//We'd like to think that 20 Paragraphs fit on one page.
//So that it does not become in extreme situations so violent we calculate depending
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 356d5df770f2..b4dfc72fbb0d 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -245,7 +245,7 @@ void SwPageFrame::DestroyImpl()
m_pSortedObjs = nullptr; // reset to zero to prevent problems when detaching the Flys
}
- if ( !IsEmptyPage() ) //#59184# unnessesary for empty pages
+ if ( !IsEmptyPage() ) //#59184# unnecessary for empty pages
{
// prevent access to destroyed pages
SwDoc *pDoc = GetFormat() ? GetFormat()->GetDoc() : nullptr;
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 0662ee6c0664..ba310aac4aa7 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -638,7 +638,7 @@ void SwSectionFrame::MoveContentAndDelete( SwSectionFrame* pDel, bool bSave )
if( pParent )
{ // Search for the appropriate insert position
if( pNxtSct && pNxtSct->GetFormat() == pParent )
- { // Here we can insert outselves at the beginning
+ { // Here we can insert ourselves at the beginning
pUp = FirstLeaf( pNxtSct );
pPrv = nullptr;
if( pPrvSct && !( pPrvSct->GetFormat() == pParent ) )
@@ -2184,7 +2184,7 @@ SwFrame* SwFrame::GetIndNext_()
return pSct->GetIndNext();
if( pSct->IsColBodyFrame() && (pSct = pSct->GetUpper()->GetUpper())->IsSctFrame() )
{ // We can only return the successor of the SectionFrames if there is no
- // content in the successing columns
+ // content in the successive columns
SwFrame* pCol = GetUpper()->GetUpper()->GetNext();
while( pCol )
{
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index e217725bcbc0..0a0e99521e89 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3244,8 +3244,8 @@ SwContentFrame *SwTabFrame::FindLastContent()
{
#if OSL_DEBUG_LEVEL > 0
SwSectionFrame* pSect = pRet->FindSctFrame();
- OSL_ENSURE( pSect, "Where does this column come fron?");
- OSL_ENSURE( IsAnLower( pSect ), "Splited cell?" );
+ OSL_ENSURE( pSect, "Where does this column come from?");
+ OSL_ENSURE( IsAnLower( pSect ), "Splitted cell?" );
#endif
return pRet->FindSctFrame()->FindLastContent();
}
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 651a6f12a666..12ebf555d498 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -329,7 +329,7 @@ void SwFrame::UpdateAttrFrame( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
break;
}
case RES_COL:
- OSL_FAIL( "Columns for new FrameTyp?" );
+ OSL_FAIL( "Columns for new FrameType?" );
break;
default:
More information about the Libreoffice-commits
mailing list