diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-24 19:42:30 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-04-24 19:44:52 -0400 |
| commit | 50708577850544920c746ebc382d47275452a761 (patch) | |
| tree | addcaff4b596658adf876f1715c593fc9cee2fd8 | |
| parent | 380631d0e24d8bf90a5431b3e3c5fb36f21dbcf0 (diff) | |
fdo#77039: Fill the match string even if the raw string is empty.
And in case of an empty string, call svl::SharedString::getEmptyString()
to get an empty shared string instance.
Change-Id: I0923e59f03468790270de8ef22323c0cedad002f
| -rw-r--r-- | sc/source/core/tool/queryparam.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index c9d7e29e41fd..487a577ab5aa 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -173,14 +173,16 @@ void ScQueryParamBase::FillInExcelSyntax( svl::SharedStringPool& rPool, const OUString& rStr, SCSIZE nIndex) { const OUString aCellStr = rStr; - if (!aCellStr.isEmpty()) - { - if ( nIndex >= maEntries.size() ) - Resize( nIndex+1 ); + if (nIndex >= maEntries.size()) + Resize(nIndex+1); - ScQueryEntry& rEntry = GetEntry(nIndex); - ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); + ScQueryEntry& rEntry = GetEntry(nIndex); + ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); + if (aCellStr.isEmpty()) + rItem.maString = svl::SharedString::getEmptyString(); + else + { rEntry.bDoQuery = true; // Operatoren herausfiltern if (aCellStr[0] == '<') |