[Libreoffice-commits] core.git: sw/source
Philipp Riemer
ruderphilipp at gmail.com
Fri Aug 9 13:53:37 PDT 2013
sw/source/core/doc/SwStyleNameMapper.cxx | 2 ++
sw/source/core/doc/doc.cxx | 1 -
sw/source/core/doc/docbm.cxx | 4 ----
sw/source/core/doc/doccomp.cxx | 1 -
sw/source/core/doc/docdesc.cxx | 1 -
sw/source/core/doc/docedt.cxx | 1 -
sw/source/core/doc/docfmt.cxx | 3 ---
sw/source/core/doc/docredln.cxx | 4 ----
sw/source/core/doc/htmltbl.cxx | 3 ---
sw/source/core/doc/poolfmt.cxx | 1 -
sw/source/core/doc/swstylemanager.hxx | 1 +
sw/source/core/doc/tblafmt.cxx | 1 -
12 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit cbcec9930cd6f601b1d4ebfd7ee0351d7d0a097e
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Fri Aug 9 21:27:32 2013 +0200
cleanup blank lines in sw/source/core/doc
Change-Id: Idd4704f3056663f56fab6e56112e5c9eff55aef7
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index 4fe5508..336329f 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -21,6 +21,7 @@
#include <tools/resmgr.hxx>
#include <poolfmt.hxx>
#include <rcid.hrc>
+
#ifdef _NEED_TO_DEBUG_MAPPING
#include <stdlib.h>
#endif
@@ -848,6 +849,7 @@ SwStyleNameMapper::GetProgName(sal_uInt16 const nId, const OUString& rName)
{
return getNameFromId(nId, rName, true);
}
+
// This gets the PoolId from the UI Name
sal_uInt16 SwStyleNameMapper::GetPoolIdFromUIName(
const OUString& rName, SwGetPoolIdFromName const eFlags)
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index ff71f35..5fe4cb6 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2193,7 +2193,6 @@ bool SwDoc::RemoveInvisibleContent()
// 1. removing the paragraph would result in an empty section or
// 2. if the paragraph is the last paragraph in the section and
// there is no paragraph in front of the paragraph:
-
if ( ( 2 == pTxtNd->EndOfSectionIndex() - pTxtNd->StartOfSectionIndex() ) ||
( 1 == pTxtNd->EndOfSectionIndex() - pTxtNd->GetIndex() &&
!GetNodes()[ pTxtNd->GetIndex() - 1 ]->GetTxtNode() ) )
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 7d81e41..ae066c7 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -874,7 +874,6 @@ namespace sw { namespace mark
}} // namespace ::sw::mark
-
#define PCURCRSR (_pCurrCrsr)
#define FOREACHPAM_START(pSttCrsr) \
{\
@@ -987,7 +986,6 @@ namespace
return nReturn;
}
-
static inline int lcl_Greater( const SwPosition& rPos, const SwNodeIndex& rNdIdx, const SwIndex* pIdx )
{
return rPos.nNode > rNdIdx || ( pIdx && rPos.nNode == rNdIdx && rPos.nContent > pIdx->GetIndex() );
@@ -1024,11 +1022,9 @@ namespace
rSave.DecType();
}
}
-
}
// IDocumentMarkAccess for SwDoc
-
IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess()
{ return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); }
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 10e2279..9bf69d7 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1512,7 +1512,6 @@ void SwCompareData::ShowInsert( sal_uLong nStt, sal_uLong nEnd )
pInsRing = pTmp;
// #i65201#: These SwPaMs are calculated smaller than needed, see comment below
-
}
void SwCompareData::ShowDelete( const CompareData& rData, sal_uLong nStt,
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 121e065..6d2cfdc 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -437,7 +437,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
pBindings->Invalidate( SID_ATTR_PAGE_ULSPACE );
pBindings->Invalidate( SID_ATTR_PAGE_LRSPACE );
}
-
}
/// All descriptors whose Follow point to the to-be-deleted have to be adapted.
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 512121f..9bee581 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1788,7 +1788,6 @@ bool SwDoc::DeleteRange( SwPaM & rPam )
return lcl_DoWithBreaks( *this, rPam, &SwDoc::DeleteRangeImpl );
}
-
static void lcl_syncGrammarError( SwTxtNode &rTxtNode, linguistic2::ProofreadingResult& rResult,
xub_StrLen /*nBeginGrammarCheck*/, const ModelToViewHelper &rConversionMap )
{
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index dc78244..7fe4e19 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1532,7 +1532,6 @@ SwFmt *SwDoc::_MakeFrmFmt(const String &rFmtName,
return dynamic_cast<SwFmt*>(pFrmFmt);
}
-
// #i40550# - add parameter <bAuto> - not relevant
SwCharFmt *SwDoc::MakeCharFmt( const String &rFmtName,
SwCharFmt *pDerivedFrom,
@@ -1604,7 +1603,6 @@ SwFmt *SwDoc::_MakeTxtFmtColl(const String &rFmtName,
return dynamic_cast<SwFmt*>(pTxtFmtColl);
}
-
//FEATURE::CONDCOLL
SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
@@ -1625,7 +1623,6 @@ SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const String &rFmtName,
//FEATURE::CONDCOLL
// GRF
-
SwGrfFmtColl* SwDoc::MakeGrfFmtColl( const String &rFmtName,
SwGrfFmtColl *pDerivedFrom )
{
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index cdc7bda0..29209b7 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -262,11 +262,9 @@ bool CheckPosition( const SwPosition* pStt, const SwPosition* pEnd )
#endif
/*
-
Text means Text not "polluted" by Redlines.
Behaviour of Insert-Redline:
-
- in the Text - insert Redline Object
- in InsertRedline (own) - ignore, existing is extended
- in InsertRedline (others) - split up InsertRedline and
@@ -287,7 +285,6 @@ Behaviour of Delete-Redline:
other Insert is overlapped by
the Delete
*/
-
bool SwDoc::AppendRedline( SwRedline* pNewRedl, bool bCallDelete )
{
bool bError = true;
@@ -3808,7 +3805,6 @@ String SwRedline::GetDescr(sal_uInt16 nPos)
return aResult;
}
-
bool SwDoc::IsInRedlines(const SwNode & rNode) const
{
SwPosition aPos(rNode);
diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx
index 2a2bb2f8..0287a98 100644
--- a/sw/source/core/doc/htmltbl.cxx
+++ b/sw/source/core/doc/htmltbl.cxx
@@ -864,7 +864,6 @@ void SwHTMLTableLayout::AutoLayoutPass1()
pConstr = pConstr->GetNext();
}
-
if( bFixRelWidths )
{
if( HasColTags() )
@@ -1126,7 +1125,6 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv
nRelAvail -= (nRelLeftFill + nRelRightFill);
}
-
// Step 2: Calculate the absolute table width.
sal_uInt16 nAbsTabWidth = 0;
bUseRelWidth = false;
@@ -1182,7 +1180,6 @@ void SwHTMLTableLayout::AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAv
if( (!IsTopTable() || nRelAvail>0) && nAbsTabWidth>nAbsAvail )
nAbsTabWidth = nAbsAvail;
-
// Step 3: Identify the column width and, if applicable, the absolute
// and relative table widths.
if( (!IsTopTable() && nMin > (sal_uLong)nAbsAvail) ||
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 1fac06b..b2e6735 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1166,7 +1166,6 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
}
break;
-
case RES_POOLCHR_BUL_LEVEL: // Bullet character
{
const Font& rBulletFont = numfunc::GetDefBulletFont();
diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx
index 379cdf3..d2851ef 100644
--- a/sw/source/core/doc/swstylemanager.hxx
+++ b/sw/source/core/doc/swstylemanager.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 _SWSTYLEMANAGER_HXX
#define _SWSTYLEMANAGER_HXX
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 9d6a863..fa7e792 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -391,7 +391,6 @@ SwBoxAutoFmt& SwBoxAutoFmt::operator=( const SwBoxAutoFmt& rNew )
return *this;
}
-
#define READ( aItem, aItemType, nVers )\
pNew = aItem.Create(rStream, nVers ); \
aItem = *(aItemType*)pNew; \
More information about the Libreoffice-commits
mailing list