diff options
| -rw-r--r-- | sc/inc/scmatrix.hxx | 9 | ||||
| -rw-r--r-- | sc/source/core/tool/scmatrix.cxx | 23 |
2 files changed, 25 insertions, 7 deletions
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx index c4b924d4075d..255d45219017 100644 --- a/sc/inc/scmatrix.hxx +++ b/sc/inc/scmatrix.hxx @@ -321,13 +321,16 @@ public: /// @return <TRUE/> if string or empty or empty path, in fact non-value. bool IsString( SCSIZE nC, SCSIZE nR ) const; - /// @return <TRUE/> if empty or empty path. + /// @return <TRUE/> if empty or empty cell or empty result, not empty path. bool IsEmpty( SCSIZE nC, SCSIZE nR ) const; - /// @return <TRUE/> if empty, not empty result or empty path. + /// @return <TRUE/> if empty cell, not empty or empty result or empty path. bool IsEmptyCell( SCSIZE nC, SCSIZE nR ) const; - /// @return <TRUE/> if empty path. + /// @return <TRUE/> if empty result, not empty or empty cell or empty path. + bool IsEmptyResult( SCSIZE nC, SCSIZE nR ) const; + + /// @return <TRUE/> if empty path, not empty or empty cell or empty result. bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const; /// @return <TRUE/> if value or boolean. diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 4402002593f6..998f56203be7 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -254,6 +254,7 @@ public: bool IsString( SCSIZE nC, SCSIZE nR ) const; bool IsEmpty( SCSIZE nC, SCSIZE nR ) const; bool IsEmptyCell( SCSIZE nC, SCSIZE nR ) const; + bool IsEmptyResult( SCSIZE nC, SCSIZE nR ) const; bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const; bool IsValue( SCSIZE nIndex ) const; bool IsValue( SCSIZE nC, SCSIZE nR ) const; @@ -684,8 +685,8 @@ bool ScMatrixImpl::IsString( SCSIZE nC, SCSIZE nR ) const bool ScMatrixImpl::IsEmpty( SCSIZE nC, SCSIZE nR ) const { - // Flag must indicate an empty element instead of an - // 'empty path' element. + // Flag must indicate an 'empty' or 'empty cell' or 'empty result' element, + // but not an 'empty path' element. ValidColRowReplicated( nC, nR ); return maMat.get_type(nR, nC) == mdds::mtm::element_empty && maMatFlag.get<TMatFlag>(nR, nC) != SC_MATFLAG_EMPTYPATH; @@ -693,13 +694,22 @@ bool ScMatrixImpl::IsEmpty( SCSIZE nC, SCSIZE nR ) const bool ScMatrixImpl::IsEmptyCell( SCSIZE nC, SCSIZE nR ) const { - // Flag must indicate an 'empty' element instead of an - // 'empty result' or 'empty path' element. + // Flag must indicate an 'empty cell' element instead of an + // 'empty' or 'empty result' or 'empty path' element. ValidColRowReplicated( nC, nR ); return maMat.get_type(nR, nC) == mdds::mtm::element_empty && maMatFlag.get<TMatFlag>(nR, nC) == SC_MATFLAG_EMPTYCELL; } +bool ScMatrixImpl::IsEmptyResult( SCSIZE nC, SCSIZE nR ) const +{ + // Flag must indicate an 'empty result' element instead of an + // 'empty' or 'empty cell' or 'empty path' element. + ValidColRowReplicated( nC, nR ); + return maMat.get_type(nR, nC) == mdds::mtm::element_empty && + maMatFlag.get<TMatFlag>(nR, nC) == SC_MATFLAG_EMPTYRESULT; +} + bool ScMatrixImpl::IsEmptyPath( SCSIZE nC, SCSIZE nR ) const { // Flag must indicate an 'empty path' element. @@ -2324,6 +2334,11 @@ bool ScMatrix::IsEmptyCell( SCSIZE nC, SCSIZE nR ) const return pImpl->IsEmptyCell(nC, nR); } +bool ScMatrix::IsEmptyResult( SCSIZE nC, SCSIZE nR ) const +{ + return pImpl->IsEmptyResult(nC, nR); +} + bool ScMatrix::IsEmptyPath( SCSIZE nC, SCSIZE nR ) const { return pImpl->IsEmptyPath(nC, nR); |