diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/ndsect.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/laycache.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/trvlfrm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/table/swnewtable.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/porfld.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/pormulti.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/undo/SwUndoPageDesc.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/inc/msfilter.hxx | 8 | ||||
-rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/dbui/mailmergehelper.cxx | 2 |
14 files changed, 19 insertions, 19 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 50fca6cb0dfa..a57b1ad39f96 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -673,7 +673,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78939, "fdo78939.docx") // fdo#78939 : LO hanged while opening issue document // Whenever a para-style was applied to a Numbering format level, - // LO incorrectly also changed the para-style.. + // LO incorrectly also changed the para-style... // check that file opens and does not hang while opening and also // check that an incorrect numbering style is not applied ... diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index e86296671638..3a2296588f03 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -256,7 +256,7 @@ namespace vMarksToCopy.push_back(pMark); } } - // We have to count the "non-copied" nodes.. + // We have to count the "non-copied" nodes... sal_uLong nDelCount; SwNodeIndex aCorrIdx(InitDelCount(rPam, nDelCount)); for(const sw::mark::IMark* const pMark : vMarksToCopy) diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 884bf4c7f0d1..58dd8e7d9c4d 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -1071,7 +1071,7 @@ void SwSectionNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx) } // if the node is in a section, the sectionframe now - // has to be created.. + // has to be created... // boolean to control <Init()> of a new section frame. bool bInitNewSect = false; if( pS ) diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 1f4f35b933b8..58a1fc3e3391 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -169,7 +169,7 @@ void SwLayoutCache::Write( SvStream &rStream, const SwDoc& rDoc ) // of the first content sal_uLong nStartOfContent = rDoc.GetNodes().GetEndOfContent(). StartOfSectionNode()->GetIndex(); - // The first page.. + // The first page... SwPageFrame* pPage = const_cast<SwPageFrame*>(static_cast<const SwPageFrame*>(rDoc.getIDocumentLayoutAccess().GetCurrentLayout()->Lower())); aIo.OpenRec( SW_LAYCACHE_IO_REC_PAGES ); @@ -590,7 +590,7 @@ sal_uLong SwLayHelper::CalcPageCount() //Estimates the number of paragraphs. sal_uLong nTmp = mpDoc->GetNodes().GetEndOfContent().GetIndex() - mpDoc->GetNodes().GetEndOfExtras().GetIndex(); - //Tables have a little overhead.. + //Tables have a little overhead... nTmp -= mpDoc->GetTableFrameFormats()->size() * 25; //Fly frames, too .. nTmp -= (mpDoc->GetNodes().GetEndOfAutotext().GetIndex() - diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index d10d90aeee65..e64301f8fbe4 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -746,7 +746,7 @@ void SwSectionFrame::MoveContentAndDelete( SwSectionFrame* pDel, bool bSave ) pPrvSct = nullptr; // Such that nothing will be merged } } - // The content is going to be inserted.. + // The content is going to be inserted... if( pSave ) { lcl_InvalidateInfFlags( pSave, bSize ); diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 8bb146470119..a967739bc87a 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -1865,7 +1865,7 @@ bool SwRootFrame::MakeTableCursors( SwTableCursor& rTableCursor ) bool bRet = false; - // For new table models there's no need to ask the layout.. + // For new table models there's no need to ask the layout... if( rTableCursor.NewTableSelection() ) return true; diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx index fd6c60952e78..04a2509b1e37 100644 --- a/sw/source/core/table/swnewtable.cxx +++ b/sw/source/core/table/swnewtable.cxx @@ -1711,7 +1711,7 @@ void SwTable::CreateSelection( const SwNode* pStartNd, const SwNode* pEndNd, nTop = nRow; lcl_CheckMinMax( nUpperMin, nUpperMax, *pLine, nCol, true ); ++nFound; - // If start and end node are identical, we're nearly done.. + // If start and end node are identical, we're nearly done... if( pEndNd == pStartNd ) { nBottom = nTop; diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 428dc0bfa5e6..87a9b2524093 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -1256,7 +1256,7 @@ bool SwCombinedPortion::Format( SwTextFormatInfo &rInf ) if( Height() < nMainAscent + nMainDescent ) Height( nMainAscent + nMainDescent ); - // We calculate the x positions of the characters in both lines.. + // We calculate the x positions of the characters in both lines... sal_uInt16 nTopDiff = 0; sal_uInt16 nBotDiff = 0; if( nMaxWidth > Width() ) diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 6fcc5814bd7c..a21514d86213 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -1175,7 +1175,7 @@ std::unique_ptr<SwMultiCreator> SwTextSizeInfo::GetMultiCreator(TextFrameIndex & return pRet; if (pTmp ? lcl_Has2Lines(*pTmp, pActiveTwoLinesItem, bTwo) : lcl_Check2Lines(pNodeTwoLinesItem, pActiveTwoLinesItem, bTwo)) - { // We have an interesting attribute.. + { // We have an interesting attribute... if( bTwo == bOn ) { // .. with the same state, so the last attribute could // be continued. diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index 9822c2d115cf..b0926499c293 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -149,7 +149,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes if( !rDest.IsHeaderShared() ) { - // Same procedure for unshared header.. + // Same procedure for unshared header... const SwFormatHeader& rSourceLeftHead = rSource.GetLeft().GetHeader(); rDest.GetLeft().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); pNewItem.reset(pItem->Clone()); @@ -162,7 +162,7 @@ void SwUndoPageDesc::ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDes } if (!rDest.IsFirstShared()) { - // Same procedure for unshared header.. + // Same procedure for unshared header... const SwFormatHeader& rSourceFirstMasterHead = rSource.GetFirstMaster().GetHeader(); rDest.GetFirstMaster().GetAttrSet().GetItemState( RES_HEADER, false, &pItem ); pNewItem.reset(pItem->Clone()); diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 3847af4523f6..e46769c02216 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -131,10 +131,10 @@ namespace sw Additionally it then has to avoid name collisions such as a) styles "Normal" and "Default" in a single document, where - we can use the original distinct names "Normal" and "Default" and.. + we can use the original distinct names "Normal" and "Default" and... b) styles "Normal" and "Default" in a single document, where we can not use the original names, and must come up with an - alternative name for one of them.. + alternative name for one of them... And it needs to report to the importer if the style being mapped to was already in existence, for the cut and paste/insert file mode we @@ -188,10 +188,10 @@ namespace sw Additionally it then has to avoid name collisions such as a) styles "Normal" and "Default" in a single document, where - we can use the original distinct names "Normal" and "Default" and.. + we can use the original distinct names "Normal" and "Default" and... b) styles "Normal" and "Default" in a single document, where we can not use the original names, and must come up with an - alternative name for one of them.. + alternative name for one of them... And it needs to report to the importer if the style being mapped to was already in existence, for the cut and paste/insert file mode we diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index f994ab9c3f2c..ff17f3ccbcec 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -841,7 +841,7 @@ namespace sw // Force to Japanese when finding one of 'geE'. // XXX This actually may not be correct, all era keywords could be // used in other locales as well. I just don't know about Word. But - // this is how it was for 10 years.. + // this is how it was for 10 years... bool bForceJapanese = (-1 != findUnquoted( rParams, 'g', 0)); // XXX Why replace? The number formatter does handle them and this // effectively changes from Gengou to Gregorian calendar. Legacy diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 93942e9e6f68..de3527796373 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2910,7 +2910,7 @@ void SwBasicEscherEx::WriteOLEPicture(EscherPropertyContainer &rPropOpt, OString aId = aGraphicObject.GetUniqueID(); if (!aId.isEmpty()) { - // SJ: the third parameter (pVisArea) should be set.. + // SJ: the third parameter (pVisArea) should be set... sal_uInt32 nBlibId = mxGlobal->GetBlibID( *QueryPictureStream(), aGraphicObject, pVisArea); if (nBlibId) rPropOpt.AddOpt(ESCHER_Prop_pib, nBlibId, true); diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index b63ac11632e1..aee7f820f92e 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -316,7 +316,7 @@ void SwAddressPreview::SelectAddress(sal_uInt16 nSelect) { OSL_ENSURE(pImpl->nSelectedAddress < pImpl->aAddresses.size(), "selection invalid"); pImpl->nSelectedAddress = nSelect; - // now make it visible.. + // now make it visible... sal_uInt16 nSelectRow = nSelect / pImpl->nColumns; sal_uInt16 nStartRow = m_xVScrollBar->vadjustment_get_value(); if( (nSelectRow < nStartRow) || (nSelectRow >= (nStartRow + pImpl->nRows) )) |