sal_Bool->bool

Change-Id: If999fe4c29c3948ed60b482930cf6e0f5b1c0ede

sc/inc/scmatrix.hxx

@@ -314,31 +314,31 @@ public:
     ScMatrixValue Get( SCSIZE nC, SCSIZE nR) const;
 
     /// @return <TRUE/> if string or empty or empty path, in fact non-value.
-    sal_Bool IsString( SCSIZE nIndex ) const;
+    bool IsString( SCSIZE nIndex ) const;
 
     /// @return <TRUE/> if string or empty or empty path, in fact non-value.
-    sal_Bool IsString( SCSIZE nC, SCSIZE nR ) const;
+    bool IsString( SCSIZE nC, SCSIZE nR ) const;
 
     /// @return <TRUE/> if empty or empty path.
-    sal_Bool IsEmpty( SCSIZE nC, SCSIZE nR ) const;
+    bool IsEmpty( SCSIZE nC, SCSIZE nR ) const;
 
     /// @return <TRUE/> if empty path.
-    sal_Bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const;
+    bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const;
 
     /// @return <TRUE/> if value or boolean.
-    sal_Bool IsValue( SCSIZE nIndex ) const;
+    bool IsValue( SCSIZE nIndex ) const;
 
     /// @return <TRUE/> if value or boolean.
-    sal_Bool IsValue( SCSIZE nC, SCSIZE nR ) const;
+    bool IsValue( SCSIZE nC, SCSIZE nR ) const;
 
     /// @return <TRUE/> if value or boolean or empty or empty path.
-    sal_Bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const;
+    bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const;
 
     /// @return <TRUE/> if boolean.
-    sal_Bool IsBoolean( SCSIZE nC, SCSIZE nR ) const;
+    bool IsBoolean( SCSIZE nC, SCSIZE nR ) const;
 
     /// @return <TRUE/> if entire matrix is numeric, including booleans, with no strings or empties
-    sal_Bool IsNumeric() const;
+    bool IsNumeric() const;
 
     void MatTrans( ScMatrix& mRes) const;
     void MatCopy ( ScMatrix& mRes) const;

sc/source/core/tool/interpr1.cxx

@@ -1888,14 +1888,14 @@ void ScInterpreter::ScIsEmpty()
             if ( !pMat )
                 ;   // nothing
             else if ( !pJumpMatrix )
-                nRes = pMat->IsEmpty( 0, 0);
+                nRes = pMat->IsEmpty( 0, 0) ? 1 : 0;
             else
             {
                 SCSIZE nCols, nRows, nC, nR;
                 pMat->GetDimensions( nCols, nRows);
                 pJumpMatrix->GetPos( nC, nR);
                 if ( nC < nCols && nR < nRows )
-                    nRes = pMat->IsEmpty( nC, nR);
+                    nRes = pMat->IsEmpty( nC, nR) ? 1 : 0;
                 // else: false, not empty (which is what Xcl does)
             }
         }

sc/source/core/tool/scmatrix.cxx

@@ -2039,47 +2039,47 @@ ScMatrixValue ScMatrix::Get(SCSIZE nC, SCSIZE nR) const
     return pImpl->Get(nC, nR);
 }
 
-sal_Bool ScMatrix::IsString( SCSIZE nIndex ) const
+bool ScMatrix::IsString( SCSIZE nIndex ) const
 {
     return pImpl->IsString(nIndex);
 }
 
-sal_Bool ScMatrix::IsString( SCSIZE nC, SCSIZE nR ) const
+bool ScMatrix::IsString( SCSIZE nC, SCSIZE nR ) const
 {
     return pImpl->IsString(nC, nR);
 }
 
-sal_Bool ScMatrix::IsEmpty( SCSIZE nC, SCSIZE nR ) const
+bool ScMatrix::IsEmpty( SCSIZE nC, SCSIZE nR ) const
 {
     return pImpl->IsEmpty(nC, nR);
 }
 
-sal_Bool ScMatrix::IsEmptyPath( SCSIZE nC, SCSIZE nR ) const
+bool ScMatrix::IsEmptyPath( SCSIZE nC, SCSIZE nR ) const
 {
     return pImpl->IsEmptyPath(nC, nR);
 }
 
-sal_Bool ScMatrix::IsValue( SCSIZE nIndex ) const
+bool ScMatrix::IsValue( SCSIZE nIndex ) const
 {
     return pImpl->IsValue(nIndex);
 }
 
-sal_Bool ScMatrix::IsValue( SCSIZE nC, SCSIZE nR ) const
+bool ScMatrix::IsValue( SCSIZE nC, SCSIZE nR ) const
 {
     return pImpl->IsValue(nC, nR);
 }
 
-sal_Bool ScMatrix::IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
+bool ScMatrix::IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
 {
     return pImpl->IsValueOrEmpty(nC, nR);
 }
 
-sal_Bool ScMatrix::IsBoolean( SCSIZE nC, SCSIZE nR ) const
+bool ScMatrix::IsBoolean( SCSIZE nC, SCSIZE nR ) const
 {
     return pImpl->IsBoolean(nC, nR);
 }
 
-sal_Bool ScMatrix::IsNumeric() const
+bool ScMatrix::IsNumeric() const
 {
     return pImpl->IsNumeric();
 }