Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
cf3f1d8d
Kaydet (Commit)
cf3f1d8d
authored
Şub 11, 2015
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
add ScMatrix::IsEmptyResult() for tdf#39316 fix preparation
Change-Id: I9f2a3e6fa9f4ef43df672661afef996269b90a7a
üst
22fe5da5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
7 deletions
+25
-7
scmatrix.hxx
sc/inc/scmatrix.hxx
+6
-3
scmatrix.cxx
sc/source/core/tool/scmatrix.cxx
+19
-4
No files found.
sc/inc/scmatrix.hxx
Dosyayı görüntüle @
cf3f1d8d
...
@@ -321,13 +321,16 @@ public:
...
@@ -321,13 +321,16 @@ public:
/// @return <TRUE/> if string or empty or empty path, in fact non-value.
/// @return <TRUE/> if string or empty or empty path, in fact non-value.
bool
IsString
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
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
;
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
;
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
;
bool
IsEmptyPath
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
/// @return <TRUE/> if value or boolean.
/// @return <TRUE/> if value or boolean.
...
...
sc/source/core/tool/scmatrix.cxx
Dosyayı görüntüle @
cf3f1d8d
...
@@ -254,6 +254,7 @@ public:
...
@@ -254,6 +254,7 @@ public:
bool
IsString
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
bool
IsString
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
bool
IsEmpty
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
bool
IsEmpty
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
bool
IsEmptyCell
(
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
IsEmptyPath
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
bool
IsValue
(
SCSIZE
nIndex
)
const
;
bool
IsValue
(
SCSIZE
nIndex
)
const
;
bool
IsValue
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
bool
IsValue
(
SCSIZE
nC
,
SCSIZE
nR
)
const
;
...
@@ -684,8 +685,8 @@ bool ScMatrixImpl::IsString( 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
bool
ScMatrixImpl
::
IsEmpty
(
SCSIZE
nC
,
SCSIZE
nR
)
const
{
{
// Flag must indicate an
empty element instead of an
// Flag must indicate an
'empty' or 'empty cell' or 'empty result' element,
// 'empty path' element.
//
but not an
'empty path' element.
ValidColRowReplicated
(
nC
,
nR
);
ValidColRowReplicated
(
nC
,
nR
);
return
maMat
.
get_type
(
nR
,
nC
)
==
mdds
::
mtm
::
element_empty
&&
return
maMat
.
get_type
(
nR
,
nC
)
==
mdds
::
mtm
::
element_empty
&&
maMatFlag
.
get
<
TMatFlag
>
(
nR
,
nC
)
!=
SC_MATFLAG_EMPTYPATH
;
maMatFlag
.
get
<
TMatFlag
>
(
nR
,
nC
)
!=
SC_MATFLAG_EMPTYPATH
;
...
@@ -693,13 +694,22 @@ bool ScMatrixImpl::IsEmpty( SCSIZE nC, SCSIZE nR ) const
...
@@ -693,13 +694,22 @@ bool ScMatrixImpl::IsEmpty( SCSIZE nC, SCSIZE nR ) const
bool
ScMatrixImpl
::
IsEmptyCell
(
SCSIZE
nC
,
SCSIZE
nR
)
const
bool
ScMatrixImpl
::
IsEmptyCell
(
SCSIZE
nC
,
SCSIZE
nR
)
const
{
{
// Flag must indicate an 'empty' element instead of an
// Flag must indicate an 'empty
cell
' element instead of an
// 'empty result' or 'empty path' element.
// 'empty
' or 'empty
result' or 'empty path' element.
ValidColRowReplicated
(
nC
,
nR
);
ValidColRowReplicated
(
nC
,
nR
);
return
maMat
.
get_type
(
nR
,
nC
)
==
mdds
::
mtm
::
element_empty
&&
return
maMat
.
get_type
(
nR
,
nC
)
==
mdds
::
mtm
::
element_empty
&&
maMatFlag
.
get
<
TMatFlag
>
(
nR
,
nC
)
==
SC_MATFLAG_EMPTYCELL
;
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
bool
ScMatrixImpl
::
IsEmptyPath
(
SCSIZE
nC
,
SCSIZE
nR
)
const
{
{
// Flag must indicate an 'empty path' element.
// Flag must indicate an 'empty path' element.
...
@@ -2324,6 +2334,11 @@ bool ScMatrix::IsEmptyCell( SCSIZE nC, SCSIZE nR ) const
...
@@ -2324,6 +2334,11 @@ bool ScMatrix::IsEmptyCell( SCSIZE nC, SCSIZE nR ) const
return
pImpl
->
IsEmptyCell
(
nC
,
nR
);
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
bool
ScMatrix
::
IsEmptyPath
(
SCSIZE
nC
,
SCSIZE
nR
)
const
{
{
return
pImpl
->
IsEmptyPath
(
nC
,
nR
);
return
pImpl
->
IsEmptyPath
(
nC
,
nR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment