summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@suse.com>2012-02-14 16:04:00 -0500
committerKohei Yoshida <kohei.yoshida@suse.com>2012-02-14 17:18:59 -0500
commitc9cf2a669237f8e253c7d4e8f8c4d022b804e020 (patch)
treeb07e301fbed0bfb57cc3c39f8070ffb79f96febc /sc
parent9d4b32ef3f1866fa586394c6cceed4dc4a17ca38 (diff)
Removed code that's no longer relevant.
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xml/xmldpimp.cxx15
-rw-r--r--sc/source/filter/xml/xmldpimp.hxx8
2 files changed, 3 insertions, 20 deletions
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 91d19cf37169..73b1c6794d76 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -372,7 +372,7 @@ void ScXMLDataPilotTableContext::SetButtons()
pDPObject->RefreshAfterLoad();
}
-void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember)
+void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim)
{
if (pDPSave)
{
@@ -401,17 +401,6 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas
;
}
- if (bHasHiddenMember)
- {
- // the layout name takes priority over the original name,
- // since this data is used against cell values.
- const OUString* pLayoutName = pDim->GetLayoutName();
- if (pLayoutName)
- maHiddenMemberFields.insert(*pLayoutName);
- else
- maHiddenMemberFields.insert(pDim->GetName());
- }
-
pDPSave->AddDimension(pDim);
}
}
@@ -1080,7 +1069,7 @@ void ScXMLDataPilotFieldContext::EndElement()
{
pDim->SetCurrentPage(&sSelectedPage);
}
- pDataPilotTable->AddDimension(pDim, mbHasHiddenMember);
+ pDataPilotTable->AddDimension(pDim);
if (bIsGroupField)
{
ScDPNumGroupInfo aInfo;
diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx
index 3ea89be0b68c..31e3c9ff9024 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -80,9 +80,6 @@ public:
class ScXMLDataPilotTableContext : public SvXMLImportContext
{
- typedef ::boost::unordered_set< ::rtl::OUString, ::rtl::OUStringHash > StringSet;
- StringSet maHiddenMemberFields;
-
struct GrandTotalItem
{
::rtl::OUString maDisplayName;
@@ -161,13 +158,10 @@ public:
void SetSourceRangeName(const rtl::OUString& sValue) { sSourceRangeName = sValue; bSourceCellRange = true; }
void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = sal_True; }
void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; }
-// void SetFilterUseRegularExpressions(const sal_Bool bValue) { aSourceQueryParam.bRegExp = bValue; }
void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; }
void SetFilterCopyOutputData(const sal_Bool bValue) { bFilterCopyOutputData = bValue; }
void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; }
-// void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; }
-// void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; }
- void AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember);
+ void AddDimension(ScDPSaveDimension* pDim);
void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim);
void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim);
void SetButtons();