[Libreoffice-commits] core.git: sw/source
Andrea Gelmini (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 3 07:57:08 UTC 2019
sw/source/filter/docx/swdocxreader.cxx | 2 +-
sw/source/filter/html/css1atr.cxx | 2 +-
sw/source/filter/html/htmlatr.cxx | 12 ++++++------
sw/source/filter/html/htmlgrin.cxx | 2 +-
sw/source/filter/html/htmlsect.cxx | 2 +-
sw/source/filter/html/htmltab.cxx | 2 +-
sw/source/filter/html/htmltabw.cxx | 2 +-
sw/source/filter/html/parcss1.cxx | 2 +-
sw/source/filter/html/swhtml.cxx | 4 ++--
sw/source/filter/html/wrthtml.cxx | 2 +-
sw/source/filter/inc/msfilter.hxx | 4 ++--
sw/source/filter/ww8/docxattributeoutput.cxx | 2 +-
sw/source/filter/ww8/docxsdrexport.cxx | 2 +-
sw/source/filter/ww8/writerhelper.cxx | 2 +-
sw/source/filter/ww8/wrtw8esh.cxx | 6 +++---
sw/source/filter/ww8/wrtw8nds.cxx | 6 +++---
sw/source/filter/ww8/wrtw8sty.cxx | 4 ++--
sw/source/filter/ww8/wrtww8.cxx | 4 ++--
sw/source/filter/ww8/wrtww8.hxx | 2 +-
sw/source/filter/ww8/wrtww8gr.cxx | 2 +-
sw/source/filter/ww8/ww8atr.cxx | 2 +-
sw/source/filter/ww8/ww8glsy.cxx | 2 +-
sw/source/filter/ww8/ww8graf.cxx | 4 ++--
sw/source/filter/ww8/ww8par.cxx | 18 +++++++++---------
sw/source/filter/ww8/ww8par.hxx | 2 +-
sw/source/filter/ww8/ww8par2.cxx | 12 ++++++------
sw/source/filter/ww8/ww8scan.cxx | 12 ++++++------
sw/source/filter/ww8/ww8scan.hxx | 2 +-
sw/source/filter/xml/xmlimp.cxx | 6 +++---
sw/source/filter/xml/xmltble.cxx | 2 +-
sw/source/filter/xml/xmltbli.cxx | 18 +++++++++---------
31 files changed, 73 insertions(+), 73 deletions(-)
New commits:
commit d05b2b91952927ec40d6ea2f482f76c7ccd25ed3
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Thu Aug 1 13:01:26 2019 +0200
Commit: Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sat Aug 3 09:55:58 2019 +0200
Fix typos
Change-Id: Ia6a6d93bade801fab77bfba701b64a905328c695
Reviewed-on: https://gerrit.libreoffice.org/76774
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Tested-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx
index ea3a2a1065d6..d9f16f087b76 100644
--- a/sw/source/filter/docx/swdocxreader.cxx
+++ b/sw/source/filter/docx/swdocxreader.cxx
@@ -229,7 +229,7 @@ bool SwDOCXReader::MakeEntries( SwDoc *pD, SwTextBlocks &rBlocks )
while( sal_uInt16(-1) != nCurPos )
{
- // add an Number to it
+ // add a Number to it
sShortcut = aLNm + OUString::number( ++nStart );
nCurPos = rBlocks.GetIndex( sShortcut );
}
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 53fe8ef3c76e..6aea83c11b60 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -1511,7 +1511,7 @@ static Writer& OutCSS1_SwFormat( Writer& rWrt, const SwFormat& rFormat,
const SfxItemSet& rFormatItemSet = rFormat.GetAttrSet();
SfxItemSet aItemSet( *rFormatItemSet.GetPool(), rFormatItemSet.GetRanges() );
aItemSet.Set( rFormatItemSet ); // Was nDeep!=1 that is not working
- // for script dependent items buts should
+ // for script dependent items but should
// not make a difference for any other
bool bSetDefaults = true, bClearSame = true;
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 56bf878addad..29254ad651c8 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1103,7 +1103,7 @@ class HTMLEndPosLst
bool ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos,
sal_Int32 nEndPos );
- // adapt the end of a splitted item
+ // adapt the end of a split item
void FixSplittedItem( HTMLStartEndPos *pPos, sal_Int32 nNewEnd,
HTMLStartEndPositions::size_type nStartPos );
@@ -1422,13 +1422,13 @@ void HTMLEndPosLst::FixSplittedItem( HTMLStartEndPos *pPos, sal_Int32 nNewEnd,
if( pTest->GetStart() >= nNewEnd )
{
// the Test attribute and all the following ones start, after the
- // splitted attribute ends
+ // split attribute ends
break;
}
else if( nTestEnd > nNewEnd )
{
- // the Test attribute starts before the splitted attribute
- // ends, and ends afterwards, i.e., it must be splitted, as well
+ // the Test attribute starts before the split attribute
+ // ends, and ends afterwards, i.e., it must be split, as well
// set the new end
pTest->SetEnd( nNewEnd );
@@ -1467,7 +1467,7 @@ void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart,
if( pTest->GetStart() < nStart )
{
// the Test attribute ends, before the new one ends. Thus, the
- // new attribute must be splitted.
+ // new attribute must be split.
InsertItem_( new HTMLStartEndPos( rItem, nStart, nTestEnd ), i );
nStart = nTestEnd;
}
@@ -1535,7 +1535,7 @@ void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart,
aEndLst.erase( it );
}
- // if necessary, insert the second part of the splitted
+ // if necessary, insert the second part of the split
// attribute
if( nTestEnd > nEnd )
{
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index c4ffa075c620..9ca5a22dcc00 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -462,7 +462,7 @@ IMAGE_SETEVENT:
if( sGrfNm.isEmpty() )
return;
- // When we are in a ordered list and the paragraph is still empty and not
+ // When we are in an ordered list and the paragraph is still empty and not
// numbered, it may be a graphic for a bullet list.
if( !m_pPam->GetPoint()->nContent.GetIndex() &&
GetNumInfo().GetDepth() > 0 && GetNumInfo().GetDepth() <= MAXLEVEL &&
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index a168f47203e3..8f7b05872566 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -674,7 +674,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
{
if( !bAppended )
{
- // If the pam is at the start of a section, a additional text
+ // If the pam is at the start of a section, an additional text
// node must be inserted. Otherwise, the new section will be
// inserted in front of the old one.
SwNodeIndex aPrvNdIdx( m_pPam->GetPoint()->nNode, -1 );
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 729513c1573c..168a5d2e40e8 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3371,7 +3371,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
if( !bForceFrame && (bTopTable || pCurTable->HasParentSection()) )
{
SplitAttrTab(pTCntxt->xAttrTab, bTopTable);
- // If we reuse a already existing paragraph, we can't add
+ // If we reuse an already existing paragraph, we can't add
// PostIts since the paragraph gets behind that table.
// They're gonna be moved into the first paragraph of the table
// If we have tables in tables, we also can't add PostIts to a
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 44ea0cfefd61..dee54a39d77d 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -1027,7 +1027,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
{
case text::HoriOrientation::LEFT:
// If a left-aligned table has no right sided flow, then we don't need
- // a ALIGN=LEFT in the table.
+ // an ALIGN=LEFT in the table.
if( eSurround==css::text::WrapTextMode_NONE || eSurround==css::text::WrapTextMode_LEFT )
eTabHoriOri = text::HoriOrientation::NONE;
break;
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index cca35e9849f8..e7dd8d1d70a3 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -817,7 +817,7 @@ void CSS1Parser::ParseRule()
// id_selector
// : '#' IDENT
-// pseude_element
+// pseudo_element
// : IDENT
std::unique_ptr<CSS1Selector> CSS1Parser::ParseSelector()
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 77aef485176f..0a9f87b2f5bb 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -489,7 +489,7 @@ SwHTMLParser::~SwHTMLParser()
DeleteFormImpl();
DeleteFootEndNoteImpl();
- OSL_ENSURE(!m_xTable.get(), "It exists still a open table");
+ OSL_ENSURE(!m_xTable.get(), "It exists still an open table");
m_pImageMaps.reset();
OSL_ENSURE( m_vPendingStack.empty(),
@@ -3956,7 +3956,7 @@ void SwHTMLParser::NewPara()
// progress bar
ShowStatline();
- OSL_ENSURE( m_nOpenParaToken == HtmlTokenId::NONE, "Now a open paragraph element will be lost." );
+ OSL_ENSURE( m_nOpenParaToken == HtmlTokenId::NONE, "Now an open paragraph element will be lost." );
m_nOpenParaToken = HtmlTokenId::PARABREAK_ON;
}
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 5c1a6ab52a42..114912975750 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -258,7 +258,7 @@ ErrCode SwHTMLWriter::WriteStream()
m_aFontHeights[6] = rHtmlOptions.GetFontSize( 6 ) * 20;
// output styles anyway
- // (then also top nad bottom paragraph spacing)
+ // (then also top and bottom paragraph spacing)
m_nExportMode = rHtmlOptions.GetExportMode();
m_nHTMLMode = GetHtmlMode(nullptr);
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 4ed7d7045511..2a6c9efff0b2 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -171,7 +171,7 @@ namespace sw
for this word style.
It will only return a failure in the pathological case of
- catastropic failure elsewhere of there exist already styles
+ catastrophic failure elsewhere of there exist already styles
rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely
and impossible.
*/
@@ -228,7 +228,7 @@ namespace sw
for this word style.
It will only return a failure in the pathological case of
- catastropic failure elsewhere of there exist already styles
+ catastrophic failure elsewhere of there exist already styles
rName and WW-rName[0..SAL_MAX_INT32], which is both unlikely
and impossible.
*/
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 12c6c3a99640..defd85643aea 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4894,7 +4894,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
/* At this point we are certain that, WriteImage returns empty RelId
for unhandled graphic type. Therefore we write the picture description
and not the relation( coz there ain't any), so that the user knows
- there is a image/graphic in the doc but it is broken instead of
+ there is an image/graphic in the doc but it is broken instead of
completely discarding it.
*/
if ( aRelId.isEmpty() )
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index a6a34aaa138e..305c570af64d 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -693,7 +693,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons
* reference : http://www.schemacentral.com/sc/ooxml/e-wp_extent-1.html
*
* Though ECMA mentions the max value as aforementioned. It appears that MSO does not
- * handle for the same, infact it actually can handles a max value of int32 i.e
+ * handle for the same, in fact it actually can handle a max value of int32 i.e
* 2147483647( MAX_INTEGER_VALUE ).
* Therefore changing the following accordingly so that LO sync's up with MSO.
**/
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index c013515899ae..792f492fa069 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -617,7 +617,7 @@ namespace sw
{
// This method will now just concatenate the polygons contained
// in the given PolyPolygon. Anything else which might be thought of
- // for reducing to a single polygon will just need nore power and
+ // for reducing to a single polygon will just need more power and
// cannot create more correct results.
sal_uInt32 nPointCount(0);
sal_uInt16 a;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 1f3dec9ef7ce..c8d04367c808 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1007,10 +1007,10 @@ void WW8Export::AppendFlyInFlys(const ww8::Frame& rFrameFormat,
0x03, 0x6a, 0, 0, 0, 0, // sprmCObjLocation
0x55, 0x08, 1 // sprmCFSpec
};
- // fSpec-Attribut true
+ // fSpec-Attribute true
// A special character is required in the text for DrawObjects,
- // therefore a fSpec-Attribut
+ // therefore a fSpec-Attribute
m_pChpPlc->AppendFkpEntry( Strm().Tell() );
WriteChar( 0x8 );
m_pChpPlc->AppendFkpEntry( Strm().Tell(), sizeof( aSpec8 ), aSpec8 );
@@ -1219,7 +1219,7 @@ bool MSWord_SdrAttrIter::IsTextAttr(sal_Int32 nSwPos)
// HasItem is used for the consolidation of the double attribute Underline and
// WordLineMode as a TextItem. OutAttr() calls the output function, which can
// query for other items at the start position of attribute via HasItem().
-// Only attributes with a end can be queried.
+// Only attributes with an end can be queried.
// The search is done with bDeep.
const SfxPoolItem* MSWord_SdrAttrIter::HasTextItem(sal_uInt16 nWhich) const
{
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 75ca2b1e01df..e215420eb8ca 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1237,7 +1237,7 @@ void WW8AttributeOutput::FieldVanish( const OUString& rText, ww::eField /*eType*
void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAttr )
{
- // it's a field; so get the Text form the Node and build the field
+ // it's a field; so get the Text from the Node and build the field
OUString sText;
ww::eField eType = ww::eNONE;
@@ -1895,7 +1895,7 @@ bool MSWordExportBase::GetBookmarks( const SwTextNode& rNd, sal_Int32 nStt,
const sal_Int32 nBStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nBEnd = pMark->GetMarkEnd().nContent.GetIndex();
- // Keep only the bookmars starting or ending in the snippet
+ // Keep only the bookmarks starting or ending in the snippet
bool bIsStartOk = ( pMark->GetMarkStart().nNode == nNd ) && ( nBStart >= nStt ) && ( nBStart <= nEnd );
bool bIsEndOk = ( pMark->GetMarkEnd().nNode == nNd ) && ( nBEnd >= nStt ) && ( nBEnd <= nEnd );
@@ -1926,7 +1926,7 @@ bool MSWordExportBase::GetAnnotationMarks( const SwWW8AttrIter& rAttrs, sal_Int3
const sal_Int32 nBStart = pMark->GetMarkStart().nContent.GetIndex();
const sal_Int32 nBEnd = pMark->GetMarkEnd().nContent.GetIndex();
- // Keep only the bookmars starting or ending in the snippet
+ // Keep only the bookmarks starting or ending in the snippet
bool bIsStartOk = ( pMark->GetMarkStart().nNode == nNd ) && ( nBStart >= nStt ) && ( nBStart <= nEnd );
bool bIsEndOk = ( pMark->GetMarkEnd().nNode == nNd ) && ( nBEnd >= nStt ) && ( nBEnd <= nEnd );
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index c8ad6e9faf28..97d94280e922 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -783,7 +783,7 @@ wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily
void wwFont::Write(SvStream *pTableStrm) const
{
pTableStrm->WriteBytes(maWW8_FFN, sizeof(maWW8_FFN)); // fixed part
- // from Ver8 following two fields interjected,
+ // from Ver8 following two fields intersected,
// we ignore them.
//char panose[ 10 ]; // 0x6 PANOSE
//char fs[ 24 ]; // 0x10 FONTSIGNATURE
@@ -1631,7 +1631,7 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt
// it as title page.
// With Left/Right changes it's different - we have to detect where
// the change of pages is, but here it's too late for that!
- // tdf#101814 if there is already a explicit first-page, no point
+ // tdf#101814 if there is already an explicit first-page, no point
// in checking heuristics here.
if ( !titlePage && pPd->GetFollow() && pPd != pPd->GetFollow() &&
pPd->GetFollow()->GetFollow() == pPd->GetFollow() &&
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 8f78c2382b1d..10f5eeb0f188 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -783,7 +783,7 @@ const SfxPoolItem* MSWordExportBase::HasItem( sal_uInt16 nWhich ) const
const SfxPoolItem* pItem=nullptr;
if (m_pISet)
{
- // if write a EditEngine text, then the WhichIds are greater as
+ // if write an EditEngine text, then the WhichIds are greater than
// our own Ids. So the Id have to translate from our into the
// EditEngine Range
nWhich = sw::hack::GetSetWhichFromSwDocWhich(*m_pISet, *m_pDoc, nWhich);
@@ -805,7 +805,7 @@ const SfxPoolItem& MSWordExportBase::GetItem(sal_uInt16 nWhich) const
assert((m_pISet || m_pChpIter) && "Where is my ItemSet / pChpIter ?");
if (m_pISet)
{
- // if write a EditEngine text, then the WhichIds are greater as
+ // if write an EditEngine text, then the WhichIds are greater than
// our own Ids. So the Id have to translate from our into the
// EditEngine Range
nWhich = sw::hack::GetSetWhichFromSwDocWhich(*m_pISet, *m_pDoc, nWhich);
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 5ae31e434dbf..a1bbfad23631 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -968,7 +968,7 @@ public:
SvStream *pTableStrm, *pDataStrm; ///< Streams for WW97 Export
std::unique_ptr<WW8Fib> pFib; ///< File Information Block
- std::unique_ptr<WW8Dop> pDop; ///< DOcument Properties
+ std::unique_ptr<WW8Dop> pDop; ///< Document Properties
std::unique_ptr<WW8_WrPlcFootnoteEdn> pFootnote; ///< Footnotes - structure to remember them, and output
std::unique_ptr<WW8_WrPlcFootnoteEdn> pEdn; ///< Endnotes - structure to remember them, and output
std::unique_ptr<WW8_WrPlcSepx> pSepx; ///< Sections/headers/footers
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 63be38408e56..2b9dc6a21358 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -495,7 +495,7 @@ void SwWW8WrGrf::WritePICFHeader(SvStream& rStrm, const ww8::Frame &rFly,
sal_Int16 nXSizeAdd = 0, nYSizeAdd = 0;
sal_Int16 nCropL = 0, nCropR = 0, nCropT = 0, nCropB = 0;
- // write Crop-Attribut content in Header ( if available )
+ // write Crop-Attribute content in Header ( if available )
const SfxPoolItem* pItem;
if (pAttrSet && (SfxItemState::SET
== pAttrSet->GetItemState(RES_GRFATR_CROPGRF, false, &pItem)))
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index ee87bc0e81e1..0e2ddb3ba90a 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3653,7 +3653,7 @@ void WW8AttributeOutput::FormatFrameSize( const SwFormatFrameSize& rSize )
// FillOrder is still missing
/**
- * ReplaceCr() is used for Pagebreaks and Pagedescs. A already written CR
+ * ReplaceCr() is used for Pagebreaks and Pagedescs. An already written CR
* will be replaced by a break character. Replace must be called right after
* the writing of CR.
*
diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx
index 10b0d12ba17a..15e6955edd25 100644
--- a/sw/source/filter/ww8/ww8glsy.cxx
+++ b/sw/source/filter/ww8/ww8glsy.cxx
@@ -158,7 +158,7 @@ bool WW8Glossary::MakeEntries(SwDoc *pD, SwTextBlocks &rBlocks,
sal_uInt16 nCurPos = rBlocks.GetIndex( sShortcut );
while( sal_uInt16(-1) != nCurPos )
{
- sShortcut = rLNm + OUString::number(++nStart); // add an Number to it
+ sShortcut = rLNm + OUString::number(++nStart); // add a Number to it
nCurPos = rBlocks.GetIndex( sShortcut );
}
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 50672e797e38..2f303bdac0e1 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -798,7 +798,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp,
}
/*
- Don't worry about the new pPlcxMan, the restorer removes it when
+ Don't worry about the new pPlcxMan, the restore removes it when
replacing the current one with the old one.
*/
aSave.Restore(this);
@@ -857,7 +857,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
{
long nMinStartCp = rStartCp;
long nMaxEndCp = rEndCp;
- // quickly grab the TextBox-Break-Deskriptor-PLCF
+ // quickly grab the TextBox-Break-Descriptor-PLCF
pT = m_xPlcxMan->GetTxbxBkd();
if (!pT) // It can occur on occasion, Caolan
return false;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index dd0fad0b0421..d5b8c244f9ee 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1429,12 +1429,12 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos,
break;
case RES_TXTATR_ANNOTATION:
- OSL_ENSURE(false, "What is a annotation doing in the control stack,"
+ OSL_ENSURE(false, "What is an annotation doing in the control stack,"
"probably should have been in the endstack");
break;
case RES_TXTATR_INPUTFIELD:
- OSL_ENSURE(false, "What is a input field doing in the control stack,"
+ OSL_ENSURE(false, "What is an input field doing in the control stack,"
"probably should have been in the endstack");
break;
@@ -1781,7 +1781,7 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const sal_uInt8* pData, short nLen)
else
{
// Here we have a tab definition which inserts no extra tabs, or deletes
- // no existing tabs. An older version of writer is probably the creater
+ // no existing tabs. An older version of writer is probably the creator
// of the document :-( . So if we are importing a style we can just
// ignore it. But if we are importing into text we cannot as during
// text SwWW8ImplReader::Read_Tab is called at the begin and end of
@@ -2633,7 +2633,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool &rbReSync, WW8_CP nStartCp)
// WW: Table in APO is possible (Both Start-Ends occur at the same time)
// WW: APO in Table not possible
-// This mean that of a Table is the content of a APO, the APO start needs
+// This mean that of a Table is the content of an APO, the APO start needs
// to be edited first, so that the Table remains in the APO and not the
// other way around.
// At the End, however, we need to edit the Table End first as the APO
@@ -2888,11 +2888,11 @@ void SwWW8ImplReader::PostProcessAttrs()
#i9241#
It appears that some documents that are in a baltic 8 bit encoding which has
some undefined characters can have use made of those characters, in which
- case they default to CP1252. If not then its perhaps that the font encoding
+ case they default to CP1252. If not then it's perhaps that the font encoding
is only in use for 6/7 and for 8+ if we are in 8bit mode then the encoding
is always 1252.
- So a encoding converter that on an undefined character attempts to
+ So an encoding converter that on an undefined character attempts to
convert from 1252 on the undefined character
*/
static std::size_t Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter,
@@ -3265,14 +3265,14 @@ namespace
// categorization is. So we don't do that here yet.
// Additional to the categorization, when word encounters weak text for ambiguous
-// chars it uses idcthint to indicate which way to bias. We don't have a idcthint
+// chars it uses idcthint to indicate which way to bias. We don't have an idcthint
// feature in writer.
// So what we currently do here then is to split our text into non-weak/weak
// sections and uses word's idcthint to determine what font it would use and
// force that on for the segment. Following what we *do* know about word's
// categorization, we know that the range 0x0020 and 0x007F is sprmCRgFtc0 in
-// word, something we map to LATIN, so we consider all weaks chars in that range
+// word, something we map to LATIN, so we consider all weak chars in that range
// to auto-bias to LATIN.
// See https://bugs.libreoffice.org/show_bug.cgi?id=34319 for an example
@@ -3946,7 +3946,7 @@ void SwWW8ImplReader::ClearParaEndPosition()
void SwWW8ImplReader::ReadAttrs(WW8_CP& rTextPos, WW8_CP& rNext, long nTextEnd, bool& rbStartLine)
{
- // Dow we have attributes?
+ // Do we have attributes?
if( rTextPos >= rNext )
{
do
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 6909a70c8847..097b330c0c74 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1342,7 +1342,7 @@ private:
bool m_bEmbeddObj; // EmbeddField is being read
- bool m_bCurrentAND_fNumberAcross; // current active Annotated List Deskriptor - ROW flag
+ bool m_bCurrentAND_fNumberAcross; // current active Annotated List Descriptor - ROW flag
bool m_bNoLnNumYet; // no Line Numbering has been activated yet (we import
// the very 1st Line Numbering and ignore the rest)
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 15ba8ae2d95c..647f1ea7ca39 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -705,7 +705,7 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD const * pAD, sal_uInt8
{
SwNumFormat aNF;
if (pAD)
- { // there is a Anld-Sprm
+ { // there is an Anld-Sprm
m_bCurrentAND_fNumberAcross = 0 != pAD->fNumberAcross;
WW8_ANLV const &rAV = pAD->eAnlv;
SetBaseAnlv(aNF, rAV, nSwLevel); // set the base format
@@ -1101,7 +1101,7 @@ void WW8TabBandDesc::ReadDef(bool bVer67, const sal_uInt8* pS, short nLen)
{
if (!bVer67)
{
- //the ww8 version of this is unusual in masquerading as a a srpm with a
+ //the ww8 version of this is unusual in masquerading as a srpm with a
//single byte len arg while it really has a word len arg, after this
//increment nLen is correct to describe the remaining amount of data
pS++;
@@ -2816,11 +2816,11 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact)
{
if (!m_MergeGroups.empty())
{
- // still valid area near the boundery
+ // still valid area near the boundary
const short nTolerance = 4;
- // box boundery
+ // box boundary
short nX2 = nX1 + nWidth;
- // approximate group boundery
+ // approximate group boundary
short nGrX1;
short nGrX2;
@@ -2831,7 +2831,7 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact)
WW8SelBoxInfo& rActGroup = *m_MergeGroups[ iGr ];
if (!rActGroup.bGroupLocked)
{
- // approximate group boundery with room (tolerance) to the *outside*
+ // approximate group boundary with room (tolerance) to the *outside*
nGrX1 = rActGroup.nGroupXStart - nTolerance;
nGrX2 = rActGroup.nGroupXStart
+ rActGroup.nGroupWidth + nTolerance;
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 196c0eef3936..3e2e802b1abf 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -542,7 +542,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher()
// chp.ftcSym
{0x080A, { 1, L_FIX} }, // "sprmCFOle2" chp.fOle2;1 or 0;bit;
{NS_sprm::LN_CIdCharType, { 0, L_FIX} }, // "sprmCIdCharType" obsolete: not applicable in
- // Word97 and later versions;;;
+ // Word97 and later versions;
{0x2A0C, { 1, L_FIX} }, // "sprmCHighlight" chp.fHighlight,
// chp.icoHighlight;ico (fHighlight is set to 1 iff
// ico is not 0)
@@ -1656,7 +1656,7 @@ WW8_FC WW8ScannerBase::WW8Cp2Fc(WW8_CP nCpPos, bool* pIsUnicode,
}
// the text and the fib share the same stream, if the text is inside the fib
- // then its definitely a bad offset. The smallest FIB supported is that of
+ // then it's definitely a bad offset. The smallest FIB supported is that of
// WW2 which is 326 bytes in size
if (nRet < nSmallestPossibleFib)
{
@@ -4763,7 +4763,7 @@ bool WW8PLCFx_FactoidBook::getIsEnd() const
return m_bIsEnd;
}
-// In the end of an paragraph in WW6 the attribute extends after the <CR>.
+// In the end of a paragraph in WW6 the attribute extends after the <CR>.
// This will be reset by one character to be used with SW,
// if we don't expect trouble thereby.
void WW8PLCFMan::AdjustEnds( WW8PLCFxDesc& rDesc )
@@ -5074,7 +5074,7 @@ WW8PLCFMan::~WW8PLCFMan()
}
// 0. which attr class,
-// 1. if it's a attr start,
+// 1. if it's an attr start,
// 2. CP, where is next attr change
sal_uInt16 WW8PLCFMan::WhereIdx(bool *const pbStart, WW8_CP *const pPos) const
{
@@ -7058,7 +7058,7 @@ static void lcl_checkFontname( OUString& sString )
// for efficiency, we'd like to use String methods as far as possible.
// Hence, we will:
// 1) convert all invalid chars to \u0001
- // 2) then erase all \u0001 chars (if any were found), and
+ // 2) then erase all \u0001 chars (if anywere found), and
// 3) erase leading/trailing ';', in case a font name was
// completely removed
@@ -7420,7 +7420,7 @@ const WW8_FFN* WW8Fonts::GetFont( sal_uInt16 nNum ) const
return &m_aFontA[nNum];
}
-// Search after a header/footer for a index in the ww list from header/footer
+// Search after a header/footer for an index in the ww list from header/footer
// specials for WinWord6 and -7:
//
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index de25d6e09c1d..807d4e6db71e 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -176,7 +176,7 @@ struct WW8PLCFxDesc;
class WW8PLCFx_PCD;
/**
- reads array of strings (see MS documentation: STring TaBle stored in File)
+ reads array of strings (see MS documentation: String Table stored in File)
returns NOT the original pascal strings but an array of converted char*
attention: the *extra data* of each string are SKIPPED and ignored
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index aee43cb6f1ae..26fdcf23934f 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -639,7 +639,7 @@ void SwXMLImport::startDocument()
if( !pDoc )
return;
- // Is there a edit shell. If yes, then we are currently inserting
+ // Is there an edit shell. If yes, then we are currently inserting
// a document. We then have to insert at the current edit shell's
// cursor position. That not quite clean code, but there is no other
// way currently.
@@ -687,7 +687,7 @@ void SwXMLImport::startDocument()
SwPaM *pPaM = pTextCursor->GetPaM();
const SwPosition* pPos = pPaM->GetPoint();
- // Split once and remember the node that has been splitted.
+ // Split once and remember the node that has been split.
pDoc->getIDocumentContentOperations().SplitNode( *pPos, false );
*m_pSttNdIdx = pPos->nNode.GetIndex()-1;
@@ -763,7 +763,7 @@ void SwXMLImport::endDocument()
SwPaM *pPaM = pTextCursor->GetPaM();
if( IsInsertMode() && m_pSttNdIdx->GetIndex() )
{
- // If we are in insert mode, join the splitted node that is in front
+ // If we are in insert mode, join the split node that is in front
// of the new content with the first new node. Or in other words:
// Revert the first split node.
SwTextNode* pTextNode = m_pSttNdIdx->GetNode().GetTextNode();
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index a726de4124cb..bef72a6f5357 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -585,7 +585,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines,
sal_uInt32 nWidth = nCPos - nOldCPos;
// If a base width is given, the table has either an automatic
- // or margin alignment, or an percentage width. In either case,
+ // or margin alignment, or a percentage width. In either case,
// relative widths should be exported.
if( nBaseWidth )
{
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index f385c113b802..4356945c11b6 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -333,7 +333,7 @@ SwXMLTableRow_Impl::SwXMLTableRow_Impl( const OUString& rStyleName,
inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol )
{
OSL_ENSURE( nCol < USHRT_MAX,
- "SwXMLTableRow_Impl::GetCell: column number is to big" );
+ "SwXMLTableRow_Impl::GetCell: column number is too big" );
// #i95726# - some fault tolerance
OSL_ENSURE( nCol < m_Cells.size(),
"SwXMLTableRow_Impl::GetCell: column number is out of bound" );
@@ -1872,7 +1872,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
for( i = nTopRow; i < nBottomRow; i++ )
{
- // Could the table be splitted behind the current row?
+ // Could the table be split behind the current row?
bool bSplit = true;
SwXMLTableRow_Impl *pRow = (*m_pRows)[i].get();
for( sal_uInt32 j=nLeftCol; j<nRightCol; j++ )
@@ -2175,21 +2175,21 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
for( sal_uInt32 nRow=nTopRow; nRow<nBottomRow; nRow++ )
{
SwXMLTableCell_Impl *pCell = GetCell(nRow,nCol);
- // Could the table fragment be splitted horizontally behind
+ // Could the table fragment be split horizontally behind
// the current line?
bool bHoriSplit = (*m_pRows)[nRow]->IsSplitable() &&
nRow+1 < nBottomRow &&
1 == pCell->GetRowSpan();
(*m_pRows)[nRow]->SetSplitable( bHoriSplit );
- // Could the table fragment be splitted vertically behind the
+ // Could the table fragment be split vertically behind the
// current column (uptp the current line?
bSplit &= ( 1 == pCell->GetColSpan() );
if( bSplit )
{
bHoriSplitPossible |= bHoriSplit;
- // Could the current table fragment be splitted
+ // Could the current table fragment be split
// horizontally behind the next column, too?
bHoriSplit &= (nCol+1 < nRightCol &&
1 == GetCell(nRow,nCol+1)->GetRowSpan());
@@ -2209,7 +2209,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
break;
}
- // Could the table fragment be splitted vertically behind the
+ // Could the table fragment be split vertically behind the
// current column (uptp the current line?
bSplit = 1 == pCell->GetColSpan();
}
@@ -2266,7 +2266,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
}
else if( m_bHasSubTables && bHoriSplitPossible && bHoriSplitMayContinue )
{
- // The table fragment could be splitted behind the current
+ // The table fragment could be split behind the current
// column, and the remaining fragment could be divided
// into lines. Anyway, it could be that this applies to
// the next column, too. That for, we check the next
@@ -2281,7 +2281,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
// this doesn't apply for thr next column, we split begind
// the current column. This applies for the last column,
// too.
- // If the resulting box cannot be splitted into rows,
+ // If the resulting box cannot be split into rows,
// the split at the last split position we remembered.
if( bHoriSplitPossible || nSplitCol > nCol+1 )
{
@@ -2424,7 +2424,7 @@ void SwXMLTableContext::MakeTable_( SwTableBox *pBox )
else
{
// If there are columns that have relative widths, we have to
- // calculate a absolute widths for them.
+ // calculate an absolute widths for them.
if( nRelCols > 0 )
{
// The absolute space that is available for all columns with a
More information about the Libreoffice-commits
mailing list