Pick up more boolean data directly.

3 files changed, 8 insertions, 23 deletions

diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 0716111147e8..6d0b599882b1 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -148,9 +148,6 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport,
     bSubTotalsSortGroups(false),
     bSubTotalsEnabledUserList(false),
     bSubTotalsAscending(true),
-    bFilterCopyOutputData(false),
-    bFilterSkipDuplicates(false),
-    bFilterUseRegularExpressions(false),
     bFilterConditionSourceRange(false),
     meRangeType(ScDBCollection::GlobalNamed)
 {
@@ -346,12 +343,6 @@ ScDBData* ScXMLDatabaseRangeContext::ConvertToDBData(const OUString& rName)
         mpQueryParam->nCol2 = aRange.aEnd.Col();
         mpQueryParam->nRow2 = aRange.aEnd.Row();
 
-        mpQueryParam->bInplace = !bFilterCopyOutputData;
-        mpQueryParam->bDuplicate = !bFilterSkipDuplicates;
-        mpQueryParam->bRegExp = bFilterUseRegularExpressions;
-        mpQueryParam->nDestTab = aFilterOutputPosition.Sheet;
-        mpQueryParam->nDestCol = aFilterOutputPosition.Column;
-        mpQueryParam->nDestRow = aFilterOutputPosition.Row;
         ScFilterDescriptorBase::fillQueryParam(*mpQueryParam, pDoc, aFilterFields);
 
         // Convert from relative to absolute column IDs for the fields. Calc
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index 9c4995e780e2..200cee097264 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -86,7 +86,6 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
     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::CellAddress aFilterOutputPosition;
     com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress;
     com::sun::star::sheet::DataImportMode nSourceType;
     sal_Int32       nRefresh;
@@ -106,9 +105,6 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
     bool            bSubTotalsSortGroups;
     bool            bSubTotalsEnabledUserList;
     bool            bSubTotalsAscending;
-    bool            bFilterCopyOutputData;
-    bool            bFilterSkipDuplicates;
-    bool            bFilterUseRegularExpressions;
     bool            bFilterConditionSourceRange;
     ScDBCollection::RangeType meRangeType;
 
@@ -147,11 +143,7 @@ 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 SetFilterCopyOutputData(const bool bTemp) { bFilterCopyOutputData = bTemp; }
-    void SetFilterSkipDuplicates(const bool bTemp) { bFilterSkipDuplicates = bTemp; }
-    void SetFilterUseRegularExpressions(const bool bTemp) { bFilterUseRegularExpressions = bTemp; }
     void SetFilterFields(const com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2>& aTemp) { aFilterFields = aTemp; }
-    void SetFilterOutputPosition(const com::sun::star::table::CellAddress& aTemp) { aFilterOutputPosition = 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 5cc07d8e95bb..2e5e1e3cec84 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -155,15 +155,17 @@ SvXMLImportContext *ScXMLFilterContext::CreateChildContext( sal_uInt16 nPrefix,
 
 void ScXMLFilterContext::EndElement()
 {
-    pDatabaseRangeContext->SetFilterUseRegularExpressions(bUseRegularExpressions);
+    mrQueryParam.bRegExp = bUseRegularExpressions;
+    mrQueryParam.bInplace = !bCopyOutputData;
+    mrQueryParam.bDuplicate = !bSkipDuplicates;
+
     if (bCopyOutputData)
     {
-        pDatabaseRangeContext->SetFilterOutputPosition(aOutputPosition);
-        pDatabaseRangeContext->SetFilterCopyOutputData(bCopyOutputData);
+        mrQueryParam.nDestCol = aOutputPosition.Column;
+        mrQueryParam.nDestRow = aOutputPosition.Row;
+        mrQueryParam.nDestTab = aOutputPosition.Sheet;
     }
-    else
-        pDatabaseRangeContext->SetFilterCopyOutputData(false);
-    pDatabaseRangeContext->SetFilterSkipDuplicates(bSkipDuplicates);
+
     pDatabaseRangeContext->SetFilterFields(aFilterFields);
     if (bConditionSourceRange)
         pDatabaseRangeContext->SetFilterConditionSourceRangeAddress(aConditionSourceRangeAddress);