Populate the query entries directly.

5 files changed, 127 insertions, 122 deletions

diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index c8c9686e8464..7352d0703675 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -102,6 +102,21 @@ ScQueryEntry& ScQueryParamBase::GetEntry(SCSIZE n)
     return maEntries[n];
 }
 
+ScQueryEntry& ScQueryParamBase::AppendEntry()
+{
+    // Find the first unused entry.
+    EntriesType::iterator itr = std::find_if(
+        maEntries.begin(), maEntries.end(), FindUnused());
+
+    if (itr != maEntries.end())
+        // Found!
+        return *itr;
+
+    // Add a new entry to the end.
+    maEntries.push_back(new ScQueryEntry);
+    return maEntries.back();
+}
+
 ScQueryEntry* ScQueryParamBase::FindEntryByField(SCCOLROW nField, bool bNew)
 {
     EntriesType::iterator itr = std::find_if(
@@ -117,14 +132,7 @@ ScQueryEntry* ScQueryParamBase::FindEntryByField(SCCOLROW nField, bool bNew)
         // no existing entry found, and we are not creating a new one.
         return NULL;
 
-    // Find the first unused entry.
-    itr = std::find_if(maEntries.begin(), maEntries.end(), FindUnused());
-    if (itr != maEntries.end())
-        return &(*itr);
-
-    // Add a new entry to the end.
-    maEntries.push_back(new ScQueryEntry);
-    return &maEntries.back();
+    return &AppendEntry();
 }
 
 void ScQueryParamBase::RemoveEntryByField(SCCOLROW nField)
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 6d0b599882b1..f8276e6905f5 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -343,8 +343,6 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName)
         mpQueryParam->nCol2 = aRange.aEnd.Col();
         mpQueryParam->nRow2 = aRange.aEnd.Row();
 
-        ScFilterDescriptorBase::fillQueryParam(*mpQueryParam, pDoc, aFilterFields);
-
         // Convert from relative to absolute column IDs for the fields. Calc
         // core expects the field positions to be absolute column IDs.
         SCCOLROW nStartPos = mpQueryParam->bByRow ? aRange.aStart.Col() : aRange.aStart.Row();
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index 200cee097264..06c659aaa540 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -84,7 +84,6 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
     rtl::OUString   sDatabaseName;
     rtl::OUString   sSourceObject;
     com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence;
-    com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields;
     std::vector < ScSubTotalRule > aSubTotalRules;
     com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress;
     com::sun::star::sheet::DataImportMode nSourceType;
@@ -143,7 +142,6 @@ public:
     void SetSubTotalsSortGroups(const bool bTemp) { bSubTotalsSortGroups = bTemp; }
     void AddSubTotalRule(const ScSubTotalRule& rRule) { aSubTotalRules.push_back(rRule); }
     void SetSortSequence(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue>& aTempSortSequence) { aSortSequence = aTempSortSequence; }
-    void SetFilterFields(const com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2>& aTemp) { aFilterFields = aTemp; }
     void SetFilterConditionSourceRangeAddress(const com::sun::star::table::CellRangeAddress& aTemp) { aFilterConditionSourceRangeAddress = aTemp;
                                                                                                     bFilterConditionSourceRange = true; }
 };
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index 2e5e1e3cec84..6cfa680e83b4 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -61,7 +61,6 @@ ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport,
     SvXMLImportContext( rImport, nPrfx, rLName ),
     mrQueryParam(rParam),
     pDatabaseRangeContext(pTempDatabaseRangeContext),
-    aFilterFields(),
     bSkipDuplicates(false),
     bCopyOutputData(false),
     bUseRegularExpressions(false),
@@ -129,20 +128,20 @@ SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix,
     {
         case XML_TOK_FILTER_AND:
         {
-            pContext = new ScXMLAndContext( GetScImport(), nPrefix,
-                                                          rLName, xAttrList, this);
+            pContext = new ScXMLAndContext(
+                GetScImport(), nPrefix, rLName, xAttrList, mrQueryParam, this);
         }
         break;
         case XML_TOK_FILTER_OR:
         {
-            pContext = new ScXMLOrContext( GetScImport(), nPrefix,
-                                                          rLName, xAttrList, this);
+            pContext = new ScXMLOrContext(
+                GetScImport(), nPrefix, rLName, xAttrList, mrQueryParam, this);
         }
         break;
         case XML_TOK_FILTER_CONDITION:
         {
-            pContext = new ScXMLConditionContext( GetScImport(), nPrefix,
-                                                          rLName, xAttrList, this);
+            pContext = new ScXMLConditionContext(
+                GetScImport(), nPrefix, rLName, xAttrList, mrQueryParam, this);
         }
         break;
     }
