[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source

[Kohei Yoshida]

 sc/source/core/data/scdpoutputimpl.cxx |   24 ++++++++++----------
 sc/source/core/data/scdpoutputimpl.hxx |   38 ++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 31 deletions(-)

New commits:
commit 8ca2859d8109912b3a2d0d753812b92fadefb06d
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Apr 26 13:15:36 2011 -0400

    Killed more sal_Bool family & tabs.

diff --git a/sc/source/core/data/scdpoutputimpl.cxx b/sc/source/core/data/scdpoutputimpl.cxx
index b611bf6..582f74e 100644
--- a/sc/source/core/data/scdpoutputimpl.cxx
+++ b/sc/source/core/data/scdpoutputimpl.cxx
@@ -50,13 +50,13 @@ void ScDPOutputImpl::OutputDataArea()
     mnCols.push_back( mnTabEndCol+1); //set last row bottom 
     mnRows.push_back( mnTabEndRow+1); //set last col bottom
     
-    sal_Bool bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() );
+    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)
@@ -64,7 +64,7 @@ void ScDPOutputImpl::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
             {
@@ -86,11 +86,11 @@ void ScDPOutputImpl::OutputDataArea()
     OutputBlockFrame( mnDataStartCol, mnTabStartRow, mnTabEndCol, mnDataStartRow-1 );
 }
 
-ScDPOutputImpl::ScDPOutputImpl( ScDocument*	pDoc, sal_uInt16 nTab,
-        SCCOL	nTabStartCol,
-        SCROW	nTabStartRow,
-        SCCOL	nMemberStartCol,
-        SCROW	nMemberStartRow,
+ScDPOutputImpl::ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab,
+        SCCOL   nTabStartCol,
+        SCROW   nTabStartRow,
+        SCCOL   nMemberStartCol,
+        SCROW   nMemberStartRow,
         SCCOL nDataStartCol, 
         SCROW nDataStartRow, 
         SCCOL nTabEndCol, 
@@ -117,7 +117,7 @@ bool ScDPOutputImpl::AddRow( SCROW nRow )
     {
         mbNeedLineRows[ nRow - mnDataStartRow ] = true;
         mnRows.push_back( nRow );
-        return sal_True;
+        return true;
     }
     else
         return false;
@@ -130,13 +130,13 @@ bool ScDPOutputImpl::AddCol( SCCOL nCol )
     {
         mbNeedLineCols[ nCol - mnDataStartCol ] = true;
         mnCols.push_back( nCol );
-        return sal_True;
+        return true;
     }
     else
-        return false;	
+        return false;
 }
 
-void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Bool bHori )
+void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bHori )
 {
     Color color = SC_DP_FRAME_COLOR;
     ::editeng::SvxBorderLine aLine( &color, SC_DP_FRAME_INNER_BOLD );
diff --git a/sc/source/core/data/scdpoutputimpl.hxx b/sc/source/core/data/scdpoutputimpl.hxx
index d2b840e..3a44a63 100644
--- a/sc/source/core/data/scdpoutputimpl.hxx
+++ b/sc/source/core/data/scdpoutputimpl.hxx
@@ -31,37 +31,37 @@
 
 #include "document.hxx"
 
-#define SC_DP_FRAME_INNER_BOLD		20
-#define SC_DP_FRAME_OUTER_BOLD		40
+#define SC_DP_FRAME_INNER_BOLD      20
+#define SC_DP_FRAME_OUTER_BOLD      40
 
-#define SC_DP_FRAME_COLOR			Color(0,0,0) //( 0x20, 0x40, 0x68 )
+#define SC_DP_FRAME_COLOR           Color(0,0,0) //( 0x20, 0x40, 0x68 )
 
 class ScDPOutputImpl
 {
-    ScDocument*			mpDoc;
-    sal_uInt16				mnTab;
+    ScDocument*         mpDoc;
+    sal_uInt16          mnTab;
     ::std::vector< bool > mbNeedLineCols;
     ::std::vector< SCCOL > mnCols;
     
     ::std::vector< bool > mbNeedLineRows;
     ::std::vector< SCROW > mnRows;
 
-    SCCOL	mnTabStartCol;
-    SCROW	mnTabStartRow;
-    SCCOL	mnMemberStartCol;
-    SCROW	mnMemberStartRow;
+    SCCOL   mnTabStartCol;
+    SCROW   mnTabStartRow;
+    SCCOL   mnMemberStartCol;
+    SCROW   mnMemberStartRow;
     
-    SCCOL	mnDataStartCol;
-    SCROW	mnDataStartRow;
-    SCCOL	mnTabEndCol;
-    SCROW	mnTabEndRow;
+    SCCOL   mnDataStartCol;
+    SCROW   mnDataStartRow;
+    SCCOL   mnTabEndCol;
+    SCROW   mnTabEndRow;
 
 public:
-    ScDPOutputImpl( ScDocument*	pDoc, sal_uInt16 nTab,
-        SCCOL	nTabStartCol,
-        SCROW	nTabStartRow,
-        SCCOL	nMemberStartCol,
-        SCROW	nMemberStartRow,
+    ScDPOutputImpl( ScDocument* pDoc, sal_uInt16 nTab,
+        SCCOL   nTabStartCol,
+        SCROW   nTabStartRow,
+        SCCOL   nMemberStartCol,
+        SCROW   nMemberStartRow,
         SCCOL nDataStartCol, 
         SCROW nDataStartRow, 
         SCCOL nTabEndCol, 
@@ -70,7 +70,7 @@ public:
     bool AddCol( SCCOL nCol );
     
     void OutputDataArea();
-    void OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Bool bHori = false );
+    void OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bHori = false );
     
 };