[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-4' - sc/source

[Kohei Yoshida]

 sc/source/core/tool/queryparam.cxx |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit c80717bba0c0a55092ff0b1564191dda22b3bad5
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Apr 24 19:42:30 2014 -0400

    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.
    
    (cherry picked from commit 50708577850544920c746ebc382d47275452a761)
    
    Conflicts:
    	sc/source/core/tool/queryparam.cxx
    
    Change-Id: I0923e59f03468790270de8ef22323c0cedad002f
    Reviewed-on: https://gerrit.libreoffice.org/9155
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 9f115c83fe94b0ed86562906f9d96465e59ec761)
    Reviewed-on: https://gerrit.libreoffice.org/9164
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index e7f73ca..eb6ff44 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -173,15 +173,17 @@ 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();
 
-        rEntry.bDoQuery = sal_True;
+    if (aCellStr.isEmpty())
+        rItem.maString = svl::SharedString::getEmptyString();
+    else
+    {
+        rEntry.bDoQuery = true;
         // Operatoren herausfiltern
         if (aCellStr[0] == '<')
         {