@@ -166,7 +165,6 @@ void ScXMLFilterContext::EndElement()
         mrQueryParam.nDestTab = aOutputPosition.Sheet;
     }
 
-    pDatabaseRangeContext->SetFilterFields(aFilterFields);
     if (bConditionSourceRange)
         pDatabaseRangeContext->SetFilterConditionSourceRangeAddress(aConditionSourceRangeAddress);
 }
@@ -217,19 +215,14 @@ bool ScXMLFilterContext::GetConnection()
     return itr->mbOr; // connection of the last stack.
 }
 
-void ScXMLFilterContext::AddFilterField(const sheet::TableFilterField2& aFilterField)
-{
-    aFilterFields.realloc(aFilterFields.getLength() + 1);
-    aFilterFields[aFilterFields.getLength() - 1] = aFilterField;
-}
-
 ScXMLAndContext::ScXMLAndContext( ScXMLImport& rImport,
-                                      sal_uInt16 nPrfx,
-                                      const ::rtl::OUString& rLName,
-                                      const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
-                                        ScXMLFilterContext* pTempFilterContext) :
+                                  sal_uInt16 nPrfx,
+                                  const rtl::OUString& rLName,
+                                  const Reference<XAttributeList>& /* xAttrList */,
+                                  ScQueryParam& rParam,
+                                  ScXMLFilterContext* pTempFilterContext) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
+    mrQueryParam(rParam),
     pFilterContext(pTempFilterContext)
 {
     pFilterContext->OpenConnection(false);
@@ -256,8 +249,8 @@ SvXMLImportContext *ScXMLAndContext::CreateChildContext( sal_uInt16 nPrefix,
         break;
         case XML_TOK_FILTER_CONDITION:
         {
-            pContext = new ScXMLConditionContext( GetScImport(), nPrefix,
-                                                          rLName, xAttrList, pFilterContext);
+            pContext = new ScXMLConditionContext(
+                GetScImport(), nPrefix, rLName, xAttrList, mrQueryParam, pFilterContext);
         }
         break;
     }
@@ -274,12 +267,14 @@ void ScXMLAndContext::EndElement()
 }
 
 ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport,
