summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Riemer <ruderphilipp@gmail.com>2014-02-16 20:17:53 +0100
committerPhilipp Riemer <ruderphilipp@gmail.com>2014-02-16 20:22:08 +0100
commitc6a842ebc8bed02ff0678f3ed6d47e4bb2e6e6cd (patch)
treeef2a8b7dfe133ec90e79e4cce37dfe0a33b700e6
parentaba99b4ae4b87d242302b39cb53ec5b0443d5c04 (diff)
fdo#62475 - remove visual noise
Change-Id: I36e970c2ed13c50e5f6cebf95aa36ca8194a01ce
-rw-r--r--sw/source/core/layout/flowfrm.cxx3
-rw-r--r--sw/source/core/layout/frmtool.cxx1
-rw-r--r--sw/source/core/layout/layact.cxx1
-rw-r--r--sw/source/core/layout/laycache.cxx3
-rw-r--r--sw/source/core/layout/pagechg.cxx1
-rw-r--r--sw/source/core/layout/paintfrm.cxx3
6 files changed, 2 insertions, 10 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 44152e7fa68e..ae3320db279d 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -672,11 +672,10 @@ SwTabFrm* SwTabFrm::FindMaster( bool bFirstMaster ) const
{
if ( bFirstMaster )
{
- //
// Optimization. This makes code like this obsolete:
// while ( pTab->IsFollow() )
// pTab = pTab->FindMaster();
- //
+
if ( !pTab->IsFollow() )
{
SwTabFrm* pNxt = pTab;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 0dbd773174e3..22442d8dce1d 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1714,6 +1714,7 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx,
}
else
bSplit = sal_False;
+
::_InsertCnt( pUpper, pDoc, rSttIdx.GetIndex(), sal_False,
nEndIdx, pPrv );
// OD 23.06.2003 #108784# - correction: append objects doesn't
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 64367c65e98f..9fc382343f9e 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1332,7 +1332,6 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect )
for ( i = 0; i < aRegion.size(); ++i )
pImp->GetShell()->AddPaintRect( aRegion[i] );
}
-
}
else
{
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index bc7bf8530dff..212135404101 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -55,7 +55,6 @@
#include <set>
-
using namespace ::com::sun::star;
/*
@@ -934,7 +933,6 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage )
SwSortedObjs &rObjs = *pPage->GetSortedObjs();
sal_uInt16 nPgNum = pPage->GetPhyPageNum();
- //
// NOTE: Here we do not use the absolute ordnums but
// relative ordnums for the objects on this page.
@@ -1123,7 +1121,6 @@ bool SwLayCacheIoImpl::OpenRec( sal_uInt8 cType )
}
// Close record
-
bool SwLayCacheIoImpl::CloseRec( sal_uInt8 )
{
bool bRes = true;
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index f04ace5eacd9..7537c9d43bf3 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1599,7 +1599,6 @@ void SwRootFrm::ImplCalcBrowseWidth()
break;
default:
break;
-
}
nBrowseWidth = std::max( nBrowseWidth, nWidth );
}
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index a4653edea202..4eaa93cb0b56 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3514,7 +3514,6 @@ static drawinglayer::primitive2d::Primitive2DSequence lcl_CreateDashedIndicatorP
aSeq[0] = drawinglayer::primitive2d::Primitive2DReference( pPlainLine );
-
// Dashed line in twips
aStrokePattern.push_back( 40 );
aStrokePattern.push_back( 40 );
@@ -3611,7 +3610,6 @@ void SwColumnFrm::PaintBreak( ) const
basegfx::BColor aLineColor = SwViewOption::GetPageBreakColor().getBColor();
-
drawinglayer::primitive2d::Primitive2DSequence aSeq =
lcl_CreateDashedIndicatorPrimitive( aStart, aEnd, aLineColor );
aSeq.realloc( aSeq.getLength( ) + 1 );
@@ -6816,7 +6814,6 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
( IsCellFrm() && IsCoveredCell() ) )
return;
}
- // <-- collapsing
const bool bFlys = pPage->GetSortedObjs() ? true : false;