sw/inc/node.hxx | 2 --
sw/source/core/doc/DocumentStylePoolManager.cxx | 2 --
sw/source/core/doc/docfmt.cxx | 6 ------
sw/source/core/doc/fmtcol.cxx | 3 ---
sw/source/core/docnode/ndsect.cxx | 9 +--------
sw/source/core/docnode/ndtbl.cxx | 4 ----
sw/source/core/docnode/node.cxx | 3 ---
sw/source/core/docnode/nodes.cxx | 8 +-------
sw/source/core/txtnode/atrftn.cxx | 4 ----
9 files changed, 2 insertions(+), 39 deletions(-)
New commits:
commit d96d1b380d3c626522407397e56d68030a73e02a
Author: Bogdan B <buzea.bog...@libreoffice.org>
AuthorDate: Thu Nov 24 23:40:14 2022 +0100
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Fri Nov 25 11:57:48 2022 +0100
tdf#141438 Clean old comments //FEATURE::CONDCOLL
Change-Id: I350a9c0a033edddf805170534561b6dca0bf5ae0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143172
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 5291e5196d1b..8bed9dd7240d 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -765,8 +765,6 @@ inline const SwAttrSet& SwContentNode::GetSwAttrSet() const
return mpAttrSet ? *GetpSwAttrSet() : GetAnyFormatColl().GetAttrSet();
}
-//FEATURE::CONDCOLL
-
inline const SfxPoolItem& SwContentNode::GetAttr( sal_uInt16 nWhich,
bool bInParents ) const
{
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 4fa11933ce0d..1d2bb17e3e54 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -657,13 +657,11 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
{
-//FEATURE::CONDCOLL
if(::IsConditionalByPoolId( nId ))
pNewColl = new SwConditionTextFormatColl( m_rDoc.GetAttrPool(),
aNm, !nParent
?
m_rDoc.GetDfltTextFormatColl()
: GetTextCollFromPool( nParent
));
else
-//FEATURE::CONDCOLL
pNewColl = new SwTextFormatColl( m_rDoc.GetAttrPool(), aNm,
!nParent
? m_rDoc.GetDfltTextFormatColl()
: GetTextCollFromPool( nParent ));
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 400ff27d1163..03e8d8d2ee0c 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -918,7 +918,6 @@ SwFormat *SwDoc::MakeTextFormatColl_(const OUString
&rFormatName,
return pTextFormatColl;
}
-//FEATURE::CONDCOLL
SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl( const OUString
&rFormatName,
SwTextFormatColl
*pDerivedFrom,
bool bBroadcast)
@@ -942,7 +941,6 @@ SwConditionTextFormatColl* SwDoc::MakeCondTextFormatColl(
const OUString &rForma
return pFormatColl;
}
-//FEATURE::CONDCOLL
// GRF
SwGrfFormatColl* SwDoc::MakeGrfFormatColl( const OUString &rFormatName,
@@ -1183,7 +1181,6 @@ SwTextFormatColl* SwDoc::CopyTextColl( const
SwTextFormatColl& rColl )
if( pParent != rColl.DerivedFrom() )
pParent = CopyTextColl(
*static_cast<SwTextFormatColl*>(rColl.DerivedFrom()) );
-//FEATURE::CONDCOLL
if( RES_CONDTXTFMTCOLL == rColl.Which() )
{
pNewColl = new SwConditionTextFormatColl( GetAttrPool(),
rColl.GetName(),
@@ -1197,7 +1194,6 @@ SwTextFormatColl* SwDoc::CopyTextColl( const
SwTextFormatColl& rColl )
static_cast<const
SwConditionTextFormatColl&>(rColl).GetCondColls() );
}
else
-//FEATURE::CONDCOLL
pNewColl = MakeTextFormatColl( rColl.GetName(), pParent );
// copy the auto formats or the attributes
@@ -1345,7 +1341,6 @@ void SwDoc::CopyFormatArr( const SwFormatsBase&
rSourceArr,
if(pSrcColl->IsAssignedToListLevelOfOutlineStyle())
pDstColl->AssignToListLevelOfOutlineStyle(pSrcColl->GetAssignedOutlineStyleLevel());
-//FEATURE::CONDCOLL
if( RES_CONDTXTFMTCOLL == pSrc->Which() )
{
if (pDstColl->Which() != RES_CONDTXTFMTCOLL)
@@ -1359,7 +1354,6 @@ void SwDoc::CopyFormatArr( const SwFormatsBase&
rSourceArr,
static_cast<SwConditionTextFormatColl*>(pDstColl)->SetConditions(
static_cast<SwConditionTextFormatColl*>(pSrc)->GetCondColls() );
}
-//FEATURE::CONDCOLL
}
}
}
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 6454a40581a2..0a53339b0460 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -19,14 +19,12 @@
#include <memory>
#include <libxml/xmlwriter.h>
-
#include <editeng/fhgtitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <osl/diagnose.h>
#include <sal/macros.h>
#include <svl/intitem.hxx>
-
#include <calbck.hxx>
#include <doc.hxx>
#include <fmtcol.hxx>
@@ -601,7 +599,6 @@ void SwConditionTextFormatColl::SetConditions( const
SwFormatCollConditions& rCn
}
}
-// FEATURE::CONDCOLL
void SwTextFormatColl::SetAttrOutlineLevel( int nLevel)
{
OSL_ENSURE( 0 <= nLevel && nLevel <= MAXLEVEL ,"SwTextFormatColl: Level
Out Of Range" );
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index bae8f8a367ef..8a53f83cd6ad 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -18,9 +18,7 @@
*/
#include <config_wasm_strip.h>
-
#include <libxml/xmlwriter.h>
-
#include <hintids.hxx>
#include <osl/diagnose.h>
#include <sfx2/linkmgr.hxx>
@@ -320,9 +318,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData &
rNewData,
}
}
-//FEATURE::CONDCOLL
pNewSectNode->CheckSectionCondColl();
-//FEATURE::CONDCOLL
getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld );
@@ -569,7 +565,7 @@ void SwDoc::DelSectionFormat( SwSectionFormat *pFormat,
bool bDelNodes )
// WARNING: First remove from the array and then delete,
// as the Section DTOR tries to delete it's format itself.
mpSectionFormatTable->erase( itFormatPos );
-//FEATURE::CONDCOLL
+
SwNodeOffset nCnt(0), nSttNd(0);
if( pIdx && &GetNodes() == &pIdx->GetNodes() &&
nullptr != (pSectNd = pIdx->GetNode().GetSectionNode() ))
@@ -577,7 +573,6 @@ void SwDoc::DelSectionFormat( SwSectionFormat *pFormat,
bool bDelNodes )
nSttNd = pSectNd->GetIndex();
nCnt = pSectNd->EndOfSectionIndex() - nSttNd - 1;
}
-//FEATURE::CONDCOLL
delete pFormat;
@@ -587,13 +582,11 @@ void SwDoc::DelSectionFormat( SwSectionFormat *pFormat,
bool bDelNodes )
GetFootnoteIdxs().UpdateFootnote( aUpdIdx.GetNode() );
}
-//FEATURE::CONDCOLL
SwContentNode* pCNd;
for( ; nCnt--; ++nSttNd )
if( nullptr != (pCNd = GetNodes()[ nSttNd ]->GetContentNode() ) &&
RES_CONDTXTFMTCOLL == pCNd->GetFormatColl()->Which() )
pCNd->ChkCondColl();
-//FEATURE::CONDCOLL
}
GetIDocumentUndoRedo().EndUndo(SwUndoId::DELSECTION, nullptr);
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index ba27869937c9..66991287a888 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -18,9 +18,7 @@
*/
#include <libxml/xmlwriter.h>
-
#include <config_wasm_strip.h>
-
#include <memory>
#include <fesh.hxx>
#include <hintids.hxx>
@@ -317,9 +315,7 @@ bool SwNodes::InsBoxen( SwTableNode* pTableNd,
rTabBoxes.insert( rTabBoxes.begin() + nRealInsPos, pPrvBox );
if( ! pTextColl->IsAssignedToListLevelOfOutlineStyle()
-//FEATURE::CONDCOLL
&& RES_CONDTXTFMTCOLL != pTextColl->Which()
-//FEATURE::CONDCOLL
)
new SwTextNode( *pSttNd->EndOfSectionNode(), pTextColl, pAutoAttr
);
else
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 60cc18131e3b..c50435e076fb 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -18,7 +18,6 @@
*/
#include <config_wasm_strip.h>
-
#include <hintids.hxx>
#include <editeng/protitem.hxx>
#include <osl/diagnose.h>
@@ -995,14 +994,12 @@ SwStartNode::SwStartNode( SwNodes& rNodes, SwNodeOffset
nPos )
void SwStartNode::CheckSectionCondColl() const
{
-//FEATURE::CONDCOLL
SwNodeIndex aIdx( *this );
SwNodeOffset nEndIdx = EndOfSectionIndex();
const SwNodes& rNds = GetNodes();
SwContentNode* pCNd;
while( nullptr != ( pCNd = rNds.GoNext( &aIdx )) && pCNd->GetIndex() <
nEndIdx )
pCNd->ChkCondColl();
-//FEATURE::CONDCOLL
}
void SwStartNode::dumpAsXml(xmlTextWriterPtr pWriter) const
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 915fb673778d..540d5ce7509b 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -18,10 +18,8 @@
*/
#include <stdlib.h>
-
#include <libxml/xmlwriter.h>
#include <osl/diagnose.h>
-
#include <node.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
@@ -41,7 +39,6 @@
#include <tox.hxx>
#include <fmtrfmrk.hxx>
#include <fmtftn.hxx>
-
#include <docsh.hxx>
#include <rootfrm.hxx>
#include <txtfrm.hxx>
@@ -181,10 +178,8 @@ void SwNodes::ChgNode( SwNodeIndex const & rDelPos,
SwNodeOffset nSz,
}
rTextNd.InvalidateNumRule();
-//FEATURE::CONDCOLL
if( RES_CONDTXTFMTCOLL == rTextNd.GetTextColl()->Which() )
rTextNd.ChkCondColl();
-//FEATURE::CONDCOLL
}
else if( rNd.IsContentNode() )
static_cast<SwContentNode&>(rNd).InvalidateNumRule();
@@ -336,10 +331,9 @@ void SwNodes::ChgNode( SwNodeIndex const & rDelPos,
SwNodeOffset nSz,
}
}
}
- //FEATURE::CONDCOLL
+
if( RES_CONDTXTFMTCOLL == pTextNd->GetTextColl()->Which() )
pTextNd->ChkCondColl();
- //FEATURE::CONDCOLL
}
else
{
diff --git a/sw/source/core/txtnode/atrftn.cxx
b/sw/source/core/txtnode/atrftn.cxx
index d558ea4911d2..52c3e1147aae 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -18,9 +18,7 @@
*/
#include <libxml/xmlwriter.h>
-
#include <fmtftn.hxx>
-
#include <doc.hxx>
#include <DocumentContentOperationsManager.hxx>
#include <IDocumentStylePoolAccess.hxx>
@@ -568,10 +566,8 @@ void SwTextFootnote::SetUniqueSeqRefNo( SwDoc& rDoc )
void SwTextFootnote::CheckCondColl()
{
-//FEATURE::CONDCOLL
if( GetStartNode() )
static_cast<SwStartNode&>(GetStartNode()->GetNode()).CheckSectionCondColl();
-//FEATURE::CONDCOLL
}
void SwTextFootnote::dumpAsXml(xmlTextWriterPtr pWriter) const