-                                      sal_uInt16 nPrfx,
-                                      const ::rtl::OUString& rLName,
-                                      const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
-                                        ScXMLFilterContext* pTempFilterContext) :
+                                sal_uInt16 nPrfx,
+                                const rtl::OUString& rLName,
+                                const Reference<
+                                    ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */,
+                                ScQueryParam& rParam,
+                                ScXMLFilterContext* pTempFilterContext) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
+    mrQueryParam(rParam),
     pFilterContext(pTempFilterContext)
 {
     pFilterContext->OpenConnection(true);
@@ -301,14 +296,14 @@ SvXMLImportContext *ScXMLOrContext::CreateChildContext( sal_uInt16 nPrefix,
     {
         case XML_TOK_FILTER_AND:
         {
-            pContext = new ScXMLAndContext( GetScImport(), nPrefix,
-                                                          rLName, xAttrList, pFilterContext);
+            pContext = new ScXMLAndContext(
+                GetScImport(), nPrefix, rLName, xAttrList, mrQueryParam, pFilterContext);
         }
         break;
         case XML_TOK_FILTER_CONDITION:
         {
-            pContext = new ScXMLConditionContext( GetScImport(), nPrefix,
-                                                          rLName, xAttrList, pFilterContext);
+            pContext = new ScXMLConditionContext(
+                GetScImport(), nPrefix, rLName, xAttrList, mrQueryParam, pFilterContext);
         }
         break;
     }
@@ -324,13 +319,13 @@ void ScXMLOrContext::EndElement()
     pFilterContext->CloseConnection();
 }
 
-ScXMLConditionContext::ScXMLConditionContext( ScXMLImport& rImport,
-                                      sal_uInt16 nPrfx,
-                                      const ::rtl::OUString& rLName,
-                                      const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                                        ScXMLFilterContext* pTempFilterContext) :
+ScXMLConditionContext::ScXMLConditionContext(
+    ScXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLName,
+    const Reference<XAttributeList>& xAttrList,
+    ScQueryParam& rParam,
+    ScXMLFilterContext* pTempFilterContext) :
     SvXMLImportContext( rImport, nPrfx, rLName ),
+    mrQueryParam(rParam),
     pFilterContext(pTempFilterContext),
     bIsCaseSensitive(false)
 {
@@ -404,80 +399,81 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi
     return pContext;
 }
 
-void ScXMLConditionContext::getOperatorXML(const rtl::OUString sTempOperator, sal_Int32& aFilterOperator, bool& bUseRegularExpressions) const
+void ScXMLConditionContext::GetOperator(
+    const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const
 {
-    bUseRegularExpressions = false;
-    if (IsXMLToken(sTempOperator, XML_MATCH))
+    rParam.bRegExp = false;
+    if (IsXMLToken(aOpStr, XML_MATCH))
     {
-        bUseRegularExpressions = true;
-        aFilterOperator = sheet::FilterOperator2::EQUAL;
+        rParam.bRegExp = true;
+        rEntry.eOp = SC_EQUAL;
     }
-    else if (IsXMLToken(sTempOperator, XML_NOMATCH))
+    else if (IsXMLToken(aOpStr, XML_NOMATCH))
     {
-        bUseRegularExpressions = true;
-        aFilterOperator = sheet::FilterOperator2::NOT_EQUAL;
+        rParam.bRegExp = true;
+        rEntry.eOp = SC_NOT_EQUAL;
     }
-    else if (sTempOperator.compareToAscii("=") == 0)
-        aFilterOperator = sheet::FilterOperator2::EQUAL;
-    else if (sTempOperator.compareToAscii("!=") == 0)
-        aFilterOperator = sheet::FilterOperator2::NOT_EQUAL;
-    else if (IsXMLToken(sTempOperator, XML_BOTTOM_PERCENT))
-        aFilterOperator = sheet::FilterOperator2::BOTTOM_PERCENT;
-    else if (IsXMLToken(sTempOperator, XML_BOTTOM_VALUES))
-        aFilterOperator = sheet::FilterOperator2::BOTTOM_VALUES;
-    else if (IsXMLToken(sTempOperator, XML_EMPTY))
-        aFilterOperator = sheet::FilterOperator2::EMPTY;
-    else if (sTempOperator.compareToAscii(">") == 0)
-        aFilterOperator = sheet::FilterOperator2::GREATER;
-    else if (sTempOperator.compareToAscii(">=") == 0)
-        aFilterOperator = sheet::FilterOperator2::GREATER_EQUAL;
-    else if (sTempOperator.compareToAscii("<") == 0)
-        aFilterOperator = sheet::FilterOperator2::LESS;
-    else if (sTempOperator.compareToAscii("<=") == 0)
-        aFilterOperator = sheet::FilterOperator2::LESS_EQUAL;
-    else if (IsXMLToken(sTempOperator, XML_NOEMPTY))
-        aFilterOperator = sheet::FilterOperator2::NOT_EMPTY;
-    else if (IsXMLToken(sTempOperator, XML_TOP_PERCENT))
-        aFilterOperator = sheet::FilterOperator2::TOP_PERCENT;
-    else if (IsXMLToken(sTempOperator, XML_TOP_VALUES))
-        aFilterOperator = sheet::FilterOperator2::TOP_VALUES;
-    else if (IsXMLToken(sTempOperator, XML_CONTAINS))
-        aFilterOperator = sheet::FilterOperator2::CONTAINS;
-    else if (IsXMLToken(sTempOperator, XML_DOES_NOT_CONTAIN))
-        aFilterOperator = sheet::FilterOperator2::DOES_NOT_CONTAIN;
-    else if (IsXMLToken(sTempOperator, XML_BEGINS_WITH))
-        aFilterOperator = sheet::FilterOperator2::BEGINS_WITH;
-    else if (IsXMLToken(sTempOperator, XML_DOES_NOT_BEGIN_WITH))
-        aFilterOperator = sheet::FilterOperator2::DOES_NOT_BEGIN_WITH;
-    else if (IsXMLToken(sTempOperator, XML_ENDS_WITH))
-        aFilterOperator = sheet::FilterOperator2::ENDS_WITH;
-    else if (IsXMLToken(sTempOperator, XML_DOES_NOT_END_WITH))
-        aFilterOperator = sheet::FilterOperator2::DOES_NOT_END_WITH;
+    else if (aOpStr.compareToAscii("=") == 0)
+        rEntry.eOp = SC_EQUAL;
+    else if (aOpStr.compareToAscii("!=") == 0)
+        rEntry.eOp = SC_NOT_EQUAL;
+    else if (IsXMLToken(aOpStr, XML_BOTTOM_PERCENT))
+        rEntry.eOp = SC_BOTPERC;
+    else if (IsXMLToken(aOpStr, XML_BOTTOM_VALUES))
+        rEntry.eOp = SC_BOTVAL;
+    else if (IsXMLToken(aOpStr, XML_EMPTY))
+        rEntry.SetQueryByEmpty();
+    else if (aOpStr.compareToAscii(">") == 0)
+        rEntry.eOp = SC_GREATER;
+    else if (aOpStr.compareToAscii(">=") == 0)
+        rEntry.eOp = SC_GREATER_EQUAL;
+    else if (aOpStr.compareToAscii("<") == 0)
+        rEntry.eOp = SC_LESS;
+    else if (aOpStr.compareToAscii("<=") == 0)
+        rEntry.eOp = SC_LESS_EQUAL;
+    else if (IsXMLToken(aOpStr, XML_NOEMPTY))
+        rEntry.SetQueryByNonEmpty();
+    else if (IsXMLToken(aOpStr, XML_TOP_PERCENT))
+        rEntry.eOp = SC_TOPPERC;
+    else if (IsXMLToken(aOpStr, XML_TOP_VALUES))
+        rEntry.eOp = SC_TOPVAL;
+    else if (IsXMLToken(aOpStr, XML_CONTAINS))
+        rEntry.eOp = SC_CONTAINS;
+    else if (IsXMLToken(aOpStr, XML_DOES_NOT_CONTAIN))
+        rEntry.eOp = SC_DOES_NOT_CONTAIN;
+    else if (IsXMLToken(aOpStr, XML_BEGINS_WITH))
+        rEntry.eOp = SC_BEGINS_WITH;
+    else if (IsXMLToken(aOpStr, XML_DOES_NOT_BEGIN_WITH))
+        rEntry.eOp = SC_DOES_NOT_BEGIN_WITH;
+    else if (IsXMLToken(aOpStr, XML_ENDS_WITH))
+        rEntry.eOp = SC_ENDS_WITH;
+    else if (IsXMLToken(aOpStr, XML_DOES_NOT_END_WITH))
+        rEntry.eOp = SC_DOES_NOT_END_WITH;
 }
 
 void ScXMLConditionContext::EndElement()
 {
-    sheet::TableFilterField2 aFilterField;
-    if (pFilterContext->GetConnection())
-        aFilterField.Connection = sheet::FilterConnection_OR;
-    else
-        aFilterField.Connection = sheet::FilterConnection_AND;
-    pFilterContext->SetCaseSensitive(bIsCaseSensitive);
-    bool bUseRegularExpressions;
-    getOperatorXML(sOperator, aFilterField.Operator, bUseRegularExpressions);
-    pFilterContext->SetUseRegularExpressions(bUseRegularExpressions);
-    aFilterField.Field = nField;
+    ScQueryEntry& rEntry = mrQueryParam.AppendEntry();
+
+    // We currently don't support per-condition case sensitivity.
+    mrQueryParam.bCaseSens = bIsCaseSensitive;
+
+    rEntry.bDoQuery = true;
+    rEntry.eConnect = pFilterContext->GetConnection() ? SC_OR : SC_AND;
+
+    GetOperator(sOperator, mrQueryParam, rEntry);
+    rEntry.nField = nField; // at this point this is relative to the left-most field.
+    ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
     if (IsXMLToken(sDataType, XML_NUMBER))
     {
-        aFilterField.NumericValue = sConditionValue.toDouble();
-        aFilterField.IsNumeric = true;
+        rItem.mfVal = sConditionValue.toDouble();
+        rItem.meType = ScQueryEntry::ByValue;
     }
     else
     {
-        aFilterField.StringValue = sConditionValue;
-        aFilterField.IsNumeric = false;
+        rItem.maString = sConditionValue;
+        rItem.meType = ScQueryEntry::ByString;
     }
-    pFilterContext->AddFilterField(aFilterField);
 }
 
 const ScXMLImport& ScXMLSetItemContext::GetScImport() const
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index 2d06af8b3ed6..5f44ecc10bce 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -45,6 +45,7 @@
 
 class ScXMLImport;
 struct ScQueryParam;
+struct ScQueryEntry;
 
 class ScXMLFilterContext : public SvXMLImportContext
 {
@@ -57,7 +58,6 @@ class ScXMLFilterContext : public SvXMLImportContext
     ScQueryParam& mrQueryParam;
     ScXMLDatabaseRangeContext* pDatabaseRangeContext;
 
-    com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields;
     com::sun::star::table::CellAddress aOutputPosition;
     com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress;
     sal_Int16   nUserListIndex;
@@ -94,11 +94,11 @@ public:
     void OpenConnection(bool b);
     void CloseConnection();
     bool GetConnection();
-    void AddFilterField(const com::sun::star::sheet::TableFilterField2& aFilterField);
 };
 
 class ScXMLAndContext : public SvXMLImportContext
 {
+    ScQueryParam& mrQueryParam;
     ScXMLFilterContext* pFilterContext;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
@@ -107,10 +107,11 @@ class ScXMLAndContext : public SvXMLImportContext
 public:
 
     ScXMLAndContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
-                        const ::rtl::OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                                        ScXMLFilterContext* pTempFilterContext);
+                     const ::rtl::OUString& rLName,
+                     const ::com::sun::star::uno::Reference<
+                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+                     ScQueryParam& rParam,
+                     ScXMLFilterContext* pTempFilterContext);
 
     virtual ~ScXMLAndContext();
 
@@ -124,6 +125,7 @@ public:
 
 class ScXMLOrContext : public SvXMLImportContext
 {
+    ScQueryParam& mrQueryParam;
     ScXMLFilterContext* pFilterContext;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
@@ -132,10 +134,11 @@ class ScXMLOrContext : public SvXMLImportContext
 public:
 
     ScXMLOrContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
-                        const ::rtl::OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                                        ScXMLFilterContext* pTempFilterContext);
+                    const ::rtl::OUString& rLName,
+                    const ::com::sun::star::uno::Reference<
+                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+                    ScQueryParam& rParam,
+                    ScXMLFilterContext* pTempFilterContext);
 
     virtual ~ScXMLOrContext();
 
