diff options
Diffstat (limited to 'sc/source/core/data/scdpoutputimpl.cxx')
| -rw-r--r-- | sc/source/core/data/scdpoutputimpl.cxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/sc/source/core/data/scdpoutputimpl.cxx b/sc/source/core/data/scdpoutputimpl.cxx index 0ca69195dd63..330ebfa21c74 100644 --- a/sc/source/core/data/scdpoutputimpl.cxx +++ b/sc/source/core/data/scdpoutputimpl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -50,16 +50,16 @@ void OutputImpl::OutputDataArea() AddRow( mnDataStartRow ); AddCol( mnDataStartCol ); - mnCols.push_back( mnTabEndCol+1); //set last row bottom + mnCols.push_back( mnTabEndCol+1); //set last row bottom mnRows.push_back( mnTabEndRow+1); //set last col bottom - + BOOL bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() ); - + std::sort( mnCols.begin(), mnCols.end(), lcl_compareColfuc ); std::sort( mnRows.begin(), mnRows.end(), lcl_compareRowfuc ); - + for( SCCOL nCol = 0; nCol < (SCCOL)mnCols.size()-1; nCol ++ ) - { + { if ( !bAllRows ) { if ( nCol < (SCCOL)mnCols.size()-2) @@ -67,7 +67,7 @@ void OutputImpl::OutputDataArea() for ( SCROW i = nCol%2; i < (SCROW)mnRows.size()-2; i +=2 ) OutputBlockFrame( mnCols[nCol], mnRows[i], mnCols[nCol+1]-1, mnRows[i+1]-1 ); if ( mnRows.size()>=2 ) - OutputBlockFrame( mnCols[nCol], mnRows[mnRows.size()-2], mnCols[nCol+1]-1, mnRows[mnRows.size()-1]-1 ); + OutputBlockFrame( mnCols[nCol], mnRows[mnRows.size()-2], mnCols[nCol+1]-1, mnRows[mnRows.size()-1]-1 ); } else { @@ -75,7 +75,7 @@ void OutputImpl::OutputDataArea() OutputBlockFrame( mnCols[nCol], mnRows[i], mnCols[nCol+1]-1, mnRows[i+1]-1 ); } } - else + else OutputBlockFrame( mnCols[nCol], mnRows.front(), mnCols[nCol+1]-1, mnRows.back()-1, bAllRows ); } //out put rows area outer framer @@ -89,14 +89,14 @@ void OutputImpl::OutputDataArea() OutputBlockFrame( mnDataStartCol, mnTabStartRow, mnTabEndCol, mnDataStartRow-1 ); } -OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab, - SCCOL nTabStartCol, - SCROW nTabStartRow, - SCCOL nMemberStartCol, - SCROW nMemberStartRow, - SCCOL nDataStartCol, - SCROW nDataStartRow, - SCCOL nTabEndCol, +OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab, + SCCOL nTabStartCol, + SCROW nTabStartRow, + SCCOL nMemberStartCol, + SCROW nMemberStartRow, + SCCOL nDataStartCol, + SCROW nDataStartRow, + SCCOL nTabEndCol, SCROW nTabEndRow ): mpDoc( pDoc ), mnTab( nTab ), @@ -105,13 +105,13 @@ OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab, mnMemberStartCol( nMemberStartCol), mnMemberStartRow( nMemberStartRow), mnDataStartCol ( nDataStartCol ), - mnDataStartRow ( nDataStartRow ), + mnDataStartRow ( nDataStartRow ), mnTabEndCol( nTabEndCol ), mnTabEndRow( nTabEndRow ) { mbNeedLineCols.resize( nTabEndCol-nDataStartCol+1, false ); mbNeedLineRows.resize( nTabEndRow-nDataStartRow+1, false ); - + } BOOL OutputImpl::AddRow( SCROW nRow ) @@ -128,7 +128,7 @@ BOOL OutputImpl::AddRow( SCROW nRow ) BOOL OutputImpl::AddCol( SCCOL nCol ) { - + if ( !mbNeedLineCols[ nCol - mnDataStartCol ] ) { mbNeedLineCols[ nCol - mnDataStartCol ] = true; @@ -136,7 +136,7 @@ BOOL OutputImpl::AddCol( SCCOL nCol ) return TRUE; } else - return FALSE; + return FALSE; } void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bHori ) @@ -147,7 +147,7 @@ void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEnd aLine.SetOutWidth( SC_DP_FRAME_INNER_BOLD ); aOutLine.SetColor( SC_DP_FRAME_COLOR ); aOutLine.SetOutWidth( SC_DP_FRAME_OUTER_BOLD ); - + SvxBoxItem aBox( ATTR_BORDER ); if ( nStartCol == mnTabStartCol ) @@ -159,18 +159,18 @@ void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEnd aBox.SetLine(&aOutLine, BOX_LINE_TOP); else aBox.SetLine(&aLine, BOX_LINE_TOP); - + if ( nEndCol == mnTabEndCol ) //bottom row aBox.SetLine(&aOutLine, BOX_LINE_RIGHT); - else + else aBox.SetLine(&aLine, BOX_LINE_RIGHT); - if ( nEndRow == mnTabEndRow ) //bottom + if ( nEndRow == mnTabEndRow ) //bottom aBox.SetLine(&aOutLine, BOX_LINE_BOTTOM); else aBox.SetLine(&aLine, BOX_LINE_BOTTOM); - + SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER ); aBoxInfo.SetValid(VALID_VERT,FALSE ); if ( bHori ) |