diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2018-09-02 06:16:28 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2018-09-27 12:14:06 +0200 |
commit | d71859ed79eef8d0d76ea93530fe708b0effdc80 (patch) | |
tree | 58cdbd13e8b777a7afec9a2dd363e1e6ae3304e2 /sw | |
parent | 1534025a0386584a7b8f3f929b10ce5eb33257cf (diff) |
Fix typos
Change-Id: Icfe120db02a70d43e4120d1f4cbb2704640d3990
Reviewed-on: https://gerrit.libreoffice.org/59470
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/ndtxt.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swtable.hxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/README | 2 | ||||
-rw-r--r-- | sw/source/core/layout/trvlfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/undo/docundo.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/view/viewsh.cxx | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index dde56486e0a7..d84c3053533c 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -413,7 +413,7 @@ public: const SwTextFormatColl* pNew ); /** Copy collection with all auto formats to dest-node. - The latter might be in an other document! + The latter might be in another document! (Method in ndcopy.cxx!!). */ void CopyCollFormat( SwTextNode& rDestNd ); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 595785583643..84663b3ca3e4 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -283,7 +283,7 @@ public: SwUndoTableCpyTable* pUndo ); bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&, SwUndoTableCpyTable* pUndo ); - // Copy headline of table (with content!) into an other one. + // Copy headline of table (with content!) into another one. void CopyHeadlineIntoTable( SwTableNode& rTableNd ); // Get box, whose start index is set on nBoxStt. diff --git a/sw/qa/extras/README b/sw/qa/extras/README index ff6425a8eb43..d68d785d2571 100644 --- a/sw/qa/extras/README +++ b/sw/qa/extras/README @@ -47,7 +47,7 @@ import problem in fact -- and once after the export and import. === Direct XPath assertions -An other alternative is to assert the resulted export document directly. +Another alternative is to assert the resulted export document directly. Currently this is only implemented for DOCX, which is a zipped XML, so it's possible to evaluate XPath checks. A check looks like this: diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 2f076858fbfe..8c8574d3be21 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -533,7 +533,7 @@ bool SwCellFrame::GetCursorOfst( SwPosition *pPos, Point &rPoint, //Problem: If two Flys have the same size and share the same position then //they end inside each other. -//Because we recursively check if a Point doesn't randomly lie inside an other +//Because we recursively check if a Point doesn't randomly lie inside another //fly which lies completely inside the current Fly we could trigger an endless //loop with the mentioned situation above. //Using the helper class SwCursorOszControl we prevent the recursion. During diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 23a726218d52..36ae515e767a 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2917,7 +2917,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo ) nullptr != (pCnt = static_cast<SwFootnoteFrame*>(this)->GetRefFromAttr() ) ) { if ( pCnt->IsFollow() ) - { // If we are in an other column/page than the frame with the + { // If we are in another column/page than the frame with the // reference, we don't need to invalidate its master. SwFrame *pTmp = pCnt->FindFootnoteBossFrame(true) == FindFootnoteBossFrame(true) ? &pCnt->FindMaster()->GetFrame() : pCnt; diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx index 42daf1a4e58a..8181c5fe1589 100644 --- a/sw/source/core/undo/docundo.cxx +++ b/sw/source/core/undo/docundo.cxx @@ -111,7 +111,7 @@ size_t UndoManager::GetUndoActionCount(const bool bCurrentLevel) const if (!m_bRepair) { - // If an other view created the last undo action, prevent undoing it from this view. + // If another view created the last undo action, prevent undoing it from this view. ViewShellId nViewShellId = m_pView->GetViewShellId(); if (pAction->GetViewShellId() != nViewShellId) nRet = 0; @@ -135,7 +135,7 @@ size_t UndoManager::GetRedoActionCount(const bool bCurrentLevel) const if (m_pView && !m_bRepair) { - // If an other view created the first redo action, prevent redoing it from this view. + // If another view created the first redo action, prevent redoing it from this view. ViewShellId nViewShellId = m_pView->GetViewShellId(); if (pAction->GetViewShellId() != nViewShellId) nRet = 0; @@ -367,7 +367,7 @@ UndoManager::GetLastUndoInfo( if (comphelper::LibreOfficeKit::isActive() && !m_bRepair) { - // If an other view created the undo action, prevent undoing it from this view. + // If another view created the undo action, prevent undoing it from this view. ViewShellId nViewShellId = pView ? pView->GetViewShellId() : m_pDocShell->GetView()->GetViewShellId(); if (pAction->GetViewShellId() != nViewShellId) { @@ -430,7 +430,7 @@ bool UndoManager::GetFirstRedoInfo(OUString *const o_pStr, if (comphelper::LibreOfficeKit::isActive() && !m_bRepair) { - // If an other view created the undo action, prevent redoing it from this view. + // If another view created the undo action, prevent redoing it from this view. ViewShellId nViewShellId = pView ? pView->GetViewShellId() : m_pDocShell->GetView()->GetViewShellId(); if (pAction->GetViewShellId() != nViewShellId) { diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index c3d04941164c..e2e855394e3a 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -313,7 +313,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) //JP 27.11.97: what hid the selection, must also Show it, // else we get Paint errors! // e.g. additional mode, page half visible vertically, in the - // middle a selection and with an other cursor jump to left + // middle a selection and with another cursor jump to left // right border. Without ShowCursor the selection disappears. bool bShowCursor = pRegion && dynamic_cast<const SwCursorShell*>(this) != nullptr; if( bShowCursor ) |