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
cff2f333
Kaydet (Commit)
cff2f333
authored
Eki 09, 2013
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Add isEmpty() to SharedString. This simplies a lot of its call sites.
Change-Id: I0ebc43abe59ac317c053a4f606dbe376d85c03b0
üst
a11e224e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
4 deletions
+10
-4
sharedstring.hxx
include/svl/sharedstring.hxx
+1
-0
table3.cxx
sc/source/core/data/table3.cxx
+1
-1
interpr1.cxx
sc/source/core/tool/interpr1.cxx
+1
-1
queryentry.cxx
sc/source/core/tool/queryentry.cxx
+2
-2
sharedstring.cxx
svl/source/misc/sharedstring.cxx
+5
-0
No files found.
include/svl/sharedstring.hxx
Dosyayı görüntüle @
cff2f333
...
@@ -40,6 +40,7 @@ public:
...
@@ -40,6 +40,7 @@ public:
const
rtl_uString
*
getDataIgnoreCase
()
const
;
const
rtl_uString
*
getDataIgnoreCase
()
const
;
bool
isValid
()
const
;
bool
isValid
()
const
;
bool
isEmpty
()
const
;
};
};
}
}
...
...
sc/source/core/data/table3.cxx
Dosyayı görüntüle @
cff2f333
...
@@ -1487,7 +1487,7 @@ public:
...
@@ -1487,7 +1487,7 @@ public:
// Simple string matching i.e. no regexp match.
// Simple string matching i.e. no regexp match.
if
(
isTextMatchOp
(
rEntry
))
if
(
isTextMatchOp
(
rEntry
))
{
{
if
(
rItem
.
meType
!=
ScQueryEntry
::
ByString
&&
rItem
.
maString
.
getString
().
isEmpty
())
if
(
rItem
.
meType
!=
ScQueryEntry
::
ByString
&&
rItem
.
maString
.
isEmpty
())
{
{
// #i18374# When used from functions (match, countif, sumif, vlookup, hlookup, lookup),
// #i18374# When used from functions (match, countif, sumif, vlookup, hlookup, lookup),
// the query value is assigned directly, and the string is empty. In that case,
// the query value is assigned directly, and the string is empty. In that case,
...
...
sc/source/core/tool/interpr1.cxx
Dosyayı görüntüle @
cff2f333
...
@@ -976,7 +976,7 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp
...
@@ -976,7 +976,7 @@ double ScInterpreter::CompareFunc( const ScCompare& rComp, ScCompareOptions* pOp
if (!rItems.empty())
if (!rItems.empty())
{
{
const ScQueryEntry::Item& rItem = rItems[0];
const ScQueryEntry::Item& rItem = rItems[0];
if
(
rItem
.
meType
!=
ScQueryEntry
::
ByString
&&
!
rItem
.
maString
.
getString
().
isEmpty
()
&&
if (rItem.meType != ScQueryEntry::ByString && !rItem.maString.isEmpty() &&
(rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL))
(rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL))
{
{
// As in ScTable::ValidQuery() match a numeric string for a
// As in ScTable::ValidQuery() match a numeric string for a
...
...
sc/source/core/tool/queryentry.cxx
Dosyayı görüntüle @
cff2f333
...
@@ -107,7 +107,7 @@ bool ScQueryEntry::IsQueryByEmpty() const
...
@@ -107,7 +107,7 @@ bool ScQueryEntry::IsQueryByEmpty() const
const
Item
&
rItem
=
maQueryItems
[
0
];
const
Item
&
rItem
=
maQueryItems
[
0
];
return
eOp
==
SC_EQUAL
&&
return
eOp
==
SC_EQUAL
&&
rItem
.
meType
==
ByEmpty
&&
rItem
.
meType
==
ByEmpty
&&
rItem
.
maString
.
getString
().
isEmpty
()
&&
rItem
.
maString
.
isEmpty
()
&&
rItem
.
mfVal
==
SC_EMPTYFIELDS
;
rItem
.
mfVal
==
SC_EMPTYFIELDS
;
}
}
...
@@ -129,7 +129,7 @@ bool ScQueryEntry::IsQueryByNonEmpty() const
...
@@ -129,7 +129,7 @@ bool ScQueryEntry::IsQueryByNonEmpty() const
const
Item
&
rItem
=
maQueryItems
[
0
];
const
Item
&
rItem
=
maQueryItems
[
0
];
return
eOp
==
SC_EQUAL
&&
return
eOp
==
SC_EQUAL
&&
rItem
.
meType
==
ByEmpty
&&
rItem
.
meType
==
ByEmpty
&&
rItem
.
maString
.
getString
().
isEmpty
()
&&
rItem
.
maString
.
isEmpty
()
&&
rItem
.
mfVal
==
SC_NONEMPTYFIELDS
;
rItem
.
mfVal
==
SC_NONEMPTYFIELDS
;
}
}
...
...
svl/source/misc/sharedstring.cxx
Dosyayı görüntüle @
cff2f333
...
@@ -113,6 +113,11 @@ bool SharedString::isValid() const
...
@@ -113,6 +113,11 @@ bool SharedString::isValid() const
return
mpData
!=
NULL
;
return
mpData
!=
NULL
;
}
}
bool
SharedString
::
isEmpty
()
const
{
return
mpData
==
NULL
||
mpData
->
length
==
0
;
}
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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