[Libreoffice-commits] .: starmath/inc starmath/source sw/inc sw/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Feb 8 09:51:59 PST 2011
starmath/inc/starmath.hrc | 1
starmath/source/accessibility.cxx | 10 ++--
starmath/source/edit.cxx | 2
starmath/source/mathmlexport.cxx | 7 ---
starmath/source/mathmlexport.hxx | 1
starmath/source/mathmlimport.cxx | 3 -
starmath/source/mathmlimport.hxx | 1
starmath/source/mathtype.cxx | 1
starmath/source/unomodel.cxx | 6 --
starmath/source/view.cxx | 2
sw/inc/doc.hxx | 2
sw/inc/drawdoc.hxx | 1
sw/inc/printdata.hxx | 2
sw/inc/section.hxx | 1
sw/source/core/SwNumberTree/SwNodeNum.cxx | 6 --
sw/source/core/SwNumberTree/SwNumberTree.cxx | 38 ++--------------
sw/source/core/attr/calbck.cxx | 3 -
sw/source/core/attr/format.cxx | 2
sw/source/core/bastyp/calc.cxx | 3 -
sw/source/core/crsr/crsrsh.cxx | 27 ++++-------
sw/source/core/crsr/pam.cxx | 10 +---
sw/source/core/crsr/viscrs.cxx | 2
sw/source/core/doc/doc.cxx | 7 ---
sw/source/core/doc/doccomp.cxx | 3 -
sw/source/core/doc/docdesc.cxx | 13 +----
sw/source/core/doc/docdraw.cxx | 9 +--
sw/source/core/doc/docedt.cxx | 9 +--
sw/source/core/doc/docfld.cxx | 3 -
sw/source/core/doc/docfly.cxx | 4 -
sw/source/core/doc/docglos.cxx | 2
sw/source/core/doc/doclay.cxx | 4 -
sw/source/core/doc/docnum.cxx | 10 ++--
sw/source/core/doc/docredln.cxx | 63 +++++++++------------------
sw/source/core/doc/htmltbl.cxx | 6 +-
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/doc/poolfmt.cxx | 6 +-
sw/source/core/doc/tblafmt.cxx | 16 +++---
sw/source/core/doc/tblrwcl.cxx | 3 -
sw/source/core/docnode/ndcopy.cxx | 10 +---
sw/source/core/docnode/ndsect.cxx | 7 +--
sw/source/core/docnode/ndtbl.cxx | 24 ++++------
sw/source/core/docnode/ndtbl1.cxx | 6 --
sw/source/core/docnode/nodes.cxx | 4 -
sw/source/core/docnode/section.cxx | 8 ---
44 files changed, 117 insertions(+), 233 deletions(-)
New commits:
commit d0aeca9b335e791e5f95dc93ab8579a6f00e222e
Author: Guillaume Poussel <gpoussel at gmail.com>
Date: Mon Feb 7 20:21:18 2011 +0100
Clean-up bogus comments in writer.
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index b1db8da..5c15da7 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -101,7 +101,6 @@
#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
#define RID_MATH_TOOLBOX (RID_APP_START + 50)
-// wegen #58705# entfernt
//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51)
#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 93f7d5d..7ce1031 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -510,10 +510,10 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
if (!pDoc)
throw RuntimeException();
String aTxt( GetAccessibleText_Impl() );
- if (!(0 <= nIndex && nIndex <= aTxt.Len())) // #108812# aTxt.Len() is valid
+ if (!(0 <= nIndex && nIndex <= aTxt.Len())) // aTxt.Len() is valid
throw IndexOutOfBoundsException();
- // #108812# find a reasonable rectangle for position aTxt.Len().
+ // find a reasonable rectangle for position aTxt.Len().
bool bWasBehindText = (nIndex == aTxt.Len());
if (bWasBehindText && nIndex)
--nIndex;
@@ -559,7 +559,7 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde
}
}
- // #108812# take rectangle from last character and move it to the right
+ // take rectangle from last character and move it to the right
if (bWasBehindText)
aRes.X += aRes.Width;
}
@@ -1285,7 +1285,7 @@ Rectangle SmTextForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
if (pEditEngine)
{
- // #108900# Handle virtual position one-past-the end of the string
+ // Handle virtual position one-past-the end of the string
if( nIndex >= pEditEngine->GetTextLen(nPara) )
{
if( nIndex )
@@ -1684,7 +1684,7 @@ void SmEditAccessible::Init()
void SmEditAccessible::ClearWin()
{
- // #112565# remove handler before current object gets destroyed
+ // remove handler before current object gets destroyed
// (avoid handler being called for already dead object)
EditEngine *pEditEngine = GetEditEngine();
if (pEditEngine)
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 44a1a49..96c8fa9 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -147,7 +147,7 @@ SmEditWindow::~SmEditWindow()
StartCursorMove();
- // #112565# clean up of classes used for accessibility
+ // clean up of classes used for accessibility
// must be done before EditView (and thus EditEngine) is no longer
// available for those classes.
if (pAccessible)
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 0cf220b..73558c3 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -386,7 +386,6 @@ sal_Bool SmXMLExportWrapper::WriteThroughComponent(
////////////////////////////////////////////////////////////
-// #110680#
SmXMLExport::SmXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
sal_uInt16 nExportFlags)
@@ -441,7 +440,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLExport_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
// EXPORT_OASIS is required here allthough there is no differrence between
// OOo and OASIS, because without the flag, a transformation to OOo would
// be chained in.
@@ -467,7 +465,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMetaOOO_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_META );
}
@@ -490,7 +487,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMeta_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_OASIS|EXPORT_META );
}
@@ -513,7 +509,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettingsOOO_createInstance
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_SETTINGS );
}
@@ -536,7 +531,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettings_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_OASIS|EXPORT_SETTINGS );
}
@@ -559,7 +553,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLExportContent_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
// The EXPORT_OASIS flag is only required to avoid that a transformer is
// chanied in
return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_OASIS|EXPORT_CONTENT );
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index fb10897..20670b4 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -114,7 +114,6 @@ protected:
void ExportBlank(const SmNode *pNode, int nLevel);
public:
- // #110680#
SmXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
sal_uInt16 nExportFlags=EXPORT_ALL);
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 0d70832..cd88d71 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -469,7 +469,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImport_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return (cppu::OWeakObject*)new SmXMLImport(rSMgr, IMPORT_ALL);
}
@@ -492,7 +491,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImportMeta_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return (cppu::OWeakObject*)new SmXMLImport( rSMgr, IMPORT_META );
}
@@ -515,7 +513,6 @@ uno::Reference< uno::XInterface > SAL_CALL SmXMLImportSettings_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return (cppu::OWeakObject*)new SmXMLImport( rSMgr, IMPORT_SETTINGS );
}
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index d5e4d18..21572f4 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -96,7 +96,6 @@ class SmXMLImport : public SvXMLImport
String aText;
public:
- // #110680#
SmXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
sal_uInt16 nImportFlags=IMPORT_ALL);
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 1cc34d6..f50ea4e 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2899,7 +2899,6 @@ int MathType::HandleChar(xub_StrLen &rTextStart,int &rSetSize,int nLevel,
*pS >> nChar;
/*
- ##912##
bad character, old mathtype < 3 has these
*/
if (nChar < 0x20)
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 72e6f24..b02c332 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -224,11 +224,9 @@ enum SmModelPropertyHandles
HANDLE_PRINTER_NAME,
HANDLE_PRINTER_SETUP,
HANDLE_SYMBOLS,
- HANDLE_BASIC_LIBRARIES, /* #93295# */
+ HANDLE_BASIC_LIBRARIES,
HANDLE_RUNTIME_UID,
- // --> PB 2004-08-25 #i33095# Security Options
- HANDLE_LOAD_READONLY,
- // <--
+ HANDLE_LOAD_READONLY, // Security Options
HANDLE_DIALOG_LIBRARIES // #i73329#
};
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index e2509dd..658af32 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -817,7 +817,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange )
{
if (STATE_CHANGE_INITSHOW == nStateChange)
{
- Resize(); // #98848# avoid SmEditWindow not being painted correctly
+ Resize(); // avoid SmEditWindow not being painted correctly
// set initial position of window in floating mode
if (true == IsFloatingMode())
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 4b7234e..8d4126d 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -584,7 +584,7 @@ private:
bool mbIgnoreTabsAndBlanksForLineCalculation : 1; // #i3952#
bool mbDoNotCaptureDrawObjsOnPage : 1; // #i62875#
bool mbOutlineLevelYieldsOutlineRule : 1;
- bool mbClipAsCharacterAnchoredWriterFlyFrames : 1; // #b6402800#
+ bool mbClipAsCharacterAnchoredWriterFlyFrames : 1;
bool mbUnixForceZeroExtLeading : 1; // #i60945#
bool mbOldPrinterMetrics : 1;
bool mbTabRelativeToIndent : 1; // #i24363# tab stops relative to indent
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index ffdb4cc..e7f0c87 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -55,7 +55,6 @@ public:
virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
protected:
- // #b6382898#
// overload of <SdrModel::createUnoModel()> is needed to provide corresponding uno model.
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
};
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index d96d417..2390866 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -71,7 +71,7 @@ public:
bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
bPrintProspectRTL,
bPrintSingleJobs, bPaperFromSetup,
- // #b6354161# Print empty pages
+ // Print empty pages
bPrintEmptyPages,
// #i56195# no field update while printing mail merge documents
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 95fd11a..b8be7e4 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -263,7 +263,6 @@ public:
// return the TOX base class if the section is a TOX section
const SwTOXBase* GetTOXBase() const;
- // #b6521322#
void BreakLink();
};
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 80eddb1..c22433a 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -38,9 +38,7 @@
// --> OD 2007-10-31 #i83479#
#include <IDocumentListItems.hxx>
// <--
-// --> OD 2010-01-13 #b6912256#
#include <doc.hxx>
-// <--
SwNodeNum::SwNodeNum( SwTxtNode* pTxtNode )
: SwNumberTreeNode(),
@@ -333,7 +331,6 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
return aResult;
}
-// --> OD 2006-03-07 #131436#
void SwNodeNum::HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum )
{
SwNodeNum* pRootNode = rNodeNum.GetParent()
@@ -384,8 +381,7 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
if ( pTxtNode )
{
pTxtNode->RemoveFromList();
- // --> OD 2010-01-13 #b6912256#
- // clear all list attributes and the list style
+ // --> clear all list attributes and the list style
SvUShortsSort aResetAttrsArray;
aResetAttrsArray.Insert( RES_PARATR_LIST_ID );
aResetAttrsArray.Insert( RES_PARATR_LIST_LEVEL );
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 0014bfd..a9c3f48 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -45,9 +45,7 @@ SwNumberTreeNode::SwNumberTreeNode()
: mChildren(),
mpParent( 0 ),
mnNumber( 0 ),
- // --> OD 2008-11-26 #158694#
mbContinueingPreviousSubTree( false ),
- // <--
mbPhantom( false ),
mItLastValid()
{
@@ -162,7 +160,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
tSwNumberTreeChildren::iterator aIt = mItLastValid;
- // --> OD 2005-10-19 #126009#
+ // -->
// improvement:
// - Only one time checked for <mChildren.end()>.
// - Less checks for each loop run.
@@ -178,9 +176,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
else
{
aIt = mChildren.begin();
- // --> OD 2008-11-26 #158694#
(*aIt)->mbContinueingPreviousSubTree = false;
- // <--
// determine default start value
// consider the case that the first child isn't counted.
@@ -194,11 +190,9 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
// determine special start value for the case that first child
// doesn't restart the numbering and the parent node isn't counted
// and isn't the first child.
- // --> OD 2005-10-27 #126009#
const bool bParentCounted( IsCounted() &&
( !IsPhantom() ||
HasPhantomCountedParent() ) );
- // <--
if ( !(*aIt)->IsRestart() &&
GetParent() && !bParentCounted )
{
@@ -210,15 +204,11 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
SwNumberTreeNode* pPrevNode( *aParentChildIt );
if ( pPrevNode->GetChildCount() > 0 )
{
- // --> OD 2008-11-26 #158694#
(*aIt)->mbContinueingPreviousSubTree = true;
- // <--
nTmpNumber = (*(pPrevNode->mChildren.rbegin()))->GetNumber();
- // --> OD 2005-10-27 #126009#
if ( (*aIt)->IsCounted() &&
( !(*aIt)->IsPhantom() ||
(*aIt)->HasPhantomCountedParent() ) )
- // <--
{
++nTmpNumber;
}
@@ -242,11 +232,9 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
while (aIt != aValidateIt)
{
++aIt;
- // --> OD 2008-11-26 #158694#
(*aIt)->mbContinueingPreviousSubTree = false;
- // <--
- // --> OD 2005-10-19 #126009# - only for counted nodes the number
+ // --> only for counted nodes the number
// has to be adjusted, compared to the previous node.
// this condition is hold also for nodes, which restart the numbering.
if ( (*aIt)->IsCounted() )
@@ -386,8 +374,6 @@ SwNumberTreeNode * SwNumberTreeNode::GetFirstNonPhantomChild()
/** Moves all children of this node that are greater than a given node
to the destination node.
-
- OD 2005-10-14 #125991#
*/
void SwNumberTreeNode::MoveGreaterChildren( SwNumberTreeNode& _rCompareNode,
SwNumberTreeNode& _rDestNode )
@@ -476,11 +462,9 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
pDest->mChildren.insert(mChildren.begin(), mChildren.end());
mChildren.clear();
- // --> OD 2006-03-08 #131436#
// <stl::set.clear()> destroys all existing iterators.
// Thus, <mItLastValid> is also destroyed and reset becomes necessary
mItLastValid = mChildren.end();
- // <--
}
OSL_ENSURE(mChildren.empty(), "MoveChildren failed!");
@@ -573,7 +557,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
tSwNumberTreeChildren::iterator aPredIt = aInsertedIt;
--aPredIt;
- // --> OD 2005-10-14 #125991#
+ // -->
// Move greater children of previous node to new child.
// This has to be done recursively on the children levels.
// Initialize loop variables <pPrevChildNode> and <pDestNode>
@@ -628,14 +612,13 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
if( bNotification )
{
- // --> OD 2005-10-20 #126009# - invalidation of not counted parent
+ // invalidation of not counted parent
// and notification of its siblings.
if ( !IsCounted() )
{
InvalidateMe();
NotifyInvalidSiblings();
}
- // <--
NotifyInvalidChildren();
}
}
@@ -757,12 +740,10 @@ SwNumberTree::tSwNumTreeNumber SwNumberTreeNode::GetNumber(bool bValidate)
return mnNumber;
}
-// --> OD 2008-11-26 #158694#
bool SwNumberTreeNode::IsContinueingPreviousSubTree() const
{
return mbContinueingPreviousSubTree;
}
-// <--
vector<SwNumberTree::tSwNumTreeNumber> SwNumberTreeNode::GetNumberVector() const
@@ -821,7 +802,6 @@ bool SwNumberTreeNode::IsCounted() const
( IsCountPhantoms() && HasCountedChildren() );
}
-// --> OD 2005-10-27 #126009#
bool SwNumberTreeNode::HasPhantomCountedParent() const
{
bool bRet( false );
@@ -846,7 +826,6 @@ bool SwNumberTreeNode::HasPhantomCountedParent() const
return bRet;
}
-// <--
bool SwNumberTreeNode::IsFirst(const SwNumberTreeNode * pNode) const
{
@@ -879,7 +858,6 @@ bool SwNumberTreeNode::IsFirst() const
pNode = pNode->GetParent();
}
- // --> OD 2007-10-02 #b6600435#
// If node isn't the first child, it is the second child and the
// first child is a phanton. In this case check, if the first phantom
// child have only phanton childs
@@ -889,7 +867,6 @@ bool SwNumberTreeNode::IsFirst() const
{
bResult = false;
}
- // <--
}
else
bResult = false;
@@ -1128,8 +1105,7 @@ void SwNumberTreeNode::SetLastValid
)
{
mItLastValid = aItValid;
- // --> OD 2005-10-19 #126009# - invalidation of children of next not
- // counted is needed
+ // invalidation of children of next not counted is needed
if ( GetParent() )
{
tSwNumberTreeChildren::iterator aParentChildIt =
@@ -1144,7 +1120,6 @@ void SwNumberTreeNode::SetLastValid
}
}
}
- // <--
}
{
@@ -1249,8 +1224,7 @@ void SwNumberTreeNode::NotifyInvalidChildren()
++aIt;
}
- // --> OD 2005-10-19 #126009# - notification of next not counted node
- // is also needed.
+ // notification of next not counted node is also needed.
if ( GetParent() )
{
tSwNumberTreeChildren::iterator aParentChildIt =
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 9ba5206..1e64aa1 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -340,10 +340,9 @@ SwClient *SwModify::_Remove(SwClient * pDepend)
if( pTmp->pAkt == pDepend || pTmp->pDelNext == pDepend )
pTmp->pDelNext = pR;
- // --> FME 2006-02-03 #127369# Notify SwClientIter if mpWatchClient is removed
+ // Notify SwClientIter if mpWatchClient is removed
if ( pTmp->mpWatchClient == pDepend )
pTmp->mpWatchClient = 0;
- // <--
pTmp = pTmp->pNxtIter;
}
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 05904e5..2e42228 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -252,7 +252,7 @@ SwFmt::~SwFmt()
bFmtInDTOR = TRUE;
SwFmt *pParentFmt = DerivedFrom();
- if (!pParentFmt) // see #112405#
+ if (!pParentFmt)
{
DBG_ERROR( "~SwFmt: parent format missing" );
}
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 0c37188..8d498e5 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -567,7 +567,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
// Name(p)=Adress.PLZ oder Adress.DATENSATZNUMMER
// DBSETNUMBERFLD = DatenSATZ-nummernfeld (NICHT "setze Datensatznummer!!!")
- // #101436#: At this point the "real" case variable has to be used
+ // At this point the "real" case variable has to be used
String sTmpName( rStr );
::ReplacePoint( sTmpName );
@@ -1430,7 +1430,6 @@ SwSbxValue SwCalc::Prim()
eError = CALC_OVERFLOW;
}
- // added here because of #77448# (=2*3^2 should be 18)
if( bChkPow && eCurrOper == CALC_POW )
{
double dleft = nErg.GetDouble();
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 201e125..b2df47e 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -271,7 +271,7 @@ if( GetWin() )
// mit der Basic-Klammerung entkoppelt; die Shells werden umgeschaltet
if( !BasicActionPend() )
{
- //JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction
+ // es muss innerhalb einer BasicAction
// der Cursor geupdatet werden; um z.B. den
// TabellenCursor zu erzeugen. Im UpdateCrsr wird
// das jetzt beruecksichtigt!
@@ -1307,7 +1307,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
ClearUpCrsrs();
- //JP 12.01.98: Bug #46496# - es muss innerhalb einer BasicAction der
+ // es muss innerhalb einer BasicAction der
// Cursor geupdatet werden; um z.B. den TabellenCursor zu
// erzeugen. Im EndAction wird jetzt das UpdateCrsr gerufen!
if( ActionPend() && BasicActionPend() )
@@ -1363,8 +1363,8 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
OSL_ENSURE( pTblFrm, "Tabelle Crsr nicht im Content ??" );
- // --> FME 2005-12-02 #126107# Make code robust. The table
- // cursor may point to a table in a currently inactive header.
+ // --> Make code robust. The table cursor may point
+ // to a table in a currently inactive header.
SwTabFrm *pTab = pTblFrm ? pTblFrm->FindTabFrm() : 0;
// <--
@@ -1384,12 +1384,11 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
SwTabFrm* pMarkTab = pMarkTblFrm->FindTabFrm();
OSL_ENSURE( pMarkTab, "Tabelle Crsr nicht im Content ??" );
- // --> FME 2005-11-28 #120360# Make code robust:
+ // Make code robust:
if ( pMarkTab )
{
bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTblFrm );
}
- // <--
}
}
@@ -1544,7 +1543,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
UpdateCrsrPos();
- // #100722# The cursor must always point into content; there's some code
+ // The cursor must always point into content; there's some code
// that relies on this. (E.g. in SwEditShell::GetScriptType, which always
// loops _behind_ the last node in the selection, which always works if you
// are in content.) To achieve this, we'll force cursor(s) to point into
@@ -1602,7 +1601,7 @@ void SwCrsrShell::UpdateCrsr( USHORT eFlags, BOOL bIdleEnd )
} while( !pFrm );
}
else if ( Imp()->IsIdleAction() )
- //Wir stellen sicher, dass anstaendig Formatiert wurde #42224#
+ //Wir stellen sicher, dass anstaendig Formatiert wurde
pFrm->PrepareCrsr();
// im geschuetzten Fly? aber bei Rahmenselektion ignorieren
@@ -2325,9 +2324,8 @@ BOOL SwCrsrShell::IsOverReadOnlyPos( const Point& rPt ) const
Point aPt( rPt );
SwPaM aPam( *pCurCrsr->GetPoint() );
GetLayout()->GetCrsrOfst( aPam.GetPoint(), aPt );
- // --> FME 2004-06-29 #114856# Formular view
+ // Formular view
return aPam.HasReadonlySel( GetViewOptions()->IsFormView() );
- // <--
}
@@ -2592,7 +2590,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin,
bSetCrsrInReadOnly = TRUE;
pVisCrsr = new SwVisCrsr( this );
- mbMacroExecAllowed = true; // #100556#
+ mbMacroExecAllowed = true;
}
@@ -2893,9 +2891,8 @@ void SwCrsrShell::NewCoreSelection()
BOOL SwCrsrShell::IsCrsrReadonly() const
{
if ( GetViewOptions()->IsReadonly() ||
- // --> FME 2004-06-29 #114856# Formular view
+ // Formular view
GetViewOptions()->IsFormView() )
- // <--
{
SwFrm *pFrm = GetCurrFrm( FALSE );
const SwFlyFrm* pFly;
@@ -2909,14 +2906,13 @@ BOOL SwCrsrShell::IsCrsrReadonly() const
{
return FALSE;
}
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
else if ( pFrm && pFrm->IsInSct() &&
0 != ( pSection = pFrm->FindSctFrm()->GetSection() ) &&
pSection->IsEditInReadonlyFlag() )
{
return FALSE;
}
- // <--
return TRUE;
}
@@ -3236,7 +3232,6 @@ void SwCrsrShell::ClearUpCrsrs()
TblCrsrToCursor();
}
-// #111827#
String SwCrsrShell::GetCrsrDescr() const
{
String aResult;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 1f18802..8768b10 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -44,13 +44,12 @@
#include <swtable.hxx>
#include <crsskip.hxx>
-// --> FME 2004-06-29 #114856# Formular view
+// Formular view
#include <flyfrm.hxx>
#include <fmteiro.hxx>
#include <section.hxx>
#include <sectfrm.hxx>
-// <--
-#include <ndtxt.hxx> // #111827#
+#include <ndtxt.hxx>
#include <IMark.hxx>
#include <hints.hxx>
@@ -641,8 +640,7 @@ USHORT SwPaM::GetPageNum( BOOL bAtPoint, const Point* pLayPos )
return 0;
}
-// --> FME 2004-06-29 #114856# Formular view
-// See also SwCrsrShell::IsCrsrReadonly()
+// Formular view - See also SwCrsrShell::IsCrsrReadonly()
const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm )
{
const SwFrm* pRet = 0;
@@ -666,7 +664,6 @@ const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm )
return pRet;
}
-// <--
// steht in etwas geschuetztem oder in die Selektion umspannt
// etwas geschuetztes.
@@ -1168,7 +1165,6 @@ BOOL GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
return TRUE;
}
-// #111827#
String SwPaM::GetTxt() const
{
String aResult;
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 01413a2..4a2c7c8 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -673,10 +673,8 @@ void SwShellCrsr::Invalidate( const SwRect& rRect )
{
pTmp->SwSelPaintRects::Invalidate( rRect );
- // --> FME 2005-08-18 #125102#
// skip any non SwShellCrsr objects in the ring
// (see:SwAutoFormat::DeleteSel()
- // <--
Ring* pTmpRing = pTmp;
pTmp = 0;
do
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 17cc186..9ef471e 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -870,11 +870,10 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
}
else
{ // ist Undo und Gruppierung eingeschaltet, ist alles anders !
- SwUndoInsert * pUndo = NULL; // #111827#
+ SwUndoInsert * pUndo = NULL;
// don't group the start if hints at the start should be expanded
if (!(nInsertMode & IDocumentContentOperations::INS_FORCEHINTEXPAND))
- // -> #111827#
{
USHORT const nUndoSize = pUndos->Count();
if (0 != nUndoSize)
@@ -897,7 +896,6 @@ bool SwDoc::InsertString( const SwPaM &rRg, const String &rStr,
}
}
}
- // <- #111827#
CharClass const& rCC = GetAppCharClass();
xub_StrLen nInsPos = rPos.nContent.GetIndex();
@@ -2590,7 +2588,6 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew)
}
}
-// #111827#
String SwDoc::GetPaMDescr(const SwPaM & rPam) const
{
String aResult;
@@ -2629,7 +2626,6 @@ String SwDoc::GetPaMDescr(const SwPaM & rPam) const
return aResult;
}
-// -> #111840#
SwField * SwDoc::GetField(const SwPosition & rPos)
{
SwTxtFld * const pAttr = GetTxtFld(rPos);
@@ -2646,7 +2642,6 @@ SwTxtFld * SwDoc::GetTxtFld(const SwPosition & rPos)
rPos.nContent.GetIndex(), RES_TXTATR_FIELD) )
: 0;
}
-// <- #111840#
bool SwDoc::ContainsHiddenChars() const
{
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 93915bc..dee5cce 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1410,8 +1410,7 @@ void SwCompareData::SetRedlinesToDoc( BOOL bUseDocInfo )
{
SwPaM* pTmp = pDelRing;
- // Bug #83296#: get the Author / TimeStamp from the "other"
- // document info
+ // get the Author / TimeStamp from the "other" document info
USHORT nAuthor = rDoc.GetRedlineAuthor();
DateTime aTimeStamp;
SwDocShell *pDocShell(rDoc.GetDocShell());
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 674e740..95d8c81 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -528,7 +528,6 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel)
}
}
-// #116530#
void SwDoc::BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
USHORT nOp)
{
@@ -556,11 +555,9 @@ void SwDoc::DelPageDesc( USHORT i, BOOL bBroadcast )
SwPageDesc *pDel = aPageDescs[i];
- // -> #116530#
if (bBroadcast)
BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_PAGE,
SFX_STYLESHEET_ERASED);
- // <- #116530#
if (DoesUndo())
{
@@ -583,7 +580,7 @@ void SwDoc::DelPageDesc( USHORT i, BOOL bBroadcast )
|*************************************************************************/
USHORT SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
- BOOL bRegardLanguage, BOOL bBroadcast) // #116530#
+ BOOL bRegardLanguage, BOOL bBroadcast)
{
SwPageDesc *pNew;
if( pCpy )
@@ -612,14 +609,12 @@ USHORT SwDoc::MakePageDesc( const String &rName, const SwPageDesc *pCpy,
}
aPageDescs.Insert( pNew, aPageDescs.Count() );
- // -> #116530#
if (bBroadcast)
BroadcastStyleOperation(rName, SFX_STYLE_FAMILY_PAGE,
SFX_STYLESHEET_CREATED);
- // <- #116530#
if (DoesUndo())
- AppendUndo(new SwUndoPageDescCreate(pNew, this)); // #116530#
+ AppendUndo(new SwUndoPageDescCreate(pNew, this));
SetModified();
return (aPageDescs.Count()-1);
@@ -901,12 +896,12 @@ SwPageDesc * SwDoc::GetPageDesc( const String & rName )
return aResult;
}
-void SwDoc::DelPageDesc( const String & rName, BOOL bBroadcast ) // #116530#
+void SwDoc::DelPageDesc( const String & rName, BOOL bBroadcast )
{
sal_uInt16 nI;
if (FindPageDesc(rName, &nI))
- DelPageDesc(nI, bBroadcast); // #116530#
+ DelPageDesc(nI, bBroadcast);
}
void SwDoc::ChgPageDesc( const String & rName, const SwPageDesc & rDesc)
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 0255f65..9bc5925 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -533,7 +533,6 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const SwFmtAnchor* pFlyAn,
// des Drawing Layers auftrat. In diesem Fall wird der Layer komplett
// neu aufgebaut.
-// #75371#
#include <svx/sxenditm.hxx>
void SwDoc::InitDrawModel()
@@ -548,11 +547,9 @@ void SwDoc::InitDrawModel()
//DrawPool und EditEnginePool anlegen, diese gehoeren uns und werden
//dem Drawing nur mitgegeben. Im ReleaseDrawModel werden die Pools wieder
//zerstoert.
- // 17.2.99: for Bug 73110 - for loading the drawing items. This must
- // be loaded without RefCounts!
+ // for loading the drawing items. This must be loaded without RefCounts!
SfxItemPool *pSdrPool = new SdrItemPool( &GetAttrPool() );
- // #75371# change DefaultItems for the SdrEdgeObj distance items
- // to TWIPS.
+ // change DefaultItems for the SdrEdgeObj distance items to TWIPS.
if(pSdrPool)
{
const long nDefEdgeDist = ((500 * 72) / 127); // 1/100th mm in twips
@@ -573,7 +570,7 @@ void SwDoc::InitDrawModel()
else
pSdrPool->FreezeIdRanges();
- // SJ: #95129# set FontHeight pool defaults without changing static SdrEngineDefaults
+ // set FontHeight pool defaults without changing static SdrEngineDefaults
GetAttrPool().SetPoolDefaultItem(SvxFontHeightItem( 240, 100, EE_CHAR_FONTHEIGHT ));
RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create DrawDocument" );
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 2ef7e3b..00f9541 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -347,11 +347,9 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
pDoc->DelLayoutFmt( pFmt );
- // --> FME 2004-10-06 #117913# DelLayoutFmt can also
- // trigger the deletion of objects.
+ // DelLayoutFmt can also trigger the deletion of objects.
if( i > rTbl.Count() )
i = rTbl.Count();
- // <--
}
}
}
@@ -1246,8 +1244,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
return sal_True;
}
-/* #107318# Convert list of ranges of whichIds to a corresponding list
- of whichIds*/
+// Convert list of ranges of whichIds to a corresponding list of whichIds
SvUShorts * lcl_RangesToUShorts(USHORT * pRanges)
{
SvUShorts * pResult = new SvUShorts();
@@ -1408,7 +1405,7 @@ void lcl_JoinText( SwPaM& rPam, sal_Bool bJoinPrev )
pDelNd->FmtToTxtAttr( pTxtNd );
else
{
- /* #107318# This case was missed:
+ /* This case was missed:
<something></something> <-- pTxtNd
<other>ccc</other> <-- pDelNd
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 4282598..c5d55a1 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2424,7 +2424,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich )
SwNodeIndex aIdx( rTxtNd );
bIsInBody = rDoc.GetNodes().GetEndOfExtras().GetIndex() < aIdx.GetIndex();
- // #104291# dvo: We don't want to update fields in redlines, or those
+ // We don't want to update fields in redlines, or those
// in frames whose anchor is in redline. However, we do want to update
// fields in hidden sections. So: In order to be updated, a field 1)
// must have a frame, or 2) it must be in the document body.
@@ -2586,7 +2586,6 @@ SwDocUpdtFld::~SwDocUpdtFld()
delete aFldTypeTable[n];
}
-// #111840#
bool SwDoc::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
SwMsgPoolItem * pMsgHnt,
bool bUpdateFlds)
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index f0d83ad..520e02a 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -579,9 +579,9 @@ BOOL SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
//Hori und Vert nur dann resetten, wenn in der Vorlage eine
//automatische Ausrichtung eingestellt ist, anderfalls den alten Wert
//wieder hineinstopfen.
- //JP 09.06.98: beim Update der RahmenVorlage sollte der Fly NICHT
+ // beim Update der RahmenVorlage sollte der Fly NICHT
// seine Orientierng verlieren (diese wird nicht geupdatet!)
- //OS: #96584# text::HoriOrientation::NONE and text::VertOrientation::NONE are allowed now
+ // text::HoriOrientation::NONE and text::VertOrientation::NONE are allowed now
if (!bKeepOrient)
{
rFmt.ResetFmtAttr(RES_VERT_ORIENT);
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 22cbe30..004fb2f 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -116,8 +116,6 @@ BOOL SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
USHORT nIdx = rBlock.GetIndex( rEntry );
if( (USHORT) -1 != nIdx )
{
- // Bug #70238# ask the TextOnly-Flag before BeginGetDoc, because
- // the method closed the Storage!
BOOL bSav_IsInsGlossary = mbInsOnlyTxtGlssry;
mbInsOnlyTxtGlssry = rBlock.IsOnlyTextBlock( nIdx );
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 3e273d3..3a29cc1 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -377,7 +377,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
SwDoc* pSrcDoc = (SwDoc*)rSource.GetDoc();
- // #108784# may we copy this object?
+ // May we copy this object?
// We may, unless it's 1) it's a control (and therfore a draw)
// 2) anchored in a header/footer
// 3) anchored (to paragraph?)
@@ -746,7 +746,7 @@ SwFlyFrmFmt* SwDoc::MakeFlySection( RndStdIds eAnchorType,
sal_uInt16 nCollId = static_cast<sal_uInt16>(
get(IDocumentSettingAccess::HTML_MODE) ? RES_POOLCOLL_TEXT : RES_POOLCOLL_FRAME );
- /* #109161# If there exists no adjust item in the paragraph
+ /* If there exists no adjust item in the paragraph
style for the content node of the new fly section
propagate an existing adjust item at the anchor to the new
content node. */
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 8d5ef74..3e78772 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -620,7 +620,7 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
// Gliederung:
const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
// OS: ohne OutlineNodes lohnt die Suche nicht
- // und man spart sich einen Absturz #42958#
+ // und man spart sich einen Absturz
if(!rOutlNds.Count())
return USHRT_MAX;
SwTxtNode* pNd;
@@ -1561,7 +1561,7 @@ const SwNumRule * SwDoc::SearchNumRule(const SwPosition & rPos,
const SwNumRule * pNumRule = pTxtNd->GetNumRule();
if (pNumRule)
{
- if ( ( pNumRule->IsOutlineRule() == ( bOutline ? TRUE : FALSE ) ) && // #115901#
+ if ( ( pNumRule->IsOutlineRule() == ( bOutline ? TRUE : FALSE ) ) &&
( ( bNum && pNumRule->Get(0).IsEnumeration()) ||
( !bNum && pNumRule->Get(0).IsItemize() ) ) ) // #i22362#, #i29560#
{
@@ -1617,7 +1617,7 @@ BOOL SwDoc::NumUpDown( const SwPaM& rPam, BOOL bDown )
ULONG nTmp = nStt; nStt = nEnd; nEnd = nTmp;
}
- // -> #115901# outline nodes are promoted or demoted differently
+ // -> outline nodes are promoted or demoted differently
bool bOnlyOutline = true;
bool bOnlyNonOutline = true;
for (ULONG n = nStt; n <= nEnd; n++)
@@ -1917,7 +1917,7 @@ BOOL SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv )
BOOL bDelLastPara = !aInsPos.nNode.GetNode().IsCntntNode();
- /* #101076# When copying to a non-content node Copy will
+ /* When copying to a non-content node Copy will
insert a paragraph before that node and insert before
that inserted node. Copy creates an SwUndoInserts that
does not cover the extra paragraph. Thus we insert the
@@ -1988,7 +1988,7 @@ BOOL SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv )
SwRedline* pNewRedline = new SwRedline( nsRedlineType_t::REDLINE_DELETE, aPam );
- // #101654# prevent assertion from aPam's target being deleted
+ // prevent assertion from aPam's target being deleted
// (Alternatively, one could just let aPam go out of scope, but
// that requires touching a lot of code.)
aPam.GetBound(TRUE).nContent.Assign( NULL, 0 );
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index d35ee22..1c18cc1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -444,12 +444,12 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
}
else if ( POS_OUTSIDE == eCmpPos )
{
- // #107164# own insert-over-insert
- // redlines: just scrap the inside ones
+ // own insert-over-insert redlines:
+ // just scrap the inside ones
pRedlineTbl->Remove( n );
bDec = true;
}
- // <- #107164#
+ // <--
else if( POS_OVERLAP_BEHIND == eCmpPos )
{
*pStt = *pREnd;
@@ -498,8 +498,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
}
else if ( POS_OUTSIDE == eCmpPos )
{
- // #102366# handle overlapping redlines in broken
- // documents
+ // handle overlapping redlines in broken documents
// split up the new redline, since it covers the
// existing redline. Insert the first part, and
@@ -517,14 +516,12 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
}
else if ( POS_OVERLAP_BEHIND == eCmpPos )
{
- // #107164# handle overlapping redlines in broken
- // documents
+ // handle overlapping redlines in broken documents
pNewRedl->SetStart( *pREnd );
}
else if ( POS_OVERLAP_BEFORE == eCmpPos )
{
- // #107164# handle overlapping redlines in broken
- // documents
+ // handle overlapping redlines in broken documents
*pEnd = *pRStt;
if( ( *pStt == *pEnd ) &&
( pNewRedl->GetContentIdx() == NULL ) )
@@ -561,8 +558,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
}
else if ( POS_OUTSIDE == eCmpPos )
{
- // #102366# handle overlapping redlines in broken
- // documents
+ // handle overlapping redlines in broken documents
// split up the new redline, since it covers the
// existing redline. Insert the first part, and
@@ -580,13 +576,13 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
}
else if ( POS_EQUAL == eCmpPos )
{
- // #112895# handle identical redlines in broken
- // documents - delete old (delete) redline
+ // handle identical redlines in broken documents
+ // delete old (delete) redline
pRedlineTbl->DeleteAndDestroy( n );
bDec = true;
}
else if ( POS_OVERLAP_BEHIND == eCmpPos )
- { // Another workaround for broken redlines (#107164#)
+ { // Another workaround for broken redlines
pNewRedl->SetStart( *pREnd );
}
break;
@@ -729,8 +725,6 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
USHORT nToBeDeleted = n;
bDec = true;
- // #107359# Do it again, Sam!
- // If you can do it for them, you can do it for me.
if( *(pNewRedl->Start()) <= *pREnd )
{
// Whoooah, we just extended the new 'redline'
@@ -777,7 +771,7 @@ bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
eRedlineMode = (RedlineMode_t)(eRedlineMode | nsRedlineMode_t::REDLINE_IGNOREDELETE_REDLINES);
- // #98863# DeleteAndJoin does not yield the
+ // DeleteAndJoin does not yield the
// desired result if there is no paragraph to
// join with, i.e. at the end of the document.
// For this case, we completely delete the
@@ -1557,7 +1551,6 @@ const SwRedline* SwDoc::GetRedline( const SwPosition& rPos,
? *pStt == rPos
: ( *pStt <= rPos && rPos < *pEnd ) )
{
- /* #107318# returned wrong redline ???*/
while( nM && rPos == *(*pRedlineTbl)[ nM - 1 ]->End() &&
rPos == *(*pRedlineTbl)[ nM - 1 ]->Start() )
{
@@ -2005,13 +1998,12 @@ const SwRedline* lcl_FindCurrRedline( const SwPosition& rSttPos,
return pFnd;
}
-// #111827#
int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
SwRedlineTbl& rArr, BOOL bCallDelete,
const SwPaM& rPam)
{
USHORT n = 0;
- int nCount = 0; // #111827#
+ int nCount = 0;
const SwPosition* pStt = rPam.Start(),
* pEnd = pStt == rPam.GetPoint() ? rPam.GetMark()
@@ -2022,7 +2014,7 @@ int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
{
// dann nur die TeilSelektion aufheben
if( (*fn_AcceptReject)( rArr, n, bCallDelete, pStt, pEnd ))
- nCount++; // #111827#
+ nCount++;
++n;
}
@@ -2034,7 +2026,7 @@ int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
if( *pTmp->End() <= *pEnd )
{
if( (*fn_AcceptReject)( rArr, n, bCallDelete, 0, 0 ))
- nCount++; // #111827#
+ nCount++;
}
else
{
@@ -2042,13 +2034,13 @@ int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
{
// dann nur in der TeilSelektion aufheben
if( (*fn_AcceptReject)( rArr, n, bCallDelete, pStt, pEnd ))
- nCount++; // #111827#
+ nCount++;
}
break;
}
}
}
- return nCount; // #111827#
+ return nCount;
}
void lcl_AdjustRedlineRange( SwPaM& rPam )
@@ -2102,7 +2094,6 @@ bool SwDoc::AcceptRedline( USHORT nPos, bool bCallDelete )
{
if( DoesUndo() )
{
- // #111827#
SwRewriter aRewriter;
aRewriter.AddRule(UNDO_ARG1, pTmp->GetDescr());
@@ -2169,7 +2160,6 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
AppendUndo( new SwUndoAcceptRedline( aPam ));
}
- // #111827#
int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *pRedlineTbl,
bCallDelete, aPam );
if( nRet > 0 )
@@ -2179,7 +2169,6 @@ bool SwDoc::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
}
if( DoesUndo() )
{
- // #111827#
String aTmpStr;
{
@@ -2210,7 +2199,6 @@ bool SwDoc::RejectRedline( USHORT nPos, bool bCallDelete )
{
if( DoesUndo() )
{
- // #111827#
SwRewriter aRewriter;
aRewriter.AddRule(UNDO_ARG1, pTmp->GetDescr());
@@ -2277,7 +2265,6 @@ bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete )
AppendUndo( new SwUndoRejectRedline( aPam ));
}
- // #111827#
int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *pRedlineTbl,
bCallDelete, aPam );
if( nRet > 0 )
@@ -2287,7 +2274,6 @@ bool SwDoc::RejectRedline( const SwPaM& rPam, bool bCallDelete )
}
if( DoesUndo() )
{
- // #111827#
String aTmpStr;
{
@@ -3051,7 +3037,6 @@ void SwRedlineData::SetExtraData( const SwRedlineExtraData* pData )
pExtraData = 0;
}
-// #111827#
String SwRedlineData::GetDescr() const
{
String aResult;
@@ -3420,11 +3405,11 @@ void SwRedline::CopyToSection()
bSaveRdlMoveFlg = pDoc->IsRedlineMove();
pDoc->SetCopyIsMove( TRUE );
- // #100619# The IsRedlineMove() flag causes the behaviour of the
+ // The IsRedlineMove() flag causes the behaviour of the
// SwDoc::_CopyFlyInFly method to change, which will eventually be
// called by the pDoc->Copy line below (through SwDoc::_Copy,
- // SwDoc::CopyWithFlyInFly). This rather obscure bugfix was introduced
- // for #63198# and #64896#, and apparently never really worked.
+ // SwDoc::CopyWithFlyInFly). This rather obscure bugfix
+ // apparently never really worked.
pDoc->SetRedlineMove( pStt->nContent == 0 );
if( pCSttNd )
@@ -3442,7 +3427,7 @@ void SwRedline::CopyToSection()
SwPosition aPos( aNdIdx, SwIndex( pTxtNd ));
pDoc->CopyRange( *this, aPos, false );
- // JP 08.10.98: die Vorlage vom EndNode ggfs. mit uebernehmen
+ // die Vorlage vom EndNode ggfs. mit uebernehmen
// - ist im Doc::Copy nicht erwuenscht
if( pCEndNd && pCEndNd != pCSttNd )
{
@@ -3521,7 +3506,7 @@ void SwRedline::DelCopyOfSection()
if( bDelLastPara )
{
- // #100611# To prevent dangling references to the paragraph to
+ // To prevent dangling references to the paragraph to
// be deleted, redline that point into this paragraph should be
// moved to the new end position. Since redlines in the redline
// table are sorted and the pEnd position is an endnode (see
@@ -3679,7 +3664,7 @@ void SwRedline::MoveFromSection()
// <--
delete pCntntSect, pCntntSect = 0;
- // #100611# adjustment of redline table positions must take start and
+ // adjustment of redline table positions must take start and
// end into account, not point and mark.
for( n = 0; n < aBeforeArr.Count(); ++n )
*(SwPosition*)aBeforeArr[ n ] = *Start();
@@ -3749,7 +3734,6 @@ USHORT SwRedline::GetStackCount() const
return nRet;
}
-// -> #111827#
USHORT SwRedline::GetAuthor( USHORT nPos ) const
{
return GetRedlineData(nPos).nAuthor;
@@ -3774,7 +3758,6 @@ const String& SwRedline::GetComment( USHORT nPos ) const
{
return GetRedlineData(nPos).sComment;
}
-// <- #111827#
int SwRedline::operator==( const SwRedline& rCmp ) const
{
@@ -3794,7 +3777,6 @@ int SwRedline::operator<( const SwRedline& rCmp ) const
return nResult;
}
-// -> #111827#
const SwRedlineData & SwRedline::GetRedlineData(USHORT nPos) const
{
SwRedlineData * pCur = pRedlineData;
@@ -3850,7 +3832,6 @@ String SwRedline::GetDescr(USHORT nPos)
return aResult;
}
-// <- #111827#
bool SwDoc::IsInRedlines(const SwNode & rNode) const
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 9d1021a..beb0ac5 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -495,7 +495,7 @@ void SwHTMLTableLayout::AutoLayoutPass1()
SwHTMLTableLayoutCell *pCell = GetCell(j,i);
SwHTMLTableLayoutCnts *pCnts = pCell->GetContents();
- // fix #31488#: Zum Ermitteln der naechsten zu berechnenden
+ // Zum Ermitteln der naechsten zu berechnenden
// Spalte muessen alle Zeilen herangezogen werden
USHORT nColSpan = pCell->GetColSpan();
if( nColSpan < nColSkip )
@@ -1181,7 +1181,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
// Weil bei Tabellen in Rahmen kein Resize aufgerufen wird,
// wenn der Rahmen eine nicht-relative Breite besitzt, koennen
// wir da solche Spielchen nicht spielen
- // MIB 19.2.98: Wegen fix #47394# spielen wir solche Spielchen
+ // Spielen wir solche Spielchen
// jetzt doch. Dort war eine Grafik in einer 1%-breiten
// Tabelle und hat da natuerlich nicht hineingepasst.
nAbsTabWidth = (USHORT)( ((ULONG)nAbsAvail * nWidthOption) / 100 );
@@ -1361,7 +1361,7 @@ void SwHTMLTableLayout::AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail,
// die ihre Maximalbreite genau einhalten, also weder
// schmaler noch breiter werden. Beim zurueckrechnen der
// absoluten Breite aus der relativen Breite kann es
- // zu Rundungsfehlern kommen (bug #45598#). Um die auszugeleichen
+ // zu Rundungsfehlern kommen. Um die auszugeleichen
// werden zuerst die fixen Breiten entsprechend korrigiert
// eingestellt und erst danach die relativen.
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index e4cdf5b..0203466 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -226,7 +226,6 @@ void lcl_ClearArea( const SwFrm &rFrm,
::DrawGraphic( pItem, &rOut, aOrigRect, aRegion[i] );
else
{
- // #116347#
rOut.Push( PUSH_FILLCOLOR|PUSH_LINECOLOR );
rOut.SetFillColor( rFrm.GetShell()->Imp()->GetRetoucheColor());
rOut.SetLineColor();
@@ -970,7 +969,6 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
pJobSetup = new JobSetup();
// #i42323#
- // The reason for #114233# is gone, so i remove it again
//TODO/LATER: is it a problem that the JopSetup isn't used?
//xRef->DoDraw( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), *pJobSetup );
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index c3226da..21558dd 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -386,7 +386,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( USHORT nId, bool bRegardLanguage )
{
// allgemeine Inhaltsformen
case RES_POOLCOLL_STANDARD:
- /* #111214# koreans do not like SvxScriptItem(TRUE) */
+ /* koreans do not like SvxScriptItem(TRUE) */
if (bRegardLanguage)
{
ULONG nAppLanguage = GetAppLanguage();
@@ -2471,13 +2471,13 @@ USHORT GetPoolParent( USHORT nId )
void SwDoc::RemoveAllFmtLanguageDependencies()
{
- /* #106748# Restore the language independ pool defaults and styles. */
+ /* Restore the language independ pool defaults and styles. */
GetAttrPool().ResetPoolDefaultItem( RES_PARATR_ADJUST );
SwTxtFmtColl * pTxtFmtColl = GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
pTxtFmtColl->ResetFmtAttr( RES_PARATR_ADJUST );
- /* #111214# koreans do not like SvxScriptItem(TRUE) */
+ /* koreans do not like SvxScriptItem(TRUE) */
pTxtFmtColl->ResetFmtAttr( RES_PARATR_SCRIPTSPACE );
SvxFrameDirectionItem aFrameDir( FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR );
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index b720b91..0f002ec 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -72,11 +72,11 @@ const USHORT AUTOFORMAT_DATA_ID_641 = 10002;
const USHORT AUTOFORMAT_ID_680DR14 = 10011;
const USHORT AUTOFORMAT_DATA_ID_680DR14 = 10012;
-// --- from 680/dr25 on: #21549# store strings as UTF-8
+// --- from 680/dr25 on: store strings as UTF-8
const USHORT AUTOFORMAT_ID_680DR25 = 10021;
const USHORT AUTOFORMAT_DATA_ID_680DR25 = 10022;
-// --- from DEV300/overline2 on: #5991# overline
+// --- from DEV300/overline2 on: overline
const USHORT AUTOFORMAT_ID_300OVRLN = 10031;
const USHORT AUTOFORMAT_DATA_ID_300OVRLN = 10032;
@@ -399,7 +399,7 @@ BOOL SwBoxAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions, USHOR
if( 0 == rVersions.nNumFmtVersion )
{
USHORT eSys, eLge;
- // --- from 680/dr25 on: #21549# store strings as UTF-8
+ // --- from 680/dr25 on: store strings as UTF-8
CharSet eCharSet = (nVer >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
rStream.ReadByteString( sNumFmtString, eCharSet )
>> eSys >> eLge;
@@ -485,7 +485,7 @@ BOOL SwBoxAutoFmt::Save( SvStream& rStream ) const
aRotateAngle.Store( rStream, aRotateAngle.GetVersion(SOFFICE_FILEFORMAT_40) );
aRotateMode.Store( rStream, aRotateMode.GetVersion(SOFFICE_FILEFORMAT_40) );
- // --- from 680/dr25 on: #21549# store strings as UTF-8
+ // --- from 680/dr25 on: store strings as UTF-8
rStream.WriteByteString( sNumFmtString, RTL_TEXTENCODING_UTF8 )
<< (USHORT)eSysLanguage << (USHORT)eNumFmtLanguage;
@@ -692,7 +692,7 @@ void SwTableAutoFmt::UpdateToSet( BYTE nPos, SfxItemSet& rSet,
rSet.Put( rChg.GetHeight() );
rSet.Put( rChg.GetWeight() );
rSet.Put( rChg.GetPosture() );
- // #103065# do not insert empty CJK font
+ // do not insert empty CJK font
const SvxFontItem& rCJKFont = rChg.GetCJKFont();
if( rCJKFont.GetStyleName().Len() )
{
@@ -707,7 +707,7 @@ void SwTableAutoFmt::UpdateToSet( BYTE nPos, SfxItemSet& rSet,
rSet.Put( rChg.GetWeight(), RES_CHRATR_CJK_WEIGHT );
rSet.Put( rChg.GetPosture(), RES_CHRATR_CJK_POSTURE );
}
- // #103065# do not insert empty CTL font
+ // do not insert empty CTL font
const SvxFontItem& rCTLFont = rChg.GetCTLFont();
if( rCTLFont.GetStyleName().Len() )
{
@@ -778,7 +778,7 @@ BOOL SwTableAutoFmt::Load( SvStream& rStream, const SwAfVersions& rVersions )
(AUTOFORMAT_DATA_ID_504 <= nVal && nVal <= AUTOFORMAT_DATA_ID)) )
{
BOOL b;
- // --- from 680/dr25 on: #21549# store strings as UTF-8
+ // --- from 680/dr25 on: store strings as UTF-8
CharSet eCharSet = (nVal >= AUTOFORMAT_ID_680DR25) ? RTL_TEXTENCODING_UTF8 : rStream.GetStreamCharSet();
rStream.ReadByteString( aName, eCharSet );
if( AUTOFORMAT_DATA_ID_552 <= nVal )
@@ -860,7 +860,7 @@ BOOL SwTableAutoFmt::Save( SvStream& rStream ) const
USHORT nVal = AUTOFORMAT_DATA_ID;
BOOL b;
rStream << nVal;
- // --- from 680/dr25 on: #21549# store strings as UTF-8
+ // --- from 680/dr25 on: store strings as UTF-8
rStream.WriteByteString( aName, RTL_TEXTENCODING_UTF8 );
rStream << nStrResId;
rStream << ( b = bInclFont );
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index a6c7f5e..2e38d33 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -4358,8 +4358,7 @@ BOOL SwTable::SetRowHeight( SwTableBox& rAktBox, USHORT eType,
pFndBox = ::lcl_SaveInsDelData( aParam, ppUndo, aTmpLst );
- // #110525# delete complete table when last row is
- // deleted
+ // delete complete table when last row is deleted
if( !bBigger &&
aParam.aBoxes.Count() == aSortCntBoxes.Count() )
{
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 107d47c..acdb007 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -998,7 +998,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
}
- /* #107213#: Safe numrule item at destination. */
+ // Safe numrule item at destination.
// #i86492# - Safe also <ListId> item of destination.
int aNumRuleState = SFX_ITEM_UNKNOWN;
SwNumRuleItem aNumRuleItem;
@@ -1022,7 +1022,6 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
}
// <--
- /* #107213# */
if( !bCopyOk )
{
@@ -1136,7 +1135,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
aDestIdx.Assign( pDestTxtNd, 0 );
aInsPos--;
- // #112756# #98130# if we have to insert an extra text node
+ // if we have to insert an extra text node
// at the destination, this node will be our new destination
// (text) node, and thus we set bStartisTxtNode to true. This
// will ensure that this node will be deleted during Undo
@@ -1145,7 +1144,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
bStartIsTxtNode = TRUE;
}
- /* #107213# Save numrule at destination */
+ // Save numrule at destination
// #i86492# - Safe also <ListId> item of destination.
int aNumRuleState = SFX_ITEM_UNKNOWN;
SwNumRuleItem aNumRuleItem;
@@ -1169,7 +1168,6 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
}
// <--
- /* #107213# */
const bool bEmptyDestNd = 0 == pDestTxtNd->GetTxt().Len();
pEndTxtNd->CopyText( pDestTxtNd, aDestIdx, SwIndex( pEndTxtNd ),
@@ -1182,7 +1180,7 @@ bool SwDoc::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if ( bOneNode )
{
- /* #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. */
// #i86492# - restore also <ListId> item
if ( !lcl_MarksWholeNode(rPam) )
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index adf50df..d903fce 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -702,7 +702,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
// <--
}
- // #56167# Der LinkFileName koennte auch nur aus Separatoren bestehen
+ // Der LinkFileName koennte auch nur aus Separatoren bestehen
String sCompareString = sfx2::cTokenSeperator;
sCompareString += sfx2::cTokenSeperator;
const bool bUpdate =
@@ -722,7 +722,7 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData,
/// Either it is set to TRUE using corresponding method <SwSection.SetCondHidden(..)>,
/// or it is set to the value of SwSection which is assigned to it.
/// Discussion with AMA results that the adjustment to the assignment operator
- /// could be very risky -> see notes in bug #102894#.
+ /// could be very risky.
pSection->SetSectionData(rNewData);
if( pAttr )
@@ -1341,10 +1341,9 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
pNewSect->SetHidden( TRUE );
if( !pNewSect->IsProtectFlag() && GetSection().IsProtect() )
pNewSect->SetProtect( TRUE );
- // --> FME 2004-06-22 #114856# edit in readonly sections
+ // edit in readonly sections
if( !pNewSect->IsEditInReadonlyFlag() && GetSection().IsEditInReadonly() )
pNewSect->SetEditInReadonly( TRUE );
- // <--
SwNodeRange aRg( *this, +1, *EndOfSectionNode() ); // (wo stehe in denn nun ??)
rNds._Copy( aRg, aInsPos, FALSE );
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index aeb9f1f..cfe9732 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -402,10 +402,10 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
rInsTblOpts.mnRowsToRepeat :
0;
- /* #106283# Save content node to extract FRAMEDIR from. */
+ /* Save content node to extract FRAMEDIR from. */
const SwCntntNode * pCntntNd = rPos.nNode.GetNode().GetCntntNode();
- /* #109161# If we are called from a shell pass the attrset from
+ /* If we are called from a shell pass the attrset from
pCntntNd (aka the node the table is inserted at) thus causing
SwNodes::InsertTable to propagate an adjust item if
necessary. */
@@ -422,7 +422,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts,
SwTableLineFmt* pLineFmt = MakeTableLineFmt();
SwTableFmt* pTableFmt = MakeTblFrmFmt( aTblName, GetDfltFrmFmt() );
- /* #106283# If the node to insert the table at is a context node and has a
+ /* If the node to insert the table at is a context node and has a
non-default FRAMEDIR propagate it to the table. */
if (pCntntNd)
{
@@ -620,7 +620,6 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
SwTxtNode * pTmpNd = new SwTxtNode( aIdx, pTxtColl );
// --> FME 2006-04-13 #i60422# Propagate some more attributes.
- // Adjustment was done for #109161#
const SfxPoolItem* pItem = NULL;
if ( NULL != pAttrSet )
{
@@ -666,7 +665,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
return 0;
}
- /* #106283# Save first node in the selection if it is a context node. */
+ /* Save first node in the selection if it is a context node. */
SwCntntNode * pSttCntntNd = pStt->nNode.GetNode().GetCntntNode();
SwPaM aOriginal( *pStt, *pEnd );
@@ -739,7 +738,7 @@ const SwTable* SwDoc::TextToTable( const SwInsertTableOptions& rInsTblOpts,
if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) )
pTableFmt->SetFmtAttr( SwFmtLayoutSplit( FALSE ));
- /* #106283# If the first node in the selection is a context node and if it
+ /* If the first node in the selection is a context node and if it
has an item FRAMEDIR set (no default) propagate the item to the
replacing table. */
if (pSttCntntNd)
@@ -1103,7 +1102,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes )
{
- /* #106283# Save first node in the selection if it is a content node. */
+ /* Save first node in the selection if it is a content node. */
SwCntntNode * pSttCntntNd = rTableNodes.begin()->begin()->aStart.GetNode().GetCntntNode();
/**debug**/
@@ -1179,7 +1178,7 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
// die Tabelle bekommt USHRT_MAX als default SSize
pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX ));
- /* #106283# If the first node in the selection is a context node and if it
+ /* If the first node in the selection is a context node and if it
has an item FRAMEDIR set (no default) propagate the item to the
replacing table. */
if (pSttCntntNd)
@@ -2589,10 +2588,9 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
{
OSL_ENSURE( pBoxFrm, "GetTabRows called without pBoxFrm" );
- // --> FME 2005-09-12 #121591# Make code robust:
+ // Make code robust:
if ( !pBoxFrm )
return;
- // <--
// --> FME 2005-01-06 #i39552# Collection of the boxes of the current
// column has to be done at the beginning of this function, because
@@ -2609,20 +2607,18 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
}
// <--
- // --> FME 2005-09-12 #121591# Make code robust:
+ // Make code robust:
if ( aDelCheck.HasBeenDeleted() )
{
OSL_ENSURE( false, "Current box has been deleted during GetTabRows()" );
return;
}
- // <--
- // --> FME 2005-09-12 #121591# Make code robust:
+ // Make code robust:
const SwTabFrm* pTab = pBoxFrm->FindTabFrm();
OSL_ENSURE( pTab, "GetTabRows called without a table" );
if ( !pTab )
return;
- // <--
const SwFrm* pFrm = pTab->GetNextLayoutLeaf();
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 0f098c5..c4d233a 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -700,9 +700,8 @@ void SwDoc::SetTabBorders( const SwCursor& rCursor, const SfxItemSet& rSet )
//Grundsaetzlich nichts setzen in HeadlineRepeats.
if ( pTab->IsFollow() &&
( pTab->IsInHeadline( *pCell ) ||
- // --> FME 2006-02-07 #126092# Same holds for follow flow rows.
+ // Same holds for follow flow rows.
pCell->IsInFollowFlowRow() ) )
- // <--
continue;
SvxBoxItem aBox( pCell->GetFmt()->GetBox() );
@@ -1279,11 +1278,10 @@ USHORT lcl_CalcCellFit( const SwLayoutFrm *pCell )
const SwTwips nAdd = (pFrm->Frm().*fnRect->fnGetWidth)() -
(pFrm->Prt().*fnRect->fnGetWidth)();
- // --> FME 2005-12-02 #127801# pFrm does not necessarily have to be a SwTxtFrm!
+ // pFrm does not necessarily have to be a SwTxtFrm!
const SwTwips nCalcFitToContent = pFrm->IsTxtFrm() ?
((SwTxtFrm*)pFrm)->CalcFitToContent() :
(pFrm->Prt().*fnRect->fnGetWidth)();
- // <--
nRet = Max( nRet, nCalcFitToContent + nAdd );
pFrm = pFrm->GetNext();
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 11a1955..6d0e350 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -736,7 +736,7 @@ BOOL SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
case ND_TABLENODE:
case ND_STARTNODE:
{
- // Bug #78589# - empty section -> nothing to do
+ // empty section -> nothing to do
// and only if it's a top level section
if( !nInsPos && !nLevel )
{
@@ -2292,7 +2292,7 @@ SwNode* SwNodes::FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
: pSttNd->FindSectionNode();
if( !( pSectNd && pSectNd->GetSection().CalcHiddenFlag()/*IsHiddenFlag()*/ ) )
{
- // #130650# in a table in table situation we have to assure that we don't leave the
+ // in a table in table situation we have to assure that we don't leave the
// outer table cell when the inner table is looking for a PrvNxt...
SwTableNode* pTableNd = pSttNd->IsTableNode()
? pSttNd->StartOfSectionNode()->FindTableNode()
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 66ee33e..a09de4d 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -65,9 +65,7 @@
#include <fmtftntx.hxx>
#include <ftnidx.hxx>
#include <doctxm.hxx>
-// --> FME 2004-06-22 #114856# edit in readonly sections
-#include <fmteiro.hxx>
-// <--
+#include <fmteiro.hxx> // edit in readonly sections
#include <swerror.h>
#include <unosection.hxx>
@@ -117,9 +115,7 @@ SwSectionData::SwSectionData(SectionType const eType, String const& rName)
, m_sSectionName(rName)
, m_bHiddenFlag(false)
, m_bProtectFlag(false)
- // --> FME 2004-06-22 #114856# edit in readonly sections
- , m_bEditInReadonlyFlag(false)
- // <--
+ , m_bEditInReadonlyFlag(false) // edit in readonly sections
, m_bHidden(false)
, m_bCondHiddenFlag(true)
, m_bConnectFlag(true)
More information about the Libreoffice-commits
mailing list