1 files changed, 11 insertions, 40 deletions
diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx
index 48cfdd0258bd..8c47371d5347 100644
--- a/sc/source/filter/xml/xmldrani.hxx
+++ b/sc/source/filter/xml/xmldrani.hxx
@@ -32,17 +32,15 @@
 
 #include "dbdata.hxx"
 #include "xmlimprt.hxx"
+#include "importcontext.hxx"
 
 #include <memory>
 
 class ScDBData;
 struct ScQueryParam;
 
-class ScXMLDatabaseRangesContext : public SvXMLImportContext
+class ScXMLDatabaseRangesContext : public ScXMLImportContext
 {
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -64,7 +62,7 @@ struct ScSubTotalRule
     css::uno::Sequence <css::sheet::SubTotalColumn> aSubTotalColumns;
 };
 
-class ScXMLDatabaseRangeContext : public SvXMLImportContext
+class ScXMLDatabaseRangeContext : public ScXMLImportContext
 {
     std::unique_ptr<ScQueryParam> mpQueryParam;
     ScRange         maRange;
@@ -98,9 +96,6 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext
     bool            bByRow;
     ScDBCollection::RangeType meRangeType;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
     std::unique_ptr<ScDBData> ConvertToDBData(const OUString& rName);
 
 public:
@@ -135,14 +130,11 @@ public:
                                                                                                     bFilterConditionSourceRange = true; }
 };
 
-class ScXMLSourceSQLContext : public SvXMLImportContext
+class ScXMLSourceSQLContext : public ScXMLImportContext
 {
     ScXMLDatabaseRangeContext*  pDatabaseRangeContext;
     OUString               sDBName;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -159,14 +151,11 @@ public:
     virtual void EndElement() override;
 };
 
-class ScXMLSourceTableContext : public SvXMLImportContext
+class ScXMLSourceTableContext : public ScXMLImportContext
 {
     ScXMLDatabaseRangeContext*  pDatabaseRangeContext;
     OUString               sDBName;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -183,14 +172,11 @@ public:
     virtual void EndElement() override;
 };
 
-class ScXMLSourceQueryContext : public SvXMLImportContext
+class ScXMLSourceQueryContext : public ScXMLImportContext
 {
     ScXMLDatabaseRangeContext*  pDatabaseRangeContext;
     OUString               sDBName;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -207,13 +193,10 @@ public:
     virtual void EndElement() override;
 };
 
-class ScXMLConResContext : public SvXMLImportContext
+class ScXMLConResContext : public ScXMLImportContext
 {
     ScXMLDatabaseRangeContext*  pDatabaseRangeContext;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLConResContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -230,13 +213,10 @@ public:
     virtual void EndElement() override;
 };
 
-class ScXMLSubTotalRulesContext : public SvXMLImportContext
+class ScXMLSubTotalRulesContext : public ScXMLImportContext
 {
     ScXMLDatabaseRangeContext* pDatabaseRangeContext;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLSubTotalRulesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -254,13 +234,10 @@ public:
     virtual void EndElement() override;
 };
 
-class ScXMLSortGroupsContext : public SvXMLImportContext
+class ScXMLSortGroupsContext : public ScXMLImportContext
 {
     ScXMLDatabaseRangeContext* pDatabaseRangeContext;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLSortGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -277,14 +254,11 @@ public:
     virtual void EndElement() override;
 };
 
-class ScXMLSubTotalRuleContext : public SvXMLImportContext
+class ScXMLSubTotalRuleContext : public ScXMLImportContext
 {
     ScXMLDatabaseRangeContext*  pDatabaseRangeContext;
     ScSubTotalRule              aSubTotalRule;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLSubTotalRuleContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -305,15 +279,12 @@ public:
     aSubTotalRule.aSubTotalColumns[aSubTotalRule.aSubTotalColumns.getLength() - 1] = rSubTotalColumn; }
 };
 
-class ScXMLSubTotalFieldContext : public SvXMLImportContext
+class ScXMLSubTotalFieldContext : public ScXMLImportContext
 {
     ScXMLSubTotalRuleContext* pSubTotalRuleContext;
     OUString sFieldNumber;
     OUString sFunction;
 
-    const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
-    ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
 public:
 
     ScXMLSubTotalFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx,