diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-30 11:06:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-01 06:57:19 +0000 |
| commit | e209d115d41e25f5658dd52ae94ceb873b33013f (patch) | |
| tree | 58b49bdcc833ec48bc8542f81b7918f50e07bb6d /sw | |
| parent | 8e27c68847c6461c7bc0bdbff44412d6bfb0b1e8 (diff) | |
remove old standalone Sun bug numbers
Sun bug numbers without any accompanying text are completely useless.
Fixed with
git grep -lP '//\s*#\d+#\s*$'
| xargs perl -i -ne'/\/\/\s*#\d+#\s*$/d or print'
And then hand-checking the result to restore places where it deleted code.
And then some more grepping and hand-editing to kill the others.
Change-Id: Ia96ce4466db8bb8da363ebf41f0ae7f45f28bf29
Reviewed-on: https://gerrit.libreoffice.org/19023
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
40 files changed, 17 insertions, 79 deletions
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi index 6d1bd32b7105..b27a19b103de 100644 --- a/sw/sdi/_frmsh.sdi +++ b/sw/sdi/_frmsh.sdi @@ -288,7 +288,7 @@ interface BaseTextFrame [ ExecMethod = ExecFrameStyle ; StateMethod = GetLineStyleState ; - Export = FALSE; //#44439# + Export = FALSE; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi index b8be3011e72f..7d81beefad35 100644 --- a/sw/sdi/_tabsh.sdi +++ b/sw/sdi/_tabsh.sdi @@ -322,7 +322,7 @@ interface BaseTextTable [ ExecMethod = ExecTableStyle ; StateMethod = GetLineStyleState ; - Export = FALSE; //#44439# + Export = FALSE; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 4a1b5494a5ce..fe5adb9cc310 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -3229,7 +3229,6 @@ bool SwFlyFrameFormat::IsBackgroundBrushInherited() const return false; } -// #125892# SwHandleAnchorNodeChg::SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat, const SwFormatAnchor& _rNewAnchorFormat, SwFlyFrm* _pKeepThisFlyFrm ) diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 6bb30287662a..2b4f3939d6b5 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -1231,7 +1231,6 @@ void SwContentFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/) //Set FixSize. VarSize is being adjusted by Format(). if ( !mbValidSize ) { - // #125452# // invalidate printing area flag, if the following conditions are hold: // - current frame width is 0. // - current printing area width is 0. @@ -1664,7 +1663,6 @@ void SwContentFrm::MakeAll(vcl::RenderContext* /*pRenderContext*/) LOOPING_LOUIE_LIGHT( bMovedFwd && bMovedBwd && !IsInBalancedSection() && ( - // #118572# ( bFootnote && !FindFootnoteFrm()->GetRef()->IsInSct() ) || // #i33887# diff --git a/sw/source/core/layout/findfrm.cxx b/sw/source/core/layout/findfrm.cxx index fdf9ca38fc9e..53d86fbdd3cf 100644 --- a/sw/source/core/layout/findfrm.cxx +++ b/sw/source/core/layout/findfrm.cxx @@ -123,7 +123,6 @@ const SwFrm *SwLayoutFrm::ContainsAny( const bool _bInvestigateFootnoteForSectio //a SectionFrm or a TabFrm. const SwLayoutFrm *pLayLeaf = this; - // #130797# const bool bNoFootnote = IsSctFrm() && !_bInvestigateFootnoteForSections; do { @@ -358,7 +357,6 @@ const SwLayoutFrm *SwFrm::ImplGetNextLayoutLeaf( bool bFwd ) const const SwContentFrm* SwContentFrm::ImplGetNextContentFrm( bool bFwd ) const { const SwFrm *pFrm = this; - // #100926# const SwContentFrm *pContentFrm = 0; bool bGoingUp = false; do { @@ -1001,7 +999,6 @@ SwContentFrm* SwFrm::_FindPrevCnt( const bool _bInSameFootnote ) SwFootnoteFrm* pMasterFootnoteFrmOfCurr( const_cast<SwFootnoteFrm*>(pFootnoteFrmOfCurr) ); pPrevContentFrm = 0L; - // #146872# // correct wrong loop-condition do { pMasterFootnoteFrmOfCurr = pMasterFootnoteFrmOfCurr->GetMaster(); diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index d26e7c04a3ce..c78bc280a23a 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -200,7 +200,6 @@ bool SwFlowFrm::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKeep if( 0 != (pNxt = m_rThis.FindNextCnt()) && (!m_pFollow || pNxt != &m_pFollow->GetFrm())) { - // #135914# // The last row of a table only keeps with the next content // it they are in the same section: if ( bCheckIfLastRowShouldKeep ) diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 66b664365cc2..a30bfe5bb17a 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -175,7 +175,6 @@ void SwFlyInCntFrm::MakeObjPos() } } -// #115759# void SwFlyInCntFrm::_ActionOnInvalidation( const InvalidationType _nInvalid ) { if ( INVALID_POS == _nInvalid || INVALID_ALL == _nInvalid ) diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index ecb637cfdf52..3a5def1fdc3b 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -263,7 +263,6 @@ SwFrmNotify::~SwFrmNotify() bool bNotifySize = false; SwAnchoredObject* pObj = rObjs[i]; SwContact* pContact = ::GetUserCall( pObj->GetDrawObj() ); - // #115759# const bool bAnchoredAsChar = pContact->ObjAnchoredAsChar(); if ( !bAnchoredAsChar ) { @@ -3320,7 +3319,6 @@ SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt1 pTmpFrm->Calc(pLayout ? pLayout->GetCurrShell()->GetOut() : 0); } - // #127369# // aIter.IsChanged checks if the current pTmpFrm has been deleted while // it is the current iterator // FrmHolder watches for deletion of the current pMinFrm diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 085b7aa81312..ae0a5125f8d1 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2172,7 +2172,6 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pI ) : SwRect aTmp( rSh.VisArea() ); rSh.UISizeNotify(); - // #137134# // Are we supposed to crash if rSh isn't a cursor shell?! // bActions |= aTmp != rSh.VisArea() || // aBools[nBoolIdx] != ((SwCrsrShell*)&rSh)->GetCharRect().IsOver( rSh.VisArea() ); diff --git a/sw/source/core/layout/objectformatterlayfrm.cxx b/sw/source/core/layout/objectformatterlayfrm.cxx index b7edff26c717..306ccf572cd8 100644 --- a/sw/source/core/layout/objectformatterlayfrm.cxx +++ b/sw/source/core/layout/objectformatterlayfrm.cxx @@ -22,7 +22,6 @@ #include <sortedobjs.hxx> #include <pagefrm.hxx> -// #124218# #include <layact.hxx> SwObjectFormatterLayFrm::SwObjectFormatterLayFrm( SwLayoutFrm& _rAnchorLayFrm, diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index a82518b440b5..aa53e362fd88 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -119,7 +119,7 @@ void SwPageDesc::Mirror() aSet.Put( m_Master.makeBackgroundBrushItem() ); aSet.Put( m_Master.GetShadow() ); aSet.Put( m_Master.GetCol() ); - aSet.Put( m_Master.GetFrmDir() ); // #112217# + aSet.Put( m_Master.GetFrmDir() ); m_Left.SetFormatAttr( aSet ); } diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 9e5ed69fedc8..ddd92e97b992 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -303,7 +303,6 @@ void SwSectionFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) // Add to the tree SwSectionFrm* pSect = pParent->FindSctFrm(); - // #156927# // Assure that parent is not inside a table frame, which is inside the found section frame. if ( pSect ) { @@ -544,7 +543,6 @@ static SwContentFrm* lcl_GetNextContentFrm( const SwLayoutFrm* pLay, bool bFwd ) return const_cast<SwContentFrm*>(static_cast<const SwContentFrm*>(pLay->GetPrev())); } - // #100926# const SwFrm* pFrm = pLay; SwContentFrm *pContentFrm = 0; bool bGoingUp = true; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 28ad96cbbf78..318bb3a496f2 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -1778,7 +1778,6 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) // table rows. bool bTryToSplit = true; - // #131283# // Indicates that two individual rows may keep together, based on the keep // attribute set at the first paragraph in the first cell. const bool bTableRowKeep = !bDontSplit && GetFormat()->GetDoc()->GetDocumentSettingManager().get(DocumentSettingId::TABLE_ROW_KEEP); @@ -2337,7 +2336,6 @@ void SwTabFrm::MakeAll(vcl::RenderContext* pRenderContext) RemoveFollowFlowLine(); } - // #119477# // If splitting the table was successful or not, // we do not want to have 'empty' follow tables. if ( GetFollow() && !GetFollow()->GetFirstNonHeadlineRow() ) @@ -3338,7 +3336,6 @@ bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool &rReformat ) } SwTwips nTmpHeight = CalcHeightOfFirstContentLine(); - // #118840# // For some mysterious reason, I changed the good old // 'return nHeight <= nSpace' to 'return nTmpHeight < nSpace'. // This obviously results in problems with table frames in @@ -4553,7 +4550,6 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva ) // a follow table and table frame isn't in its // rebuild of last line. const SwTabFrm* pTabFrm = pLay->FindTabFrm(); - // #115759# // - save: check, if table frame is found. if ( pTabFrm && !( pTabFrm->IsFollow() && @@ -5337,7 +5333,6 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const } } - // #118411# // Optimization: lcl_CalcHeightOfFirstContentLine actually can trigger // a formatting of the row frame (via the GetFormatted()). We don't // want this formatting if the row does not have a height. diff --git a/sw/source/core/swg/SwXMLBlockExport.cxx b/sw/source/core/swg/SwXMLBlockExport.cxx index 46ed5f73220e..b2ee9e05b788 100644 --- a/sw/source/core/swg/SwXMLBlockExport.cxx +++ b/sw/source/core/swg/SwXMLBlockExport.cxx @@ -26,7 +26,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::xmloff::token; -// #110680# SwXMLBlockListExport::SwXMLBlockListExport( const uno::Reference< uno::XComponentContext >& rContext, SwXMLTextBlocks & rBlocks, @@ -77,7 +76,6 @@ sal_uInt32 SwXMLBlockListExport::exportDoc(enum XMLTokenEnum ) return 0; } -// #110680# SwXMLTextBlockExport::SwXMLTextBlockExport( const uno::Reference< uno::XComponentContext >& rContext, SwXMLTextBlocks & rBlocks, diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx index 33102ea0716d..c0dbb802a9e1 100644 --- a/sw/source/core/swg/SwXMLSectionList.cxx +++ b/sw/source/core/swg/SwXMLSectionList.cxx @@ -30,7 +30,6 @@ using namespace ::xmloff::token; sal_Char const sXML_np__office[] = "_ooffice"; sal_Char const sXML_np__text[] = "_otext"; -// #110680# SwXMLSectionList::SwXMLSectionList( const uno::Reference< uno::XComponentContext >& rContext, std::vector<OUString*> &rNewSectionList) diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index 0b43c8d00edb..7a24c663ca97 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -367,7 +367,6 @@ void SwTextFly::CtorInitTextFly( const SwTextFrm *pFrm ) { mbIgnoreCurrentFrame = false; mbIgnoreContour = false; - // #118809# mbIgnoreObjsInHeaderFooter = false; pPage = pFrm->FindPageFrm(); const SwFlyFrm* pTmp = pFrm->FindFlyFrm(); @@ -796,7 +795,6 @@ bool SwTextFly::GetTop( const SwAnchoredObject* _pAnchoredObj, pTmp = GetVirtualUpper( pTmp, aPos ); } // #i26945# - // #115759# // If <pTmp> is a text frame inside a table, take the upper // of the anchor frame, which contains the anchor position. else if ( pTmp->IsTextFrm() && pTmp->IsInTab() ) diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 67db7831fba0..bcc08766dd00 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -254,7 +254,6 @@ SwTabPortion *SwTextFormatter::NewTabPortion( SwTextFormatInfo &rInf, bool bAuto if ( bAuto ) { if ( SVX_TAB_ADJUST_DECIMAL == eAdj && - // #127428# 1 == aLineInf.NumberOfTabStops() ) pTabPor = new SwAutoTabDecimalPortion( nNewTabPos, cDec, cFill ); } diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 7ec67802ab31..e1e15b540bb2 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -155,7 +155,6 @@ void SwFormatField::RegisterToFieldType( SwFieldType& rType ) rType.Add(this); } -// #111840# void SwFormatField::SetField(SwField * _pField) { delete mpField; diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 165eb37c886e..bc0fa90bd567 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -480,7 +480,6 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) sal_Int32 nOldPos = nPos; nMaxPos = nMaxPos + nPos; - // #107816# // Look if the length of the original text and the ToUpper-converted // text is different. If yes, do special handling. OUString aNewText; diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 659e829edc8e..934697f4ab4a 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -120,7 +120,6 @@ SwTextNode *SwNodes::MakeTextNode( const SwNodeIndex & rWhere, SwNodeIndex aIdx( *pNode ); - // #125329# // call method <UpdateOutlineNode(..)> only for the document nodes array if ( IsDocNodes() ) UpdateOutlineNode(*pNode); @@ -2577,7 +2576,7 @@ SwTextNode* SwTextNode::_MakeNewTextNode( const SwNodeIndex& rPos, bool bNext, delete pNewAttrSet; const SwNumRule* pRule = GetNumRule(); - if( pRule && pRule == pNode->GetNumRule() && rNds.IsDocNodes() ) // #115901# + if( pRule && pRule == pNode->GetNumRule() && rNds.IsDocNodes() ) { // #i55459# // - correction: parameter <bNext> has to be checked, as it was in the diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index c29760898b31..0b8a3c2d0bc5 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -1094,7 +1094,6 @@ Size SwSubFont::_GetTextSize( SwDrawTextInfo& rInf ) if(bCaseMapLengthDiffers && rInf.GetLen()) { - // #108203# // If the length of the original string and the CaseMapped one // are different, it is necessary to handle the given text part as // a single snippet since its size may differ, too. @@ -1209,7 +1208,6 @@ void SwSubFont::_DrawText( SwDrawTextInfo &rInf, const bool bGrey ) if(bCaseMapLengthDiffers && rInf.GetLen()) { - // #108203# // If the length of the original string and the CaseMapped one // are different, it is necessary to handle the given text part as // a single snippet since its size may differ, too. diff --git a/sw/source/core/undo/SwUndoPageDesc.cxx b/sw/source/core/undo/SwUndoPageDesc.cxx index c55eb68139a4..6473547ff17f 100644 --- a/sw/source/core/undo/SwUndoPageDesc.cxx +++ b/sw/source/core/undo/SwUndoPageDesc.cxx @@ -363,7 +363,6 @@ SwRewriter SwUndoPageDesc::GetRewriter() const return aResult; } -// #116530# SwUndoPageDescCreate::SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * _pDoc) : SwUndo(UNDO_CREATE_PAGEDESC), pDesc(pNew), aNew(*pNew, _pDoc), @@ -378,13 +377,11 @@ SwUndoPageDescCreate::~SwUndoPageDescCreate() void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &) { - // -> #116530# if (pDesc) { aNew = *pDesc; pDesc = NULL; } - // <- #116530# pDoc->DelPageDesc(aNew.GetName(), true); } @@ -392,7 +389,7 @@ void SwUndoPageDescCreate::UndoImpl(::sw::UndoRedoContext &) void SwUndoPageDescCreate::DoImpl() { SwPageDesc aPageDesc = aNew; - pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, false, true); // #116530# + pDoc->MakePageDesc(aNew.GetName(), &aPageDesc, false, true); } void SwUndoPageDescCreate::RedoImpl(::sw::UndoRedoContext &) @@ -432,12 +429,12 @@ SwUndoPageDescDelete::~SwUndoPageDescDelete() void SwUndoPageDescDelete::UndoImpl(::sw::UndoRedoContext &) { SwPageDesc aPageDesc = aOld; - pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, false, true); // #116530# + pDoc->MakePageDesc(aOld.GetName(), &aPageDesc, false, true); } void SwUndoPageDescDelete::DoImpl() { - pDoc->DelPageDesc(aOld.GetName(), true); // #116530# + pDoc->DelPageDesc(aOld.GetName(), true); } void SwUndoPageDescDelete::RedoImpl(::sw::UndoRedoContext &) diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index f258063057dc..4d9ac054533c 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -110,15 +110,13 @@ #define STR_UNDO_COMPAREDOC (CORE_REPEAT_END +38) #define STR_UNDO_SETFLYFRMFMT (CORE_REPEAT_END +39) #define STR_UNDO_SETRUBYATTR (CORE_REPEAT_END +40) -// #102505# #define STR_UNDO_TMPAUTOCORR (CORE_REPEAT_END +41) - #define STR_TOXCHANGE (CORE_REPEAT_END +42) #define STR_UNDO_PAGEDESC_CREATE (CORE_REPEAT_END +43) #define STR_UNDO_PAGEDESC (CORE_REPEAT_END +44) #define STR_UNDO_PAGEDESC_DELETE (CORE_REPEAT_END +45) #define STR_UNDO_HEADER_FOOTER (CORE_REPEAT_END +46) // #i7983# -#define STR_UNDO_FIELD (CORE_REPEAT_END +47) // #111840# +#define STR_UNDO_FIELD (CORE_REPEAT_END +47) #define STR_UNDO_TXTFMTCOL_CREATE (CORE_REPEAT_END +48) #define STR_UNDO_TXTFMTCOL_DELETE (CORE_REPEAT_END +49) #define STR_UNDO_TXTFMTCOL_RENAME (CORE_REPEAT_END +50) diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src index f2f969b3c1e2..90b2038ceab5 100644 --- a/sw/source/core/undo/undo.src +++ b/sw/source/core/undo/undo.src @@ -390,7 +390,6 @@ String STR_UNDO_SETRUBYATTR { Text [ en-US ] = "Ruby Setting"; }; -// #102505# String STR_UNDO_TMPAUTOCORR { Text [ en-US ] = "AutoCorrect" ; diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index cfa249aa06f0..e4d18ce70d25 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -1098,7 +1098,6 @@ bool SwUndo::CanRedlineGroup( SwRedlineSaveDatas& rCurr, return true; } -// #111827# OUString ShortenString(const OUString & rStr, sal_Int32 nLength, const OUString & rFillStr) { assert(nLength - rFillStr.getLength() >= 2); diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 933df1518edc..5dd9949910ba 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -335,7 +335,6 @@ void SwUndoInsLayFormat::RepeatImpl(::sw::RepeatContext & rContext) (void) pFlyFormat; } -// #111827# OUString SwUndoInsLayFormat::GetComment() const { OUString aResult; diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx index 1fda3b988566..313d2a49d6a8 100644 --- a/sw/source/core/undo/unins.cxx +++ b/sw/source/core/undo/unins.cxx @@ -106,7 +106,6 @@ void SwUndoInsert::Init(const SwNodeIndex & rNd) bCacheComment = false; } -// #111827# SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt, sal_Int32 nL, const SwInsertFlags nInsertFlags, @@ -120,7 +119,6 @@ SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd, sal_Int32 nCnt, Init(rNd); } -// #111827# SwUndoInsert::SwUndoInsert( const SwNodeIndex& rNd ) : SwUndo(UNDO_SPLITNODE), pText( 0 ), pRedlData( 0 ), nNode( rNd.GetIndex() ), nContent(0), nLen(1), @@ -452,7 +450,6 @@ void SwUndoInsert::RepeatImpl(::sw::RepeatContext & rContext) } } -// #111827# SwRewriter SwUndoInsert::GetRewriter() const { SwRewriter aResult; @@ -580,7 +577,6 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences, return aResult; } -// #111827# SwRewriter SwUndoReplace::GetRewriter() const { return MakeUndoReplaceRewriter(1, m_pImpl->GetOld(), m_pImpl->GetIns()); @@ -1012,7 +1008,6 @@ void SwUndoInsertLabel::RepeatImpl(::sw::RepeatContext & rContext) } } -// #111827# SwRewriter SwUndoInsertLabel::GetRewriter() const { return CreateRewriter(sText); diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx index 6cd854ca2c67..4758876fcbe3 100644 --- a/sw/source/core/undo/unnum.cxx +++ b/sw/source/core/undo/unnum.cxx @@ -285,7 +285,6 @@ void SwUndoNumUpDown::RepeatImpl(::sw::RepeatContext & rContext) rContext.GetDoc().NumUpDown(rContext.GetRepeatPaM(), 1 == nOffset); } -// #115901# SwUndoNumOrNoNum::SwUndoNumOrNoNum( const SwNodeIndex& rIdx, bool bOldNum, bool bNewNum) : SwUndo( UNDO_NUMORNONUM ), nIdx( rIdx.GetIndex() ), mbNewNum(bNewNum), @@ -317,7 +316,6 @@ void SwUndoNumOrNoNum::RedoImpl(::sw::UndoRedoContext & rContext) } } -// #115901# void SwUndoNumOrNoNum::RepeatImpl(::sw::RepeatContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index 93172620ea89..3a233d98d4c5 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -130,7 +130,7 @@ void SwViewShellImp::PaintLayer( const SdrLayerID _nLayerID, GetDrawView()->GetModel()->GetDrawOutliner().SetDefaultHorizontalTextDirection( aEEHoriTextDirOfPage ); } - pOutDev->Push( PushFlags::LINECOLOR ); // #114231# + pOutDev->Push( PushFlags::LINECOLOR ); if (pPrintData) { // hide drawings but not form controls (form controls are handled elsewhere) diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 3da8f9e387e0..6d02ea30868f 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1989,7 +1989,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect ) if( 3 == nRet ) aFillText = aText; - else if ((4 == nRet) || (2 == nRet)) //#109414# + else if ((4 == nRet) || (2 == nRet)) aFillText = "\t"; else aFillText.clear(); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 5801208958d8..66eaeda96a46 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -337,7 +337,6 @@ short SwOutlineTabDialog::Ok() // set levels for all created templates; has to be done in order to // delete possibly cancelled assignments again. - // #130443# // encapsulate changes into a action to avoid effects on the current cursor // position during the changes. rWrtSh.StartAction(); @@ -1007,7 +1006,6 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle pVDev->SetFont(aStdFont); if(pActNum->IsContinusNum()) aNumVector[nLevel] = nPreNum; - // #128041# OUString aText(pActNum->MakeNumString( aNumVector )); pVDev->DrawText( Point(nNumberXPos, nYStart), aText ); nBulletWidth = pVDev->GetTextWidth(aText); @@ -1100,7 +1098,6 @@ void NumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle pVDev->SetFont(aStdFont); if (pActNum->IsContinusNum()) aNumVector[nLevel] = nPreNum; - // #128041# OUString aText(pActNum->MakeNumString( aNumVector )); pVDev->DrawText( Point(nXStart, nYStart), aText ); nTextOffset = pVDev->GetTextWidth(aText) + nXStep; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 5e66db718a73..3ad6f9c3a988 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1362,7 +1362,7 @@ bool SwFieldMgr::InsertField( void SwFieldMgr::UpdateCurField(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, - SwField * _pTmpField) // #111840# + SwField * _pTmpField) { // change format OSL_ENSURE(pCurField, "no field at CursorPos"); diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx index 11ffecd024b8..c79753ad16b9 100644 --- a/sw/source/uibase/inc/conrect.hxx +++ b/sw/source/uibase/inc/conrect.hxx @@ -28,7 +28,6 @@ class ConstRectangle : public SwDrawBase bool bMarquee; bool bCapVertical; - // #93382# bool mbVertical; public: diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 2f34a84300aa..fe4f06c90cb1 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -133,7 +133,7 @@ public: void UpdateCurField(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, - SwField * _pField = 0); // #111840# + SwField * _pField = 0); OUString GetCurFieldPar1() const { return aCurPar1; } OUString GetCurFieldPar2() const { return aCurPar2; } diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 18b49fafee90..b018074f9684 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -668,7 +668,6 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) aTmp += "."; } - // #111827# SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, m_pSh->GetCrsrDescr()); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index fadf770aa2e4..adc80f534b63 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -815,7 +815,6 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) SwWait aWait( *pSh->GetView().GetDocShell(), true ); pSh->StartAction(); - // #111827# if (aRedlines.size() > 1) { OUString aTmpStr; @@ -848,7 +847,6 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) (pSh->*FnAccRej)( nPosition ); } - // #111827# if (aRedlines.size() > 1) { pSh->EndUndo(); diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx index 841e9ebb0b19..b042cf46dee7 100644 --- a/sw/source/uibase/ribbar/conrect.cxx +++ b/sw/source/uibase/ribbar/conrect.cxx @@ -41,7 +41,6 @@ ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin, : SwDrawBase( pWrtShell, pEditWin, pSwView ) , bMarquee(false) , bCapVertical(false) - // #93382# , mbVertical(false) { } diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 78ad21e2b3f0..a48e970561ed 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -87,7 +87,7 @@ enum SwDocumentSettingsPropertyHandles HANDLE_IS_LABEL_DOC, HANDLE_IS_ADD_FLY_OFFSET, HANDLE_IS_ADD_EXTERNAL_LEADING, - HANDLE_OLD_NUMBERING, // #111955# + HANDLE_OLD_NUMBERING, HANDLE_OUTLINELEVEL_YIELDS_NUMBERING, /* Stampit It disable the print cancel button of the shown progress dialog. */ HANDLE_ALLOW_PRINTJOB_CANCEL, @@ -111,7 +111,6 @@ enum SwDocumentSettingsPropertyHandles HANDLE_TABS_RELATIVE_TO_INDENT, HANDLE_RSID, HANDLE_RSID_ROOT, - // #i89181# HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, HANDLE_MODIFYPASSWORDINFO, HANDLE_MATH_BASELINE_ALIGNMENT, @@ -161,7 +160,7 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() { OUString("IsLabelDocument"), HANDLE_IS_LABEL_DOC, cppu::UnoType<bool>::get(), 0, 0}, { OUString("AddFrameOffsets"), HANDLE_IS_ADD_FLY_OFFSET, cppu::UnoType<bool>::get(), 0, 0}, { OUString("AddExternalLeading"), HANDLE_IS_ADD_EXTERNAL_LEADING, cppu::UnoType<bool>::get(), 0, 0}, - { OUString("UseOldNumbering"), HANDLE_OLD_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, // #111955# + { OUString("UseOldNumbering"), HANDLE_OLD_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, { OUString("OutlineLevelYieldsNumbering"), HANDLE_OUTLINELEVEL_YIELDS_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, /* Stampit It disable the print cancel button of the shown progress dialog. */ { OUString("AllowPrintJobCancel"), HANDLE_ALLOW_PRINTJOB_CANCEL, cppu::UnoType<bool>::get(), 0, 0}, @@ -185,7 +184,6 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() { OUString("Rsid"), HANDLE_RSID, cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("RsidRoot"), HANDLE_RSID_ROOT, cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("ProtectForm"), HANDLE_PROTECT_FORM, cppu::UnoType<bool>::get(), 0, 0}, - // #i89181# { OUString("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, cppu::UnoType<bool>::get(), 0, 0}, { OUString("ModifyPasswordInfo"), HANDLE_MODIFYPASSWORDINFO, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), 0, 0}, { OUString("MathBaselineAlignment"), HANDLE_MATH_BASELINE_ALIGNMENT, cppu::UnoType<bool>::get(), 0, 0}, @@ -561,7 +559,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, bTmp); } break; - case HANDLE_OLD_NUMBERING: // #111955# + case HANDLE_OLD_NUMBERING: { bool bTmp = *static_cast<sal_Bool const *>(rValue.getValue()); mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::OLD_NUMBERING, bTmp); @@ -708,7 +706,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM, bTmp); } break; - // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { bool bTmp = *static_cast<sal_Bool const *>(rValue.getValue()); @@ -1029,12 +1026,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::ADD_EXT_LEADING); } break; - case HANDLE_OLD_NUMBERING: // #111955# + case HANDLE_OLD_NUMBERING: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::OLD_NUMBERING); } break; - case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: // #111955# + case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE); } @@ -1144,7 +1141,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::PROTECT_FORM); } break; - // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 36cde06faa6f..d6dd03a8eb69 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -21,7 +21,6 @@ #include <crsskip.hxx> #include <swcrsr.hxx> #include <editeng/lrspitem.hxx> -// #134369# #include <view.hxx> #include <drawbase.hxx> @@ -359,10 +358,8 @@ long SwWrtShell::DelRight() LeaveSelFrmMode(); UnSelectFrm(); - // #134369# OSL_ENSURE( !IsFrmSelected(), "<SwWrtShell::DelRight(..)> - <SwWrtShell::UnSelectFrm()> should unmark all objects" ); - // #134369# // leave draw mode, if necessary. { if (GetView().GetDrawFuncPtr()) @@ -377,7 +374,6 @@ long SwWrtShell::DelRight() } } - // #134369# // <IsFrmSelected()> can't be true - see above. { nSelection = GetSelectionType(); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index c0cc481d6478..719e23730eff 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -207,7 +207,6 @@ void SwWrtShell::Insert( const OUString &rStr ) // insert is already in parentheses at Editshell. StartAllAction(); - // #111827# SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, GetCrsrDescr()); |