[Libreoffice-commits] core.git: sw/source
Philipp Riemer
ruderphilipp at gmail.com
Sat Sep 7 15:22:00 PDT 2013
sw/source/core/docnode/cancellablejob.hxx | 1
sw/source/core/docnode/finalthreadmanager.cxx | 3 -
sw/source/core/docnode/ndcopy.cxx | 5 --
sw/source/core/docnode/ndindex.cxx | 8 ---
sw/source/core/docnode/ndsect.cxx | 10 ----
sw/source/core/docnode/ndtbl.cxx | 28 -------------
sw/source/core/docnode/ndtbl1.cxx | 9 ----
sw/source/core/docnode/node.cxx | 36 +----------------
sw/source/core/docnode/node2lay.cxx | 3 -
sw/source/core/docnode/nodes.cxx | 23 ----------
sw/source/core/docnode/observablethread.cxx | 2
sw/source/core/docnode/pausethreadstarting.cxx | 2
sw/source/core/docnode/retrievedinputstreamdata.cxx | 1
sw/source/core/docnode/retrieveinputstream.cxx | 1
sw/source/core/docnode/retrieveinputstreamconsumer.cxx | 1
sw/source/core/docnode/section.cxx | 19 --------
sw/source/core/docnode/swbaslnk.cxx | 4 -
sw/source/core/docnode/swthreadjoiner.cxx | 1
sw/source/core/docnode/swthreadmanager.cxx | 1
19 files changed, 15 insertions(+), 143 deletions(-)
New commits:
commit a7c60c0e639b6cdd0c883794dbbf84596c11d77f
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Sun Aug 11 00:09:00 2013 +0200
remove/add blank lines for consistent code layout in sw/source/core/docnode/
Change-Id: I4ccd099b8ae491c69f25fd32d12a532348d6655d
Reviewed-on: https://gerrit.libreoffice.org/5868
Reviewed-by: Philipp Riemer <ruderphilipp at gmail.com>
Tested-by: Philipp Riemer <ruderphilipp at gmail.com>
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index d424846..2be7824 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#ifndef _CANCELLABLEJOB_HXX
#define _CANCELLABLEJOB_HXX
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index d375492..7008e7a3 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <finalthreadmanager.hxx>
#include <osl/thread.hxx>
@@ -86,6 +87,7 @@ bool CancelJobsThread::allJobsCancelled() const
return maJobs.empty() && mbAllJobsCancelled;
}
+
void CancelJobsThread::stopWhenAllJobsCancelled()
{
osl::MutexGuard aGuard(maMutex);
@@ -227,7 +229,6 @@ void SAL_CALL TerminateOfficeThread::onTerminated()
delete this;
}
-
/** class FinalThreadManager
@author OD
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 92c0cec..e0b0d7a 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <editeng/formatbreakitem.hxx>
#include <hintids.hxx>
@@ -522,7 +521,6 @@ void SwTxtNode::CopyCollFmt( SwTxtNode& rDestNd )
rDestNd.SetAttr( aPgBrkSet );
}
-
// Copy method from SwDoc
// Prevent copying in Flys that are anchored in the area
static sal_Bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
@@ -1615,7 +1613,4 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
}
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx
index f8097ac..3c3a9f6 100644
--- a/sw/source/core/docnode/ndindex.cxx
+++ b/sw/source/core/docnode/ndindex.cxx
@@ -17,10 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include "ndindex.hxx"
-
SwNodeRange::SwNodeRange( const SwNodeIndex &rS, const SwNodeIndex &rE )
: aStart( rS ), aEnd( rE )
{}
@@ -33,7 +31,6 @@ SwNodeRange::SwNodeRange( SwNodes& rNds, sal_uLong nSttIdx, sal_uLong nEndIdx )
: aStart( rNds, nSttIdx ), aEnd( rNds, nEndIdx )
{}
-
SwNodeRange::SwNodeRange( const SwNodeIndex& rS, long nSttDiff,
const SwNodeIndex& rE, long nEndDiff )
: aStart( rS, nSttDiff ), aEnd( rE, nEndDiff )
@@ -44,14 +41,12 @@ SwNodeRange::SwNodeRange( const SwNode& rS, long nSttDiff,
: aStart( rS, nSttDiff ), aEnd( rE, nEndDiff )
{}
-
SwNodeIndex::SwNodeIndex( SwNodes& rNds, sal_uLong nIdx )
: pNd( rNds[ nIdx ] ), pNext( 0 ), pPrev( 0 )
{
rNds.RegisterIndex( *this );
}
-
SwNodeIndex::SwNodeIndex( const SwNodeIndex& rIdx, long nDiff )
: pNext( 0 ), pPrev( 0 )
{
@@ -63,7 +58,6 @@ SwNodeIndex::SwNodeIndex( const SwNodeIndex& rIdx, long nDiff )
pNd->GetNodes().RegisterIndex( *this );
}
-
SwNodeIndex::SwNodeIndex( const SwNode& rNd, long nDiff )
: pNext( 0 ), pPrev( 0 )
{
@@ -75,7 +69,6 @@ SwNodeIndex::SwNodeIndex( const SwNode& rNd, long nDiff )
pNd->GetNodes().RegisterIndex( *this );
}
-
void SwNodeIndex::Remove()
{
pNd->GetNodes().DeRegisterIndex( *this );
@@ -137,5 +130,4 @@ SwNodeIndex& SwNodeIndex::Assign( const SwNode& rNd, long nOffset )
return *this;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 3a643e3..288c445 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svl/smplhint.hxx>
#include <hintids.hxx>
#include <sfx2/linkmgr.hxx>
@@ -55,7 +54,6 @@
#include <viewsh.hxx>
#include <txtfrm.hxx>
-
// #i21457# - new implementation of local method <lcl_IsInSameTblBox(..)>.
// Method now determines the previous/next on its own. Thus, it can be controlled,
// for which previous/next is checked, if it's visible.
@@ -967,10 +965,7 @@ SwSectionNode* SwNode::FindSectionNode()
return pTmp->GetSectionNode();
}
-
-//---------
// SwSectionNode
-//---------
// ugly hack to make m_pSection const
static SwSectionFmt &
@@ -1047,7 +1042,6 @@ SwSectionNode::~SwSectionNode()
}
}
-
SwFrm *SwSectionNode::MakeFrm( SwFrm *pSib )
{
m_pSection->m_Data.SetHiddenFlag(false);
@@ -1264,7 +1258,6 @@ SwSectionNode* SwSectionNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) c
}
}
-
pNewSect->SetType( GetSection().GetType() );
pNewSect->SetCondition( GetSection().GetCondition() );
pNewSect->SetLinkFileName( GetSection().GetLinkFileName() );
@@ -1327,7 +1320,6 @@ sal_Bool SwSectionNode::IsCntntHidden() const
return sal_True; // Hide everything
}
-
void SwSectionNode::NodesArrChgd()
{
SwSectionFmt *const pFmt = m_pSection->GetFmt();
@@ -1383,7 +1375,6 @@ void SwSectionNode::NodesArrChgd()
}
}
-
OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
{
const OUString aName( ResId( STR_REGION_DEFNAME, *pSwResMgr ) );
@@ -1432,5 +1423,4 @@ OUString SwDoc::GetUniqueSectionName( const OUString* pChkStr ) const
return aName + OUString::number( ++nNum );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index db0de08..988cae6 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <hintids.hxx>
#include <editeng/lrspitem.hxx>
@@ -221,7 +220,6 @@ SwTableNode* SwDoc::IsIdxInTbl(const SwNodeIndex& rIdx)
return pTableNd;
}
-
/**
* Insert a new Box before the InsPos
*/
@@ -615,7 +613,6 @@ SwTableNode* SwNodes::InsertTable( const SwNodeIndex& rNdIdx,
return pTblNd;
}
-
/**
* Text to Table
*/
@@ -1415,7 +1412,6 @@ SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
return pTblNd;
}
-
/**
* Table to Text
*/
@@ -1494,7 +1490,6 @@ static void lcl_DelLine( SwTableLine* pLine, _DelTabPara* pPara )
pPara->pLastNd = aPara.pLastNd;
}
-
static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
{
OSL_ENSURE( pDelPara, "The parameters are missing" );
@@ -1557,7 +1552,6 @@ static void lcl_DelBox( SwTableBox* pBox, _DelTabPara* pDelPara )
}
}
-
sal_Bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
SwUndoTblToTxt* pUndo )
{
@@ -1671,7 +1665,6 @@ sal_Bool SwNodes::TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
return sal_True;
}
-
/**
* Inserting Columns/Rows
*/
@@ -2138,7 +2131,6 @@ sal_Bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
return bRet;
}
-
/**
* Split up/merge Boxes in the Table
*/
@@ -2211,7 +2203,6 @@ sal_Bool SwDoc::SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert, sal_uInt16 n
return bRet;
}
-
sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
{
// Check if the current cursor's Point/Mark are inside a Table
@@ -2317,8 +2308,6 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
return nRet;
}
-
-
/**
* SwTableNode
*
@@ -2453,7 +2442,6 @@ void SwTableNode::DelFrms()
}
}
-
void SwTableNode::SetNewTable( SwTable* pNewTable, sal_Bool bNewFrames )
{
DelFrms();
@@ -2520,9 +2508,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
pTab->GetTable()->GetTabCols( rFill, pBox );
}
-//
// Here are some little helpers used in SwDoc::GetTabRows
-//
#define ROWFUZZY 25
@@ -2547,10 +2533,7 @@ static bool lcl_IsFrmInColumn( const SwCellFrm& rFrm, SwSelBoxes& rBoxes )
return false;
}
-//
// SwDoc::GetTabRows()
-//
-
void SwDoc::GetTabRows( SwTabCols &rFill, const SwCursor* ,
const SwCellFrm* pBoxFrm ) const
{
@@ -2922,8 +2905,6 @@ void SwDoc::SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet )
SetModified();
}
-
-
void SwCollectTblLineBoxes::AddToUndoHistory( const SwCntntNode& rNd )
{
if( pHst )
@@ -3067,6 +3048,7 @@ sal_uInt16 aTableSplitBoxSetRange[] = {
RES_PROTECT, RES_PROTECT,
RES_VERT_ORIENT, RES_VERT_ORIENT,
0 };
+
SfxItemSet aTmpSet( pFmt->GetDoc()->GetAttrPool(),
aTableSplitBoxSetRange );
aTmpSet.Put( pFmt->GetAttrSet() );
@@ -3308,7 +3290,6 @@ public:
}
};
-
static void lcl_SplitTable_CpyBox( SwTableBox* pBox, _SplitTable_Para* pPara );
static void lcl_SplitTable_CpyLine( SwTableLine* pLn, _SplitTable_Para* pPara )
@@ -3631,7 +3612,6 @@ sal_Bool SwNodes::MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev,
return sal_True;
}
-
// Use the PtrArray's ForEach method
struct _SetAFmtTabPara
{
@@ -3714,7 +3694,6 @@ static bool lcl_SetAFmtBox( _FndBox & rBox, _SetAFmtTabPara *pSetPara )
return true;
}
-
/**
* AutoFormat for the Table/TableSelection
*/
@@ -3803,7 +3782,6 @@ sal_Bool SwDoc::SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt&
return sal_True;
}
-
/**
* Find out who has the Attributes
*/
@@ -3995,7 +3973,6 @@ sal_Bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
return bRet;
}
-
void SwDoc::ChkBoxNumFmt( SwTableBox& rBox, sal_Bool bCallUpdate )
{
// Optimization: If the Box says it's Text, it remains Text
@@ -4404,8 +4381,6 @@ sal_Bool SwDoc::InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
return bRet;
}
-
-
sal_Bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
{
bool bChgd = false;
@@ -4436,7 +4411,6 @@ sal_Bool SwDoc::_UnProtectTblCells( SwTable& rTbl )
return bChgd;
}
-
sal_Bool SwDoc::UnProtectCells( const String& rName )
{
sal_Bool bChgd = sal_False;
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx
index 95e2163..754f63b 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -52,7 +52,6 @@
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
-
extern void ClearFEShellTabCols();
// See swtable.cxx too
@@ -73,7 +72,6 @@ public:
static void Delete( std::vector<SwTblFmtCmp*> &rArr );
};
-
SwTblFmtCmp::SwTblFmtCmp( SwFrmFmt *pO, SwFrmFmt *pN, sal_Int16 nT )
: pOld ( pO ), pNew ( pN ), nType( nT )
{
@@ -190,7 +188,6 @@ struct LinesAndTable
rLines( rL ), rTable( rTbl ), bInsertLines( true ) {}
};
-
bool _FindLine( _FndLine & rLine, LinesAndTable* pPara );
bool _FindBox( _FndBox & rBox, LinesAndTable* pPara )
@@ -273,7 +270,6 @@ static void lcl_CollectLines( std::vector<SwTableLine*> &rArr, const SwCursor& r
}
}
-
static void lcl_ProcessRowAttr( std::vector<SwTblFmtCmp*>& rFmtCmp, SwTableLine* pLine, const SfxPoolItem& rNew )
{
SwFrmFmt *pNewFmt;
@@ -288,7 +284,6 @@ static void lcl_ProcessRowAttr( std::vector<SwTblFmtCmp*>& rFmtCmp, SwTableLine*
}
}
-
static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew );
static void lcl_ProcessRowSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableLine *pLine, const SwFmtFrmSize &rNew )
@@ -299,7 +294,6 @@ static void lcl_ProcessRowSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableLine
::lcl_ProcessBoxSize( rFmtCmp, rBoxes[i], rNew );
}
-
static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *pBox, const SwFmtFrmSize &rNew )
{
SwTableLines &rLines = pBox->GetTabLines();
@@ -312,7 +306,6 @@ static void lcl_ProcessBoxSize( std::vector<SwTblFmtCmp*> &rFmtCmp, SwTableBox *
}
}
-
void SwDoc::SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew )
{
SwTableNode* pTblNd = rCursor.GetPoint()->nNode.GetNode().FindTableNode();
@@ -1266,7 +1259,6 @@ sal_uInt16 SwDoc::GetBoxAlign( const SwCursor& rCursor ) const
return nAlign;
}
-
/**
* Class: SwDoc
* Methods: AdjustCellWidth()
@@ -1457,7 +1449,6 @@ static void lcl_CalcColValues( std::vector<sal_uInt16> &rToFill, const SwTabCols
}
}
-
void SwDoc::AdjustCellWidth( const SwCursor& rCursor, sal_Bool bBalance )
{
// Check whether the current Crsr has it's Point/Mark in a Table
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 7bb6f71..cde428a2 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/protitem.hxx>
@@ -93,7 +92,6 @@ void GetNewAutoStyle( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
rNode.SetModifyAtAttr( bSetModifyAtAttr );
}
-
void SetParent( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
const SwCntntNode& rNode,
const SwFmt* pParentFmt,
@@ -263,7 +261,6 @@ sal_uInt16 ClearItem_BC( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
|* All EndNodes of the BaseSection have level 0
|* All StartNodes of the BaseSection have level 1
*******************************************************************/
-
sal_uInt16 SwNode::GetSectionLevel() const
{
// EndNode of a BaseSection? They are always 0!
@@ -365,7 +362,6 @@ SwNode::~SwNode()
// Find the TableNode in which it is located.
// If we're not in a table: return 0
-
SwTableNode* SwNode::FindTableNode()
{
if( IsTableNode() )
@@ -376,7 +372,6 @@ SwTableNode* SwNode::FindTableNode()
return pTmp->GetTableNode();
}
-
// Is the node located in the visible area of the Shell?
sal_Bool SwNode::IsInVisibleArea( ViewShell* pSh ) const
{
@@ -718,7 +713,6 @@ const SwPageDesc* SwNode::FindPageDesc( sal_Bool bCalcLay,
return pPgDesc;
}
-
// If the node is located in a Fly, we return it formatted accordingly
SwFrmFmt* SwNode::GetFlyFmt() const
{
@@ -868,7 +862,6 @@ sal_uInt8 SwNode::HasPrevNextLayNode() const
|* IN
|* rNodes is the variable array in which the node is contained
*******************************************************************/
-
SwStartNode::SwStartNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
SwStartNodeType eSttNd )
: SwNode( rWhere, nNdType ), eSttNdTyp( eSttNd )
@@ -884,7 +877,6 @@ SwStartNode::SwStartNode( SwNodes& rNodes, sal_uLong nPos )
pEndOfSection = (SwEndNode*)this;
}
-
void SwStartNode::CheckSectionCondColl() const
{
//FEATURE::CONDCOLL
@@ -925,12 +917,7 @@ SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd )
pStartOfSection->pEndOfSection = this;
}
-
-
-// --------------------
// SwCntntNode
-// --------------------
-
SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
SwFmtColl *pColl )
@@ -987,7 +974,6 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
}
break;
-
case RES_FMT_CHG:
// If the Format parent was switched, register the Attrset at the new one
// Skip own Modify!
@@ -998,6 +984,7 @@ void SwCntntNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewV
AttrSetHandleHelper::SetParent( mpAttrSet, *this, GetFmtColl(), GetFmtColl() );
}
break;
+
//FEATURE::CONDCOLL
case RES_CONDCOLL_CONDCHG:
if( ((SwCondCollCondChg*)pNewValue)->pChangedFmt == GetRegisteredIn() &&
@@ -1081,8 +1068,6 @@ SwRect SwCntntNode::FindPageFrmRect( const sal_Bool bPrtArea, const Point* pPoin
xub_StrLen SwCntntNode::Len() const { return 0; }
-
-
SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
{
OSL_ENSURE( pNewColl, "Collectionpointer is 0." );
@@ -1119,7 +1104,6 @@ SwFmtColl *SwCntntNode::ChgFmtColl( SwFmtColl *pNewColl )
return pOldColl;
}
-
sal_Bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
{
sal_Bool bRet = sal_True;
@@ -1167,7 +1151,6 @@ sal_Bool SwCntntNode::GoNext(SwIndex * pIdx, sal_uInt16 nMode ) const
return bRet;
}
-
sal_Bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
{
sal_Bool bRet = sal_True;
@@ -1215,12 +1198,10 @@ sal_Bool SwCntntNode::GoPrevious(SwIndex * pIdx, sal_uInt16 nMode ) const
return bRet;
}
-
/*
* Creates all Views for the Doc for this Node.
* The created ContentFrames are attached to the corresponding Layout.
*/
-
void SwCntntNode::MakeFrms( SwCntntNode& rNode )
{
OSL_ENSURE( &rNode != this,
@@ -1263,7 +1244,6 @@ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
* Deletes all Views from the Doc for this Node.
* The ContentFrames are removed from the corresponding Layout.
*/
-
void SwCntntNode::DelFrms()
{
if( !GetDepends() )
@@ -1286,7 +1266,6 @@ void SwCntntNode::DelFrms()
}
}
-
SwCntntNode *SwCntntNode::JoinNext()
{
return this;
@@ -1298,8 +1277,6 @@ SwCntntNode *SwCntntNode::JoinPrev()
return this;
}
-
-
// Get info from Modify
bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
{
@@ -1329,7 +1306,6 @@ bool SwCntntNode::GetInfo( SfxPoolItem& rInfo ) const
return SwModify::GetInfo( rInfo );
}
-
// Set an Attribute
sal_Bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
{
@@ -1364,6 +1340,7 @@ sal_Bool SwCntntNode::SetAttr(const SfxPoolItem& rAttr )
}
return bRet;
}
+
#include <svl/itemiter.hxx>
sal_Bool SwCntntNode::SetAttr( const SfxItemSet& rSet )
@@ -1490,6 +1467,7 @@ sal_Bool SwCntntNode::ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
}
return bRet;
}
+
sal_Bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
{
if( !GetpSwAttrSet() )
@@ -1530,7 +1508,6 @@ sal_Bool SwCntntNode::ResetAttr( const std::vector<sal_uInt16>& rWhichArr )
return 0 != nDel ;
}
-
sal_uInt16 SwCntntNode::ResetAllAttr()
{
if( !GetpSwAttrSet() )
@@ -1569,7 +1546,6 @@ sal_uInt16 SwCntntNode::ResetAllAttr()
return aNew.Count();
}
-
sal_Bool SwCntntNode::GetAttr( SfxItemSet& rSet, sal_Bool bInParent ) const
{
if( rSet.Count() )
@@ -1686,10 +1662,7 @@ int SwCntntNode::CanJoinPrev( SwNodeIndex* pIdx ) const
return sal_True;
}
-
//FEATURE::CONDCOLL
-
-
void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
{
if( (!pColl && pCondColl) || ( pColl && !pCondColl ) ||
@@ -1721,7 +1694,6 @@ void SwCntntNode::SetCondFmtColl( SwFmtColl* pColl )
}
}
-
sal_Bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
{
const SwNodes& rNds = GetNodes();
@@ -1808,7 +1780,6 @@ sal_Bool SwCntntNode::IsAnyCondition( SwCollCondition& rTmp ) const
return sal_False;
}
-
void SwCntntNode::ChkCondColl()
{
// Check, just to be sure
@@ -1883,7 +1854,6 @@ short SwCntntNode::GetTextDirection( const SwPosition& rPos,
}
}
-
return nRet;
}
diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx
index 8801dd9..87e2f1f 100644
--- a/sw/source/core/docnode/node2lay.cxx
+++ b/sw/source/core/docnode/node2lay.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <switerator.hxx>
#include <calbck.hxx>
#include <node.hxx>
@@ -131,7 +130,6 @@ SwNode* GoPreviousWithFrm(SwNodeIndex *pIdx)
return pNd;
}
-
SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, bool bSearch )
: pUpperFrms( NULL ), nIndex( nIdx ), bInit( false )
{
@@ -462,5 +460,4 @@ SwFrm* SwNode2Layout::GetFrm( const Point* pDocPos,
return pImpl->GetFrm( pDocPos, pPos, bCalcFrm );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 4c02bf0..e3cc86c 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdlib.h>
#include <node.hxx>
@@ -44,13 +43,9 @@
typedef std::vector<SwStartNode*> SwSttNdPtrs;
-
// Funktion zum bestimmen des hoechsten Levels innerhalb des Bereiches
-
sal_uInt16 HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange );
-//-----------------------------------------------------------------------
-
/*******************************************************************
|* SwNodes::SwNodes
|*
@@ -98,7 +93,6 @@ SwNodes::SwNodes( SwDoc* pDocument )
|* in mehreren drin sein koennen
|*
*******************************************************************/
-
SwNodes::~SwNodes()
{
delete pOutlineNds;
@@ -396,7 +390,6 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
}
}
-
/***********************************************************************
|*
|* SwNodes::Move
@@ -414,7 +407,6 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
|* ( 1.Node: aStart, letzer Node: aEnd-1 !! )
|*
***********************************************************************/
-
sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
const SwNodeIndex& aIndex, sal_Bool bNewFrms )
{
@@ -698,8 +690,6 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
}
break;
-
-
case ND_SECTIONNODE:
if( !nLevel &&
GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNodes))
@@ -899,7 +889,6 @@ sal_Bool SwNodes::_MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
return sal_True;
}
-
/*******************************************************************
|*
|* SwNodes::SectionDown
@@ -1069,7 +1058,6 @@ void SwNodes::SectionUp(SwNodeRange *pRange)
SectionUpDown( aIdx, aTmpIdx );
}
-
/*************************************************************************
|*
|* SwNodes::SectionUpDown()
@@ -1125,9 +1113,6 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEn
}
}
-
-
-
/*******************************************************************
|*
|* SwNodes::Delete
@@ -1440,7 +1425,6 @@ SwCntntNode* SwNodes::GoPrevious(SwNodeIndex *pIdx) const
|* sal_False: ungueltiger SRange
|*
*************************************************************************/
-
inline int TstIdx( sal_uLong nSttIdx, sal_uLong nEndIdx, sal_uLong nStt, sal_uLong nEnd )
{
return nStt < nSttIdx && nEnd >= nSttIdx &&
@@ -1464,7 +1448,6 @@ sal_Bool SwNodes::CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& r
return sal_False; // liegt irgendwo dazwischen, FEHLER
}
-
/*************************************************************************
|*
|* void SwNodes::DelNodes()
@@ -1533,7 +1516,6 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart, sal_uLong nCnt )
}
}
-
/*************************************************************************
|*
|* sal_uInt16 HighestLevel( SwNodes & rNodes, const SwNodeRange & rRange )
@@ -1820,8 +1802,6 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
rNodes.IsDocNodes() ? SWFMTFLD_INSERTED : SWFMTFLD_REMOVED ) );
}
-
-
/*************************************************************************
|*
|* SwNodes::_Copy()
@@ -1832,7 +1812,6 @@ void SwNodes::MoveRange( SwPaM & rPam, SwPosition & rPos, SwNodes& rNodes )
|* SwIndex& auf diese Position im Nodes-Array
|*
*************************************************************************/
-
void SwNodes::_CopyNodes( const SwNodeRange& rRange,
const SwNodeIndex& rIndex, sal_Bool bNewFrms, sal_Bool bTblInsDummyNode ) const
{
@@ -2061,7 +2040,6 @@ SwStartNode* SwNodes::MakeEmptySection( const SwNodeIndex& rIdx,
return pSttNd;
}
-
SwStartNode* SwNodes::MakeTextSection( const SwNodeIndex & rWhere,
SwStartNodeType eSttNdTyp,
SwTxtFmtColl *pColl,
@@ -2184,7 +2162,6 @@ SwCntntNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
return 0;
}
-
// suche den vorhergehenden [/nachfolgenden ] ContentNode oder
// TabellenNode mit Frames. Wird kein Ende angeben, dann wird mit
// dem FrameIndex begonnen; ansonsten, wird mit dem vor rFrmIdx und
diff --git a/sw/source/core/docnode/observablethread.cxx b/sw/source/core/docnode/observablethread.cxx
index ba372c0..7b6931f 100644
--- a/sw/source/core/docnode/observablethread.cxx
+++ b/sw/source/core/docnode/observablethread.cxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <observablethread.hxx>
+#include <observablethread.hxx>
#include <boost/shared_ptr.hpp>
/** class for an observable thread
diff --git a/sw/source/core/docnode/pausethreadstarting.cxx b/sw/source/core/docnode/pausethreadstarting.cxx
index b00f190..767cce3 100644
--- a/sw/source/core/docnode/pausethreadstarting.cxx
+++ b/sw/source/core/docnode/pausethreadstarting.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <pausethreadstarting.hxx>
#include <swthreadmanager.hxx>
@@ -26,6 +27,7 @@
@author OD
*/
+
SwPauseThreadStarting::SwPauseThreadStarting()
: mbPausedThreadStarting( false )
{
diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx
index a8051b1..bde75ed 100644
--- a/sw/source/core/docnode/retrievedinputstreamdata.cxx
+++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <retrievedinputstreamdata.hxx>
#include <retrieveinputstreamconsumer.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index 9c4996d..e72a6e9 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <retrieveinputstream.hxx>
#include <comphelper/mediadescriptor.hxx>
#include <com/sun/star/io/XStream.hpp>
diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
index d7b1f22..0beed7d 100644
--- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
+++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <retrieveinputstreamconsumer.hxx>
#include <ndgrf.hxx>
#include <retrieveinputstream.hxx>
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index ecd2f94..0bf8ad0 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <stdlib.h>
#include <hintids.hxx>
#include <svl/intitem.hxx>
@@ -61,7 +60,6 @@
using namespace ::com::sun::star;
-
SV_IMPL_REF( SwServerObject )
class SwIntrnlSectRefLink : public SwBaseLink
@@ -88,11 +86,9 @@ public:
}
};
-
TYPEINIT1(SwSectionFmt,SwFrmFmt );
TYPEINIT1(SwSection,SwClient );
-
SwSectionData::SwSectionData(SectionType const eType, OUString const& rName)
: m_eType(eType)
, m_sSectionName(rName)
@@ -226,7 +222,6 @@ SwSection::SwSection(
}
}
-
SwSection::~SwSection()
{
SwSectionFmt* pFmt = GetFmt();
@@ -300,7 +295,6 @@ bool SwSection::DataEquals(SwSectionData const& rCmp) const
return bResult;
}
-
void SwSection::ImplSetHiddenFlag(bool const bTmpHidden, bool const bCondition)
{
SwSectionFmt* pFmt = GetFmt();
@@ -380,7 +374,6 @@ void SwSection::SetHidden(bool const bFlag)
ImplSetHiddenFlag(bFlag, m_Data.IsCondHidden());
}
-
void SwSection::SetProtect(bool const bFlag)
{
SwSectionFmt *const pFormat( GetFmt() );
@@ -554,7 +547,6 @@ void SwSection::SetCondHidden(bool const bFlag)
ImplSetHiddenFlag(m_Data.IsHidden(), bFlag);
}
-
// Set/remove the linked FileName
OUString SwSection::GetLinkFileName() const
{
@@ -594,7 +586,6 @@ OUString SwSection::GetLinkFileName() const
return m_Data.GetLinkFileName();
}
-
void SwSection::SetLinkFileName(const OUString& rNew, OUString const*const pPassWd)
{
if (m_RefLink.Is())
@@ -691,7 +682,6 @@ SwSectionFmt::~SwSectionFmt()
}
}
-
SwSection * SwSectionFmt::GetSection() const
{
return SwIterator<SwSection,SwSectionFmt>::FirstElement( *this );
@@ -740,7 +730,6 @@ void SwSectionFmt::DelFrms()
}
}
-
// Create the Views
void SwSectionFmt::MakeFrms()
{
@@ -1041,7 +1030,6 @@ void SwSectionFmt::UpdateParent()
} while( 0 != ( pLast = ++aIter ));
}
-
SwSectionNode* SwSectionFmt::GetSectionNode(bool const bAlways)
{
const SwNodeIndex* pIdx = GetCntnt(sal_False).GetCntntIdx();
@@ -1106,7 +1094,6 @@ SwSectionFmt::MakeUnoObject()
return xMeta;
}
-
// Method to break section links inside a linked section
static void lcl_BreakSectionLinksInSect( const SwSectionNode& rSectNd )
{
@@ -1188,7 +1175,6 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
}
}
-
::sfx2::SvBaseLink::UpdateResult SwIntrnlSectRefLink::DataChanged(
const OUString& rMimeType, const uno::Any & rValue )
{
@@ -1440,7 +1426,6 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
}
}
-
// remove all undo actions and turn undo on again
pDoc->GetIDocumentUndoRedo().DelAllUndoObj();
pDoc->GetIDocumentUndoRedo().DoUndo(bWasUndo);
@@ -1459,7 +1444,6 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
return SUCCESS;
}
-
void SwIntrnlSectRefLink::Closed()
{
SwDoc* pDoc = rSectFmt.GetDoc();
@@ -1506,7 +1490,6 @@ void SwIntrnlSectRefLink::Closed()
SvBaseLink::Closed();
}
-
void SwSection::CreateLink( LinkCreateType eCreateType )
{
SwSectionFmt* pFmt = GetFmt();
@@ -1604,7 +1587,6 @@ const SwNode* SwIntrnlSectRefLink::GetAnchor() const
return rSectFmt.GetSectionNode( sal_False );
}
-
sal_Bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
xub_StrLen , xub_StrLen ) const
{
@@ -1631,5 +1613,4 @@ SwSectionFmts::~SwSectionFmts()
delete *it;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index e26cd3f..31b01a4 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
@@ -82,7 +81,6 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
rGrfNd.UnlockModify();
}
-
::sfx2::SvBaseLink::UpdateResult SwBaseLink::DataChanged(
const OUString& rMimeType, const uno::Any & rValue )
{
@@ -273,7 +271,6 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
pCntntNode->ModifyNotification( &aMsgHint, &aMsgHint );
}
-
if( pESh )
{
const sal_Bool bEndActionByVirDev = pESh->IsEndActionByVirDev();
@@ -374,7 +371,6 @@ sal_Bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfN
return bRet;
}
-
sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat )
{
bSwapIn = sal_True;
diff --git a/sw/source/core/docnode/swthreadjoiner.cxx b/sw/source/core/docnode/swthreadjoiner.cxx
index f68e9cb..b572150 100644
--- a/sw/source/core/docnode/swthreadjoiner.cxx
+++ b/sw/source/core/docnode/swthreadjoiner.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <swthreadjoiner.hxx>
#include <finalthreadmanager.hxx>
#include <com/sun/star/util/JobManager.hpp>
diff --git a/sw/source/core/docnode/swthreadmanager.cxx b/sw/source/core/docnode/swthreadmanager.cxx
index 11ef3e9..d96daea 100644
--- a/sw/source/core/docnode/swthreadmanager.cxx
+++ b/sw/source/core/docnode/swthreadmanager.cxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include <swthreadmanager.hxx>
#include <swthreadjoiner.hxx>
#include <observablethread.hxx>
More information about the Libreoffice-commits
mailing list