summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2016-04-26 09:56:47 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-04-30 15:06:45 +0000
commitfc2590cfa112222500a6c847917d7545f60024c6 (patch)
tree951f6a8e86c6d42672b9fe1e6e6cde3ee7eed152 /sw
parent783b02de3bc75cd0be1a6e919d4755a297fe7a84 (diff)
Fix typos
Change-Id: Id81b16ff26283611f0b84929d831c827f847ab73 Reviewed-on: https://gerrit.libreoffice.org/24317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/ring.hxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx2
-rw-r--r--sw/source/core/text/txthyph.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx8
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 3a57d9e19ce5..86943939497d 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -227,7 +227,7 @@ namespace sw
value_type& dereference() const
{ return m_pCurrent ? *m_pCurrent : * m_pStart; }
/**
- * value_type is is:
+ * value_type is:
* - pointing to the current item in the iteration in general
* - nullptr if on the first item (begin())
* - m_pStart when beyond the last item (end())
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index fcfcfbdf7548..9260cd12e648 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -563,7 +563,7 @@ DECLARE_OOXMLEXPORT_TEST(testParagraphMark, "paragraph-mark.docx")
DECLARE_OOXMLEXPORT_TEST(testParagraphMarkNonempty, "paragraph-mark-nonempty.odt")
{
if (xmlDocPtr pXmlDoc = parseExport())
- // There were two <w:sz> elements, make sure the 40 one is is dropped and the 20 one is kept.
+ // There were two <w:sz> elements, make sure the 40 one is dropped and the 20 one is kept.
assertXPath(pXmlDoc, "//w:p/w:pPr/w:rPr/w:sz", "val", "20");
}
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index f6c70df42157..369a22ae3b03 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -420,7 +420,7 @@ sal_uInt16 SwSoftHyphPortion::GetViewWidth( const SwTextSizeInfo &rInf ) const
* -> invisible, neighbors unchanged
* 2) SoftHyph is in the line, ViewOpt on
* -> visible, neighbors unchanged
- * 3) SoftHyph is at the end of the line, ViewOpt or or off
+ * 3) SoftHyph is at the end of the line, ViewOpt on or off
* -> always visible, neighbors unchanged
*/
void SwSoftHyphPortion::Paint( const SwTextPaintInfo &rInf ) const
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index acafdd777d71..ac170336ca73 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -486,11 +486,11 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
/*
#i1140#
If I have a table and apply a style to one of its frames that should cause
- a paragraph that its applied to it to only exist as a separate floating
+ a paragraph that it is applied to it to only exist as a separate floating
frame, then the behaviour depends on which cell that it has been applied
- to. If its the first cell of a row then the whole table row jumps into the
- new frame, if its not then then the paragraph attributes are applied
- "except" for the floating frame stuff. i.e. its ignored. So if theres a
+ to. If it is the first cell of a row then the whole table row jumps into the
+ new frame, if it isn't then the paragraph attributes are applied
+ "except" for the floating frame stuff. i.e. it's ignored. So if there's a
table, and we're not in the first cell then we ignore the fact that the
paragraph style wants to be in a different frame.
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 0b886c616a07..a5a851f37e32 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -918,7 +918,7 @@ static bool lcl_SaveDoc(
bool bAnyError = !xObjectShell->DoSaveAs(*pDstMed);
// Actually this should be a bool... so in case of email and individual
- // files, where this is set, we skip the the recently used handling
+ // files, where this is set, we skip the recently used handling
bAnyError |= !xObjectShell->DoSaveCompleted( pDstMed, !decodedURL );
bAnyError |= (0 != xObjectShell->GetError());
if( bAnyError )