[Libreoffice-commits] .: sw/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Oct 14 08:07:46 PDT 2010
sw/source/core/doc/acmplwrd.cxx | 34 -----------------
sw/source/core/doc/doc.cxx | 65 ++++++++-------------------------
sw/source/core/doc/doccomp.cxx | 34 +----------------
sw/source/core/doc/docedt.cxx | 27 +-------------
sw/source/core/doc/docfld.cxx | 77 ++--------------------------------------
sw/source/core/doc/docfly.cxx | 27 +-------------
sw/source/core/doc/doclay.cxx | 18 ++-------
sw/source/core/doc/docnew.cxx | 27 --------------
sw/source/core/doc/docnum.cxx | 37 ++++++-------------
sw/source/core/doc/docsort.cxx | 46 -----------------------
sw/source/core/doc/doctxm.cxx | 61 -------------------------------
sw/source/core/doc/number.cxx | 49 +------------------------
sw/source/core/doc/sortopt.cxx | 10 -----
sw/source/core/doc/tblcpy.cxx | 11 -----
sw/source/core/doc/tblrwcl.cxx | 41 ---------------------
15 files changed, 48 insertions(+), 516 deletions(-)
New commits:
commit d5ff3f84c3f1714a0eee0da21fdb9b5b3a88c246
Author: Prashant Shah <pshah.mumbai at gmail.com>
Date: Thu Oct 14 18:42:28 2010 +0530
Cleanup: remove bogus comments from doc directory
This patch removes bogus comments found in the doc directory
including empty Beschreibung (translation: description) statements
Signed-off-by: Prashant Shah <pshah.mumbai at gmail.com>
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 5309a81..ed12cbf 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -49,9 +49,7 @@
#include <docsh.hxx>
#include <vector>
-/* -----------------------------05.08.2002 12:43------------------------------
- ---------------------------------------------------------------------------*/
class SwAutoCompleteClient : public SwClient
{
SwAutoCompleteWord* pAutoCompleteWord;
@@ -72,9 +70,7 @@ public:
static ULONG GetElementCount() {return nSwAutoCompleteClientCount;}
#endif
};
-/* -----------------------------05.08.2002 12:48------------------------------
- ---------------------------------------------------------------------------*/
typedef std::vector<SwAutoCompleteClient> SwAutoCompleteClientVector;
class SwAutoCompleteWord_Impl
@@ -88,9 +84,6 @@ public:
void RemoveDocument(const SwDoc& rDoc);
};
-/* -----------------------------05.08.2002 14:11------------------------------
-
- ---------------------------------------------------------------------------*/
typedef const SwDoc* SwDocPtr;
typedef std::vector<SwDocPtr> SwDocPtrVector;
class SwAutoCompleteString : public String
@@ -114,9 +107,7 @@ class SwAutoCompleteString : public String
ULONG SwAutoCompleteClient::nSwAutoCompleteClientCount = 0;
ULONG SwAutoCompleteString::nSwAutoCompleteStringCount = 0;
#endif
-/* -----------------------------06.08.2002 08:57------------------------------
- ---------------------------------------------------------------------------*/
SwAutoCompleteClient::SwAutoCompleteClient(SwAutoCompleteWord& rToTell, SwDoc& rSwDoc) :
pAutoCompleteWord(&rToTell),
pDoc(&rSwDoc)
@@ -126,9 +117,7 @@ SwAutoCompleteClient::SwAutoCompleteClient(SwAutoCompleteWord& rToTell, SwDoc& r
++nSwAutoCompleteClientCount;
#endif
}
-/* -----------------------------05.08.2002 14:07------------------------------
- ---------------------------------------------------------------------------*/
SwAutoCompleteClient::SwAutoCompleteClient(const SwAutoCompleteClient& rClient) :
SwClient(),
pAutoCompleteWord(rClient.pAutoCompleteWord),
@@ -139,18 +128,14 @@ SwAutoCompleteClient::SwAutoCompleteClient(const SwAutoCompleteClient& rClient)
++nSwAutoCompleteClientCount;
#endif
}
-/* -----------------------------05.08.2002 14:10------------------------------
- ---------------------------------------------------------------------------*/
SwAutoCompleteClient::~SwAutoCompleteClient()
{
#ifdef DBG_UTIL
--nSwAutoCompleteClientCount;
#endif
}
-/* -----------------06.03.2003 15:30-----------------
- --------------------------------------------------*/
SwAutoCompleteClient& SwAutoCompleteClient::operator=(const SwAutoCompleteClient& rClient)
{
pAutoCompleteWord = rClient.pAutoCompleteWord;
@@ -161,9 +146,7 @@ SwAutoCompleteClient& SwAutoCompleteClient::operator=(const SwAutoCompleteClient
pRegisteredIn->Remove(this);
return *this;
}
-/* -----------------------------05.08.2002 12:49------------------------------
- ---------------------------------------------------------------------------*/
void SwAutoCompleteClient::Modify(SfxPoolItem *pOld, SfxPoolItem *)
{
switch( pOld ? pOld->Which() : 0 )
@@ -177,9 +160,7 @@ void SwAutoCompleteClient::Modify(SfxPoolItem *pOld, SfxPoolItem *)
}
}
-/* -----------------------------05.08.2002 13:03------------------------------
- ---------------------------------------------------------------------------*/
void SwAutoCompleteWord_Impl::AddDocument(SwDoc& rDoc)
{
SwAutoCompleteClientVector::iterator aIt;
@@ -190,9 +171,7 @@ void SwAutoCompleteWord_Impl::AddDocument(SwDoc& rDoc)
}
aClientVector.push_back(SwAutoCompleteClient(rAutoCompleteWord, rDoc));
}
-/* -----------------------------05.08.2002 14:33------------------------------
- ---------------------------------------------------------------------------*/
void SwAutoCompleteWord_Impl::RemoveDocument(const SwDoc& rDoc)
{
SwAutoCompleteClientVector::iterator aIt;
@@ -205,9 +184,7 @@ void SwAutoCompleteWord_Impl::RemoveDocument(const SwDoc& rDoc)
}
}
}
-/* -----------------------------06.08.2002 08:54------------------------------
- ---------------------------------------------------------------------------*/
SwAutoCompleteString::SwAutoCompleteString(const String& rStr, xub_StrLen nPos, xub_StrLen nLen) :
String( rStr, nPos, nLen )
{
@@ -215,18 +192,14 @@ SwAutoCompleteString::SwAutoCompleteString(const String& rStr, xub_StrLen nPos,
++nSwAutoCompleteStringCount;
#endif
}
-/* -----------------------------05.08.2002 14:22------------------------------
- ---------------------------------------------------------------------------*/
SwAutoCompleteString::~SwAutoCompleteString()
{
#ifdef DBG_UTIL
--nSwAutoCompleteStringCount;
#endif
}
-/* -----------------------------05.08.2002 14:17------------------------------
- ---------------------------------------------------------------------------*/
void SwAutoCompleteString::AddDocument(const SwDoc& rDoc)
{
SwDocPtrVector::iterator aIt;
@@ -238,9 +211,7 @@ void SwAutoCompleteString::AddDocument(const SwDoc& rDoc)
SwDocPtr pNew = &rDoc;
aSourceDocs.push_back(pNew);
}
-/* -----------------------------05.08.2002 14:36------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool SwAutoCompleteString::RemoveDocument(const SwDoc& rDoc)
{
SwDocPtrVector::iterator aIt;
@@ -254,9 +225,7 @@ sal_Bool SwAutoCompleteString::RemoveDocument(const SwDoc& rDoc)
}
return sal_False;
}
-/* ---------------------------------------------------------------------------
- ---------------------------------------------------------------------------*/
SwAutoCompleteWord::SwAutoCompleteWord( USHORT nWords, USHORT nMWrdLen )
: aWordLst( 0, 255 ), aLRULst( 0, 255 ),
pImpl(new SwAutoCompleteWord_Impl(*this)),
@@ -448,9 +417,7 @@ void SwAutoCompleteWord::CheckChangedList( const SvStringsISortDtor& rNewLst )
aWordLst.Remove( nMyPos, nMyLen - nMyPos );
}
}
-/* -----------------------------05.08.2002 12:54------------------------------
- ---------------------------------------------------------------------------*/
void SwAutoCompleteWord::DocumentDying(const SwDoc& rDoc)
{
pImpl->RemoveDocument(rDoc);
@@ -470,4 +437,3 @@ void SwAutoCompleteWord::DocumentDying(const SwDoc& rDoc)
}
}
}
-
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index d1a29eb..d25fd10 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -131,7 +131,6 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-
// Seiten-Deskriptoren
SV_IMPL_PTRARR(SwPageDescs,SwPageDescPtr);
// Verzeichnisse
@@ -139,8 +138,7 @@ SV_IMPL_PTRARR( SwTOXTypes, SwTOXTypePtr )
// FeldTypen
SV_IMPL_PTRARR( SwFldTypes, SwFldTypePtr)
-/** IInterface
-*/
+/* IInterface */
sal_Int32 SwDoc::acquire()
{
OSL_ASSERT(mReferenceCount >= 0 && "Negative reference count detected! This is a sign for unbalanced acquire/release calls.");
@@ -159,8 +157,7 @@ sal_Int32 SwDoc::getReferenceCount() const
return mReferenceCount;
}
-/** IDocumentSettingAccess
-*/
+/* IDocumentSettingAccess */
bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
{
switch (id)
@@ -465,8 +462,7 @@ void SwDoc::setCharacterCompressionType( /*[in]*/SwCharCompressType n )
}
}
-/** IDocumentDeviceAccess
-*/
+/* IDocumentDeviceAccess */
SfxPrinter* SwDoc::getPrinter(/*[in]*/ bool bCreate ) const
{
SfxPrinter* pRet = 0;
@@ -647,8 +643,7 @@ void SwDoc::setPrintData(/*[in]*/ const SwPrintData& rPrtData )
*pPrtData = rPrtData;
}
-/** Implementations the next Interface here
-*/
+/* Implementations the next Interface here */
/*
* Dokumenteditieren (Doc-SS) zum Fuellen des Dokuments
@@ -975,6 +970,7 @@ SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg,
pDfltGrfFmtColl ),
pFlyAttrSet, pGrfAttrSet, pFrmFmt );
}
+
SwFlyFrmFmt* SwDoc::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet,
@@ -1034,7 +1030,6 @@ SwFlyFrmFmt* SwDoc::InsertOLE(const SwPaM &rRg, const String& rObjName,
|* SwDoc::GetFldType()
|* Beschreibung: liefert den am Doc eingerichteten Feldtypen zurueck
*************************************************************************/
-
SwFieldType *SwDoc::GetSysFldType( const USHORT eWhich ) const
{
for( USHORT i = 0; i < INIT_FLDTYPES; ++i )
@@ -1042,10 +1037,10 @@ SwFieldType *SwDoc::GetSysFldType( const USHORT eWhich ) const
return (*pFldTypes)[i];
return 0;
}
+
/*************************************************************************
* void SetDocStat( const SwDocStat& rStat );
*************************************************************************/
-
void SwDoc::SetDocStat( const SwDocStat& rStat )
{
*pDocStat = rStat;
@@ -1056,9 +1051,6 @@ const SwDocStat& SwDoc::GetDocStat() const
return *pDocStat;
}
-/*************************************************************************/
-
-
struct _PostItFld : public _SetGetExpFld
{
_PostItFld( const SwNodeIndex& rNdIdx, const SwTxtFld* pFld, const SwIndex* pIdx = 0 )
@@ -1074,7 +1066,6 @@ struct _PostItFld : public _SetGetExpFld
}
};
-
USHORT _PostItFld::GetPageNo(
const StringRangeEnumerator &rRangeEnum,
const std::set< sal_Int32 > &rPossiblePages,
@@ -1107,7 +1098,6 @@ USHORT _PostItFld::GetPageNo(
return 0;
}
-
bool lcl_GetPostIts(
IDocumentFieldsAccess* pIDFA,
_SetGetExpFlds * pSrtLst )
@@ -1145,7 +1135,6 @@ bool lcl_GetPostIts(
return bHasPostIts;
}
-
static void lcl_FormatPostIt(
IDocumentContentOperations* pIDCO,
SwPaM& aPam,
@@ -1198,7 +1187,6 @@ static void lcl_FormatPostIt(
pIDCO->InsertString( aPam, aStr );
}
-
// provide the paper tray to use according to the page style in use,
// but do that only if the respective item is NOT just the default item
static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
@@ -1214,7 +1202,6 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
return nRes;
}
-
void SwDoc::CalculatePagesForPrinting(
/* out */ SwRenderData &rData,
@@ -1379,7 +1366,6 @@ void SwDoc::CalculatePagesForPrinting(
aPageRange, rData.GetPagesToPrint(),
1, nDocPageCount, 0, &rData.GetValidPagesSet() );
}
-
void SwDoc::UpdatePagesForPrintingWithPostItData(
/* out */ SwRenderData &rData,
@@ -1563,7 +1549,6 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
}
}
}
-
void SwDoc::CalculatePagePairsForProspectPrinting(
/* out */ SwRenderData &rData,
@@ -1711,7 +1696,6 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
// thus we are done here.
}
-
sal_uInt16 SwDoc::GetPageCount() const
{
return GetRootFrm() ? GetRootFrm()->GetPageNum() : 0;
@@ -1742,11 +1726,9 @@ const Size SwDoc::GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const
return aSize;
}
-
/*************************************************************************
* void UpdateDocStat( const SwDocStat& rStat );
*************************************************************************/
-
void SwDoc::UpdateDocStat( SwDocStat& rStat )
{
if( rStat.bModified )
@@ -1835,9 +1817,7 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat )
}
}
-
// Dokument - Info
-
void SwDoc::DocInfoChgd( )
{
GetSysFldType( RES_DOCINFOFLD )->UpdateFlds();
@@ -1845,7 +1825,7 @@ void SwDoc::DocInfoChgd( )
SetModified();
}
- // returne zum Namen die im Doc gesetzte Referenz
+// returne zum Namen die im Doc gesetzte Referenz
const SwFmtRefMark* SwDoc::GetRefMark( const String& rName ) const
{
const SfxPoolItem* pItem;
@@ -1864,7 +1844,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( const String& rName ) const
return 0;
}
- // returne die RefMark per Index - fuer Uno
+// returne die RefMark per Index - fuer Uno
const SwFmtRefMark* SwDoc::GetRefMark( USHORT nIndex ) const
{
const SfxPoolItem* pItem;
@@ -1888,10 +1868,10 @@ const SwFmtRefMark* SwDoc::GetRefMark( USHORT nIndex ) const
return pRet;
}
- // returne die Namen aller im Doc gesetzten Referenzen
- //JP 24.06.96: Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine
- // RefMark gesetzt ist
- // OS 25.06.96: ab jetzt wird immer die Anzahl der Referenzen returnt
+// returne die Namen aller im Doc gesetzten Referenzen
+//JP 24.06.96: Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine
+// RefMark gesetzt ist
+// OS 25.06.96: ab jetzt wird immer die Anzahl der Referenzen returnt
USHORT SwDoc::GetRefMarks( SvStringsDtor* pNames ) const
{
const SfxPoolItem* pItem;
@@ -2007,7 +1987,6 @@ void SwDoc::ResetModified()
}
}
-
void SwDoc::ReRead( SwPaM& rPam, const String& rGrfName,
const String& rFltName, const Graphic* pGraphic,
const GraphicObject* pGrafObj )
@@ -2080,7 +2059,6 @@ BOOL lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
return TRUE;
}
-
/*************************************************************************
* SwDoc::SpellItAgainSam( BOOL bInvalid, BOOL bOnlyWrong )
*
@@ -2091,7 +2069,6 @@ BOOL lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
* Mit bOnlyWrong kann man dann steuern, ob nur die Bereiche mit falschen
* Woertern oder die kompletten Bereiche neu ueberprueft werden muessen.
************************************************************************/
-
void SwDoc::SpellItAgainSam( BOOL bInvalid, BOOL bOnlyWrong, BOOL bSmartTags )
{
ASSERT( GetRootFrm(), "SpellAgain: Where's my RootFrm?" );
@@ -2230,8 +2207,8 @@ void SwDoc::Summary( SwDoc* pExtDoc, BYTE nLevel, BYTE nPara, BOOL bImpress )
}
}
- // loesche den nicht sichtbaren Content aus dem Document, wie z.B.:
- // versteckte Bereiche, versteckte Absaetze
+// loesche den nicht sichtbaren Content aus dem Document, wie z.B.:
+// versteckte Bereiche, versteckte Absaetze
BOOL SwDoc::RemoveInvisibleContent()
{
BOOL bRet = FALSE;
@@ -2402,9 +2379,7 @@ BOOL SwDoc::RemoveInvisibleContent()
EndUndo( UNDO_UI_DELETE_INVISIBLECNTNT, NULL );
return bRet;
}
-/*-- 11.06.2004 08:34:04---------------------------------------------------
- -----------------------------------------------------------------------*/
BOOL SwDoc::ConvertFieldsToText()
{
BOOL bRet = FALSE;
@@ -2515,7 +2490,7 @@ bool SwDoc::LinksUpdated() const
return mbLinksUpdated;
}
- // embedded alle lokalen Links (Bereiche/Grafiken)
+// embedded alle lokalen Links (Bereiche/Grafiken)
bool SwDoc::EmbedAllLinks()
{
BOOL bRet = FALSE;
@@ -2566,10 +2541,6 @@ bool SwDoc::EmbedAllLinks()
return bRet;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
BOOL SwDoc::IsInsTblFormatNum() const
{
return SW_MOD()->IsInsTblFormatNum(get(IDocumentSettingAccess::HTML_MODE));
@@ -2580,16 +2551,12 @@ BOOL SwDoc::IsInsTblChangeNumFormat() const
return SW_MOD()->IsInsTblChangeNumFormat(get(IDocumentSettingAccess::HTML_MODE));
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
BOOL SwDoc::IsInsTblAlignNum() const
{
return SW_MOD()->IsInsTblAlignNum(get(IDocumentSettingAccess::HTML_MODE));
}
- // setze das InsertDB als Tabelle Undo auf:
+// setze das InsertDB als Tabelle Undo auf:
void SwDoc::AppendUndoForInsertFromDB( const SwPaM& rPam, BOOL bIsTable )
{
if( bIsTable )
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index f929eb4..3cd3cce 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -51,7 +51,6 @@
using namespace ::com::sun::star;
-
class CompareLine
{
public:
@@ -194,12 +193,8 @@ public:
Compare( ULONG nDiff, CompareData& rData1, CompareData& rData2 );
};
-// ====================================================================
-
CompareLine::~CompareLine() {}
-// ----------------------------------------------------------------------
-
CompareData::CompareData()
: pIndex( 0 ), pChangedFlag( 0 ), nSttLineNum( 0 )
{
@@ -311,8 +306,6 @@ void CompareData::CheckForChangesInLine( const CompareData& ,
{
}
-// ----------------------------------------------------------------------
-
Hash::Hash( ULONG nSize )
: nCount( 1 )
{
@@ -399,8 +392,6 @@ void Hash::CalcHashValue( CompareData& rData )
}
}
-// ----------------------------------------------------------------------
-
Compare::Compare( ULONG nDiff, CompareData& rData1, CompareData& rData2 )
{
MovedData *pMD1, *pMD2;
@@ -447,8 +438,6 @@ Compare::Compare( ULONG nDiff, CompareData& rData1, CompareData& rData2 )
delete pMD2;
}
-
-
void Compare::CountDifference( const CompareData& rData, ULONG* pCounts )
{
ULONG nLen = rData.GetLineCount();
@@ -587,8 +576,6 @@ void Compare::CheckDiscard( ULONG nLen, sal_Char* pDiscard )
}
}
-// ----------------------------------------------------------------------
-
Compare::MovedData::MovedData( CompareData& rData, sal_Char* pDiscard )
: pIndex( 0 ), pLineNum( 0 ), nCount( 0 )
{
@@ -621,9 +608,7 @@ Compare::MovedData::~MovedData()
delete pLineNum;
}
-// ----------------------------------------------------------------------
-
- // Suche die verschobenen Lines
+// Suche die verschobenen Lines
Compare::CompareSequence::CompareSequence(
CompareData& rD1, CompareData& rD2,
const MovedData& rMD1, const MovedData& rMD2 )
@@ -839,8 +824,6 @@ void Compare::ShiftBoundaries( CompareData& rData1, CompareData& rData2 )
}
}
-/* */
-
class SwCompareLine : public CompareLine
{
const SwNode& rNode;
@@ -891,8 +874,6 @@ public:
void SetRedlinesToDoc( BOOL bUseDocInfo );
};
-// ----------------------------------------------------------------
-
SwCompareLine::SwCompareLine( const SwNode& rNd )
: rNode( rNd )
{
@@ -1246,8 +1227,6 @@ BOOL SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
return bRet;
}
-// ----------------------------------------------------------------
-
SwCompareData::~SwCompareData()
{
if( pDelRing )
@@ -1292,7 +1271,6 @@ ULONG SwCompareData::PrevIdx( const SwNode* pNd )
return pNd->GetIndex() - 1;
}
-
void SwCompareData::CheckRanges( CompareData& rData )
{
const SwNodes& rSrcNds = ((SwCompareData&)rData).rDoc.GetNodes();
@@ -1346,7 +1324,6 @@ void SwCompareData::CheckRanges( CompareData& rData )
}
}
-
void SwCompareData::ShowInsert( ULONG nStt, ULONG nEnd )
{
SwPaM* pTmp = new SwPaM( ((SwCompareLine*)GetLine( nStt ))->GetNode(), 0,
@@ -1566,11 +1543,7 @@ void SwCompareData::SetRedlinesToDoc( BOOL bUseDocInfo )
}
}
-/* */
-
-
-
- // returnt (?die Anzahl der Unterschiede?) ob etwas unterschiedlich ist
+// returnt (?die Anzahl der Unterschiede?) ob etwas unterschiedlich ist
long SwDoc::CompareDoc( const SwDoc& rDoc )
{
if( &rDoc == this )
@@ -1614,7 +1587,6 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
return nRet;
}
-
typedef void (SwDoc::*FNInsUndo)( SwUndo* );
class _SaveMergeRedlines : public Ring
@@ -1872,5 +1844,3 @@ long SwDoc::MergeDoc( const SwDoc& rDoc )
return nRet;
}
-
-
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 6413ef7..a7d719d 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -184,8 +184,6 @@ void lcl_SkipAttr( const SwTxtNode *pNode, SwIndex &rIdx, xub_StrLen &rStart )
}
}
-// -----------------------------------------------------------------
-
void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
const SwNodeIndex* pInsertPos )
{
@@ -303,11 +301,8 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
}
}
-// -----------------------------------------------------------------
-
// loesche und verschiebe alle "Fly's am Absatz", die in der SSelection
// liegen. Steht am SPoint ein Fly, wird dieser auf den Mark verschoben.
-
void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
const SwNodeIndex& rPtNdIdx )
{
@@ -364,7 +359,6 @@ void DelFlyInRange( const SwNodeIndex& rMkNdIdx,
}
}
-
bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
const SwNodeIndex& rInsPos,
SwFtnIdxs& rFtnArr, SwFtnIdxs& rSaveArr,
@@ -563,7 +557,6 @@ void lcl_RestoreRedlines( SwDoc* pDoc, const SwPosition& rPos, _SaveRedlines& rA
pDoc->SetRedlineMode_intern( eOld );
}
-
void lcl_SaveRedlines( const SwNodeRange& rRg, _SaveRedlines& rArr )
{
SwDoc* pDoc = rRg.aStart.GetNode().GetDoc();
@@ -668,12 +661,10 @@ void lcl_RestoreRedlines( SwDoc* pDoc, sal_uInt32 nInsPos, _SaveRedlines& rArr )
pDoc->SetRedlineMode_intern( eOld );
}
-// ------------------------------------------------------------------------
// #i59534: Redo of insertion of multiple text nodes runs into trouble
// because of unnecessary expanded redlines
// From now on this class saves the redline positions of all redlines which ends exact at the
// insert position (node _and_ content index)
-
_SaveRedlEndPosForRestore::_SaveRedlEndPosForRestore( const SwNodeIndex& rInsIdx, xub_StrLen nCnt )
: pSavArr( 0 ), pSavIdx( 0 ), nSavCntnt( nCnt )
{
@@ -722,9 +713,6 @@ void _SaveRedlEndPosForRestore::_Restore()
}
}
-
-// ------------------------------------------------------------------------
-
// Loeschen einer vollstaendigen Section des NodesArray.
// Der uebergebene Node steht irgendwo in der gewuenschten Section
void SwDoc::DeleteSection( SwNode *pNode )
@@ -748,7 +736,6 @@ void SwDoc::DeleteSection( SwNode *pNode )
GetNodes().DelNodes( aSttIdx, aEndIdx.GetIndex() - aSttIdx.GetIndex() + 1 );
}
-
void SwDoc::SetModified(SwPaM &rPaM)
{
SwDataChanged aTmp( rPaM, 0 );
@@ -758,7 +745,6 @@ void SwDoc::SetModified(SwPaM &rPaM)
/*************************************************************************
* SwDoc::Overwrite()
************************************************************************/
-
bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr )
{
SwPosition& rPt = *(SwPosition*)rRg.GetPoint();
@@ -858,7 +844,6 @@ bool SwDoc::Overwrite( const SwPaM &rRg, const String &rStr )
return sal_True;
}
-
bool SwDoc::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
{
SwNodeIndex aIdx( rPaM.Start()->nNode );
@@ -1547,7 +1532,6 @@ bool lcl_DoWithBreaks(SwDoc & rDoc, SwPaM & rPam,
return bRet;
}
-
bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM & rPam, const bool )
{
ASSERT( IsRedlineOn(), "DeleteAndJoinWithRedline: redline off" );
@@ -1856,7 +1840,6 @@ void lcl_syncGrammarError( SwTxtNode &rTxtNode, linguistic2::ProofreadingResult&
rResult.aErrors.realloc( j );
}
-
uno::Any SwDoc::Spell( SwPaM& rPaM,
uno::Reference< XSpellChecker1 > &xSpeller,
sal_uInt16* pPageCnt, sal_uInt16* pPageSt,
@@ -2170,7 +2153,6 @@ uno::Reference< XHyphenatedWord > SwDoc::Hyphenate(
return aHyphArg.GetHyphWord(); // will be set by lcl_HyphenateNode
}
-
sal_Bool lcl_GetTokenToParaBreak( String& rStr, String& rRet, sal_Bool bRegExpRplc )
{
sal_Bool bRet = sal_False;
@@ -2513,8 +2495,8 @@ SetRedlineMode( eOld );
return true;
}
- // speicher die akt. Werte fuer die automatische Aufnahme von Ausnahmen
- // in die Autokorrektur
+// speicher die akt. Werte fuer die automatische Aufnahme von Ausnahmen
+// in die Autokorrektur
void SwDoc::SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew )
{
if( pACEWord && pNew != pACEWord )
@@ -2655,7 +2637,6 @@ bool SwDoc::DelFullPara( SwPaM& rPam )
return sal_True;
}
-
void SwDoc::TransliterateText(
const SwPaM& rPaM,
utl::TransliterationWrapper& rTrans )
@@ -2731,9 +2712,8 @@ void SwDoc::TransliterateText(
SetModified();
}
-
#define MAX_REDLINE_COUNT 250
-// -----------------------------------------------------------------------------
+
void SwDoc::checkRedlining(RedlineMode_t& _rReadlineMode)
{
const SwRedlineTbl& rRedlineTbl = GetRedlineTbl();
@@ -2753,7 +2733,6 @@ void SwDoc::checkRedlining(RedlineMode_t& _rReadlineMode)
}
}
}
-// -----------------------------------------------------------------------------
void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const
{
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 1468142..4f1098a 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -80,7 +80,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
SV_IMPL_OP_PTRARR_SORT( _SetGetExpFlds, _SetGetExpFldPtr )
-
/*--------------------------------------------------------------------
Beschreibung: Feldtypen einfuegen
--------------------------------------------------------------------*/
@@ -89,7 +88,6 @@ SV_IMPL_OP_PTRARR_SORT( _SetGetExpFlds, _SetGetExpFldPtr )
* Return immer einen gueltigen Pointer auf den Typ. Wenn er also neu
* zugefuegt oder schon vorhanden ist.
*/
-
SwFieldType* SwDoc::InsertFldType(const SwFieldType &rFldTyp)
{
USHORT nSize = pFldTypes->Count(),
@@ -226,7 +224,6 @@ void SwDoc::InsDeletedFldType( SwFieldType& rFldTyp )
/*--------------------------------------------------------------------
Beschreibung: Feldtypen loeschen
--------------------------------------------------------------------*/
-
void SwDoc::RemoveFldType(USHORT nFld)
{
ASSERT( INIT_FLDTYPES <= nFld, "keine InitFields loeschen" );
@@ -279,7 +276,6 @@ const SwFldTypes* SwDoc::GetFldTypes() const
/*--------------------------------------------------------------------
Beschreibung: Den ersten Typen mit ResId und Namen finden
--------------------------------------------------------------------*/
-
SwFieldType* SwDoc::GetFldType( USHORT nResId, const String& rName,
bool bDbFieldMatching // used in some UNO calls for RES_DBFLD
// to use different string matching code
@@ -327,7 +323,6 @@ SwFieldType* SwDoc::GetFldType( USHORT nResId, const String& rName,
return pRet;
}
-
/*************************************************************************
|* SwDoc::UpdateFlds()
|* Beschreibung Felder updaten
@@ -335,7 +330,6 @@ SwFieldType* SwDoc::GetFldType( USHORT nResId, const String& rName,
/*
* Alle sollen neu evaluiert werden.
*/
-
void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
{
// Modify() fuer jeden Feldtypen rufen,
@@ -396,7 +390,6 @@ void SwDoc::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
/******************************************************************************
* void SwDoc::UpdateUsrFlds()
******************************************************************************/
-
void SwDoc::UpdateUsrFlds()
{
SwCalc* pCalc = 0;
@@ -419,7 +412,6 @@ void SwDoc::UpdateUsrFlds()
/*--------------------------------------------------------------------
Beschreibung: Referenzfelder und TableFelder erneuern
--------------------------------------------------------------------*/
-
void SwDoc::UpdateRefFlds( SfxPoolItem* pHt )
{
SwFieldType* pFldType;
@@ -707,10 +699,6 @@ void SwDoc::UpdatePageFlds( SfxPoolItem* pMsgHnt )
SetNewFldLst(true);
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
// ---- Loesche alle nicht referenzierten FeldTypen eines Dokumentes --
void SwDoc::GCFieldTypes()
{
@@ -750,12 +738,8 @@ void SwDoc::SetNewFldLst(bool bFlag)
mbNewFldLst = bFlag;
}
-
-//----------------------------------------------------------------------
-
// der StartIndex kann optional mit angegeben werden (z.B. wenn dieser
// zuvor schon mal erfragt wurde - ist sonst eine virtuelle Methode !!)
-
_SetGetExpFld::_SetGetExpFld( const SwNodeIndex& rNdIdx, const SwTxtFld* pFld,
const SwIndex* pIdx )
{
@@ -782,9 +766,9 @@ _SetGetExpFld::_SetGetExpFld( const SwNodeIndex& rNdIdx,
nCntnt = *rINet.GetStart();
}
- //Erweiterung fuer Sections:
- // diese haben immer als Content-Position 0xffff !!
- // Auf dieser steht nie ein Feld, maximal bis STRING_MAXLEN moeglich
+// Erweiterung fuer Sections:
+// diese haben immer als Content-Position 0xffff !!
+// Auf dieser steht nie ein Feld, maximal bis STRING_MAXLEN moeglich
_SetGetExpFld::_SetGetExpFld( const SwSectionNode& rSectNd,
const SwPosition* pPos )
{
@@ -1042,10 +1026,6 @@ void LookString( SwHash** ppTbl, USHORT nSize, const String& rName,
rRet.Erase();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
String lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
{
SwDBData aDBData( rDBFld.GetDBData( &rDoc ));
@@ -1064,10 +1044,6 @@ String lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
return sDBNumNm;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
SwNewDBMgr* pMgr )
{
@@ -1257,7 +1233,6 @@ void SwDoc::FldsToExpand( SwHash**& ppHashTbl, USHORT& rTblSize,
}
}
-
void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
{
if( IsExpFldsLocked() || IsInReading() )
@@ -1564,10 +1539,6 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
pUpdtFlds->SetFieldsDirty( FALSE );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
{
SwNewDBMgr* pMgr = GetNewDBMgr();
@@ -1601,10 +1572,6 @@ void SwDoc::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDoc::_InitFieldTypes() // wird vom CTOR gerufen!!
{
// Feldtypen
@@ -1727,6 +1694,7 @@ String lcl_DBDataToString(const SwDBData& rData)
sRet += String::CreateFromInt32(rData.nCommandType);
return sRet;
}
+
void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList,
const SvStringsDtor* pAllDBNames )
{
@@ -1804,10 +1772,6 @@ void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList,
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDoc::GetAllDBNames( SvStringsDtor& rAllDBNames )
{
SwNewDBMgr* pMgr = GetNewDBMgr();
@@ -1823,10 +1787,6 @@ void SwDoc::GetAllDBNames( SvStringsDtor& rAllDBNames )
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
SvStringsDtor& SwDoc::FindUsedDBs( const SvStringsDtor& rAllDBNames,
const String& rFormel,
SvStringsDtor& rUsedDBNames )
@@ -1861,10 +1821,6 @@ SvStringsDtor& SwDoc::FindUsedDBs( const SvStringsDtor& rAllDBNames,
return rUsedDBNames;
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDoc::AddUsedDBToList( SvStringsDtor& rDBNameList,
const SvStringsDtor& rUsedDBNames )
{
@@ -1872,10 +1828,6 @@ void SwDoc::AddUsedDBToList( SvStringsDtor& rDBNameList,
AddUsedDBToList( rDBNameList, *rUsedDBNames.GetObject(i) );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDoc::AddUsedDBToList( SvStringsDtor& rDBNameList, const String& rDBName)
{
if( !rDBName.Len() )
@@ -1901,10 +1853,6 @@ void SwDoc::AddUsedDBToList( SvStringsDtor& rDBNameList, const String& rDBName)
rDBNameList.Insert( pNew, rDBNameList.Count() );
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDoc::ChangeDBFields( const SvStringsDtor& rOldNames,
const String& rNewName )
{
@@ -2008,10 +1956,6 @@ void SwDoc::ChangeDBFields( const SvStringsDtor& rOldNames,
SetModified();
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames,
const String& rNewName, String& rFormel )
{
@@ -2053,10 +1997,6 @@ void SwDoc::ReplaceUsedDBs( const SvStringsDtor& rUsedDBNames,
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
BOOL SwDoc::IsNameInArray( const SvStringsDtor& rArr, const String& rName )
{
#ifdef UNX
@@ -2225,9 +2165,7 @@ bool SwDoc::SetFieldsDirty( bool b, const SwNode* pChk, ULONG nLen )
GetUpdtFlds().SetFieldsDirty( b );
return bFldsFnd;
}
-/* -----------------------------21.12.99 12:55--------------------------------
- ---------------------------------------------------------------------------*/
void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
{
const USHORT nSize = pFldTypes->Count();
@@ -2244,9 +2182,6 @@ void SwDoc::ChangeAuthorityData( const SwAuthEntry* pNewData )
}
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
void SwDocUpdtFld::InsDelFldInFldLst( BOOL bIns, const SwTxtFld& rFld )
{
@@ -2520,10 +2455,6 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
// JP_DEBUG
}
-/*--------------------------------------------------------------------
- Beschreibung:
- --------------------------------------------------------------------*/
-
void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, USHORT nFldWhich )
{
const SwTxtNode& rTxtNd = rTFld.GetTxtNode();
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 20055dd..0b96b83 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -71,12 +71,8 @@
extern USHORT GetHtmlMode( const SwDocShell* );
-
using namespace ::com::sun::star;
-/*-----------------17.02.98 08:35-------------------
-
---------------------------------------------------*/
USHORT SwDoc::GetFlyCount( FlyCntType eType ) const
{
const SwSpzFrmFmts& rFmts = *GetSpzFrmFmts();
@@ -118,9 +114,6 @@ USHORT SwDoc::GetFlyCount( FlyCntType eType ) const
return nCount;
}
-/*-----------------17.02.98 08:35-------------------
-
---------------------------------------------------*/
// If you change this, also update SwXFrameEnumeration in unocoll.
SwFrmFmt* SwDoc::GetFlyNum( USHORT nIdx, FlyCntType eType )
{
@@ -161,8 +154,6 @@ SwFrmFmt* SwDoc::GetFlyNum( USHORT nIdx, FlyCntType eType )
return pRetFmt;
}
-/* */
-
/***********************************************************************
#* Class : SwDoc
#* Methode : SetFlyFrmAnchor
@@ -170,7 +161,6 @@ SwFrmFmt* SwDoc::GetFlyNum( USHORT nIdx, FlyCntType eType )
#* Datum : MA 01. Feb. 94
#* Update : JP 09.03.98
#***********************************************************************/
-
Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
const SwFrmFmt* pFlyFmt )
{
@@ -533,7 +523,6 @@ void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
* Erstellt : OK 14.04.94 15:40
* Aenderung : JP 23.04.98
***************************************************************************/
-
BOOL SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
SfxItemSet* pSet, BOOL bKeepOrient )
{
@@ -646,7 +635,6 @@ void SwDoc::GetGrfNms( const SwFlyFrmFmt& rFmt, String* pGrfName,
|* Letzte Aenderung JP 08.07.98
|*
*************************************************************************/
-
sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
RndStdIds _eAnchorType,
const sal_Bool _bSameOnly,
@@ -897,10 +885,6 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
return bUnmark;
}
-
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
int SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
{
//Die Source darf noch keinen Follow haben.
@@ -999,9 +983,7 @@ int SwDoc::Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest )
return bAllowed ? SW_CHAIN_OK : SW_CHAIN_WRONG_AREA;
}
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
+
int SwDoc::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
{
int nErr = Chainable( rSource, rDest );
@@ -1045,9 +1027,7 @@ int SwDoc::Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest )
}
return nErr;
}
-/* -----------------23.07.98 13:56-------------------
- *
- * --------------------------------------------------*/
+
void SwDoc::Unchain( SwFrmFmt &rFmt )
{
SwFmtChain aChain( rFmt.GetChain() );
@@ -1063,6 +1043,3 @@ void SwDoc::Unchain( SwFrmFmt &rFmt )
EndUndo( UNDO_UNCHAIN, NULL );
}
}
-
-
-
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 021bb55..f91ef98 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -138,7 +138,6 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
|* Letzte Aenderung JP 08.05.98
|*
|*************************************************************************/
-
SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
{
SwFrmFmt *pFmt = 0;
@@ -222,6 +221,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
}
return pFmt;
}
+
/*************************************************************************
|*
|* SwDoc::DelLayoutFmt()
@@ -232,7 +232,6 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
|* Letzte Aenderung MA 05. Feb. 93
|*
|*************************************************************************/
-
void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
{
//Verkettung von Rahmen muss ggf. zusammengefuehrt werden.
@@ -392,7 +391,6 @@ void SwDoc::DelLayoutFmt( SwFrmFmt *pFmt )
|* Letzte Aenderung MA 17. Jul. 96
|*
|*************************************************************************/
-
SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
const SwFmtAnchor& rNewAnchor,
bool bSetTxtFlyAtt, bool bMakeFrms )
@@ -922,9 +920,8 @@ if( DoesUndo() ) // werden erstmal alle Undo - Objecte geloescht.
return pFmt;
}
-
- //Einfuegen eines DrawObjectes. Das Object muss bereits im DrawModel
- // angemeldet sein.
+// Einfuegen eines DrawObjectes. Das Object muss bereits im DrawModel
+// angemeldet sein.
SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
SdrObject& rDrawObj,
const SfxItemSet* pFlyAttrSet,
@@ -1034,7 +1031,6 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
|* Letzte Aenderung MD 23. Feb. 95
|*
|*************************************************************************/
-
/*sal_Bool TstFlyRange( const SwPaM* pPam, sal_uInt32 nFlyPos )
{
sal_Bool bOk = sal_False;
@@ -1046,6 +1042,7 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
return bOk;
}
*/
+
/* -----------------------------04.04.00 10:55--------------------------------
paragraph frames - o.k. if the PaM includes the paragraph from the beginning
to the beginning of the next paragraph at least
@@ -1086,7 +1083,6 @@ sal_Bool TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
return bOk;
}
-
void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
const SwPaM* pCmpRange, sal_Bool bDrawAlso ) const
{
@@ -1194,7 +1190,6 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
Otherwise the new set will not be changed.
*/
-
void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWhich )
{
const SfxPoolItem *pOldItem = NULL, *pNewItem = NULL;
@@ -1224,7 +1219,6 @@ void lcl_CpyAttr( SfxItemSet &rNewSet, const SfxItemSet &rOldSet, sal_uInt16 nWh
}
-
SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator,
const String& rNumberingSeparator,
const sal_Bool bBefore, const sal_uInt16 nId, const ULONG nNdIdx,
@@ -1548,7 +1542,6 @@ SwFlyFrmFmt* SwDoc::InsertLabel( const SwLabelType eType, const String &rTxt, co
|* Letzte Aenderung MIB 7. Dez. 98
|*
|*************************************************************************/
-
SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
const String& rSeparator,
const String& rNumberSeparator,
@@ -1818,7 +1811,6 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel( const String &rTxt,
|* IDocumentTimerAccess-methods
|*
|*************************************************************************/
-
void SwDoc::StartIdling()
{
mbStartIdleTimer = sal_True;
@@ -1845,7 +1837,6 @@ void SwDoc::UnblockIdling()
aIdleTimer.Start();
}
-
/*************************************************************************
|*
|* SwDoc::DoIdleJobs()
@@ -1854,7 +1845,6 @@ void SwDoc::UnblockIdling()
|* Letzte Aenderung MA 09. Jun. 95
|*
|*************************************************************************/
-
IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
{
#ifdef TIMELOG
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 6ee9dbc..1266d95 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -122,7 +122,6 @@
#include <sfx2/Metadatable.hxx>
#include <fmtmeta.hxx> // MetaFieldManager
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::document;
@@ -140,7 +139,6 @@ SV_IMPL_PTRARR( SwGrfFmtColls, SwGrfFmtCollPtr)
/*
* global functions...
*/
-
uno::Reference< linguistic2::XProofreadingIterator > SwDoc::GetGCIterator() const
{
if (!m_xGCIterator.is() && SvtLinguConfig().HasGrammarChecker())
@@ -199,9 +197,6 @@ void StartGrammarChecking( SwDoc &rDoc )
/*
* interne Funktionen
*/
-
-
-
BOOL lcl_DelFmtIndizes( const SwFrmFmtPtr& rpFmt, void* )
{
SwFmtCntnt &rFmtCntnt = (SwFmtCntnt&)rpFmt->GetCntnt();
@@ -216,7 +211,6 @@ BOOL lcl_DelFmtIndizes( const SwFrmFmtPtr& rpFmt, void* )
/*
* exportierte Methoden
*/
-
SwDoc::SwDoc() :
aNodes( this ),
aUndoNodes( this ),
@@ -472,8 +466,6 @@ SwDoc::SwDoc() :
* Dieser darf also keinesfalls durch delete geloescht
* werden!!!!!!!!!!
*/
-
-
SwDoc::~SwDoc()
{
// --> OD 2007-03-16 #i73788#
@@ -705,8 +697,6 @@ SwDoc::~SwDoc()
SfxItemPool::Free(mpAttrPool);
}
-//---------------------------------------------------
-
VirtualDevice& SwDoc::CreateVirtualDevice_() const
{
VirtualDevice* pNewVir = new VirtualDevice( 1 );
@@ -727,8 +717,6 @@ VirtualDevice& SwDoc::CreateVirtualDevice_() const
return *pVirDev;
}
-//---------------------------------------------------
-
SfxPrinter& SwDoc::CreatePrinter_() const
{
ASSERT( ! pPrt, "Do not call CreatePrinter_(), call getPrinter() instead" )
@@ -750,7 +738,6 @@ SfxPrinter& SwDoc::CreatePrinter_() const
const_cast<SwDoc*>(this)->setPrinter( pNewPrt, true, true );
return *pPrt;
}
-//---------------------------------------------------
void SwDoc::SetDocShell( SwDocShell* pDSh )
{
@@ -770,12 +757,8 @@ void SwDoc::SetDocShell( SwDocShell* pDSh )
}
}
-
// Convenience-Methode, um uebermaessige Includes von docsh.hxx
// zu vermeiden
-
-
-
uno::Reference < embed::XStorage > SwDoc::GetDocStorage()
{
if( pDocShell )
@@ -785,14 +768,11 @@ uno::Reference < embed::XStorage > SwDoc::GetDocStorage()
return NULL;
}
-
-
SfxObjectShell* SwDoc::GetPersist() const
{
return pDocShell ? pDocShell : pLinkMgr->GetPersist();
}
-
void SwDoc::ClearDoc()
{
BOOL bOldUndo = mbUndo;
@@ -925,9 +905,7 @@ void SwDoc::SetPreViewPrtData( const SwPagePreViewPrtData* pNew )
DELETEZ( pPgPViewPrtData );
SetModified();
}
-/* -----------------------------06.01.00 14:03--------------------------------
- ---------------------------------------------------------------------------*/
SwModify* SwDoc::GetUnoCallBack() const
{
return pUnoCallBack;
@@ -937,7 +915,6 @@ SwModify* SwDoc::GetUnoCallBack() const
* SwDoc:
* Reading and writing of the layout cache.
*--------------------------------------------------*/
-
void SwDoc::ReadLayoutCache( SvStream& rStream )
{
if( !pLayoutCache )
@@ -1083,9 +1060,6 @@ void SwDoc::InitTOXTypes()
pTOXTypes->Insert( pNew, pTOXTypes->Count() );
}
-/*-- 08.05.2009 10:07:57---------------------------------------------------
-
- -----------------------------------------------------------------------*/
SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
{
SwDoc* pRet = new SwDoc;
@@ -1160,6 +1134,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
pRet->SetRefForDocShell( 0 );
return xRetShell;
}
+
/*-- 08.05.2009 10:52:40---------------------------------------------------
copy document content - code from SwFEShell::Paste( SwDoc* , BOOL )
-----------------------------------------------------------------------*/
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index f5a10ae..f2e0ae4 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -168,7 +168,7 @@ void SwDoc::PropagateOutlineRule()
}
}
- // Hoch-/Runterstufen
+// Hoch-/Runterstufen
BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
{
if( !GetNodes().GetOutLineNds().Count() || !nOffset )
@@ -424,9 +424,7 @@ BOOL SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
return TRUE;
}
-
-
- // Hoch-/Runter - Verschieben !
+// Hoch-/Runter - Verschieben !
BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
{
// kein Verschiebung in den Sonderbereichen
@@ -577,7 +575,6 @@ BOOL SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
return MoveParagraph( aPam, nOffs, TRUE );
}
-
USHORT lcl_FindOutlineName( const SwNodes& rNds, const String& rName,
BOOL bExact )
{
@@ -604,8 +601,6 @@ USHORT lcl_FindOutlineName( const SwNodes& rNds, const String& rName,
return nSavePos;
}
-
-
USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
{
// Gueltig Nummern sind (immer nur Offsets!!!):
@@ -705,18 +700,16 @@ USHORT lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
return nPos;
}
- // zu diesem Gliederungspunkt
-
-
- // JP 13.06.96:
- // im Namen kann eine Nummer oder/und der Text stehen.
- // zuerst wird ueber die Nummer versucht den richtigen Eintrag zu finden.
- // Gibt es diesen, dann wird ueber den Text verglichen, od es der
- // gewuenschte ist. Ist das nicht der Fall, wird noch mal nur ueber den
- // Text gesucht. Wird dieser gefunden ist es der Eintrag. Ansonsten der,
- // der ueber die Nummer gefunden wurde.
- // Ist keine Nummer angegeben, dann nur den Text suchen.
+// zu diesem Gliederungspunkt
+// JP 13.06.96:
+// im Namen kann eine Nummer oder/und der Text stehen.
+// zuerst wird ueber die Nummer versucht den richtigen Eintrag zu finden.
+// Gibt es diesen, dann wird ueber den Text verglichen, od es der
+// gewuenschte ist. Ist das nicht der Fall, wird noch mal nur ueber den
+// Text gesucht. Wird dieser gefunden ist es der Eintrag. Ansonsten der,
+// der ueber die Nummer gefunden wurde.
+// Ist keine Nummer angegeben, dann nur den Text suchen.
BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
{
if( rName.Len() )
@@ -784,8 +777,6 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
return FALSE;
}
-/* */
-
// --- Nummerierung -----------------------------------------
// --> OD 2008-02-19 #refactorlists#
@@ -864,7 +855,6 @@ BOOL SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
//}
// <--
-
void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
{
SwNumRule* pOld = rDoc.FindNumRulePtr( rRule.GetName() );
@@ -1207,7 +1197,7 @@ void SwDoc::SetNodeNumStart( const SwPosition& rPos, USHORT nStt )
}
}
- // loeschen geht nur, wenn die Rule niemand benutzt!
+// loeschen geht nur, wenn die Rule niemand benutzt!
BOOL SwDoc::DelNumRule( const String& rName, BOOL bBroadcast )
{
USHORT nPos = FindNumRule( rName );
@@ -1685,8 +1675,7 @@ void SwDoc::InvalidateNumRules()
(*pNumRuleTbl)[n]->SetInvalidRule(TRUE);
}
- // zum naechsten/vorhergehenden Punkt auf gleicher Ebene
-
+// zum naechsten/vorhergehenden Punkt auf gleicher Ebene
BOOL lcl_IsNumOk( BYTE nSrchNum, BYTE& rLower, BYTE& rUpper,
BOOL bOverUpper, BYTE nNumber )
{
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 81ceef7..ce28294 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -70,12 +70,9 @@ LocaleDataWrapper* SwSortElement::pLclData = 0;
SV_IMPL_OP_PTRARR_SORT( SwSortElements, SwSortElementPtr );
-
/*--------------------------------------------------------------------
Beschreibung: Ein Sortierelement fuers Sort konstruieren
--------------------------------------------------------------------*/
-
-
void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt,
FlatFndBox* pFltBx )
{
@@ -100,7 +97,6 @@ void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt,
// rOpt.bIgnoreCase ? SW_COLLATOR_IGNORES : 0 );
}
-
void SwSortElement::Finit()
{
delete pOptions, pOptions = 0;
@@ -112,12 +108,10 @@ void SwSortElement::Finit()
pBox = 0;
}
-
SwSortElement::~SwSortElement()
{
}
-
double SwSortElement::StrToDouble( const String& rStr ) const
{
if( !pLclData )
@@ -139,8 +133,6 @@ double SwSortElement::StrToDouble( const String& rStr ) const
/*--------------------------------------------------------------------
Beschreibung: Operatoren zum Vergleichen
--------------------------------------------------------------------*/
-
-
BOOL SwSortElement::operator==(const SwSortElement& )
{
return FALSE;
@@ -149,7 +141,6 @@ BOOL SwSortElement::operator==(const SwSortElement& )
/*--------------------------------------------------------------------
Beschreibung: Kleiner-Operator fuers sortieren
--------------------------------------------------------------------*/
-
BOOL SwSortElement::operator<(const SwSortElement& rCmp)
{
@@ -207,24 +198,18 @@ double SwSortElement::GetValue( USHORT nKey ) const
/*--------------------------------------------------------------------
Beschreibung: SortierElemente fuer Text
--------------------------------------------------------------------*/
-
-
SwSortTxtElement::SwSortTxtElement(const SwNodeIndex& rPos)
: nOrg(rPos.GetIndex()), aPos(rPos)
{
}
-
SwSortTxtElement::~SwSortTxtElement()
{
}
-
/*--------------------------------------------------------------------
Beschreibung: Key ermitteln
--------------------------------------------------------------------*/
-
-
String SwSortTxtElement::GetKey(USHORT nId) const
{
SwTxtNode* pTxtNd = aPos.GetNode().GetTxtNode();
@@ -251,17 +236,14 @@ String SwSortTxtElement::GetKey(USHORT nId) const
return rStr.Copy( nStart, nEnd-nStart );
}
-
/*--------------------------------------------------------------------
Beschreibung: Sortier-Elemente fuer Tabellen
--------------------------------------------------------------------*/
-
SwSortBoxElement::SwSortBoxElement( USHORT nRC )
: nRow( nRC )
{
}
-
SwSortBoxElement::~SwSortBoxElement()
{
}
@@ -269,8 +251,6 @@ SwSortBoxElement::~SwSortBoxElement()
/*--------------------------------------------------------------------
Beschreibung: Schluessel zu einer Zelle ermitteln
--------------------------------------------------------------------*/
-
-
String SwSortBoxElement::GetKey(USHORT nKey) const
{
const _FndBox* pFndBox;
@@ -328,8 +308,6 @@ double SwSortBoxElement::GetValue( USHORT nKey ) const
/*--------------------------------------------------------------------
Beschreibung: Text sortieren im Document
--------------------------------------------------------------------*/
-
-
BOOL SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
{
// pruefen ob Rahmen im Text
@@ -505,7 +483,6 @@ BOOL SwDoc::SortText(const SwPaM& rPaM, const SwSortOptions& rOpt)
/*--------------------------------------------------------------------
Beschreibung: Tabelle sortieren im Document
--------------------------------------------------------------------*/
-
BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
{
// uebers SwDoc fuer Undo !!
@@ -641,8 +618,6 @@ BOOL SwDoc::SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
/*--------------------------------------------------------------------
Beschreibung: Zeilenweise verschieben
--------------------------------------------------------------------*/
-
-
void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, USHORT nS, USHORT nT,
SwMovedBoxes& rMovedList, SwUndoSort* pUD)
{
@@ -689,8 +664,6 @@ void MoveRow(SwDoc* pDoc, const FlatFndBox& rBox, USHORT nS, USHORT nT,
/*--------------------------------------------------------------------
Beschreibung: Spaltenweise verschieben
--------------------------------------------------------------------*/
-
-
void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, USHORT nS, USHORT nT,
SwMovedBoxes& rMovedList, SwUndoSort* pUD)
{
@@ -737,8 +710,6 @@ void MoveCol(SwDoc* pDoc, const FlatFndBox& rBox, USHORT nS, USHORT nT,
/*--------------------------------------------------------------------
Beschreibung: Eine einzelne Zelle verschieben
--------------------------------------------------------------------*/
-
-
void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
BOOL bMovedBefore, SwUndoSort* pUD)
{
@@ -795,8 +766,6 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar,
/*--------------------------------------------------------------------
Beschreibung: Zweidimensionales Array aus FndBoxes generieren
--------------------------------------------------------------------*/
-
-
FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) :
pDoc(pDocPtr),
rBoxRef(rBox),
@@ -821,7 +790,6 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) :
}
}
-
FlatFndBox::~FlatFndBox()
{
_FndBox** ppTmp = (_FndBox**)pArr;
@@ -834,8 +802,6 @@ FlatFndBox::~FlatFndBox()
/*--------------------------------------------------------------------
Beschreibung: Alle Lines einer Box muessen gleichviel Boxen haben
--------------------------------------------------------------------*/
-
-
BOOL FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
{
const _FndLines &rLines = rBox.GetLines();
@@ -862,8 +828,6 @@ BOOL FlatFndBox::CheckLineSymmetry(const _FndBox& rBox)
Beschreibung: Box auf Symmetrie pruefen
Alle Boxen einer Line muessen gleichviele Lines haben
--------------------------------------------------------------------*/
-
-
BOOL FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
{
const _FndBoxes &rBoxes = rLn.GetBoxes();
@@ -889,8 +853,6 @@ BOOL FlatFndBox::CheckBoxSymmetry(const _FndLine& rLn)
/*--------------------------------------------------------------------
Beschreibung: max Anzahl der Spalten (Boxes)
--------------------------------------------------------------------*/
-
-
USHORT FlatFndBox::GetColCount(const _FndBox& rBox)
{
const _FndLines& rLines = rBox.GetLines();
@@ -918,8 +880,6 @@ USHORT FlatFndBox::GetColCount(const _FndBox& rBox)
/*--------------------------------------------------------------------
Beschreibung: max Anzahl der Zeilen (Lines)
--------------------------------------------------------------------*/
-
-
USHORT FlatFndBox::GetRowCount(const _FndBox& rBox)
{
const _FndLines& rLines = rBox.GetLines();
@@ -944,8 +904,6 @@ USHORT FlatFndBox::GetRowCount(const _FndBox& rBox)
/*--------------------------------------------------------------------
Beschreibung: lineares Array aus atomaren FndBoxes erzeugen
--------------------------------------------------------------------*/
-
-
void FlatFndBox::FillFlat(const _FndBox& rBox, BOOL bLastBox)
{
BOOL bModRow = FALSE;
@@ -1007,8 +965,6 @@ void FlatFndBox::FillFlat(const _FndBox& rBox, BOOL bLastBox)
/*--------------------------------------------------------------------
Beschreibung: Zugriff auf eine bestimmte Zelle
--------------------------------------------------------------------*/
-
-
const _FndBox* FlatFndBox::GetBox(USHORT n_Col, USHORT n_Row) const
{
USHORT nOff = n_Row * nCols + n_Col;
@@ -1024,5 +980,3 @@ const SfxItemSet* FlatFndBox::GetItemSet(USHORT n_Col, USHORT n_Row) const
return ppItemSets ? *(ppItemSets + (n_Row * nCols + n_Col )) : 0;
}
-
-
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 4eda348..0e3af99 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -135,8 +135,6 @@ USHORT SwDoc::GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const
/*--------------------------------------------------------------------
Beschreibung: aktuelle Verzeichnismarkierungen ermitteln
--------------------------------------------------------------------*/
-
-
USHORT SwDoc::GetCurTOXMark( const SwPosition& rPos,
SwTOXMarks& rArr ) const
{
@@ -178,7 +176,6 @@ USHORT SwDoc::GetCurTOXMark( const SwPosition& rPos,
/*--------------------------------------------------------------------
Beschreibung: Marke loeschen
--------------------------------------------------------------------*/
-
void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
{
// hole den TextNode und
@@ -214,7 +211,6 @@ void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
/*--------------------------------------------------------------------
Beschreibung: Traveln zwischen TOXMarks
--------------------------------------------------------------------*/
-
class CompareNodeCntnt
{
ULONG nNode;
@@ -357,8 +353,6 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
return *pNew;
}
-/* */
-
const SwTOXBaseSection* SwDoc::InsertTableOf( const SwPosition& rPos,
const SwTOXBase& rTOX,
const SfxItemSet* pSet,
@@ -411,8 +405,6 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
return pNewSection;
}
-
-
const SwTOXBaseSection* SwDoc::InsertTableOf( ULONG nSttNd, ULONG nEndNd,
const SwTOXBase& rTOX,
const SfxItemSet* pSet )
@@ -457,7 +449,6 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( ULONG nSttNd, ULONG nEndNd,
/*--------------------------------------------------------------------
Beschreibung: Aktuelles Verzeichnis ermitteln
--------------------------------------------------------------------*/
-
const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const
{
const SwNode& rNd = rPos.nNode.GetNode();
@@ -477,9 +468,7 @@ const SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos ) const
}
return 0;
}
-/* -----------------01.09.99 16:01-------------------
- --------------------------------------------------*/
const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
{
ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
@@ -488,9 +477,7 @@ const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
ASSERT( pFmt, "invalid TOXBaseSection!" );
return pFmt->GetAttrSet();
}
-/* -----------------02.09.99 07:48-------------------
- --------------------------------------------------*/
const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate )
{
SwTOXBase** prBase = 0;
@@ -512,9 +499,7 @@ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate )
}
return (*prBase);
}
-/* -----------------02.09.99 08:06-------------------
- --------------------------------------------------*/
void SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
{
SwTOXBase** prBase = 0;
@@ -536,8 +521,6 @@ void SwDoc::SetDefaultTOXBase(const SwTOXBase& rBase)
/*--------------------------------------------------------------------
Beschreibung: Verzeichnis loeschen
--------------------------------------------------------------------*/
-
-
BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes )
{
// its only delete the TOX, not the nodes
@@ -630,7 +613,6 @@ BOOL SwDoc::DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes )
/*--------------------------------------------------------------------
Beschreibung: Verzeichnistypen verwalten
--------------------------------------------------------------------*/
-
USHORT SwDoc::GetTOXTypeCount(TOXTypes eTyp) const
{
const SwTOXTypePtr * ppTTypes = pTOXTypes->GetData();
@@ -640,9 +622,7 @@ USHORT SwDoc::GetTOXTypeCount(TOXTypes eTyp) const
++nCnt;
return nCnt;
}
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
const SwTOXType* SwDoc::GetTOXType( TOXTypes eTyp, USHORT nId ) const
{
const SwTOXTypePtr * ppTTypes = pTOXTypes->GetData();
@@ -653,18 +633,13 @@ const SwTOXType* SwDoc::GetTOXType( TOXTypes eTyp, USHORT nId ) const
return 0;
}
-/*--------------------------------------------------------------------
-
- --------------------------------------------------------------------*/
const SwTOXType* SwDoc::InsertTOXType( const SwTOXType& rTyp )
{
SwTOXType * pNew = new SwTOXType( rTyp );
pTOXTypes->Insert( pNew, pTOXTypes->Count() );
return pNew;
}
-/*--------------------------------------------------------------------
- --------------------------------------------------------------------*/
String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
const String* pChkStr ) const
{
@@ -719,9 +694,6 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType,
return aName += String::CreateFromInt32( ++nNum );
}
-/*--------------------------------------------------------------------
-
- --------------------------------------------------------------------*/
BOOL SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
{
ASSERT( rTOXBase.ISA( SwTOXBaseSection ),
@@ -739,8 +711,6 @@ BOOL SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
return bRet;
}
-/* */
-
const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, BYTE nLvl = 0 )
{
const SwNode* pNd = &rNd;
@@ -761,11 +731,9 @@ const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, BYTE nLvl = 0 )
return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0;
}
-
/*--------------------------------------------------------------------
Beschreibung: Verzeichnis-Klasse
--------------------------------------------------------------------*/
-
SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt)
: SwTOXBase( rBase )
, SwSection( TOX_CONTENT_SECTION, aEmptyStr, rFmt )
@@ -774,12 +742,10 @@ SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt)
SetSectionName( GetTOXName() );
}
-
SwTOXBaseSection::~SwTOXBaseSection()
{
}
-
BOOL SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, BOOL bAtStart ) const
{
BOOL bRet = FALSE;
@@ -808,7 +774,6 @@ BOOL SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, BOOL bAtStart ) const
/*--------------------------------------------------------------------
Beschreibung: Verzeichnisinhalt zusammensammeln
--------------------------------------------------------------------*/
-
void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
const bool _bNewTOX )
{
@@ -1099,8 +1064,6 @@ sNm.AppendAscii( RTL_CONSTASCII_STRINGPARAM( "_Head" ));
/*--------------------------------------------------------------------
Beschreibung: AlphaDelimitter einfuegen
--------------------------------------------------------------------*/
-
-
void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
@@ -1145,7 +1108,6 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
/*--------------------------------------------------------------------
Beschreibung: Template auswerten
--------------------------------------------------------------------*/
-
SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( USHORT nLevel )
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
@@ -1193,11 +1155,9 @@ SwTxtFmtColl* SwTOXBaseSection::GetTxtFmtColl( USHORT nLevel )
return pColl;
}
-
/*--------------------------------------------------------------------
Beschreibung: Aus Markierungen erzeugen
--------------------------------------------------------------------*/
-
void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
const SwTxtNode* pOwnChapterNode )
{
@@ -1271,12 +1231,9 @@ void SwTOXBaseSection::UpdateMarks( const SwTOXInternational& rIntl,
}
}
-
/*--------------------------------------------------------------------
Beschreibung: Verzeichnisinhalt aus Gliederungsebene generieren
--------------------------------------------------------------------*/
-
-
void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
@@ -1305,7 +1262,6 @@ void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode )
/*--------------------------------------------------------------------
Beschreibung: Verzeichnisinhalt aus Vorlagenbereichen generieren
--------------------------------------------------------------------*/
-
void SwTOXBaseSection::UpdateTemplate( const SwTxtNode* pOwnChapterNode )
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
@@ -1385,9 +1341,7 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
}
}
}
-/* -----------------15.09.99 14:18-------------------
- --------------------------------------------------*/
void SwTOXBaseSection::UpdateAuthorities( const SwTOXInternational& rIntl )
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
@@ -1580,7 +1534,6 @@ void SwTOXBaseSection::UpdateCntnt( SwTOXElement eMyType,
/*--------------------------------------------------------------------
Beschreibung: Tabelleneintraege zusammensuchen
--------------------------------------------------------------------*/
-
void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
{
SwDoc* pDoc = (SwDoc*)GetFmt()->GetDoc();
@@ -1635,7 +1588,6 @@ void SwTOXBaseSection::UpdateTable( const SwTxtNode* pOwnChapterNode )
Beschreibung: String generieren anhand der Form
SonderZeichen 0-31 und 255 entfernen
--------------------------------------------------------------------*/
-
String lcl_GetNumString( const SwTOXSortTabBase& rBase, sal_Bool bUsePrefix, BYTE nLevel )
{
String sRet;
@@ -1957,7 +1909,6 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx,
Beschreibung: Seitennummer errechnen und nach dem Formatieren
eintragen
--------------------------------------------------------------------*/
-
void SwTOXBaseSection::UpdatePageNum()
{
if( !aSortArr.Count() )
@@ -2069,11 +2020,9 @@ void SwTOXBaseSection::UpdatePageNum()
aSortArr.DeleteAndDestroy( 0, aSortArr.Count() );
}
-
/*--------------------------------------------------------------------
Beschreibung: Austausch der Seitennummer-Platzhalter
--------------------------------------------------------------------*/
-
// search for the page no in the array of main entry page numbers
BOOL lcl_HasMainEntry( const SvUShorts* pMainEntryNums, USHORT nToFind )
{
@@ -2249,11 +2198,9 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
delete pCharStyleIdx;
}
-
/*--------------------------------------------------------------------
Beschreibung: Sortiert einfuegen in das SortArr
--------------------------------------------------------------------*/
-
void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
{
Range aRange(0, aSortArr.Count());
@@ -2349,7 +2296,6 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
/*--------------------------------------------------------------------
Beschreibung: Schluessel-Bereich suchen und evtl einfuegen
--------------------------------------------------------------------*/
-
Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReading,
const SwTOXSortTabBase& rNew,
USHORT nLevel, const Range& rRange )
@@ -2410,7 +2356,6 @@ Range SwTOXBaseSection::GetKeyRange(const String& rStr, const String& rStrReadin
return Range(nStart, nEnd);
}
-
BOOL SwTOXBase::IsTOXBaseInReadonly() const
{
const SwTOXBaseSection *pSect = PTR_CAST(SwTOXBaseSection, this);
@@ -2428,9 +2373,7 @@ BOOL SwTOXBase::IsTOXBaseInReadonly() const
}
return bRet;
}
-/* -----------------17.08.99 13:29-------------------
- --------------------------------------------------*/
const SfxItemSet* SwTOXBase::GetAttrSet() const
{
const SwTOXBaseSection *pSect = PTR_CAST(SwTOXBaseSection, this);
@@ -2460,7 +2403,3 @@ BOOL SwTOXBase::GetInfo( SfxPoolItem& rInfo ) const
}
return TRUE;
}
-
-/* */
-
-
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 77d7431..5d895a5 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -186,25 +186,19 @@ USHORT SwNumRule::GetBullIndent( BYTE nLvl )
return aDefNumIndents[ nLvl ];
}
-
-
static void lcl_SetRuleChgd( SwTxtNode& rNd, BYTE nLevel )
{
if( rNd.GetActualListLevel() == nLevel )
rNd.NumRuleChgd();
}
-/* -----------------------------22.02.01 13:41--------------------------------
- ---------------------------------------------------------------------------*/
SwNumFmt::SwNumFmt() :
SvxNumberFormat(SVX_NUM_ARABIC),
SwClient( 0 ),
pVertOrient(new SwFmtVertOrient( 0, text::VertOrientation::NONE))
{
}
-/* -----------------------------22.02.01 13:42--------------------------------
- ---------------------------------------------------------------------------*/
SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
SvxNumberFormat(rFmt),
SwClient( rFmt.pRegisteredIn ),
@@ -214,9 +208,7 @@ SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
&eMyVertOrient);
}
-/* -----------------------------22.02.01 13:58--------------------------------
- ---------------------------------------------------------------------------*/
SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
SvxNumberFormat(rNumFmt),
pVertOrient(new SwFmtVertOrient( 0, rNumFmt.GetVertOrient()))
@@ -242,16 +234,12 @@ SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
pRegisteredIn->Remove( this );
}
-/* -----------------------------22.02.01 13:42--------------------------------
- ---------------------------------------------------------------------------*/
SwNumFmt::~SwNumFmt()
{
delete pVertOrient;
}
-/* -----------------------------02.07.01 15:37--------------------------------
- ---------------------------------------------------------------------------*/
void SwNumFmt::NotifyGraphicArrived()
{
if( GetCharFmt() )
@@ -313,10 +301,6 @@ BOOL SwNumFmt::IsItemize() const
}
-
-/* -----------------------------23.02.01 09:28--------------------------------
-
- ---------------------------------------------------------------------------*/
SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
{
SvxNumberFormat::operator=(rNumFmt);
@@ -326,9 +310,7 @@ SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
pRegisteredIn->Remove( this );
return *this;
}
-/* -----------------------------23.02.01 09:28--------------------------------
- ---------------------------------------------------------------------------*/
BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
{
BOOL bRet = SvxNumberFormat::operator==(rNumFmt) &&
@@ -336,9 +318,6 @@ BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
return bRet;
}
-/* -----------------------------22.02.01 13:44--------------------------------
-
- ---------------------------------------------------------------------------*/
void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
{
if( pChFmt )
@@ -346,9 +325,7 @@ void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
else if( GetRegisteredIn() )
pRegisteredIn->Remove( this );
}
-/* -----------------------------22.02.01 13:45--------------------------------
- ---------------------------------------------------------------------------*/
void SwNumFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
{
// dann suche mal in dem Doc nach dem NumRules-Object, in dem dieses
@@ -367,16 +344,12 @@ void SwNumFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
else
SwClient::Modify( pOld, pNew );
}
-/* -----------------------------23.02.01 11:08--------------------------------
- ---------------------------------------------------------------------------*/
void SwNumFmt::SetCharFmtName(const String& rSet)
{
SvxNumberFormat::SetCharFmtName(rSet);
}
-/* -----------------------------22.02.01 13:47--------------------------------
- ---------------------------------------------------------------------------*/
const String& SwNumFmt::GetCharFmtName() const
{
if((SwCharFmt*)pRegisteredIn)
@@ -384,9 +357,7 @@ const String& SwNumFmt::GetCharFmtName() const
else
return aEmptyStr;
}
-/* -----------------------------22.02.01 16:05--------------------------------
- ---------------------------------------------------------------------------*/
void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
const sal_Int16* pOrient)
{
@@ -394,23 +365,17 @@ void SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSiz
pVertOrient->SetVertOrient( *pOrient );
SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
}
-/* -----------------------------22.02.01 16:05--------------------------------
- ---------------------------------------------------------------------------*/
void SwNumFmt::SetVertOrient(sal_Int16 eSet)
{
SvxNumberFormat::SetVertOrient(eSet);
}
-/* -----------------------------22.02.01 16:05--------------------------------
- ---------------------------------------------------------------------------*/
sal_Int16 SwNumFmt::GetVertOrient() const
{
return SvxNumberFormat::GetVertOrient();
}
-/* -----------------------------22.02.01 13:54--------------------------------
- ---------------------------------------------------------------------------*/
void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
{
BOOL bDocIsModified = pDoc->IsModified();
@@ -465,9 +430,7 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
if( bFnd && !bDocIsModified )
pDoc->ResetModified();
}
-/* -----------------------------31.05.01 16:08--------------------------------
- ---------------------------------------------------------------------------*/
const SwFmtVertOrient* SwNumFmt::GetGraphicOrientation() const
{
sal_Int16 eOrient = SvxNumberFormat::GetVertOrient();
@@ -718,7 +681,6 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
return *this;
}
-
BOOL SwNumRule::operator==( const SwNumRule& rRule ) const
{
BOOL bRet = eRuleType == rRule.eRuleType &&
@@ -741,7 +703,6 @@ BOOL SwNumRule::operator==( const SwNumRule& rRule ) const
return bRet;
}
-
void SwNumRule::Set( USHORT i, const SwNumFmt& rNumFmt )
{
ASSERT( i < MAXLEVEL, "Serious defect, please inform OD" )
@@ -776,7 +737,6 @@ void SwNumRule::Set( USHORT i, const SwNumFmt* pNumFmt )
*pOld = *pNumFmt, bInvalidRuleFlag = TRUE;
}
-
String SwNumRule::MakeNumString( const SwNodeNum& rNum, BOOL bInclStrings,
BOOL bOnlyArabic ) const
{
@@ -930,7 +890,6 @@ String SwNumRule::MakeRefNumString( const SwNodeNum& rNodeNum,
// eine Art Copy-Constructor, damit die Num-Formate auch an den
// richtigen CharFormaten eines Dokumentes haengen !!
// (Kopiert die NumFormate und returnt sich selbst)
-
SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
{
for( USHORT n = 0; n < MAXLEVEL; ++n )
@@ -953,9 +912,7 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
bInvalidRuleFlag = TRUE;
return *this;
}
-/* -----------------30.10.98 08:33-------------------
- *
- * --------------------------------------------------*/
+
void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
{
for( USHORT n = 0; n < MAXLEVEL; ++n )
@@ -968,9 +925,7 @@ void SwNumRule::SetSvxRule(const SvxNumRule& rNumRule, SwDoc* pDoc)
bInvalidRuleFlag = TRUE;
bContinusNum = rNumRule.IsContinuousNumbering();
}
-/* -----------------30.10.98 08:33-------------------
- *
- * --------------------------------------------------*/
+
SvxNumRule SwNumRule::MakeSvxNumRule() const
{
SvxNumRule aRule(NUM_CONTINUOUS|NUM_CHAR_TEXT_DISTANCE|NUM_CHAR_STYLE|
diff --git a/sw/source/core/doc/sortopt.cxx b/sw/source/core/doc/sortopt.cxx
index 6bfa6ff..433896d 100644
--- a/sw/source/core/doc/sortopt.cxx
+++ b/sw/source/core/doc/sortopt.cxx
@@ -33,13 +33,11 @@
#include <i18npool/lang.h>
#include <sortopt.hxx>
-
SV_IMPL_PTRARR(SwSortKeys, SwSortKey*)
/*--------------------------------------------------------------------
Beschreibung: Sortier-Schluessel
--------------------------------------------------------------------*/
-
SwSortKey::SwSortKey() :
eSortOrder( SRT_ASCENDING ),
nColumnId( 0 ),
@@ -55,7 +53,6 @@ SwSortKey::SwSortKey(USHORT nId, const String& rSrtType, SwSortOrder eOrder) :
{
}
-
SwSortKey::SwSortKey(const SwSortKey& rOld) :
sSortType( rOld.sSortType ),
eSortOrder( rOld.eSortOrder ),
@@ -67,8 +64,6 @@ SwSortKey::SwSortKey(const SwSortKey& rOld) :
/*--------------------------------------------------------------------
Beschreibung: Sortieroptionen fuers Sortieren
--------------------------------------------------------------------*/
-
-
SwSortOptions::SwSortOptions()
: eDirection( SRT_ROWS ),
cDeli( 9 ),
@@ -78,7 +73,6 @@ SwSortOptions::SwSortOptions()
{
}
-
SwSortOptions::SwSortOptions(const SwSortOptions& rOpt) :
eDirection( rOpt.eDirection ),
cDeli( rOpt.cDeli ),
@@ -93,11 +87,7 @@ SwSortOptions::SwSortOptions(const SwSortOptions& rOpt) :
}
}
-
SwSortOptions::~SwSortOptions()
{
aKeys.DeleteAndDestroy(0, aKeys.Count());
}
-
-
-
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 1e8cc6e..fb4a3bc 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -749,8 +749,6 @@ BOOL SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
return TRUE;
}
-// ---------------------------------------------------------------
-
// kopiere die Tabelle in diese.
// Kopiere alle Boxen einer Line in entsprechenden Boxen. Der alte Inhalt
// wird dabei geloescht.
@@ -758,8 +756,6 @@ BOOL SwTable::InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
// Box einer "GrundLine".
// Ist auch keine Line mehr vorhanden, -> auch in die letzte Box
// einer "GrundLine"
-
-
BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
SwUndoTblCpyTbl* pUndo )
{
@@ -840,7 +836,6 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwNodeIndex& rSttBox,
return TRUE;
}
-
BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
SwUndoTblCpyTbl* pUndo )
{
@@ -1062,8 +1057,6 @@ BOOL SwTable::InsTable( const SwTable& rCpyTbl, const SwSelBoxes& rSelBoxes,
return TRUE;
}
-
-
BOOL _FndCntntBox( const SwTableBox*& rpBox, void* pPara )
{
SwTableBox* pBox = (SwTableBox*)rpBox;
@@ -1074,14 +1067,12 @@ BOOL _FndCntntBox( const SwTableBox*& rpBox, void* pPara )
return TRUE;
}
-
BOOL _FndCntntLine( const SwTableLine*& rpLine, void* pPara )
{
((SwTableLine*)rpLine)->GetTabBoxes().ForEach( &_FndCntntBox, pPara );
return TRUE;
}
-
// suche alle Inhaltstragenden-Boxen dieser Box
SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
SwSelBoxes& rBoxes, BOOL bToTop ) const
@@ -1096,5 +1087,3 @@ SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
pLine->GetTabBoxes().ForEach( &_FndCntntBox, &rBoxes );
return rBoxes;
}
-
-
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index a443835..1669f84 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -235,7 +235,6 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize );
#endif
-
struct CR_SetLineHeight
{
SwSelBoxes aBoxes;
@@ -293,8 +292,6 @@ SV_IMPL_VARARR_SORT( _CpyTabFrms, _CpyTabFrm )
void lcl_DelCpyTabFrmFmts( _CpyTabFrm& rArr );
-// ---------------------------------------------------------------
-
struct _CpyPara
{
boost::shared_ptr< std::vector< std::vector< ULONG > > > pWidths;
@@ -338,7 +335,6 @@ struct _CpyPara
void SetBoxWidth( SwTableBox* pBox );
};
-
BOOL lcl_CopyCol( const _FndBox*& rpFndBox, void* pPara )
{
_CpyPara* pCpyPara = (_CpyPara*)pPara;
@@ -492,8 +488,6 @@ BOOL lcl_CopyRow( const _FndLine*& rpFndLine, void* pPara )
return TRUE;
}
-//-----------------------------------------------------------
-
void lcl_InsCol( _FndLine* pFndLn, _CpyPara& rCpyPara, USHORT nCpyCnt,
BOOL bBehind )
{
@@ -537,7 +531,6 @@ SwRowFrm* GetRowFrm( SwTableLine& rLine )
return 0;
}
-
BOOL SwTable::InsertCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt, BOOL bBehind )
{
ASSERT( rBoxes.Count() && nCnt, "keine gueltige Box-Liste" );
@@ -727,7 +720,6 @@ BOOL _FndBoxAppendRowLine( const SwTableLine*& rpLine, void* pPara )
return TRUE;
}
-
BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt )
{
SwTableNode* pTblNd = (SwTableNode*)aSortCntBoxes[0]->GetSttNd()->FindTableNode();
@@ -787,7 +779,6 @@ BOOL SwTable::AppendRow( SwDoc* pDoc, USHORT nCnt )
return TRUE;
}
-
void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
BOOL bFirst, SwShareBoxFmts& rShareFmts );
@@ -1088,7 +1079,6 @@ void lcl_SaveUpperLowerBorder( SwTable& rTbl, const SwTableBox& rBox,
}
}
-
BOOL SwTable::DeleteSel(
SwDoc* pDoc
,
@@ -1164,9 +1154,6 @@ BOOL SwTable::DeleteSel(
return TRUE;
}
-
-// ---------------------------------------------------------------
-
BOOL SwTable::OldSplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt,
BOOL bSameHeight )
{
@@ -1421,8 +1408,6 @@ BOOL SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt )
return TRUE;
}
-// ---------------------------------------------------------------
-
/*
----------------------- >> MERGE << ------------------------
Algorithmus:
@@ -1437,7 +1422,6 @@ BOOL SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt )
----------------------- >> MERGE << ------------------------
*/
-
void lcl_CpyLines( USHORT nStt, USHORT nEnd,
SwTableLines& rLines,
SwTableBox* pInsBox,
@@ -1484,8 +1468,6 @@ void lcl_CalcWidth( SwTableBox* pBox )
pFmt->ResetFmtAttr( RES_BOXATR_BEGIN, RES_BOXATR_END - 1 );
}
-
-
struct _InsULPara
{
SwTableNode* pTblNd;
@@ -1515,7 +1497,6 @@ struct _InsULPara
{ bUL_LR = TRUE; bUL = FALSE; if( pLine ) pInsLine = pLine; }
};
-
BOOL lcl_Merge_MoveBox( const _FndBox*& rpFndBox, void* pPara )
{
_InsULPara* pULPara = (_InsULPara*)pPara;
@@ -1757,7 +1738,6 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
return TRUE;
}
-
BOOL SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
SwTableBox* pMergeBox, SwUndoTblMerge* pUndo )
{
@@ -1868,8 +1848,6 @@ BOOL SwTable::OldMerge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
return TRUE;
}
-// ---------------------------------------------------------------
-
void lcl_CheckRowSpan( SwTable &rTbl )
{
USHORT nLineCount = rTbl.GetTabLines().Count();
@@ -2376,10 +2354,6 @@ BOOL SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
return TRUE;
}
-
-
-// ---------------------------------------------------------------
-
// suche ab dieser Line nach der naechsten Box mit Inhalt
SwTableBox* SwTableLine::FindNextBox( const SwTable& rTbl,
const SwTableBox* pSrchBox, BOOL bOvrTblLns ) const
@@ -2503,7 +2477,6 @@ SwTableBox* SwTableBox::FindPreviousBox( const SwTable& rTbl,
bOvrTblLns );
}
-
BOOL lcl_BoxSetHeadCondColl( const SwTableBox*& rpBox, void* )
{
// in der HeadLine sind die Absaetze mit BedingtenVorlage anzupassen
@@ -2521,8 +2494,6 @@ BOOL lcl_LineSetHeadCondColl( const SwTableLine*& rpLine, void* )
return TRUE;
}
-/* */
-
SwTwips lcl_GetDistance( SwTableBox* pBox, BOOL bLeft )
{
BOOL bFirst = TRUE;
@@ -2741,8 +2712,6 @@ BOOL lcl_SetOtherBoxWidth( SwTableLine* pLine, CR_SetBoxWidth& rParam,
return TRUE;
}
-/* */
-
BOOL lcl_InsSelBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
SwTwips nDist, BOOL bCheck )
{
@@ -3027,7 +2996,6 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
return TRUE;
}
-
// das Ergebnis des Positions Vergleiches
// POS_BEFORE, // Box liegt davor
// POS_BEHIND, // Box liegt dahinter
@@ -3036,7 +3004,6 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
// POS_EQUAL, // Box und Start/End sind gleich
// POS_OVERLAP_BEFORE, // Box ueberlappt den Start
// POS_OVERLAP_BEHIND // Box ueberlappt das Ende
-
SwComparePosition _CheckBoxInRange( USHORT nStt, USHORT nEnd,
USHORT nBoxStt, USHORT nBoxEnd )
{
@@ -3482,8 +3449,6 @@ BOOL lcl_DelOtherBox( SwTableLine* , CR_SetBoxWidth& , SwTwips , BOOL )
return TRUE;
}
-/* */
-
void lcl_AjustLines( SwTableLine* pLine, CR_SetBoxWidth& rParam )
{
SwTableBoxes& rBoxes = pLine->GetTabBoxes();
@@ -4071,7 +4036,6 @@ BOOL SwTable::SetColWidth( SwTableBox& rAktBox, USHORT eType,
return bRet;
}
-/* */
_FndBox* lcl_SaveInsDelData( CR_SetLineHeight& rParam, SwUndo** ppUndo,
SwTableSortBoxes& rTmpLst )
@@ -4568,8 +4532,6 @@ BOOL SwTable::SetRowHeight( SwTableBox& rAktBox, USHORT eType,
return bRet;
}
-/* */
-
SwFrmFmt* SwShareBoxFmt::GetFormat( long nWidth ) const
{
SwFrmFmt *pRet = 0, *pTmp;
@@ -4659,6 +4621,7 @@ void SwShareBoxFmts::AddFormat( const SwFrmFmt& rOld, const SwFrmFmt& rNew )
pEntry->AddFormat( rNew );
}
}
+
void SwShareBoxFmts::ChangeFrmFmt( SwTableBox* pBox, SwTableLine* pLn,
SwFrmFmt& rFmt )
{
@@ -4765,5 +4728,3 @@ BOOL SwShareBoxFmts::Seek_Entry( const SwFrmFmt& rFmt, USHORT* pPos ) const
*pPos = nU;
return FALSE;
}
-
-
More information about the Libreoffice-commits
mailing list