diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /svx/source/table/tablelayouter.cxx | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'svx/source/table/tablelayouter.cxx')
-rw-r--r-- | svx/source/table/tablelayouter.cxx | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 1df137851e40..4eb2ea1e289b 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -48,15 +48,12 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; - namespace sdr { namespace table { - static SvxBorderLine gEmptyBorder; - TableLayouter::TableLayouter( const TableModelRef& xTableModel ) : mxTable( xTableModel ) , msSize( "Size" ) @@ -64,14 +61,12 @@ TableLayouter::TableLayouter( const TableModelRef& xTableModel ) } - TableLayouter::~TableLayouter() { ClearBorderLayout(); } - basegfx::B2ITuple TableLayouter::getCellSize( const CellRef& xCell, const CellPos& rPos ) const { sal_Int32 width = 0; @@ -115,7 +110,6 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellRef& xCell, const CellPo } - bool TableLayouter::getCellArea( const CellRef& xCell, const CellPos& rPos, basegfx::B2IRectangle& rArea ) const { try @@ -170,7 +164,6 @@ sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const } - bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const { const BorderLineMap& rMap = bHorizontal ? maHorizontalBorders : maVerticalBorders; @@ -189,7 +182,6 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor } - /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const { @@ -213,7 +205,6 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, } - sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { sal_Int32 nRet = 0; @@ -244,7 +235,6 @@ sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/ } - sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ ) { sal_Int32 nRet = 0; @@ -299,7 +289,6 @@ sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, } - static bool checkMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 nMergedY, sal_Int32 nCellX, sal_Int32 nCellY, bool& bRunning ) { Reference< XMergeableCell > xCell( xTable->getCellByPosition( nCellX, nCellY ), UNO_QUERY ); @@ -420,7 +409,6 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 } - sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) { if( isValidColumn( nColumn ) ) @@ -435,7 +423,6 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn ) } - sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ) { // break loops after 100 runs to avoid freezing office due to developer error @@ -505,13 +492,11 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu } - typedef std::vector< CellRef > MergeableCellVector; typedef std::vector< MergeableCellVector > MergeVector; typedef std::vector< sal_Int32 > Int32Vector; - void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) { const sal_Int32 nColCount = getColumnCount(); @@ -664,7 +649,6 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit ) } - void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) { const sal_Int32 nColCount = getColumnCount(); @@ -822,7 +806,6 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit ) } - /** try to fit the table into the given rectangle. If the rectangle is to small, it will be grown to fit the table. */ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFitHeight ) @@ -855,7 +838,6 @@ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFi } - void TableLayouter::updateCells( Rectangle& rRectangle ) { const sal_Int32 nColCount = getColumnCount(); @@ -886,7 +868,6 @@ void TableLayouter::updateCells( Rectangle& rRectangle ) } - CellRef TableLayouter::getCell( const CellPos& rPos ) const { CellRef xCell; @@ -902,7 +883,6 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const } - bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) { if (!pThis || ((pThis == &gEmptyBorder) && (pOther != nullptr))) @@ -938,7 +918,6 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine } - void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine ) { if( pLine == nullptr ) @@ -961,7 +940,6 @@ void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, } - void TableLayouter::ClearBorderLayout() { ClearBorderLayout(maHorizontalBorders); @@ -969,7 +947,6 @@ void TableLayouter::ClearBorderLayout() } - void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) { const sal_Int32 nColCount = rMap.size(); @@ -992,7 +969,6 @@ void TableLayouter::ClearBorderLayout(BorderLineMap& rMap) } - void TableLayouter::ResizeBorderLayout() { ClearBorderLayout(); @@ -1001,7 +977,6 @@ void TableLayouter::ResizeBorderLayout() } - void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) { const sal_Int32 nColCount = getColumnCount() + 1; @@ -1018,7 +993,6 @@ void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap ) } - void TableLayouter::UpdateBorderLayout() { // make sure old border layout is cleared and border maps have correct size @@ -1061,7 +1035,6 @@ void TableLayouter::UpdateBorderLayout() } - void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol ) { if( mxTable.is() ) try @@ -1100,7 +1073,6 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, } - void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow ) { if( mxTable.is() ) try |