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

[Kohei Yoshida]

 sc/inc/dpoutput.hxx              |   10 +++++-----
 sc/source/core/data/dpoutput.cxx |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit c68838985dbbca58cbcc11cf0b07af325840ddd2
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Apr 26 13:02:07 2011 -0400

    killed sal_Bool and tabs.

diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index d068e1f..07f9a0f 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -81,7 +81,7 @@ private:
     com::sun::star::uno::Reference<
         com::sun::star::sheet::XDimensionsSupplier> xSource;
     ScAddress				aStartPos;
-    sal_Bool					bDoFilter;
+    bool					bDoFilter;
     ScDPOutLevelData*		pColFields;
     ScDPOutLevelData*		pRowFields;
     ScDPOutLevelData*		pPageFields;
@@ -91,7 +91,7 @@ private:
     com::sun::star::uno::Sequence<
         com::sun::star::uno::Sequence<
             com::sun::star::sheet::DataResult> > aData;
-    sal_Bool					bResultsError;
+    bool                    bResultsError;
     bool                    mbHasDataLayout;
     String					aDataDescription;
 
@@ -103,8 +103,8 @@ private:
     sal_uInt32                  nSingleNumFmt;
 
     // Output geometry related parameters
-    sal_Bool					bSizesValid;
-    sal_Bool					bSizeOverflow;
+    bool					bSizesValid;
+    bool					bSizeOverflow;
     long					nColCount;
     long					nRowCount;
     long					nHeaderSize;
@@ -136,7 +136,7 @@ public:
                     ScDPOutput( ScDocument* pD,
                                 const com::sun::star::uno::Reference<
                                     com::sun::star::sheet::XDimensionsSupplier>& xSrc,
-                                const ScAddress& rPos, sal_Bool bFilter );
+                                const ScAddress& rPos, bool bFilter );
                     ~ScDPOutput();
 
     void			SetPosition( const ScAddress& rPos );
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 12d5ed2..1611e25 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -350,7 +350,7 @@ uno::Sequence<sheet::MemberResult> lcl_GetSelectedPageAsResult( const uno::Refer
 }
 
 ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsSupplier>& xSrc,
-                                const ScAddress& rPos, sal_Bool bFilter ) :
+                        const ScAddress& rPos, bool bFilter ) :
     pDoc( pD ),
     xSource( xSrc ),
     aStartPos( rPos ),
@@ -526,7 +526,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS
         }
         catch (uno::RuntimeException&)
         {
-            bResultsError = sal_True;
+            bResultsError = true;
         }
     }
 
@@ -695,7 +695,7 @@ void ScDPOutput::CalcSizes()
         if ( aStartPos.Col() + nRowFieldCount + nColCount - 1 > MAXCOL ||
              aStartPos.Row() + nPageSize + nHeaderSize + nColFieldCount + nRowCount > MAXROW )
         {
-            bSizeOverflow = sal_True;
+            bSizeOverflow = true;
         }
 
         nTabStartCol = aStartPos.Col();
@@ -715,7 +715,7 @@ void ScDPOutput::CalcSizes()
             nTabEndRow = nDataStartRow + (SCROW)nRowCount - 1;
         else
             nTabEndRow = nDataStartRow;		// single row will remain empty
-        bSizesValid = sal_True;
+        bSizesValid = true;
     }
 }