Fixed ODS import filter to correctly identify data layout dimension.

And cleaned up the code a bit.  The new code should be much more
robust.

1 files changed, 2 insertions, 5 deletions

diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx
index e0a5a8706b44..f031ec1365e3 100644
--- a/sc/inc/dpoutputgeometry.hxx
+++ b/sc/inc/dpoutputgeometry.hxx
@@ -38,9 +38,8 @@ class SC_DLLPUBLIC ScDPOutputGeometry
 {
 public:
     enum FieldType { Column, Row, Page, Data, None };
-    enum ImportType { ODF, XLS };
 
-    ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter, ImportType eImportType);
+    ScDPOutputGeometry(const ScRange& rOutRange, bool bShowFilter);
     ~ScDPOutputGeometry();
 
     /**
@@ -57,7 +56,7 @@ public:
 
     SCROW getRowFieldHeaderRow() const;
 
-    FieldType getFieldButtonType(const ScAddress& rPos) const;
+    std::pair<FieldType, size_t> getFieldButtonType(const ScAddress& rPos) const;
 
 private:
     ScDPOutputGeometry(); // disabled
@@ -69,8 +68,6 @@ private:
     sal_uInt32  mnPageFields;
     sal_uInt32  mnDataFields;
 
-    ImportType  meImportType;
-
     bool        mbShowFilter;
 };