Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3262 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/3262/1 fdo#62475 - remove pointless comments and ASCII art in sw/source/core/doc Change-Id: I15f0af451a2259ddfeaa5e7964317e6c0537e4db --- M sw/source/core/doc/docdesc.cxx M sw/source/core/doc/docdraw.cxx M sw/source/core/doc/docedt.cxx M sw/source/core/doc/docfld.cxx M sw/source/core/doc/doclay.cxx M sw/source/core/doc/docnew.cxx M sw/source/core/doc/docsort.cxx M sw/source/core/doc/docstat.cxx M sw/source/core/doc/doctxm.cxx M sw/source/core/doc/fmtcol.cxx M sw/source/core/doc/list.cxx M sw/source/core/doc/notxtfrm.cxx M sw/source/core/doc/sortopt.cxx M sw/source/core/doc/tblafmt.cxx 14 files changed, 9 insertions(+), 179 deletions(-) diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 9f3fa78..fc6809c 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -114,12 +114,6 @@ rFmt3.SetFmtAttr( aUL ); } -/************************************************************************* -|* -|* SwDoc::ChgPageDesc() -|* -|*************************************************************************/ - static void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt &rDest, const bool bPage = true ) { @@ -514,14 +508,6 @@ SetModified(); } - - -/************************************************************************* -|* -|* SwDoc::MakePageDesc() -|* -|*************************************************************************/ - sal_uInt16 SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy, bool bRegardLanguage, bool bBroadcast) { @@ -581,11 +567,6 @@ } return pRet; } - -/****************************************************************************** - * Method : void SwDoc::PrtDataChanged() - * Description : - ******************************************************************************/ void SwDoc::PrtDataChanged() { diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index c172e1f..80cedc9 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -381,12 +381,6 @@ delete [] pFmtsAndObjs; } -/************************************************************************* -|* -|* SwDoc::DeleteSelection() -|* -|*************************************************************************/ - bool SwDoc::DeleteSelection( SwDrawView& rDrawView ) { bool bCallBase = false; @@ -482,12 +476,6 @@ return bCallBase; } -/************************************************************************* -|* -|* SwDoc::DeleteSelection() -|* -|*************************************************************************/ - _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn, sal_uInt32 nArrOrdNum ) : pFmt( pFrmFmt ), pAnchor( pFlyAn ), nOrdNum( nArrOrdNum ) @@ -524,7 +512,6 @@ } } -/*************************************************************************/ // Is also called by the Sw3 Reader, if there was an error when reading the // drawing layer. If it is called by the Sw3 Reader the layer is rebuilt // from scratch. @@ -762,9 +749,6 @@ return nInvisibleLayerId; } -/*************************************************************************/ - - void SwDoc::ReleaseDrawModel() { if ( mpDrawModel ) @@ -785,9 +769,6 @@ SfxItemPool::Free(pEEgPool); } } - -/*************************************************************************/ - SdrModel* SwDoc::_MakeDrawModel() { @@ -812,8 +793,6 @@ return mpDrawModel; } -/*************************************************************************/ - void SwDoc::DrawNotifyUndoHdl() { mpDrawModel->SetNotifyUndoActionHdl( Link() ); @@ -835,19 +814,14 @@ if (pField && pField->ISA(SvxDateField)) { - /****************************************************************** - * Date field - ******************************************************************/ + // Date field pInfo->SetRepresentation( ((const SvxDateField*) pField)->GetFormatted( *GetNumberFormatter( sal_True ), LANGUAGE_SYSTEM) ); } else if (pField && pField->ISA(SvxURLField)) { - /****************************************************************** - * URL field - ******************************************************************/ - + // URL field switch ( ((const SvxURLField*) pField)->GetFormat() ) { case SVXURLFORMAT_APPDEFAULT: //!!! Can be set in App??? @@ -883,16 +857,12 @@ } else if (pField && pField->ISA(SdrMeasureField)) { - /****************************************************************** - * Measure field - ******************************************************************/ + // Measure field pInfo->ClearFldColor(); } else if ( pField && pField->ISA(SvxExtTimeField)) { - /****************************************************************** - * Time field - ******************************************************************/ + // Time field pInfo->SetRepresentation( ((const SvxExtTimeField*) pField)->GetFormatted( *GetNumberFormatter( sal_True ), LANGUAGE_SYSTEM) ); diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index 7a9c890..39d895d 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -703,9 +703,6 @@ SetModified(); } -/************************************************************************* - * SwDoc::Overwrite() - ************************************************************************/ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr ) { SwPosition& rPt = *(SwPosition*)rRg.GetPoint(); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 477bc5d..c27319c 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -298,10 +298,6 @@ return pRet; } -/************************************************************************* -|* SwDoc::UpdateFlds() -|* Description: Update fields -*************************************************************************/ /* * All have to be re-evaluated. */ @@ -362,9 +358,6 @@ SetModified(); } -/****************************************************************************** - * void SwDoc::UpdateUsrFlds() - ******************************************************************************/ void SwDoc::UpdateUsrFlds() { SwCalc* pCalc = 0; diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index cd35ba8..cc24619 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1092,12 +1092,6 @@ } } -/************************************************************************* -|* -|* SwDoc::InsertLabel() -|* -|*************************************************************************/ - /* #i6447# changed behaviour if lcl_CpyAttr: If the old item set contains the item to set (no inheritance) copy the item @@ -1490,12 +1484,6 @@ return pNewFmt; } - -/************************************************************************* -|* -|* SwDoc::InsertDrawLabel() -|* -|*************************************************************************/ static SwFlyFrmFmt * lcl_InsertDrawLabel( SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl, SwUndoInsertLabel *const pUndo, SwDrawFrmFmt *const pOldFmt, @@ -1781,12 +1769,8 @@ return pNewFmt; } +// IDocumentTimerAccess methods ------------------------------------------ -/************************************************************************* -|* -|* IDocumentTimerAccess methods -|* -|*************************************************************************/ void SwDoc::StartIdling() { mbStartIdleTimer = true; @@ -1818,11 +1802,6 @@ maIdleTimer.Start(); } -/************************************************************************* -|* -|* SwDoc::DoIdleJobs() -|* -|*************************************************************************/ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer ) { #ifdef TIMELOG diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index b4e65b7..463037d 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -1156,9 +1156,7 @@ return pRetShell; } -/*------------------------------------------------------------------------- - copy document content - code from SwFEShell::Paste( SwDoc* ) - -----------------------------------------------------------------------*/ +// copy document content - code from SwFEShell::Paste( SwDoc* ) void SwDoc::Paste( const SwDoc& rSource ) { // this has to be empty const sal_uInt16 nStartPageNumber = GetPhyPageNum(); diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 9f8a11f..3067363 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -157,17 +157,11 @@ return nCmp; } -/*-------------------------------------------------------------------- - Description: Comparison operators - --------------------------------------------------------------------*/ bool SwSortElement::operator==(const SwSortElement& ) const { return false; } -/*-------------------------------------------------------------------- - Description: Less-than operator for sorting - --------------------------------------------------------------------*/ bool SwSortElement::operator<(const SwSortElement& rCmp) const { // The actual comparison @@ -199,9 +193,6 @@ { } -/*-------------------------------------------------------------------- - Description: Get Key - --------------------------------------------------------------------*/ String SwSortTxtElement::GetKey(sal_uInt16 nId) const { SwTxtNode* pTxtNd = aPos.GetNode().GetTxtNode(); diff --git a/sw/source/core/doc/docstat.cxx b/sw/source/core/doc/docstat.cxx index d2501e3..bb23ce2 100644 --- a/sw/source/core/doc/docstat.cxx +++ b/sw/source/core/doc/docstat.cxx @@ -19,11 +19,6 @@ #include <docstat.hxx> - -/************************************************************************ - * SwDocStat::SwDocStat() - ************************************************************************/ - SwDocStat::SwDocStat() : nTbl(0), nGrf(0), @@ -37,10 +32,6 @@ nCharExcludingSpaces(0), bModified(sal_True) {} - -/************************************************************************ - * void SwDocStat::Reset() - ************************************************************************/ void SwDocStat::Reset() { diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index ad3d837..96e1792 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -696,9 +696,8 @@ return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0; } -/*-------------------------------------------------------------------- - Description: Table of contents class - --------------------------------------------------------------------*/ +// Table of contents class ------------------------------------------ + SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt) : SwTOXBase( rBase ) , SwSection( TOX_CONTENT_SECTION, aEmptyStr, rFmt ) @@ -1011,9 +1010,6 @@ SetProtect( SwTOXBase::IsProtected() ); } -/*-------------------------------------------------------------------- - Description: Insert AlphaDelimitter - --------------------------------------------------------------------*/ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl ) { SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc(); @@ -2129,9 +2125,6 @@ delete pCharStyleIdx; } -/*-------------------------------------------------------------------- - Description: Insert sorted into aSortArr - --------------------------------------------------------------------*/ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew) { Range aRange(0, aSortArr.size()); diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 2f6b170..fc71b66 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -112,10 +112,6 @@ } } // end of namespace TxtFmtCollFunc -/* - * SwTxtFmtColl TXT - */ - void SwTxtFmtColl::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { if( GetDoc()->IsInDtor() ) diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 941f94c..f37e999 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -27,10 +27,7 @@ #include <pam.hxx> #include <SwNodeNum.hxx> -// ---------------------------------------------------------------------------- -// SwListImpl // implementation class for SwList -// ---------------------------------------------------------------------------- class SwListImpl { public: @@ -223,9 +220,7 @@ } } -// ---------------------------------------------------------------------------- -// SwList -// ---------------------------------------------------------------------------- +// SwList --------------------------------------------------------------------- SwList::SwList( const String sListId, SwNumRule& rDefaultListStyle, const SwNodes& rNodes ) diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 84e9b9a..bf9c7e8 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -138,13 +138,6 @@ Graphic::DrawEx( rSh.GetOut(), rText, *pFont, rBmp, rRect.Pos(), rRect.SSize() ); } -/************************************************************************* -|* -|* SwGrfFrm::SwGrfFrm(ViewShell * const,SwGrfNode *) -|* -*************************************************************************/ - - SwNoTxtFrm::SwNoTxtFrm(SwNoTxtNode * const pNode, SwFrm* pSib ) : SwCntntFrm( pNode, pSib ) { @@ -161,34 +154,15 @@ nWeight = 0; } -/************************************************************************* -|* -|* SwNoTxtNode::MakeFrm() -|* -*************************************************************************/ - - SwCntntFrm *SwNoTxtNode::MakeFrm( SwFrm* pSib ) { return new SwNoTxtFrm(this, pSib); } -/************************************************************************* -|* -|* SwNoTxtFrm::~SwNoTxtFrm() -|* -*************************************************************************/ - SwNoTxtFrm::~SwNoTxtFrm() { StopAnimation(); } - -/************************************************************************* -|* -|* void SwNoTxtFrm::Modify( SwHint * pOld, SwHint * pNew ) -|* -*************************************************************************/ void SetOutDev( ViewShell *pSh, OutputDevice *pOut ) { @@ -222,12 +196,6 @@ } } } - -/************************************************************************* -|* -|* void SwNoTxtFrm::Paint() -|* -*************************************************************************/ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { @@ -478,13 +446,6 @@ return pFly->Prt().SSize(); } -/************************************************************************* -|* -|* SwNoTxtFrm::MakeAll() -|* -*************************************************************************/ - - void SwNoTxtFrm::MakeAll() { SwCntntNotify aNotify( this ); @@ -521,13 +482,6 @@ else if( nChgHght < 0) Shrink( Min(Prt().Height(), -nChgHght) ); } - -/************************************************************************* -|* -|* SwNoTxtFrm::GetCharRect() -|* -|*************************************************************************/ - sal_Bool SwNoTxtFrm::GetCharRect( SwRect &rRect, const SwPosition& rPos, SwCrsrMoveState *pCMS ) const diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx index 1f7c4b2..e27c269 100644 --- a/sw/source/core/doc/sortopt.cxx +++ b/sw/source/core/doc/sortopt.cxx @@ -22,9 +22,6 @@ #include <sortopt.hxx> #include <boost/foreach.hpp> -/*-------------------------------------------------------------------- - Description: Sort Key - --------------------------------------------------------------------*/ SwSortKey::SwSortKey() : eSortOrder( SRT_ASCENDING ), nColumnId( 0 ), @@ -48,9 +45,6 @@ { } -/*-------------------------------------------------------------------- - Description: Sorting options for Sorting - --------------------------------------------------------------------*/ SwSortOptions::SwSortOptions() : eDirection( SRT_ROWS ), cDeli( 9 ), diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 516df7a..1a98459 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -256,8 +256,6 @@ rStream >> nNumFmtVersion; } -// --------------------------------------------------------------------------- - SwBoxAutoFmt::SwBoxAutoFmt() : aFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_FONT ) ), aHeight( 240, 100, RES_CHRATR_FONTSIZE ), -- To view, visit https://gerrit.libreoffice.org/3262 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I15f0af451a2259ddfeaa5e7964317e6c0537e4db Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Riemer <ruderphil...@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice