[Libreoffice-commits] .: sw/sdi sw/source
David Tardon
dtardon at kemper.freedesktop.org
Thu Feb 3 00:28:20 PST 2011
sw/sdi/_frmsh.sdi | 3 -
sw/source/core/attr/format.cxx | 2 -
sw/source/core/crsr/crsrsh.cxx | 3 -
sw/source/core/doc/docnew.cxx | 10 ++---
sw/source/core/doc/docredln.cxx | 10 +----
sw/source/core/doc/doctxm.cxx | 30 ++++++---------
sw/source/core/doc/fmtcol.cxx | 34 ++++++-----------
sw/source/core/doc/htmltbl.cxx | 2 -
sw/source/core/doc/notxtfrm.cxx | 29 +++++---------
sw/source/core/doc/number.cxx | 6 +--
sw/source/core/doc/poolfmt.cxx | 20 +---------
sw/source/core/docnode/ndcopy.cxx | 26 +++++--------
sw/source/core/docnode/ndnotxt.cxx | 6 +--
sw/source/core/docnode/ndnum.cxx | 2 -
sw/source/core/docnode/ndsect.cxx | 30 +++++++--------
sw/source/core/docnode/ndtbl.cxx | 12 ++----
sw/source/core/docnode/node.cxx | 33 +++++-----------
sw/source/core/docnode/node2lay.cxx | 6 +--
sw/source/core/docnode/nodes.cxx | 3 -
sw/source/core/docnode/observablethread.cxx | 2 -
sw/source/core/docnode/pausethreadstarting.cxx | 2 -
sw/source/core/docnode/retrievedinputstreamdata.cxx | 4 +-
sw/source/core/docnode/retrieveinputstream.cxx | 2 -
sw/source/core/docnode/retrieveinputstreamconsumer.cxx | 2 -
sw/source/core/docnode/section.cxx | 15 +------
sw/source/core/docnode/swthreadmanager.cxx | 2 -
sw/source/core/docnode/threadlistener.cxx | 2 -
sw/source/core/docnode/threadmanager.cxx | 2 -
28 files changed, 109 insertions(+), 191 deletions(-)
New commits:
commit d9adf1dfebc18f438a3acbf4601901e01e500b87
Author: shirahara <luixxiul at gmail.com>
Date: Wed Feb 2 20:41:40 2011 +0900
Remove comments (writer)
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index d074710..080bc7a 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -262,14 +262,13 @@ interface BaseTextFrame
[
ExecMethod = Execute ;
]
- // --> OD 2009-07-08 #i73249#
+ // #i73249#
FN_TITLE_DESCRIPTION_SHAPE
[
ExecMethod = Execute ;
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- // <--
/*****************************************************
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 337c92f..05904e5 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -655,8 +655,6 @@ sal_Bool SwFmt::IsBackgroundTransparent() const
Default implementation returns false. Thus, subclasses have to overload
method, if the specific subclass can have a transparent shadow.
- @author OD
-
@return false, default implementation
*/
sal_Bool SwFmt::IsShadowTransparent() const
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a6db747..201e125 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2592,8 +2592,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
bSetCrsrInReadOnly = TRUE;
pVisCrsr = new SwVisCrsr( this );
- // OD 11.02.2003 #100556#
- mbMacroExecAllowed = true;
+ mbMacroExecAllowed = true; // #100556#
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 81bf466..8153957 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -475,9 +475,7 @@ SwDoc::~SwDoc()
delete pURLStateChgd;
delete pLayouter;
- // --> OD 2005-09-05 #125370#
pLayouter = 0L;
- // <--
// Undo-Benachrichtigung vom Draw abschalten
if( pDrawModel )
@@ -792,7 +790,7 @@ void SwDoc::ClearDoc()
GetNodes().Delete( aSttIdx,
GetNodes().GetEndOfContent().GetIndex() - aSttIdx.GetIndex() );
- // --> OD 2006-02-28 #i62440#
+ // #i62440#
// destruction of numbering rules and creation of new outline rule
// *after* the document nodes are deleted.
pOutlineRule = NULL;
@@ -817,9 +815,9 @@ void SwDoc::ClearDoc()
pFtnColl = pEndNoteInfo->GetFtnTxtColl();
if( pFtnColl ) pFtnColl->Remove( pEndNoteInfo );
- // JP 27.01.98: opt.: ausgehend davon, das Standard als 2. im Array
- // steht, sollte das als letztes geloescht werden, damit
- // die ganze Umhaengerei der Formate vermieden wird!
+ // opt.: ausgehend davon, das Standard als 2. im Array
+ // steht, sollte das als letztes geloescht werden, damit
+ // die ganze Umhaengerei der Formate vermieden wird!
if( 2 < pTxtFmtCollTbl->Count() )
pTxtFmtCollTbl->DeleteAndDestroy( 2, pTxtFmtCollTbl->Count()-2 );
pTxtFmtCollTbl->DeleteAndDestroy( 1, pTxtFmtCollTbl->Count()-1 );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index d422972..d35ee22 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -3510,10 +3510,8 @@ void SwRedline::DelCopyOfSection()
if( pCSttNd && pCEndNd )
{
- // --> OD 2009-08-20 #i100466#
- // force a <join next> on <delete and join> operation
+ // #i100466# - force a <join next> on <delete and join> operation
pDoc->DeleteAndJoin( aPam, true );
- // <--
}
else if( pCSttNd || pCEndNd )
{
@@ -3617,9 +3615,7 @@ void SwRedline::MoveFromSection()
}
}
- // --> OD 2009-03-17 #i95711#
- const SwNode* pKeptCntntSectNode( &pCntntSect->GetNode() );
- // <--
+ const SwNode* pKeptCntntSectNode( &pCntntSect->GetNode() ); // #i95711#
{
SwPaM aPam( pCntntSect->GetNode(),
*pCntntSect->GetNode().EndOfSectionNode(), 1,
@@ -3668,7 +3664,7 @@ void SwRedline::MoveFromSection()
if( pColl && pCNd )
pCNd->ChgFmtColl( pColl );
}
- // --> OD 2009-03-17 #i95771#
+ // #i95771#
// Under certain conditions the previous <SwDoc::Move(..)> has already
// remove the change tracking section of this <SwRedline> instance from
// the change tracking nodes area.
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index ab040ad..495257b 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -374,7 +374,7 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
if( bExpand )
{
- // OD 19.03.2003 #106329# - add value for 2nd parameter = true to
+ // add value for 2nd parameter = true to
// indicate, that a creation of a new table of content has to be performed.
// Value of 1st parameter = default value.
pNewSection->Update( 0, true );
@@ -792,8 +792,8 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
if(pAttr && pDoc && GetFmt())
pDoc->ChgFmt(*GetFmt(), *pAttr);
- // OD 18.03.2003 #106329# - determine default page description, which
- // will be used by the content nodes, if no approriate one is found.
+ // determine default page description, which will be used by the content nodes,
+ // if no approriate one is found.
const SwPageDesc* pDefaultPageDesc;
{
pDefaultPageDesc =
@@ -809,8 +809,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
pDefaultPageDesc = 0;
}
}
- // OD 28.04.2003 #109166# - consider end node of content section in the
- // node array.
+ // consider end node of content section in the node array.
if ( !pDefaultPageDesc &&
( pSectNd->EndOfSectionNode()->GetIndex() <
(pSectNd->GetNodes().GetEndOfContent().GetIndex() - 1) )
@@ -828,8 +827,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
pDefaultPageDesc = pNdAfterTOX->FindPageDesc( FALSE );
}
}
- // OD 28.04.2003 #109166# - consider start node of content section in
- // the node array.
+ // consider start node of content section in the node array.
if ( !pDefaultPageDesc &&
( pSectNd->GetIndex() >
(pSectNd->GetNodes().GetEndOfContent().StartOfSectionIndex() + 1) )
@@ -1020,8 +1018,8 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
pNextMark->GetSecondaryKey() == sSecKey)
nRange++;
}
- // OD 18.03.2003 #106329# - pass node index of table-of-content section
- // and default page description to method <GenerateText(..)>.
+ // pass node index of table-of-content section and default page description
+ // to method <GenerateText(..)>.
GenerateText( nCnt, nRange, aStrArr, pSectNd->GetIndex(), pDefaultPageDesc );
nCnt += nRange - 1;
}
@@ -1596,8 +1594,8 @@ String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, BYT
return sRet;
}
-// OD 18.03.2003 #106329# - add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc>
-// in order to control, which page description is used, no appropriate one is found.
+// add parameter <_TOXSectNdIdx> and <_pDefaultPageDesc> in order to control,
+// which page description is used, no appropriate one is found.
void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
USHORT nCount,
SvStringsDtor& ,
@@ -1701,7 +1699,6 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
{
// dann hilft alles nichts, wir muessen ueber die Seiten-
// vorlage gehen.
- // OD 18.03.2003 #106329# - call
sal_uInt32 nPgDescNdIdx = pTOXNd->GetIndex() + 1;
sal_uInt32* pPgDescNdIdx = &nPgDescNdIdx;
pPageDesc = pTOXNd->FindPageDesc( FALSE, pPgDescNdIdx );
@@ -1768,10 +1765,9 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
if(rBase.aTOXSources.Count())
pTOXSource = &rBase.aTOXSources[0];
- // --> OD 2008-02-14 #i53420#
+ // #i53420#
if ( pTOXSource && pTOXSource->pNd &&
pTOXSource->pNd->IsCntntNode() )
- // <--
{
const SwCntntFrm* pFrm = pTOXSource->pNd->GetFrm();
if( pFrm )
@@ -1779,13 +1775,13 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
SwChapterFieldType aFldTyp;
SwChapterField aFld( &aFldTyp, aToken.nChapterFormat );
aFld.SetLevel( static_cast<BYTE>(aToken.nOutlineLevel - 1) );
- // --> OD 2008-02-14 #i53420#
+ // #i53420#
aFld.ChangeExpansion( pFrm,
dynamic_cast<const SwCntntNode*>(pTOXSource->pNd),
TRUE );
// <--
- //---> i89791
- // OD 2008-06-26 - continue to support CF_NUMBER
+ //---> #i89791#
+ // continue to support CF_NUMBER
// and CF_NUM_TITLE in order to handle ODF 1.0/1.1
// written by OOo 3.x in the same way as OOo 2.x
// would handle them.
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index b33ee43..aed0ddc 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -37,9 +37,7 @@
#include <doc.hxx> // fuer GetAttrPool
#include <errhdl.hxx>
#include <fmtcol.hxx>
-// --> OD 2006-11-22 #i71574#
-#include <fmtcolfunc.hxx>
-// <--
+#include <fmtcolfunc.hxx> // #i71574#
#include <hints.hxx>
#include <calc.hxx>
#include <node.hxx>
@@ -60,7 +58,7 @@ SV_IMPL_PTRARR( SwFmtCollConditions, SwCollConditionPtr );
namespace TxtFmtCollFunc
{
- // --> OD 2006-11-22 #i71574#
+ // #i71574#
void CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
SwFmt* pFmt,
const SwNumRuleItem* pNewNumRuleItem )
@@ -75,7 +73,7 @@ namespace TxtFmtCollFunc
return;
}
- // --> OD 2007-01-24 #i73790#
+ // #i73790#
if ( !pTxtFmtColl->StayAssignedToListLevelOfOutlineStyle() &&
pTxtFmtColl->IsAssignedToListLevelOfOutlineStyle() )
// <--
@@ -148,16 +146,13 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
return;
}
- // --> OD 2006-06-16 #i66431# - adjust type of <bNewParent>
- bool bNewParent( false );
- // <--
+ bool bNewParent( false ); // #i66431# - adjust type of <bNewParent>
SvxULSpaceItem *pNewULSpace = 0, *pOldULSpace = 0;
SvxLRSpaceItem *pNewLRSpace = 0, *pOldLRSpace = 0;
SvxFontHeightItem* aFontSizeArr[3] = {0,0,0};
- // --> OD 2006-10-17 #i70223#
+ // #i70223#
const bool bAssignedToListLevelOfOutlineStyle(IsAssignedToListLevelOfOutlineStyle());//#outline level ,zhaojianwei
const SwNumRuleItem* pNewNumRuleItem( 0L );
- // <--
SwAttrSetChg *pNewChgSet = 0, *pOldChgSet = 0;
@@ -177,8 +172,7 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
FALSE, (const SfxPoolItem**)&(aFontSizeArr[1]) );
pNewChgSet->GetChgSet()->GetItemState( RES_CHRATR_CTL_FONTSIZE,
FALSE, (const SfxPoolItem**)&(aFontSizeArr[2]) );
- // --> OD 2006-10-17 #i70223#
- // --> OD 2007-12-19 #i84745#
+ // #i70223#, #i84745#
// check, if attribute set is applied to this paragraph style
if ( bAssignedToListLevelOfOutlineStyle &&
pNewChgSet->GetTheChgdSet() == &GetAttrSet() )
@@ -199,10 +193,8 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
aFontSizeArr[0] = (SvxFontHeightItem*)&pParent->Get( RES_CHRATR_FONTSIZE );
aFontSizeArr[1] = (SvxFontHeightItem*)&pParent->Get( RES_CHRATR_CJK_FONTSIZE );
aFontSizeArr[2] = (SvxFontHeightItem*)&pParent->Get( RES_CHRATR_CTL_FONTSIZE );
- // --> OD 2006-06-16 #i66431#
- // modify has to be propagated, because of new parent format.
+ // #i66431# - modify has to be propagated, because of new parent format.
bNewParent = true;
- // <--
}
break;
@@ -221,7 +213,7 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
case RES_CHRATR_CTL_FONTSIZE:
aFontSizeArr[2] = (SvxFontHeightItem*)pNew;
break;
- // --> OD 2006-10-17 #i70223#
+ // #i70223#
case RES_PARATR_NUMRULE:
{
if ( bAssignedToListLevelOfOutlineStyle )
@@ -233,7 +225,7 @@ void SwTxtFmtColl::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
break;
}
- // --> OD 2006-10-17 #i70223#
+ // #i70223#
if ( bAssignedToListLevelOfOutlineStyle && pNewNumRuleItem )
{
TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
@@ -424,12 +416,12 @@ BOOL SwTxtFmtColl::ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 )
}
// <--
-// --> OD 2007-01-24 #i73790#
+// #i73790#
USHORT SwTxtFmtColl::ResetAllFmtAttr()
{
const bool bOldState( mbStayAssignedToListLevelOfOutlineStyle );
mbStayAssignedToListLevelOfOutlineStyle = true;
- // --> OD 2008-12-16 #i70748#
+ // #i70748#
// Outline level is no longer a member, it is a attribute now.
// Thus, it needs to be restored, if the paragraph style is assigned
// to the outline style
@@ -440,7 +432,7 @@ USHORT SwTxtFmtColl::ResetAllFmtAttr()
USHORT nRet = SwFmtColl::ResetAllFmtAttr();
- // --> OD 2008-12-16 #i70748#
+ // #i70748#
if ( nAssignedOutlineStyleLevel != -1 )
{
AssignToListLevelOfOutlineStyle( nAssignedOutlineStyleLevel );
@@ -680,7 +672,7 @@ void SwTxtFmtColl::AssignToListLevelOfOutlineStyle(const int nAssignedListLevel)
mbAssignedToOutlineStyle = true;
SetAttrOutlineLevel(nAssignedListLevel+1);
- // --> OD 2009-03-18 #i100277#
+ // #i100277#
SwClientIter aIter( *this );
SwTxtFmtColl* pDerivedTxtFmtColl =
dynamic_cast<SwTxtFmtColl*>(aIter.First( TYPE( SwTxtFmtColl ) ));
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 08c053a..90b4644 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -369,7 +369,7 @@ USHORT SwHTMLTableLayout::GetBrowseWidth( const SwDoc& rDoc )
return (USHORT)pPageFrm->Prt().Width();
}
- // --> OD 2010-05-12 #i91658#
+ // #i91658#
// Assertion removed which state that no browse width is available.
// Investigation reveals that all calls can handle the case that no browse
// width is provided.
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index af7ca81..e4cdf5b 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -79,9 +79,7 @@
#include <svtools/embedhlp.hxx>
#include <svtools/chartprettypainter.hxx>
-// --> OD 2009-03-05 #i99665#
-#include <dview.hxx>
-// <--
+#include <dview.hxx> // #i99665#
using namespace com::sun::star;
@@ -228,7 +226,7 @@ void lcl_ClearArea( const SwFrm &rFrm,
::DrawGraphic( pItem, &rOut, aOrigRect, aRegion[i] );
else
{
- // OD 2004-04-23 #116347#
+ // #116347#
rOut.Push( PUSH_FILLCOLOR|PUSH_LINECOLOR );
rOut.SetFillColor( rFrm.GetShell()->Imp()->GetRetoucheColor());
rOut.SetLineColor();
@@ -254,7 +252,7 @@ void SwNoTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/
if( !pSh->GetViewOptions()->IsGraphic() )
{
StopAnimation();
- // OD 10.01.2003 #i6467# - no paint of placeholder for page preview
+ // #i6467# - no paint of placeholder for page preview
if ( pSh->GetWin() && !pSh->IsPreView() )
{
const SwNoTxtNode* pNd = GetNode()->GetNoTxtNode();
@@ -286,7 +284,7 @@ void SwNoTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/
if( pGrfNd )
pGrfNd->SetFrameInPaint( TRUE );
- // OD 16.04.2003 #i13147# - add 2nd parameter with value <sal_True> to
+ // #i13147# - add 2nd parameter with value <sal_True> to
// method call <FindFlyFrm().GetContour(..)> to indicate that it is called
// for paint in order to avoid load of the intrinsic graphic.
if ( ( !pOut->GetConnectMetaFile() ||
@@ -629,7 +627,7 @@ void SwNoTxtFrm::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
{
USHORT nWhich = pNew ? pNew->Which() : pOld ? pOld->Which() : 0;
- // --> OD 2007-03-06 #i73788#
+ // #i73788#
// no <SwCntntFrm::Modify(..)> for RES_LINKED_GRAPHIC_STREAM_ARRIVED
if ( RES_GRAPHIC_PIECE_ARRIVED != nWhich &&
RES_GRAPHIC_ARRIVED != nWhich &&
@@ -701,10 +699,8 @@ void SwNoTxtFrm::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
case RES_GRAPHIC_PIECE_ARRIVED:
case RES_GRAPHIC_ARRIVED:
- // --> OD 2007-03-06 #i73788#
- // handle RES_LINKED_GRAPHIC_STREAM_ARRIVED as RES_GRAPHIC_ARRIVED
+ // i73788# - handle RES_LINKED_GRAPHIC_STREAM_ARRIVED as RES_GRAPHIC_ARRIVED
case RES_LINKED_GRAPHIC_STREAM_ARRIVED:
- // <--
if ( GetNode()->GetNodeType() == ND_GRFNODE )
{
bComplete = FALSE;
@@ -831,14 +827,13 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
if( !bPrn )
{
- // --> OD 2007-01-02 #i73788#
+ // #i73788#
if ( pGrfNd->IsLinkedInputStreamReady() )
{
pGrfNd->UpdateLinkWithInputStream();
}
// <--
- // --> OD 2008-01-30 #i85717#
- // --> OD 2008-07-21 #i90395# - check, if asynchronous retrieval
+ // #i85717#, #i90395# - check, if asynchronous retrieval
// if input stream for the graphic is possible
// else if( GRAPHIC_DEFAULT == rGrfObj.GetType() &&
else if ( ( rGrfObj.GetType() == GRAPHIC_DEFAULT ||
@@ -854,9 +849,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
!(aTmpSz = pGrfNd->GetTwipSize()).Width() ||
!aTmpSz.Height() || !pGrfNd->GetAutoFmtLvl() )
{
- // --> OD 2006-12-22 #i73788#
- pGrfNd->TriggerAsyncRetrieveInputStream();
- // <--
+ pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788#
}
String aTxt( pGrfNd->GetTitle() );
if ( !aTxt.Len() )
@@ -954,7 +947,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
}
else if( pOLENd )
{
- // --> OD 2009-03-05 #i99665#
+ // #i99665#
// Adjust AntiAliasing mode at output device for chart OLE
const USHORT nFormerAntialiasingAtOutput( pOut->GetAntialiasing() );
if ( pOLENd->IsChart() &&
@@ -1009,7 +1002,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
((SwFEShell*)pShell)->ConnectObj( pOLENd->GetOLEObj().GetObject(), pFly->Prt(), pFly->Frm());
}
- // --> OD 2009-03-05 #i99665#
+ // #i99665#
if ( pOLENd->IsChart() &&
pShell->Imp()->GetDrawView()->IsAntiAliasing() )
{
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index ee9e9e2..e89903f 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -105,7 +105,7 @@ const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
return pResult;
}
-// --> OD 2008-07-08 #i91400#
+// #i91400#
void SwNumRule::SetName( const String & rName,
IDocumentListsAccess& rDocListAccess)
// <--
@@ -864,7 +864,7 @@ void SwNumRule::SetInvalidRule(BOOL bFlag)
for ( aIter = maTxtNodeList.begin(); aIter != maTxtNodeList.end(); ++aIter )
{
const SwTxtNode* pTxtNode = *aIter;
- // --> OD 2010-06-04 #i111681# - applying patch from cmc
+ // #i111681# - applying patch from cmc
SwList* pList = pTxtNode->GetDoc()->getListByName( pTxtNode->GetListId() );
OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
if ( pList )
@@ -1297,8 +1297,6 @@ namespace numfunc
/** class containing configuration data about user interface behavior
regarding lists and list items.
-
- OD 2007-10-01 #b660435#
configuration item about behavior of <TAB>/<SHIFT-TAB>-key at first
position of first list item
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 915adbd..c3226da 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -241,7 +241,7 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
pColl->SetFmtAttr( aLR );
}
- // --> OD 2006-11-20 #i71764#
+ // #i71764#
// Check on document setting OUTLINE_LEVEL_YIELDS_OUTLINE_RULE no longer needed.
// All paragraph styles, which are assigned to a level of the
// outline style has to have the outline style set as its list style.
@@ -1640,9 +1640,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
SwCharFmt *pNumCFmt = 0, *pBullCFmt = 0;
const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode
- // --> OD 2008-06-06 #i89178#
- = numfunc::GetDefaultPositionAndSpaceMode();
- // <--
+ = numfunc::GetDefaultPositionAndSpaceMode(); //#i89178#
// <--
{
BOOL bIsModified = IsModified();
@@ -1962,9 +1960,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
aFmt.SetCharFmt( pBullCFmt );
- // --> OD 2006-06-29 #6440955#
aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- // <--
aFmt.SetBulletChar( cBulletChar );
USHORT nOffs = GetMetricVal( CM_01 ) * 4,
nOffs2 = GetMetricVal( CM_1 ) * 2;
@@ -2007,9 +2003,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
aFmt.SetIncludeUpperLevels( 1 );
- // --> OD 2006-06-29 #6440955#
aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- // <--
aFmt.SetBulletChar( cBulletChar );
static const USHORT aAbsSpace[ MAXLEVEL ] =
@@ -2065,9 +2059,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
aFmt.SetIncludeUpperLevels( 1 );
- // --> OD 2006-06-29 #6440955#
aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- // <--
aFmt.SetBulletChar( 0x2013 );
static const USHORT aAbsSpace[ MAXLEVEL ] =
@@ -2124,9 +2116,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
aFmt.SetIncludeUpperLevels( 1 );
- // --> OD 2006-06-29 #6440955#
aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- // <--
USHORT nOffs = GetMetricVal( CM_01 ) * 4;
@@ -2167,9 +2157,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetCharFmt( pBullCFmt );
aFmt.SetStart( 1 );
aFmt.SetIncludeUpperLevels( 1 );
- // --> OD 2006-06-29 #6440955#
aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- // <--
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
@@ -2232,9 +2220,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId )
aFmt.SetStart( 1 );
aFmt.SetIncludeUpperLevels( 1 );
aFmt.SetBulletChar( 0x2717 );
- // --> OD 2006-06-29 #6440955#
aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- // <--
static const USHORT aAbsSpace[ MAXLEVEL ] =
{
@@ -2504,7 +2490,7 @@ void SwDoc::RemoveAllFmtLanguageDependencies()
rDesc.GetLeft().SetFmtAttr( aFrameDir );
}
- // OD 09.10.2003 #i18732# - restore static pool default for item
+ // #i18732# - restore static pool default for item
// RES_FOLLOW_TEXT_FLOW.
GetAttrPool().ResetPoolDefaultItem( RES_FOLLOW_TEXT_FLOW );
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 465870b..107d47c 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -118,11 +118,9 @@ namespace
nNdOff -= nDelCount;
xub_StrLen nCntntPos = rOrigPos.nContent.GetIndex();
- // --> OD, AMA 2008-07-07 #b6713815#
// Always adjust <nNode> at to be changed <SwPosition> instance <rChgPos>
rChgPos.nNode = nNdOff + rCpyStt.nNode.GetIndex();
if( !nNdOff )
- // <--
{
// dann nur den Content anpassen
if( nCntntPos > rOrigStt.nContent.GetIndex() )
@@ -273,7 +271,7 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
}
// ??? reicht das ??? was ist mit PostIts/Feldern/FeldTypen ???
- // --> OD 2008-11-18 #i96213# - force copy of all attributes
+ // #i96213# - force copy of all attributes
pCpyTxtNd->CopyText( pTxtNd, SwIndex( pCpyTxtNd ),
pCpyTxtNd->GetTxt().Len(), true );
// <--
@@ -818,7 +816,7 @@ bool lcl_MarksWholeNode(const SwPaM & rPam)
return bResult;
}
-// --> OD 2009-08-25 #i86492#
+// #i86492#
bool lcl_ContainsOnlyParagraphsInList( const SwPaM& rPam )
{
bool bRet = false;
@@ -912,7 +910,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
pDoc->SetOutlineNumRule(*GetOutlineNumRule());
}
- // --> OD 2009-08-25 #i86492#
+ // #i86492#
// Correct the search for a previous list:
// First search for non-outline numbering list. Then search for non-outline
// bullet list.
@@ -926,7 +924,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
pDoc->SearchNumRule( rPos, false, false, false, 0, aListIdToPropagate, true );
}
// <--
- // --> OD 2009-08-25 #i86492#
+ // #i86492#
// Do not propagate previous found list, if
// - destination is an empty paragraph which is not in a list and
// - source contains at least one paragraph which is not in a list
@@ -1001,8 +999,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
/* #107213#: Safe numrule item at destination. */
- // --> OD 2009-08-25 #i86492#
- // Safe also <ListId> item of destination.
+ // #i86492# - Safe also <ListId> item of destination.
int aNumRuleState = SFX_ITEM_UNKNOWN;
SwNumRuleItem aNumRuleItem;
int aListIdState = SFX_ITEM_UNKNOWN;
@@ -1045,10 +1042,9 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
{
pSttTxtNd->CopyCollFmt( *pDestTxtNd );
- /* #107213# If only a part of one paragraph is copied
+ /* If only a part of one paragraph is copied
restore the numrule at the destination. */
- // --> OD 2009-08-25 #i86492#
- // restore also <ListId> item
+ // #i86492# - restore also <ListId> item
if ( !lcl_MarksWholeNode(rPam) )
{
if (SFX_ITEM_SET == aNumRuleState)
@@ -1150,8 +1146,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
/* #107213# Save numrule at destination */
- // --> OD 2009-08-25 #i86492#
- // Safe also <ListId> item of destination.
+ // #i86492# - Safe also <ListId> item of destination.
int aNumRuleState = SFX_ITEM_UNKNOWN;
SwNumRuleItem aNumRuleItem;
int aListIdState = SFX_ITEM_UNKNOWN;
@@ -1189,8 +1184,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
{
/* #107213# If only a part of one paragraph is copied
restore the numrule at the destination. */
- // --> OD 2009-08-25 #i86492#
- // restore also <ListId> item
+ // #i86492# - restore also <ListId> item
if ( !lcl_MarksWholeNode(rPam) )
{
if (SFX_ITEM_SET == aNumRuleState)
@@ -1459,7 +1453,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
{
const _ZSortFly& rZSortFly = aArr[ n ];
- // --> OD 2006-01-04 #i59964#
+ // #i59964#
// correct determination of new anchor position
SwFmtAnchor aAnchor( *rZSortFly.GetAnchor() );
SwPosition* pNewPos = (SwPosition*)aAnchor.GetCntntAnchor();
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index 001394d..a926c96 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -46,9 +46,7 @@
#include <istyleaccess.hxx>
#include <SwStyleNameMapper.hxx>
-// --> OD 2009-07-13 #i73249#
-#include <frmfmt.hxx>
-// <--
+#include <frmfmt.hxx> // #i73249#
SwNoTxtNode::SwNoTxtNode( const SwNodeIndex & rWhere,
const BYTE nNdType,
@@ -252,7 +250,7 @@ Graphic SwNoTxtNode::GetGraphic() const
return aRet;
}
-// --> OD 2009-07-14 #i73249#
+// #i73249#
void SwNoTxtNode::SetTitle( const String& rTitle, bool bBroadcast )
{
// Title attribute of <SdrObject> replaces own AlternateText attribute
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index fcb6c22..12c6bac 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -98,7 +98,6 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
{
if (! bFound)
{
- // --> OD 2005-11-02 #125329#
// assure that text is in the correct nodes array
if ( &(pTxtNd->GetNodes()) == this )
{
@@ -109,7 +108,6 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
OSL_ENSURE( false,
"<SwNodes::UpdateOutlineNode(..)> - given text node isn't in the correct nodes array. This is a serious defect -> inform OD" );
}
- // <--
}
}
else
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 5af35f5..adf50df 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -60,13 +60,13 @@
#include <doctxm.hxx>
#include <fmtftntx.hxx>
#include <comcore.hrc>
-// --> OD 2005-12-01 #i27138#
+// #i27138#
#include <viewsh.hxx>
#include <txtfrm.hxx>
// <--
-// OD 04.11.2003 #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
+// #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
// Method now determines the previous/next on its own. Thus, it can be controlled,
// for which previous/next is checked, if it's visible.
bool lcl_IsInSameTblBox( SwNodes& _rNds,
@@ -142,13 +142,13 @@ void lcl_CheckEmptyLayFrm( SwNodes& rNds, SwSectionData& rSectionData,
SwNodeIndex aIdx( rStt );
if( !rNds.GoPrevSection( &aIdx, TRUE, FALSE ) ||
!CheckNodesRange( rStt, aIdx, TRUE ) ||
- // OD 04.11.2003 #i21457#
+ // #i21457#
!lcl_IsInSameTblBox( rNds, rStt, true ))
{
aIdx = rEnd;
if( !rNds.GoNextSection( &aIdx, TRUE, FALSE ) ||
!CheckNodesRange( rEnd, aIdx, TRUE ) ||
- // OD 04.11.2003 #i21457#
+ // #i21457#
!lcl_IsInSameTblBox( rNds, rEnd, false ))
{
rSectionData.SetHidden( false );
@@ -621,7 +621,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
{
SwSectionFmt* pFmt = (*pSectionFmtTbl)[ nPos ];
SwSection* pSection = pFmt->GetSection();
- /// OD 04.10.2002 #102894#
+
/// remember hidden condition flag of SwSection before changes
bool bOldCondHidden = pSection->IsCondHidden() ? true : false;
@@ -717,7 +717,6 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
else
sSectName.Erase();
- /// OD 04.10.2002 #102894# - NOTE
/// In SwSection::operator=(..) class member bCondHiddenFlag is always set to TRUE.
/// IMHO this have to be changed, but I can't estimate the consequences:
/// Either it is set to TRUE using corresponding method <SwSection.SetCondHidden(..)>,
@@ -742,7 +741,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
if( !pIdx )
pIdx = pFmt->GetCntnt().GetCntntIdx();
FldsToCalc( aCalc, pIdx->GetIndex(), USHRT_MAX );
- /// OD 04.10.2002 #102894#
+
/// Because on using SwSection::operator=() to set up <pSection>
/// with <rNewData> and the above given note, the hidden condition flag
/// has to be set to FALSE, if hidden condition flag of <pFmt->GetSection()>
@@ -1153,7 +1152,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
pNew = rIdx.GetNode().GetCntntNode()->MakeFrm();
SwSectionNode* pS = rIdx.GetNode().FindSectionNode();
- // --> OD 2008-06-23 #156927#
+
// Assure that node is not inside a table, which is inside the
// found section.
if ( pS )
@@ -1165,16 +1164,15 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
pS = 0;
}
}
- // <--
+
// if the node is in a section, the sectionframe now
// has to be created..
- // OD 14.11.2002 #104684# - boolean to control <Init()> of a new
- // section frame.
+ // boolean to control <Init()> of a new section frame.
bool bInitNewSect = false;
if( pS )
{
SwSectionFrm *pSct = new SwSectionFrm( pS->GetSection() );
- // OD 14.11.2002 #104684# - prepare <Init()> of new section frame.
+ // prepare <Init()> of new section frame.
bInitNewSect = true;
SwLayoutFrm* pUp = pSct;
while( pUp->Lower() ) // for columned sections
@@ -1183,7 +1181,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
pUp = (SwLayoutFrm*)pUp->Lower();
}
pNew->Paste( pUp, NULL );
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
@@ -1210,7 +1208,7 @@ void SwSectionNode::MakeFrms(const SwNodeIndex & rIdx )
else
// der neue liegt hinter mir
pNew->Paste( pFrm->GetUpper(), pFrm->GetNext() );
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
@@ -1280,13 +1278,13 @@ void SwSectionNode::DelFrms()
SwNodeIndex aIdx( *this );
if( !rNds.GoPrevSection( &aIdx, TRUE, FALSE ) ||
!CheckNodesRange( *this, aIdx, TRUE ) ||
- // OD 04.11.2003 #i21457#
+ // #i21457#
!lcl_IsInSameTblBox( rNds, *this, true ))
{
aIdx = *EndOfSectionNode();
if( !rNds.GoNextSection( &aIdx, TRUE, FALSE ) ||
!CheckNodesRange( *EndOfSectionNode(), aIdx, TRUE ) ||
- // OD 04.11.2003 #i21457#
+ // #i21457#
!lcl_IsInSameTblBox( rNds, *EndOfSectionNode(), false ))
{
m_pSection->m_Data.SetHiddenFlag(false);
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c9b442f..aeb9f1f 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -41,7 +41,7 @@
#include <editeng/protitem.hxx>
#include <editeng/boxitem.hxx>
#include <svl/stritem.hxx>
-// OD 06.08.2003 #i17174#
+// #i17174#
#include <editeng/shaditem.hxx>
#include <fmtfsize.hxx>
#include <fmtornt.hxx>
@@ -93,9 +93,7 @@
#include <map>
#include <algorithm>
-// --> OD 2005-12-05 #i27138#
-#include <rootfrm.hxx>
-// <--
+#include <rootfrm.hxx> // #i27138#
#include <fldupde.hxx>
#if OSL_DEBUG_LEVEL > 1
@@ -2423,7 +2421,7 @@ void SwTableNode::MakeFrms( SwNodeIndex* pIdxBehind )
{
SwTabFrm* pNew = MakeFrm();
pNew->Paste( pUpper, pFrm );
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
@@ -2463,7 +2461,7 @@ void SwTableNode::DelFrms()
{
while ( pFrm->HasFollow() )
pFrm->JoinAndDelFollows();
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
@@ -2769,7 +2767,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
SwTable& rTab = *pTab->GetTable();
const SwFmtFrmSize& rTblFrmSz = rTab.GetFrmFmt()->GetFrmSize();
SWRECTFN( pTab )
- // OD 06.08.2003 #i17174# - With fix for #i9040# the shadow size is taken
+ // #i17174# - With fix for #i9040# the shadow size is taken
// from the table width. Thus, add its left and right size to current table
// printing area width in order to get the correct table size attribute.
SwTwips nPrtWidth = (pTab->Prt().*fnRect->fnGetWidth)();
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 586ac07..95437e4 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -32,9 +32,7 @@
#include <hintids.hxx>
-// --> OD 2005-02-21 #i42921#
-#include <editeng/frmdiritem.hxx>
-// <--
+#include <editeng/frmdiritem.hxx> // #i42921#
#include <editeng/protitem.hxx>
#include <com/sun/star/i18n/CharacterIteratorMode.hdl>
#include <fmtcntnt.hxx>
@@ -72,13 +70,9 @@
#include <crsskip.hxx>
#include <SwStyleNameMapper.hxx>
#include <scriptinfo.hxx>
-// --> OD 2005-12-05 #i27138#
-#include <rootfrm.hxx>
-// <--
+#include <rootfrm.hxx> // #i27138#
#include <istyleaccess.hxx>
-// --> OD 2007-10-31 #i83479#
-#include <IDocumentListItems.hxx>
-// <--
+#include <IDocumentListItems.hxx> // #i83479#
using namespace ::com::sun::star::i18n;
@@ -521,7 +515,6 @@ BOOL SwNode::IsProtect() const
const SwPageDesc* SwNode::FindPageDesc( BOOL bCalcLay,
sal_uInt32* pPgDescNdIdx ) const
{
- // OD 18.03.2003 #106329#
if ( !GetNodes().IsDocNodes() )
{
return 0;
@@ -556,7 +549,6 @@ const SwPageDesc* SwNode::FindPageDesc( BOOL bCalcLay,
0 != ( pPage = pFrm->FindPageFrm() ) )
{
pPgDesc = pPage->GetPageDesc();
- // OD 18.03.2003 #106329#
if ( pPgDescNdIdx )
{
*pPgDescNdIdx = pNode->GetIndex();
@@ -752,7 +744,6 @@ const SwPageDesc* SwNode::FindPageDesc( BOOL bCalcLay,
else if( pNd->IsSectionNode() )
pPgDesc = pNd->GetSectionNode()->GetSection().
GetFmt()->GetPageDesc().GetPageDesc();
- // OD 18.03.2003 #106329#
if ( pPgDescNdIdx )
{
*pPgDescNdIdx = pNd->GetIndex();
@@ -892,8 +883,7 @@ BYTE SwNode::HasPrevNextLayNode() const
if( IsValidNextPrevNd( *this ))
{
SwNodeIndex aIdx( *this, -1 );
- // --> OD 2007-06-04 #i77805#
- // skip section start and end nodes
+ // #i77805# - skip section start and end nodes
while ( aIdx.GetNode().IsSectionNode() ||
( aIdx.GetNode().IsEndNode() &&
aIdx.GetNode().StartOfSectionNode()->IsSectionNode() ) )
@@ -1326,7 +1316,7 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
{
pNew = rNode.MakeFrm();
pNew->Paste( pUpper, pFrm );
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
@@ -1364,7 +1354,7 @@ void SwCntntNode::DelFrms()
for( pFrm = (SwCntntFrm*)aIter.First( TYPE(SwCntntFrm)); pFrm;
pFrm = (SwCntntFrm*)aIter.Next() )
{
- // --> OD 2005-12-01 #i27138#
+ // #i27138#
// notify accessibility paragraphs objects about changed
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
@@ -1759,7 +1749,7 @@ const SfxPoolItem* SwCntntNode::GetNoCondAttr( USHORT nWhich,
nWhich, FALSE, &pFnd ) && bInParents ))
((SwFmt*)GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd );
}
- // --> OD 2005-10-25 #126347# - undo change of issue #i51029#
+ // undo change of issue #i51029#
// Note: <GetSwAttrSet()> returns <mpAttrSet>, if set, otherwise it returns
// the attribute set of the paragraph style, which is valid for the
// content node - see file <node.hxx>
@@ -1989,7 +1979,7 @@ void SwCntntNode::ChkCondColl()
}
}
-// --> OD 2005-02-21 #i42921#
+// #i42921#
short SwCntntNode::GetTextDirection( const SwPosition& rPos,
const Point* pPt ) const
{
@@ -1999,10 +1989,8 @@ short SwCntntNode::GetTextDirection( const SwPosition& rPos,
if( pPt )
aPt = *pPt;
- // --> OD 2007-01-10 #i72024#
- // No format of the frame, because this can cause recursive layout actions
+ // #i72024# - No format of the frame, because this can cause recursive layout actions
SwFrm* pFrm = GetFrm( &aPt, &rPos, FALSE );
- // <--
if ( pFrm )
{
@@ -2059,12 +2047,11 @@ const IDocumentFieldsAccess* SwNode::getIDocumentFieldsAccess() const { return G
IDocumentFieldsAccess* SwNode::getIDocumentFieldsAccess() { return GetDoc(); }
IDocumentContentOperations* SwNode::getIDocumentContentOperations() { return GetDoc(); }
IStyleAccess& SwNode::getIDocumentStyleAccess() { return GetDoc()->GetIStyleAccess(); }
-// --> OD 2007-10-31 #i83479#
+// #i83479#
IDocumentListItems& SwNode::getIDocumentListItems()
{
return *GetDoc();
}
-// <--
BOOL SwNode::IsInRedlines() const
{
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 63349c1..7c8f244 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -232,12 +232,12 @@ SwLayoutFrm* SwNode2LayImpl::UpperFrm( SwFrm* &rpFrm, const SwNode &rNode )
SwFrm* pFrm = bMaster ? rpFrm->FindPrev() : rpFrm->FindNext();
if( pFrm && pFrm->IsSctFrm() )
{
- // #137684#: pFrm could be a "dummy"-section
+ // pFrm could be a "dummy"-section
if( ((SwSectionFrm*)pFrm)->GetSection() &&
(&((SwSectionNode*)pNode)->GetSection() ==
((SwSectionFrm*)pFrm)->GetSection()) )
{
- // OD 2004-06-02 #i22922# - consider columned sections
+ // #i22922# - consider columned sections
// 'Go down' the section frame as long as the layout frame
// is found, which would contain content.
while ( pFrm->IsLayoutFrm() &&
@@ -347,7 +347,7 @@ void SwNode2LayImpl::RestoreUpperFrms( SwNodes& rNds, ULONG nStt, ULONG nEnd )
{
SwSectionFrm* pSctFrm = pTmp->FindSctFrm();
pSctFrm->ColUnlock();
- // OD 26.08.2003 #i18103# - invalidate size of section in order to
+ // #i18103# - invalidate size of section in order to
// assure, that the section is formatted, unless it was 'Collocked'
// from its 'collection' until its 'restoration'.
pSctFrm->_InvalidateSize();
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 1600d87..11a1955 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -163,8 +163,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, ULONG nSz,
SwNodeIndex aDelIdx( *this, n );
SwNode& rNd = aDelIdx.GetNode();
- // --> OD 2005-11-16 #i57920#
- // correction of refactoring done by cws swnumtree:
+ // #i57920# - correction of refactoring done by cws swnumtree:
// - <SwTxtNode::SetLevel( NO_NUMBERING ) is deprecated and
// set <IsCounted> state of the text node to <false>, which
// isn't correct here.
diff --git a/sw/source/core/docnode/observablethread.cxx b/sw/source/core/docnode/observablethread.cxx
index 411cfd4..2348dba 100644
--- a/sw/source/core/docnode/observablethread.cxx
+++ b/sw/source/core/docnode/observablethread.cxx
@@ -32,7 +32,7 @@
/** class for an observable thread
- OD 2007-01-29 #i73788#
+ #i73788#
@author OD
*/
diff --git a/sw/source/core/docnode/pausethreadstarting.cxx b/sw/source/core/docnode/pausethreadstarting.cxx
index 2b3b5bb..f97a40d 100644
--- a/sw/source/core/docnode/pausethreadstarting.cxx
+++ b/sw/source/core/docnode/pausethreadstarting.cxx
@@ -32,7 +32,7 @@
/** Helper class to pause starting of threads during existence of an instance
of this class
- OD 2007-03-16 #i73788#
+ #i73788#
@author OD
*/
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index 52a19ae..c5ad719 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -32,7 +32,7 @@
/** implementation of class <SwRetrievedInputStreamDataManager>
- OD 2007-01-30 #i73788#
+ #i73788#
*/
SwRetrievedInputStreamDataManager* SwRetrievedInputStreamDataManager::mpManager = 0;
SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::mnNextKeyValue = 1;
@@ -131,7 +131,7 @@ bool SwRetrievedInputStreamDataManager::PopData( const tDataKey nDataKey,
filling of the data container to provide retrieved input stream to the
thread Consumer using <Application::PostUserEvent(..)>
- OD 2007-01-29 #i73788#
+ #i73788#
Note: This method has to be run in the main thread.
@author OD
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index cddae56..0d62d56 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -32,7 +32,7 @@
/** class for a thread to retrieve an input stream given by an URL
- OD 2007-01-29 #i73788#
+ #i73788#
@author OD
*/
diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
index f55809f..02741d7 100644
--- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
+++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
@@ -34,7 +34,7 @@
/** class to provide creation of a thread to retrieve an input stream given by
an URL and to consume the retrieved input stream.
- OD 2007-01-29 #i73788#
+ #i73788#
@author OD
*/
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index e0a3da7..66ee33e 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -95,13 +95,11 @@ public:
virtual BOOL IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt = 0,
xub_StrLen nEnd = STRING_NOTFOUND ) const;
- // --> OD 2007-02-14 #b6521322#
inline SwSectionNode* GetSectNode()
{
const SwNode* pSectNd( const_cast<SwIntrnlSectRefLink*>(this)->GetAnchor() );
return const_cast<SwSectionNode*>( dynamic_cast<const SwSectionNode*>( pSectNd ) );
}
- // <--
};
@@ -746,7 +744,6 @@ void SwSectionFmt::DelFrms()
{
SwClientIter aIter( *this );
SwClient *pLast = aIter.GoStart();
- // --> OD 2007-08-14 #147431#
// First delete the <SwSectionFrm> of the <SwSectionFmt> instance
while ( pLast )
{
@@ -771,7 +768,7 @@ void SwSectionFmt::DelFrms()
}
pLast = aIter++;
}
- // <--
+
ULONG nEnde = pSectNd->EndOfSectionIndex();
ULONG nStart = pSectNd->GetIndex()+1;
lcl_DeleteFtn( pSectNd, nStart, nEnde );
@@ -1225,7 +1222,6 @@ SwSectionFmt::MakeUnoObject()
}
-// --> OD 2007-02-14 #b6521322#
// Method to break section links inside a linked section
void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
{
@@ -1262,7 +1258,6 @@ void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
}
}
}
-// <--
void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
{
@@ -1433,7 +1428,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
return ;
}
- // --> OD 2005-02-11 #i38810# - Due to possible existing signatures, the
+ // #i38810# - Due to possible existing signatures, the
// document has to be modified after updating a link.
pDoc->SetModified();
// set additional flag that links have been updated, in order to check this
@@ -1579,7 +1574,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
pCpyRg = new SwNodeRange( pSrcDoc->GetNodes().GetEndOfExtras(), 2,
pSrcDoc->GetNodes().GetEndOfContent() );
- // --> OD 2007-11-30 #i81653#
+ // #i81653#
// Update links of extern linked document or extern linked
// document section, if section is protected.
if ( pSrcDoc != pDoc &&
@@ -1618,9 +1613,7 @@ void SwIntrnlSectRefLink::DataChanged( const String& rMimeType,
delete pCpyRg;
}
- // --> OD 2007-02-14 #b6521322#
lcl_BreakSectionLinksInSect( *pSectNd );
- // <--
// update alle Links in diesem Bereich
lcl_UpdateLinksInSect( *this, *pSectNd );
@@ -1810,7 +1803,6 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
}
}
-// --> OD 2007-02-14 #b6521322#
void SwSection::BreakLink()
{
const SectionType eCurrentType( GetType() );
@@ -1839,7 +1831,6 @@ void SwSection::BreakLink()
SetLinkFileName( aEmptyStr );
SetLinkFilePassword( aEmptyStr );
}
-// <--
const SwNode* SwIntrnlSectRefLink::GetAnchor() const
{
diff --git a/sw/source/core/docnode/swthreadmanager.cxx b/sw/source/core/docnode/swthreadmanager.cxx
index 89e86c5..4701088 100644
--- a/sw/source/core/docnode/swthreadmanager.cxx
+++ b/sw/source/core/docnode/swthreadmanager.cxx
@@ -33,7 +33,7 @@
/** class to manage threads in Writer - it conforms the singleton pattern
- OD 2007-04-13 #i73788#
+ #i73788#
@author OD
*/
diff --git a/sw/source/core/docnode/threadlistener.cxx b/sw/source/core/docnode/threadlistener.cxx
index 749c0ce..2cc525f 100644
--- a/sw/source/core/docnode/threadlistener.cxx
+++ b/sw/source/core/docnode/threadlistener.cxx
@@ -30,7 +30,7 @@
/** helper class to observe threads
- OD 2007-03-30 #i73788#
+ #i73788#
@author OD
*/
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index c42f476..21ad9d6 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star;
/** class to manage threads
- OD 2007-01-29 #i73788#
+ #i73788#
@author OD
*/
More information about the Libreoffice-commits
mailing list