@@ -149,6 +152,7 @@ public:
 
 class ScXMLConditionContext : public SvXMLImportContext
 {
+    ScQueryParam& mrQueryParam;
     ScXMLFilterContext* pFilterContext;
 
     rtl::OUString sDataType;
@@ -163,10 +167,11 @@ class ScXMLConditionContext : public SvXMLImportContext
 public:
 
     ScXMLConditionContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
-                        const ::rtl::OUString& rLName,
-                        const ::com::sun::star::uno::Reference<
-                                        ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
-                                        ScXMLFilterContext* pTempFilterContext);
+                           const ::rtl::OUString& rLName,
+                           const ::com::sun::star::uno::Reference<
+                               ::com::sun::star::xml::sax::XAttributeList>& xAttrList,
+                           ScQueryParam& rParam,
+                           ScXMLFilterContext* pTempFilterContext);
 
     virtual ~ScXMLConditionContext();
 
@@ -175,7 +180,7 @@ public:
                                      const ::com::sun::star::uno::Reference<
                                           ::com::sun::star::xml::sax::XAttributeList>& xAttrList );
 
-    void getOperatorXML(const rtl::OUString sTempOperator, sal_Int32& aFilterOperator, bool& bUseRegularExpressions) const;
+    void GetOperator(const rtl::OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const;
     virtual void EndElement();
 };