[Libreoffice-commits] core.git: sw/source
Philipp Riemer
ruderphilipp at gmail.com
Wed Oct 2 01:17:56 PDT 2013
sw/source/core/doc/acmplwrd.cxx | 1 -
sw/source/core/doc/docbm.cxx | 1 -
sw/source/core/doc/docedt.cxx | 1 -
sw/source/core/doc/docfly.cxx | 2 --
sw/source/core/doc/docfmt.cxx | 7 -------
sw/source/core/doc/docftn.cxx | 1 -
sw/source/core/doc/docglbl.cxx | 2 --
sw/source/core/doc/doclay.cxx | 4 ----
sw/source/core/doc/docnew.cxx | 2 --
sw/source/core/doc/docnum.cxx | 3 ---
sw/source/core/doc/docsort.cxx | 1 -
sw/source/core/doc/doctxm.cxx | 1 -
12 files changed, 26 deletions(-)
New commits:
commit a323a7df85c6b782cdbd2a35ba0498ceeeb40dec
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Thu Sep 26 13:08:06 2013 +0200
whitespace work in sw/source/core/doc/
Change-Id: I79561a63db523b8da8de72a1096e908d184a8a0b
Reviewed-on: https://gerrit.libreoffice.org/6076
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 050b9f5..92ccc0e 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -148,7 +148,6 @@ void SwAutoCompleteClient::Modify( const SfxPoolItem* pOld, const SfxPoolItem *)
((SwModify*)GetRegisteredIn())->Remove(this);
pAutoCompleteWord->DocumentDying(*pDoc);
break;
-
}
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index c9e7684..b89917b 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -905,7 +905,6 @@ namespace
// 0x0801 = Crsr from the CrsrShell Point
// 0x0400 = UnoCrsr Mark
// 0x0401 = UnoCrsr Point
- //
class _SwSaveTypeCountContent
{
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 35299c8..09cbd16 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -483,7 +483,6 @@ static void lcl_SaveRedlines( const SwPaM& aPam, _SaveRedlines& rArr )
if( eCompare == POS_OVERLAP_BEFORE ||
eCompare == POS_OUTSIDE )
{
-
SwRedline* pNewRedline = new SwRedline( *pCurrent );
*pNewRedline->End() = *pStart;
*pCurrent->Start() = *pStart;
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 292da26..37b711c 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -226,7 +226,6 @@ sal_Int8 SwDoc::SetFlyFrmAnchor( SwFrmFmt& rFmt, SfxItemSet& rSet, bool bNewFrms
if( nOld == nNew )
return DONTMAKEFRMS;
-
Point aOldAnchorPos( ::lcl_FindAnchorLayPos( *this, rOldAnch, &rFmt ));
Point aNewAnchorPos( ::lcl_FindAnchorLayPos( *this, aNewAnch, 0 ));
@@ -799,7 +798,6 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
static_cast<SwAnchoredDrawObject*>(pContact->GetAnchoredObj( 0L ))
->AdjustPositioningAttr( pNewAnchorFrm,
&aNewObjRect );
-
}
else
{
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 2af2290..1685b58 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -978,7 +978,6 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
// Reset all attributes from the set!
if( pCharSet && pCharSet->Count() && !( nsSetAttrMode::SETATTR_DONTREPLACE & nFlags ) )
{
-
ParaRstFmt aPara( pStt, pEnd, pHistory, 0, pCharSet );
pDoc->GetNodes().ForEach( aSt, aEnd, lcl_RstTxtAttr, &aPara );
}
@@ -1047,7 +1046,6 @@ lcl_InsAttr(SwDoc *const pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
continue;
SwTxtNode *pCurrentNd = (SwTxtNode*)pNd;
pCurrentNd->TryCharSetExpandToNum(*pCharSet);
-
}
}
@@ -1470,7 +1468,6 @@ sal_uInt16 SwDoc::GetTblFrmFmtCount(bool bUsed) const
--nCount;
}
}
-
return nCount;
}
@@ -1505,7 +1502,6 @@ SwFrmFmt *SwDoc::MakeFrmFmt(const String &rFmtName,
SwFrmFmt *pDerivedFrom,
bool bBroadcast, bool bAuto)
{
-
SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), rFmtName, pDerivedFrom );
pFmt->SetAuto(bAuto);
@@ -1688,7 +1684,6 @@ static bool lcl_SetTxtFmtColl( const SwNodePtr& rpNode, void* pArgs )
SwTxtFmtColl* pFmt = static_cast<SwTxtFmtColl*>(pPara->pFmtColl);
if ( pPara->bReset )
{
-
if( pFmt->GetAttrOutlineLevel() == 0 && pPara )
pPara->bKeepOutlineLevelAttr = true;
@@ -2372,13 +2367,11 @@ void SwDoc::_CreateNumberFormatter()
{
OSL_ENSURE( !mpNumberFormatter, "is already there" );
-
LanguageType eLang = LANGUAGE_SYSTEM;
mpNumberFormatter = new SvNumberFormatter( comphelper::getProcessComponentContext(), eLang );
mpNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL );
mpNumberFormatter->SetYear2000(static_cast<sal_uInt16>(::utl::MiscCfg().GetYear2000()));
-
}
SwTblNumFmtMerge::SwTblNumFmtMerge( const SwDoc& rSrc, SwDoc& rDest )
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index b87a8a6..bddcbc8 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -491,7 +491,6 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
rFtnArr.UpdateAllFtn();
}
else if( pTmpRoot )
- //
{
std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index 21e2618..272617d 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -240,7 +240,6 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
aTmplDate += a2Min;
}
-
// Skip all invalid ones
while( nOutl < pOutlNds->size() &&
(*pOutlNds)[ nOutl ]->GetIndex() < GetNodes().GetEndOfExtras().GetIndex() )
@@ -314,7 +313,6 @@ bool SwDoc::SplitDoc( sal_uInt16 eDocType, const String& rPath, bool bOutline, c
// All Flys in the section
CopyFlyInFlyImpl( aRg, 0, aIdx );
-
// And what's with all the Bookmarks?
// ?????
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index e2bf370..0012b53 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -566,7 +566,6 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos,
pFmt->SetFmtAttr( SwFmtCntnt( rNode.StartOfSectionNode() ));
-
const SwFmtAnchor* pAnchor = 0;
if( pFlySet )
{
@@ -1266,7 +1265,6 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
// and then size calculations could not be correct anymore.
pNewSet->Put( SvxBoxItem(RES_BOX) );
pNewSet->Put( SvxShadowItem(RES_SHADOW) );
-
}
// Always transfer the anchor, which is a hard attribute anyways.
@@ -1308,7 +1306,6 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
pNewFmt );
}
-
// The old one should not have a flow and it should be adjusted to above and
// middle.
// Also, the width should be 100% and it should also adjust the hight, if changed.
@@ -2145,7 +2142,6 @@ bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
}
}
-
const SwNode* pFlyNd = pNd->FindFlyStartNode();
while( pFlyNd )
{
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 1a2fb44..5f0eb42 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -996,7 +996,6 @@ void SwDoc::UpdateLinks( bool bUI )
}
}
}
-
}
::sfx2::IXmlIdRegistry&
@@ -1166,7 +1165,6 @@ void SwDoc::Paste( const SwDoc& rSource )
SwNodeIndex aTargetIdx( GetNodes().GetEndOfExtras(), 2 );
SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
-
aCpyPam.SetMark();
aCpyPam.Move( fnMoveForward, fnGoDoc );
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 8057764..bf5952d 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1653,10 +1653,8 @@ bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
else if (bOnlyNonOutline)
{
/* #i24560#
-
Only promote or demote if all selected paragraphs are
promotable resp. demotable.
-
*/
for (sal_uLong nTmp = nStt; nTmp <= nEnd; ++nTmp)
{
@@ -2275,7 +2273,6 @@ OUString SwDoc::GetUniqueNumRuleName( const OUString* pChkStr, bool bAutoNum ) c
++nNum, nTmp >>= 1;
break;
}
-
}
delete [] pSetFlags;
if( pChkStr && !pChkStr->isEmpty() )
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 615ff30..d9f4315 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -760,7 +760,6 @@ FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const _FndBox& rBox) :
_FndBox** ppTmp = (_FndBox**)pArr;
memset( ppTmp, 0, sizeof(const _FndBox*) * nRows * nCols );
-
FillFlat( rBoxRef );
}
}
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 510a890..1d7425e 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -871,7 +871,6 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
DelFlyInRange( SwNodeIndex(aSttIdx, -1), aEndIdx );
pDoc->GetNodes().Delete( aSttIdx, aEndIdx.GetIndex() - aSttIdx.GetIndex() );
-
}
// insert title of TOX
More information about the Libreoffice-commits
mailing list