More, boolean-related cleanup. Removed unused data members.

4 files changed, 22 insertions, 34 deletions

diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 73b1c6794d76..86bf12b18f6c 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -134,13 +134,13 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
     mnColFieldCount(0),
     mnPageFieldCount(0),
     mnDataFieldCount(0),
-    bIsNative(sal_True),
+    bIsNative(true),
     bIgnoreEmptyRows(false),
     bIdentifyCategories(false),
     bTargetRangeAddress(false),
     bSourceCellRange(false),
-    bShowFilter(sal_True),
-    bDrillDown(sal_True),
+    bShowFilter(true),
+    bDrillDown(true),
     bHeaderGridLayout(false)
 {
     sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 31e3c9ff9024..20ba1078e0f9 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -114,18 +114,14 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
     sal_uInt32      mnColFieldCount;
     sal_uInt32      mnPageFieldCount;
     sal_uInt32      mnDataFieldCount;
-    sal_Bool        bIsNative;
-    sal_Bool        bIgnoreEmptyRows;
-    sal_Bool        bIdentifyCategories;
-    sal_Bool        bUseRegularExpression;
-    sal_Bool        bIsCaseSensitive;
-    sal_Bool        bSkipDuplicates;
-    sal_Bool        bFilterCopyOutputData;
-    sal_Bool        bTargetRangeAddress;
-    sal_Bool        bSourceCellRange;
-    sal_Bool        bShowFilter;
-    sal_Bool        bDrillDown;
-    sal_Bool        bHeaderGridLayout;
+    bool            bIsNative:1;
+    bool            bIgnoreEmptyRows:1;
+    bool            bIdentifyCategories:1;
+    bool            bTargetRangeAddress:1;
+    bool            bSourceCellRange:1;
+    bool            bShowFilter:1;
+    bool            bDrillDown;
+    bool            bHeaderGridLayout:1;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }
     ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); }
@@ -149,17 +145,16 @@ public:
     void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const ::rtl::OUString& rDisplayName);
     void SetDatabaseName(const rtl::OUString& sValue) { sDatabaseName = sValue; }
     void SetSourceObject(const rtl::OUString& sValue) { sSourceObject = sValue; }
-    void SetNative(const sal_Bool bValue) { bIsNative = bValue; }
+    void SetNative(bool bValue) { bIsNative = bValue; }
     void SetServiceName(const rtl::OUString& sValue) { sServiceName = sValue; }
     void SetServiceSourceName(const rtl::OUString& sValue) { sServiceSourceName = sValue; }
     void SetServiceSourceObject(const rtl::OUString& sValue) { sServiceSourceObject = sValue; }
     void SetServiceUsername(const rtl::OUString& sValue) { sServiceUsername = sValue; }
     void SetServicePassword(const rtl::OUString& sValue) { sServicePassword = sValue; }
     void SetSourceRangeName(const rtl::OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; }
-    void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = sal_True; }
+    void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = true; }
     void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; }
     void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; }
-    void SetFilterCopyOutputData(const sal_Bool bValue) { bFilterCopyOutputData = bValue; }
     void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; }
     void AddDimension(ScDPSaveDimension* pDim);
     void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index a6803705b802..65c9420041c5 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -641,16 +641,9 @@ void ScXMLDPFilterContext::EndElement()
     aFilterFields.bRegExp = bUseRegularExpressions;
     aFilterFields.bCaseSens = bIsCaseSensitive;
     aFilterFields.bDuplicate = !bSkipDuplicates;
-//  pDataPilotTable->SetFilterUseRegularExpressions(bUseRegularExpressions);
     if (bCopyOutputData)
-    {
         pDataPilotTable->SetFilterOutputPosition(aOutputPosition);
-        pDataPilotTable->SetFilterCopyOutputData(bCopyOutputData);
-    }
-    else
-        pDataPilotTable->SetFilterCopyOutputData(false);
-//  pDataPilotTable->SetFilterIsCaseSensitive(bIsCaseSensitive);
-//  pDataPilotTable->SetFilterSkipDuplicates(bSkipDuplicates);
+
     pDataPilotTable->SetSourceQueryParam(aFilterFields);
     if (bConditionSourceRange)
         pDataPilotTable->SetFilterSourceRange(aConditionSourceRangeAddress);
diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx
index 952b705ebdc1..8a9715dc8183 100644
--- a/sc/source/filter/xml/xmlfilti.hxx
+++ b/sc/source/filter/xml/xmlfilti.hxx
@@ -217,14 +217,14 @@ class ScXMLDPFilterContext : public SvXMLImportContext
     ScRange         aConditionSourceRangeAddress;
     sal_uInt8   nFilterFieldCount;
     sal_Int16   nUserListIndex;
-    bool        bSkipDuplicates;
-    bool        bCopyOutputData;
-    bool        bUseRegularExpressions;
-    bool        bIsCaseSensitive;
-    bool        bEnabledUserList;
-    bool        bConnectionOr;
-    bool        bNextConnectionOr;
-    bool        bConditionSourceRange;
+    bool        bSkipDuplicates:1;
+    bool        bCopyOutputData:1;
+    bool        bUseRegularExpressions:1;
+    bool        bIsCaseSensitive:1;
+    bool        bEnabledUserList:1;
+    bool        bConnectionOr:1;
+    bool        bNextConnectionOr:1;
+    bool        bConditionSourceRange:1;
     ::std::stack<bool>  aConnectionOrStack;
 
     const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); }