[Libreoffice-commits] core.git: sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Nov 7 06:39:33 UTC 2016
sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 6
sc/source/filter/xml/XMLCalculationSettingsContext.hxx | 13 --
sc/source/filter/xml/XMLCellRangeSourceContext.cxx | 2
sc/source/filter/xml/XMLCellRangeSourceContext.hxx | 15 --
sc/source/filter/xml/XMLConsolidationContext.cxx | 2
sc/source/filter/xml/XMLConsolidationContext.hxx | 15 --
sc/source/filter/xml/XMLDDELinksContext.cxx | 14 +-
sc/source/filter/xml/XMLDDELinksContext.hxx | 29 +---
sc/source/filter/xml/XMLDetectiveContext.cxx | 6
sc/source/filter/xml/XMLDetectiveContext.hxx | 16 --
sc/source/filter/xml/XMLEmptyContext.cxx | 2
sc/source/filter/xml/XMLEmptyContext.hxx | 7 -
sc/source/filter/xml/XMLTableShapesContext.cxx | 2
sc/source/filter/xml/XMLTableShapesContext.hxx | 5
sc/source/filter/xml/XMLTableSourceContext.cxx | 2
sc/source/filter/xml/XMLTableSourceContext.hxx | 5
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 110 +++++------------
sc/source/filter/xml/XMLTrackedChangesContext.hxx | 6
sc/source/filter/xml/importcontext.cxx | 2
sc/source/filter/xml/importcontext.hxx | 2
sc/source/filter/xml/xmlannoi.cxx | 2
sc/source/filter/xml/xmlannoi.hxx | 6
sc/source/filter/xml/xmlbodyi.cxx | 2
sc/source/filter/xml/xmlbodyi.hxx | 5
sc/source/filter/xml/xmlcoli.cxx | 4
sc/source/filter/xml/xmlcoli.hxx | 12 -
sc/source/filter/xml/xmlcondformat.cxx | 18 +-
sc/source/filter/xml/xmlcondformat.hxx | 40 +-----
sc/source/filter/xml/xmlconti.cxx | 2
sc/source/filter/xml/xmlconti.hxx | 6
sc/source/filter/xml/xmlcvali.cxx | 28 +---
sc/source/filter/xml/xmlcvali.hxx | 6
sc/source/filter/xml/xmldpimp.cxx | 47 +++----
sc/source/filter/xml/xmldpimp.hxx | 109 +++-------------
sc/source/filter/xml/xmldrani.cxx | 20 +--
sc/source/filter/xml/xmldrani.hxx | 51 +------
sc/source/filter/xml/xmlfilti.cxx | 28 +---
sc/source/filter/xml/xmlfilti.hxx | 47 +------
sc/source/filter/xml/xmlimprt.cxx | 9 -
sc/source/filter/xml/xmllabri.cxx | 4
sc/source/filter/xml/xmllabri.hxx | 16 --
sc/source/filter/xml/xmlnexpi.cxx | 6
sc/source/filter/xml/xmlnexpi.hxx | 16 --
sc/source/filter/xml/xmlrowi.cxx | 4
sc/source/filter/xml/xmlrowi.hxx | 11 -
sc/source/filter/xml/xmlsceni.cxx | 2
sc/source/filter/xml/xmlsceni.hxx | 6
sc/source/filter/xml/xmlsorti.cxx | 4
sc/source/filter/xml/xmlsorti.hxx | 11 -
sc/source/filter/xml/xmltabi.cxx | 9 -
sc/source/filter/xml/xmltabi.hxx | 10 -
51 files changed, 255 insertions(+), 547 deletions(-)
New commits:
commit 496c0de160dd405c9f089679fc5f590bfe15e49e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Nov 4 15:07:36 2016 +0200
inherit from ScXMLImportContext
and drop a bunch of redundant code
Change-Id: I187273ad9eebeaf2446e09b2e3442e963d8ae4f4
Reviewed-on: https://gerrit.libreoffice.org/30568
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index b99b58e..6aeed40 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -36,7 +36,7 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
fIterationEpsilon(0.001),
nIterationCount(100),
nYear2000(1930),
@@ -161,7 +161,7 @@ ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
ScXMLCalculationSettingsContext* pCalcSet) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; ++i )
@@ -207,7 +207,7 @@ ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
ScXMLCalculationSettingsContext* pCalcSet) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; ++i )
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
index e7c9f94..3ad233a3 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx
@@ -24,9 +24,10 @@
#include <unotools/textsearch.hxx>
#include <com/sun/star/util/Date.hpp>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-class ScXMLCalculationSettingsContext : public SvXMLImportContext
+class ScXMLCalculationSettingsContext : public ScXMLImportContext
{
css::util::Date aNullDate;
double fIterationEpsilon;
@@ -39,8 +40,6 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext
bool bLookUpLabels;
bool bMatchWholeCell;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -59,10 +58,8 @@ public:
virtual void EndElement() override;
};
-class ScXMLNullDateContext : public SvXMLImportContext
+class ScXMLNullDateContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLNullDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -77,10 +74,8 @@ public:
virtual void EndElement() override;
};
-class ScXMLIterationContext : public SvXMLImportContext
+class ScXMLIterationContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLIterationContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 5fbbf75..624d6f9 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -39,7 +39,7 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
ScMyImpCellRangeSource* pCellRangeSource ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
if( !xAttrList.is() ) return;
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
index dd76562..8d0c409 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx
@@ -22,6 +22,7 @@
#include <xmloff/xmlimp.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
struct ScMyImpCellRangeSource
@@ -30,19 +31,15 @@ struct ScMyImpCellRangeSource
OUString sFilterName;
OUString sFilterOptions;
OUString sURL;
- sal_Int32 nColumns;
- sal_Int32 nRows;
- sal_Int32 nRefresh;
+ sal_Int32 nColumns;
+ sal_Int32 nRows;
+ sal_Int32 nRefresh;
- ScMyImpCellRangeSource();
+ ScMyImpCellRangeSource();
};
-class ScXMLCellRangeSourceContext : public SvXMLImportContext
+class ScXMLCellRangeSourceContext : public ScXMLImportContext
{
-private:
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLCellRangeSourceContext(
ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index f47bd10..217327a 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -33,7 +33,7 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
eFunction( SUBTOTAL_FUNC_NONE ),
bLinkToSource( false ),
bTargetAddr(false)
diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx
index 9bff604..499aab1 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.hxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.hxx
@@ -24,21 +24,18 @@
#include "address.hxx"
#include <xmloff/xmlimp.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-class ScXMLConsolidationContext : public SvXMLImportContext
+class ScXMLConsolidationContext : public ScXMLImportContext
{
private:
OUString sSourceList;
OUString sUseLabel;
- ScAddress aTargetAddr;
- ScSubTotalFunc eFunction;
- bool bLinkToSource;
- bool bTargetAddr;
-
-protected:
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
+ ScAddress aTargetAddr;
+ ScSubTotalFunc eFunction;
+ bool bLinkToSource;
+ bool bTargetAddr;
public:
ScXMLConsolidationContext(
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 43425db..4b02602 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -35,7 +35,7 @@ ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
// here are no attributes
rImport.LockSolarMutex();
@@ -69,7 +69,7 @@ ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
aDDELinkTable(),
aDDELinkRow(),
sApplication(),
@@ -193,7 +193,7 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDDELink(pTempDDELink)
{
if( !xAttrList.is() ) return;
@@ -251,7 +251,7 @@ ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDDELink(pTempDDELink)
{
// here are no attributes
@@ -290,7 +290,7 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDDELink(pTempDDELink)
{
if( !xAttrList.is() ) return;
@@ -336,7 +336,7 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDDELink(pTempDDELink),
nRows(1)
{
@@ -390,7 +390,7 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDDELinkContext* pTempDDELink) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sValue(),
fValue(),
nCells(1),
diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx
index 6679ca0..43cfcca 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.hxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.hxx
@@ -22,12 +22,11 @@
#include <xmloff/xmlictxt.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
#include <list>
-class ScXMLDDELinksContext : public SvXMLImportContext
+class ScXMLDDELinksContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -52,7 +51,7 @@ struct ScDDELinkCell
typedef std::list<ScDDELinkCell> ScDDELinkCells;
-class ScXMLDDELinkContext : public SvXMLImportContext
+class ScXMLDDELinkContext : public ScXMLImportContext
{
ScDDELinkCells aDDELinkTable;
ScDDELinkCells aDDELinkRow;
@@ -64,8 +63,6 @@ class ScXMLDDELinkContext : public SvXMLImportContext
sal_Int32 nRows;
sal_uInt8 nMode;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDDELinkContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -90,12 +87,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDDESourceContext : public SvXMLImportContext
+class ScXMLDDESourceContext : public ScXMLImportContext
{
ScXMLDDELinkContext* pDDELink;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDDESourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -111,12 +106,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDDETableContext : public SvXMLImportContext
+class ScXMLDDETableContext : public ScXMLImportContext
{
ScXMLDDELinkContext* pDDELink;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDDETableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -132,12 +125,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDDEColumnContext : public SvXMLImportContext
+class ScXMLDDEColumnContext : public ScXMLImportContext
{
ScXMLDDELinkContext* pDDELink;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDDEColumnContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -153,13 +144,11 @@ public:
virtual void EndElement() override;
};
-class ScXMLDDERowContext : public SvXMLImportContext
+class ScXMLDDERowContext : public ScXMLImportContext
{
ScXMLDDELinkContext* pDDELink;
sal_Int32 nRows;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDDERowContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -175,7 +164,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLDDECellContext : public SvXMLImportContext
+class ScXMLDDECellContext : public ScXMLImportContext
{
OUString sValue;
double fValue;
@@ -186,8 +175,6 @@ class ScXMLDDECellContext : public SvXMLImportContext
ScXMLDDELinkContext* pDDELink;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDDECellContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index 543c4bb..976beb5 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -64,7 +64,7 @@ ScXMLDetectiveContext::ScXMLDetectiveContext(
sal_uInt16 nPrfx,
const OUString& rLName,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDetectiveObjVec( pNewDetectiveObjVec )
{
}
@@ -106,7 +106,7 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
ScMyImpDetectiveObjVec* pNewDetectiveObjVec ):
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDetectiveObjVec( pNewDetectiveObjVec ),
aDetectiveObj(),
bValid( false )
@@ -183,7 +183,7 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
aDetectiveOp(),
bHasType( false )
{
diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx
index 8cbbb6b..fc98754 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.hxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.hxx
@@ -25,6 +25,7 @@
#include "detfunc.hxx"
#include "detdata.hxx"
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
#include <list>
@@ -72,14 +73,11 @@ public:
bool GetFirstOp( ScMyImpDetectiveOp& rDetOp );
};
-class ScXMLDetectiveContext : public SvXMLImportContext
+class ScXMLDetectiveContext : public ScXMLImportContext
{
private:
ScMyImpDetectiveObjVec* pDetectiveObjVec;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDetectiveContext(
ScXMLImport& rImport,
@@ -97,16 +95,13 @@ public:
virtual void EndElement() override;
};
-class ScXMLDetectiveHighlightedContext : public SvXMLImportContext
+class ScXMLDetectiveHighlightedContext : public ScXMLImportContext
{
private:
ScMyImpDetectiveObjVec* pDetectiveObjVec;
ScMyImpDetectiveObj aDetectiveObj;
bool bValid;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDetectiveHighlightedContext(
ScXMLImport& rImport,
@@ -125,15 +120,12 @@ public:
virtual void EndElement() override;
};
-class ScXMLDetectiveOperationContext : public SvXMLImportContext
+class ScXMLDetectiveOperationContext : public ScXMLImportContext
{
private:
ScMyImpDetectiveOp aDetectiveOp;
bool bHasType;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDetectiveOperationContext(
ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx
index e5b9053..8e7abc8 100644
--- a/sc/source/filter/xml/XMLEmptyContext.cxx
+++ b/sc/source/filter/xml/XMLEmptyContext.cxx
@@ -23,7 +23,7 @@
ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
}
diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx
index e702961..2587885 100644
--- a/sc/source/filter/xml/XMLEmptyContext.hxx
+++ b/sc/source/filter/xml/XMLEmptyContext.hxx
@@ -21,15 +21,12 @@
#include <xmloff/xmlictxt.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-class ScXMLEmptyContext : public SvXMLImportContext
+class ScXMLEmptyContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
-
ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName);
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index 53389bb..1d3b8db 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -29,7 +29,7 @@ ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
// here are no attributes
}
diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx
index fb39e31..db9a3f3 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.hxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx
@@ -22,11 +22,10 @@
#include <xmloff/xmlictxt.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-class ScXMLTableShapesContext : public SvXMLImportContext
+class ScXMLTableShapesContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index d66733e..c3f3cf7 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -35,7 +35,7 @@ ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sLink(),
sTableName(),
sFilterName(),
diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx
index ec81e7d..31791c0 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.hxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.hxx
@@ -23,8 +23,9 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/sheet/SheetLinkMode.hpp>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-class ScXMLTableSourceContext : public SvXMLImportContext
+class ScXMLTableSourceContext : public ScXMLImportContext
{
OUString sLink;
OUString sTableName;
@@ -33,8 +34,6 @@ class ScXMLTableSourceContext : public SvXMLImportContext
sal_Int32 nRefresh;
css::sheet::SheetLinkMode nMode;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index a853a8d..e36f54f 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -38,7 +38,7 @@
using namespace com::sun::star;
using namespace xmloff::token;
-class ScXMLChangeInfoContext : public SvXMLImportContext
+class ScXMLChangeInfoContext : public ScXMLImportContext
{
ScMyActionInfo aInfo;
OUStringBuffer sAuthorBuffer;
@@ -47,8 +47,6 @@ class ScXMLChangeInfoContext : public SvXMLImportContext
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
sal_uInt32 nParagraphCount;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLChangeInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -62,12 +60,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLBigRangeContext : public SvXMLImportContext
+class ScXMLBigRangeContext : public ScXMLImportContext
{
ScBigRange& rBigRange;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLBigRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -81,7 +77,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLCellContentDeletionContext : public SvXMLImportContext
+class ScXMLCellContentDeletionContext : public ScXMLImportContext
{
OUString sFormulaAddress;
OUString sFormula;
@@ -100,8 +96,6 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext
bool bBigRange;
bool bContainsCell;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLCellContentDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -115,12 +109,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDependenceContext : public SvXMLImportContext
+class ScXMLDependenceContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDependenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -134,12 +126,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDependingsContext : public SvXMLImportContext
+class ScXMLDependingsContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDependingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -153,12 +143,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLChangeDeletionContext : public SvXMLImportContext
+class ScXMLChangeDeletionContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLChangeDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -172,12 +160,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDeletionsContext : public SvXMLImportContext
+class ScXMLDeletionsContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDeletionsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -193,7 +179,7 @@ public:
class ScXMLChangeCellContext;
-class ScXMLChangeTextPContext : public SvXMLImportContext
+class ScXMLChangeTextPContext : public ScXMLImportContext
{
css::uno::Reference< css::xml::sax::XAttributeList> xAttrList;
OUString sLName;
@@ -202,8 +188,6 @@ class ScXMLChangeTextPContext : public SvXMLImportContext
SvXMLImportContext* pTextPContext;
sal_uInt16 nPrefix;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLChangeTextPContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -222,7 +206,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLChangeCellContext : public SvXMLImportContext
+class ScXMLChangeCellContext : public ScXMLImportContext
{
ScCellValue& mrOldCell;
@@ -237,8 +221,6 @@ class ScXMLChangeCellContext : public SvXMLImportContext
bool bString;
bool bFormula;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLChangeCellContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -260,7 +242,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLPreviousContext : public SvXMLImportContext
+class ScXMLPreviousContext : public ScXMLImportContext
{
OUString sFormulaAddress;
OUString sFormula;
@@ -276,8 +258,6 @@ class ScXMLPreviousContext : public SvXMLImportContext
sal_uInt16 nType;
sal_uInt8 nMatrixFlag;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLPreviousContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -291,13 +271,11 @@ public:
virtual void EndElement() override;
};
-class ScXMLContentChangeContext : public SvXMLImportContext
+class ScXMLContentChangeContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
ScBigRange aBigRange;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLContentChangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -310,12 +288,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLInsertionContext : public SvXMLImportContext
+class ScXMLInsertionContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLInsertionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -328,12 +304,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLInsertionCutOffContext : public SvXMLImportContext
+class ScXMLInsertionCutOffContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLInsertionCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -346,12 +320,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLMovementCutOffContext : public SvXMLImportContext
+class ScXMLMovementCutOffContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLMovementCutOffContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -364,12 +336,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLCutOffsContext : public SvXMLImportContext
+class ScXMLCutOffsContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -382,12 +352,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDeletionContext : public SvXMLImportContext
+class ScXMLDeletionContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDeletionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -400,14 +368,12 @@ public:
virtual void EndElement() override;
};
-class ScXMLMovementContext : public SvXMLImportContext
+class ScXMLMovementContext : public ScXMLImportContext
{
ScBigRange aSourceRange;
ScBigRange aTargetRange;
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLMovementContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -420,12 +386,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLRejectionContext : public SvXMLImportContext
+class ScXMLRejectionContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLRejectionContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
@@ -443,7 +407,7 @@ ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
rImport.LockSolarMutex();
@@ -522,7 +486,7 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
aInfo(),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper),
nParagraphCount(0)
@@ -597,7 +561,7 @@ ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScBigRange& rTempBigRange ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
rBigRange(rTempBigRange)
{
bool bColumn(false);
@@ -682,7 +646,7 @@ ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport&
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
fValue(0.0),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper),
nID(0),
@@ -758,7 +722,7 @@ ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nID(0);
@@ -800,7 +764,7 @@ ScXMLDependingsContext::ScXMLDependingsContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
// here are no attributes
@@ -838,7 +802,7 @@ ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nID(0);
@@ -880,7 +844,7 @@ ScXMLDeletionsContext::ScXMLDeletionsContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
// here are no attributes
@@ -919,7 +883,7 @@ ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xTempAttrList,
ScXMLChangeCellContext* pTempChangeCellContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
xAttrList(xTempAttrList),
sLName(rLName),
sText(),
@@ -1009,7 +973,7 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport,
formula::FormulaGrammar::Grammar& rGrammar,
OUString& rTempInputString, double& fDateTimeValue, sal_uInt16& nType,
sal_uInt8& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows )
- : SvXMLImportContext( rImport, nPrfx, rLName )
+ : ScXMLImportContext( rImport, nPrfx, rLName )
, mrOldCell(rOldCell)
, rInputString(rTempInputString)
, rDateTimeValue(fDateTimeValue)
@@ -1209,7 +1173,7 @@ ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
fValue(0.0),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper),
nID(0),
@@ -1267,7 +1231,7 @@ ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nActionNumber(0);
@@ -1358,7 +1322,7 @@ ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nActionNumber(0);
@@ -1462,7 +1426,7 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nID(0);
@@ -1511,7 +1475,7 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nID(0);
@@ -1574,7 +1538,7 @@ ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& /* xAttrList */,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
// here are no attributes
@@ -1613,7 +1577,7 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nActionNumber(0);
@@ -1728,7 +1692,7 @@ ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nActionNumber(0);
@@ -1813,7 +1777,7 @@ ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pChangeTrackingImportHelper(pTempChangeTrackingImportHelper)
{
sal_uInt32 nActionNumber(0);
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
index f0a2619..c331316 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx
@@ -23,18 +23,16 @@
#include "XMLChangeTrackingImportHelper.hxx"
#include "chgtrack.hxx"
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
#include <xmloff/xmlictxt.hxx>
#include <rtl/ustrbuf.hxx>
class ScXMLChangeTrackingImportHelper;
-class ScXMLTrackedChangesContext : public SvXMLImportContext
+class ScXMLTrackedChangesContext : public ScXMLImportContext
{
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
diff --git a/sc/source/filter/xml/importcontext.cxx b/sc/source/filter/xml/importcontext.cxx
index b4e1207..9e851c6 100644
--- a/sc/source/filter/xml/importcontext.cxx
+++ b/sc/source/filter/xml/importcontext.cxx
@@ -10,7 +10,7 @@
#include "importcontext.hxx"
#include "xmlimprt.hxx"
-ScXMLImportContext::ScXMLImportContext(SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName) :
+ScXMLImportContext::ScXMLImportContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName) :
SvXMLImportContext(rImport, nPrefix, rLocalName)
{
}
diff --git a/sc/source/filter/xml/importcontext.hxx b/sc/source/filter/xml/importcontext.hxx
index 52cd8a4..6b660631 100644
--- a/sc/source/filter/xml/importcontext.hxx
+++ b/sc/source/filter/xml/importcontext.hxx
@@ -22,7 +22,7 @@ class ScXMLImportContext : public SvXMLImportContext
{
public:
ScXMLImportContext(
- SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName);
+ ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName);
protected:
ScXMLImport& GetScImport();
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 0dab506..87ea27d 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -46,7 +46,7 @@ ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLAnnotationData& rAnnotationData,
ScXMLTableRowCellContext* pTempCellContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
mrAnnotationData( rAnnotationData ),
pCellContext(pTempCellContext),
pShapeContext(nullptr)
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index d32d9f4..d10897c 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
class ScXMLTableRowCellContext;
@@ -62,7 +63,7 @@ struct ScXMLAnnotationData
~ScXMLAnnotationData();
};
-class ScXMLAnnotationContext : public SvXMLImportContext
+class ScXMLAnnotationContext : public ScXMLImportContext
{
public:
@@ -99,9 +100,6 @@ private:
OUStringBuffer maCreateDateStringBuffer;
ScXMLTableRowCellContext* pCellContext;
SvXMLImportContext* pShapeContext;
-
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
};
#endif
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 379a3a5..53f1b62 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -60,7 +60,7 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sPassword(),
meHash1(PASSHASH_SHA1),
meHash2(PASSHASH_UNSPECIFIED),
diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx
index 2177a5c..ac9274b 100644
--- a/sc/source/filter/xml/xmlbodyi.hxx
+++ b/sc/source/filter/xml/xmlbodyi.hxx
@@ -23,12 +23,13 @@
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlimp.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
#include "tabprotection.hxx"
class ScXMLChangeTrackingImportHelper;
-class ScXMLBodyContext : public SvXMLImportContext
+class ScXMLBodyContext : public ScXMLImportContext
{
OUString sPassword;
ScPasswordHash meHash1;
@@ -37,8 +38,6 @@ class ScXMLBodyContext : public SvXMLImportContext
bool bHadCalculationSettings;
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index bd1de55..1d62b3c 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -44,7 +44,7 @@ ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sVisibility(GetXMLToken(XML_VISIBLE))
{
nColCount = 1;
@@ -158,7 +158,7 @@ ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
const bool bTempHeader, const bool bTempGroup) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
nHeaderStartCol(0),
nHeaderEndCol(0),
nGroupStartCol(0),
diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx
index b99df7c..85aaa64 100644
--- a/sc/source/filter/xml/xmlcoli.hxx
+++ b/sc/source/filter/xml/xmlcoli.hxx
@@ -22,18 +22,15 @@
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlimp.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-
-class ScXMLTableColContext : public SvXMLImportContext
+class ScXMLTableColContext : public ScXMLImportContext
{
sal_Int32 nColCount;
OUString sStyleName;
OUString sVisibility;
OUString sCellStyleName;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -49,7 +46,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLTableColsContext : public SvXMLImportContext
+class ScXMLTableColsContext : public ScXMLImportContext
{
sal_Int32 nHeaderStartCol;
sal_Int32 nHeaderEndCol;
@@ -59,9 +56,6 @@ class ScXMLTableColsContext : public SvXMLImportContext
bool bGroup;
bool bGroupDisplay;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLTableColsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index 0850bcf..6479f1b 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -22,7 +22,7 @@
ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName):
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
GetScImport().SetNewCondFormatData();
GetScImport().GetDocument()->SetCondFormList(new ScConditionalFormatList(), GetScImport().GetTables().GetCurrentSheet());
@@ -58,7 +58,7 @@ void ScXMLConditionalFormatsContext::EndElement()
ScXMLConditionalFormatContext::ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList):
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
OUString sRange;
@@ -138,7 +138,7 @@ ScXMLConditionalFormatContext::~ScXMLConditionalFormatContext()
ScXMLColorScaleFormatContext::ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, ScConditionalFormat* pFormat):
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pColorScaleFormat(nullptr)
{
pColorScaleFormat = new ScColorScaleFormat(GetScImport().GetDocument());
@@ -167,7 +167,7 @@ SvXMLImportContext* ScXMLColorScaleFormatContext::CreateChildContext( sal_uInt16
ScXMLDataBarFormatContext::ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
ScConditionalFormat* pFormat):
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
mpDataBarFormat(nullptr),
mpFormatData(nullptr)
{
@@ -322,7 +322,7 @@ ScXMLIconSetFormatContext::ScXMLIconSetFormatContext(ScXMLImport& rImport, sal_u
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScConditionalFormat* pFormat):
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
OUString aIconSetType, sShowValue;
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
@@ -566,7 +566,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
ScConditionalFormat* pFormat ):
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
OUString sExpression;
OUString sStyle;
@@ -641,7 +641,7 @@ ScXMLColorScaleFormatEntryContext::ScXMLColorScaleFormatEntryContext( ScXMLImpor
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
ScColorScaleFormat* pFormat):
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
mpFormatEntry( nullptr )
{
double nVal = 0;
@@ -693,7 +693,7 @@ ScXMLFormattingEntryContext::ScXMLFormattingEntryContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
ScColorScaleEntry*& pColorScaleEntry):
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
OUString sVal;
OUString sType;
@@ -770,7 +770,7 @@ ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList,
ScConditionalFormat* pFormat ):
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
OUString sDateType, sStyle;
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx
index 5170490..c93e4b6 100644
--- a/sc/source/filter/xml/xmlcondformat.hxx
+++ b/sc/source/filter/xml/xmlcondformat.hxx
@@ -12,6 +12,7 @@
#include <xmloff/xmlictxt.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
#include "rangelst.hxx"
class ScColorScaleFormat;
@@ -21,10 +22,8 @@ struct ScDataBarFormatData;
class ScConditionalFormat;
struct ScIconSetFormatData;
-class ScXMLConditionalFormatsContext : public SvXMLImportContext
+class ScXMLConditionalFormatsContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName );
@@ -38,10 +37,8 @@ public:
virtual void EndElement() override;
};
-class ScXMLConditionalFormatContext : public SvXMLImportContext
+class ScXMLConditionalFormatContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLConditionalFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -60,12 +57,8 @@ private:
ScRangeList maRange;
};
-class ScXMLColorScaleFormatContext : public SvXMLImportContext
+class ScXMLColorScaleFormatContext : public ScXMLImportContext
{
-private:
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLColorScaleFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName, ScConditionalFormat* pFormat);
@@ -80,10 +73,8 @@ private:
ScColorScaleFormat* pColorScaleFormat;
};
-class ScXMLDataBarFormatContext : public SvXMLImportContext
+class ScXMLDataBarFormatContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDataBarFormatContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -102,11 +93,8 @@ private:
};
-class ScXMLIconSetFormatContext : public SvXMLImportContext
+class ScXMLIconSetFormatContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
ScIconSetFormatData* mpFormatData;
public:
@@ -122,10 +110,8 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
};
-class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext
+class ScXMLColorScaleFormatEntryContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLColorScaleFormatEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -138,10 +124,8 @@ private:
ScColorScaleEntry* mpFormatEntry;
};
-class ScXMLFormattingEntryContext : public SvXMLImportContext
+class ScXMLFormattingEntryContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLFormattingEntryContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -151,10 +135,8 @@ public:
virtual ~ScXMLFormattingEntryContext() override {}
};
-class ScXMLCondContext : public SvXMLImportContext
+class ScXMLCondContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLCondContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -164,10 +146,8 @@ public:
virtual ~ScXMLCondContext() override {}
};
-class ScXMLDateContext : public SvXMLImportContext
+class ScXMLDateContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
public:
ScXMLDateContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index 800cfd4..9ae456e 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -34,7 +34,7 @@ ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */,
OUStringBuffer& sTempValue) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sOUText(),
sValue(sTempValue)
{
diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx
index d245a80..0daa587 100644
--- a/sc/source/filter/xml/xmlconti.hxx
+++ b/sc/source/filter/xml/xmlconti.hxx
@@ -22,15 +22,13 @@
#include <xmloff/xmlimp.hxx>
#include <rtl/ustrbuf.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-class ScXMLContentContext : public SvXMLImportContext
+class ScXMLContentContext : public ScXMLImportContext
{
OUStringBuffer sOUText;
OUStringBuffer& sValue;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 8535463..8fdd9af 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star;
using namespace xmloff::token;
using namespace ::formula;
-class ScXMLContentValidationContext : public SvXMLImportContext
+class ScXMLContentValidationContext : public ScXMLImportContext
{
OUString sName;
OUString sHelpTitle;
@@ -51,9 +51,6 @@ class ScXMLContentValidationContext : public SvXMLImportContext
SvXMLImportContextRef xEventContext;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
css::sheet::ValidationAlertStyle GetAlertStyle() const;
void SetFormula( OUString& rFormula, OUString& rFormulaNmsp, FormulaGrammar::Grammar& reGrammar,
const OUString& rCondition, const OUString& rGlobNmsp, FormulaGrammar::Grammar eGlobGrammar, bool bHasNmsp ) const;
@@ -78,7 +75,7 @@ public:
void SetErrorMacro(const bool bExecute);
};
-class ScXMLHelpMessageContext : public SvXMLImportContext
+class ScXMLHelpMessageContext : public ScXMLImportContext
{
OUString sTitle;
OUStringBuffer sMessage;
@@ -87,8 +84,6 @@ class ScXMLHelpMessageContext : public SvXMLImportContext
ScXMLContentValidationContext* pValidationContext;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLHelpMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -105,7 +100,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLErrorMessageContext : public SvXMLImportContext
+class ScXMLErrorMessageContext : public ScXMLImportContext
{
OUString sTitle;
OUStringBuffer sMessage;
@@ -115,8 +110,6 @@ class ScXMLErrorMessageContext : public SvXMLImportContext
ScXMLContentValidationContext* pValidationContext;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLErrorMessageContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -133,15 +126,12 @@ public:
virtual void EndElement() override;
};
-class ScXMLErrorMacroContext : public SvXMLImportContext
+class ScXMLErrorMacroContext : public ScXMLImportContext
{
OUString sName;
bool bExecute;
-
ScXMLContentValidationContext* pValidationContext;
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLErrorMacroContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -161,7 +151,7 @@ ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rIm
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
// here are no attributes
}
@@ -198,7 +188,7 @@ ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImpo
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
nShowList(sheet::TableValidationVisibility::UNSORTED),
bAllowEmptyCell(true),
bDisplayHelp(false),
@@ -468,7 +458,7 @@ ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLContentValidationContext* pTempValidationContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sTitle(),
sMessage(),
nParagraphCount(0),
@@ -536,7 +526,7 @@ ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLContentValidationContext* pTempValidationContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sTitle(),
sMessage(),
sMessageType(),
@@ -608,7 +598,7 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLContentValidationContext* pTempValidationContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
sName(),
bExecute(false)
{
diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx
index 2f63648..e353d73 100644
--- a/sc/source/filter/xml/xmlcvali.hxx
+++ b/sc/source/filter/xml/xmlcvali.hxx
@@ -26,12 +26,10 @@
#include <com/sun/star/sheet/ConditionOperator.hpp>
#include <rtl/ustrbuf.hxx>
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
-class ScXMLContentValidationsContext : public SvXMLImportContext
+class ScXMLContentValidationsContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index f57105f..19b8472 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -58,7 +58,7 @@ ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
// has no Attributes
rImport.LockSolarMutex();
@@ -103,7 +103,7 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDoc(GetScImport().GetDocument()),
pDPObject(nullptr),
pDPDimSaveData(nullptr),
@@ -592,7 +592,7 @@ ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTempDataPilotTable) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotTable(pTempDataPilotTable)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -646,7 +646,7 @@ ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTempDataPilotTable) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotTable(pTempDataPilotTable)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -695,7 +695,7 @@ ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTempDataPilotTable) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotTable(pTempDataPilotTable)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -744,7 +744,7 @@ ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTempDataPilotTable) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotTable(pTempDataPilotTable)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -803,15 +803,10 @@ void ScXMLSourceServiceContext::EndElement()
{
}
-ScXMLImport& ScXMLDataPilotGrandTotalContext::GetScImport()
-{
- return static_cast<ScXMLImport&>(GetImport());
-}
-
ScXMLDataPilotGrandTotalContext::ScXMLDataPilotGrandTotalContext(
ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTableContext ) :
- SvXMLImportContext( rImport, nPrefix, rLName ),
+ ScXMLImportContext( rImport, nPrefix, rLName ),
mpTableContext(pTableContext),
meOrientation(NONE),
mbVisible(false)
@@ -883,7 +878,7 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTempDataPilotTable) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotTable(pTempDataPilotTable)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -947,7 +942,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotTableContext* pTempDataPilotTable) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotTable(pTempDataPilotTable),
xDim(),
fStart(0.0),
@@ -1157,7 +1152,7 @@ ScXMLDataPilotFieldReferenceContext::ScXMLDataPilotFieldReferenceContext( ScXMLI
const OUString& rLName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sheet::DataPilotFieldReference aReference;
@@ -1224,7 +1219,7 @@ ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pTempDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotField(pTempDataPilotField)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -1297,7 +1292,7 @@ ScXMLDataPilotDisplayInfoContext::ScXMLDataPilotDisplayInfoContext( ScXMLImport&
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sheet::DataPilotFieldAutoShowInfo aInfo;
@@ -1347,7 +1342,7 @@ ScXMLDataPilotSortInfoContext::ScXMLDataPilotSortInfoContext( ScXMLImport& rImpo
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sheet::DataPilotFieldSortInfo aInfo;
@@ -1395,7 +1390,7 @@ ScXMLDataPilotLayoutInfoContext::ScXMLDataPilotLayoutInfoContext( ScXMLImport& r
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
sheet::DataPilotFieldLayoutInfo aInfo;
@@ -1439,7 +1434,7 @@ ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rIm
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */,
ScXMLDataPilotFieldContext* pTempDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotField(pTempDataPilotField),
nFunctionCount(0),
pFunctions(nullptr)
@@ -1510,7 +1505,7 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotSubTotals(pTempDataPilotSubTotals)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -1559,7 +1554,7 @@ ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */,
ScXMLDataPilotFieldContext* pTempDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotField(pTempDataPilotField)
{
// has no attributes
@@ -1599,7 +1594,7 @@ ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pTempDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotField(pTempDataPilotField),
bDisplay( true ),
bDisplayDetails( true ),
@@ -1672,7 +1667,7 @@ ScXMLDataPilotGroupsContext::ScXMLDataPilotGroupsContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pTempDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotField(pTempDataPilotField)
{
OUString sGroupSource;
@@ -1795,7 +1790,7 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotFieldContext* pTempDataPilotField) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotField(pTempDataPilotField)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -1847,7 +1842,7 @@ ScXMLDataPilotGroupMemberContext::ScXMLDataPilotGroupMemberContext( ScXMLImport&
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDataPilotGroupContext* pTempDataPilotGroup) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDataPilotGroup(pTempDataPilotGroup)
{
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 acff68b..d67e730 100644
--- a/sc/source/filter/xml/xmldpimp.hxx
+++ b/sc/source/filter/xml/xmldpimp.hxx
@@ -31,6 +31,7 @@
#include "dpsave.hxx"
#include "queryparam.hxx"
#include "xmlimprt.hxx"
+#include "importcontext.hxx"
#include <unordered_map>
@@ -46,12 +47,8 @@ enum ScMySourceType
CELLRANGE
};
-class ScXMLDataPilotTablesContext : public SvXMLImportContext
+class ScXMLDataPilotTablesContext : public ScXMLImportContext
{
-
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -67,7 +64,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLDataPilotTableContext : public SvXMLImportContext
+class ScXMLDataPilotTableContext : public ScXMLImportContext
{
typedef std::unordered_map<OUString, OUString, OUStringHash> SelectedPagesType;
@@ -116,9 +113,6 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext
SelectedPagesType maSelectedPages;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -154,13 +148,10 @@ public:
void SetSelectedPage( const OUString& rDimName, const OUString& rSelected );
};
-class ScXMLDPSourceSQLContext : public SvXMLImportContext
+class ScXMLDPSourceSQLContext : public ScXMLImportContext
{
ScXMLDataPilotTableContext* pDataPilotTable;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDPSourceSQLContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -177,13 +168,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDPSourceTableContext : public SvXMLImportContext
+class ScXMLDPSourceTableContext : public ScXMLImportContext
{
ScXMLDataPilotTableContext* pDataPilotTable;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDPSourceTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -200,13 +188,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDPSourceQueryContext : public SvXMLImportContext
+class ScXMLDPSourceQueryContext : public ScXMLImportContext
{
ScXMLDataPilotTableContext* pDataPilotTable;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDPSourceQueryContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -223,13 +208,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLSourceServiceContext : public SvXMLImportContext
+class ScXMLSourceServiceContext : public ScXMLImportContext
{
ScXMLDataPilotTableContext* pDataPilotTable;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLSourceServiceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -246,12 +228,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext
+class ScXMLDataPilotGrandTotalContext : public ScXMLImportContext
{
enum Orientation { COLUMN, ROW, BOTH, NONE };
- ScXMLImport& GetScImport();
-
ScXMLDataPilotTableContext* mpTableContext;
OUString maDisplayName;
Orientation meOrientation;
@@ -272,13 +252,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLSourceCellRangeContext : public SvXMLImportContext
+class ScXMLSourceCellRangeContext : public ScXMLImportContext
{
ScXMLDataPilotTableContext* pDataPilotTable;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLSourceCellRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -301,7 +278,7 @@ struct ScXMLDataPilotGroup
OUString aName;
};
-class ScXMLDataPilotFieldContext : public SvXMLImportContext
+class ScXMLDataPilotFieldContext : public ScXMLImportContext
{
ScXMLDataPilotTableContext* pDataPilotTable;
std::unique_ptr<ScDPSaveDimension> xDim;
@@ -324,9 +301,6 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext
bool bAutoEnd:1;
bool mbHasHiddenMember:1;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotFieldContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -367,13 +341,8 @@ public:
void AddGroup(const ::std::vector<OUString>& rMembers, const OUString& rName);
};
-class ScXMLDataPilotFieldReferenceContext : public SvXMLImportContext
+class ScXMLDataPilotFieldReferenceContext : public ScXMLImportContext
{
-// css::sheet::DataPilotFieldReference aReference;
-
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotFieldReferenceContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -384,13 +353,10 @@ public:
virtual ~ScXMLDataPilotFieldReferenceContext() override;
};
-class ScXMLDataPilotLevelContext : public SvXMLImportContext
+class ScXMLDataPilotLevelContext : public ScXMLImportContext
{
ScXMLDataPilotFieldContext* pDataPilotField;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotLevelContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -407,11 +373,8 @@ public:
virtual void EndElement() override;
};
-class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext
+class ScXMLDataPilotDisplayInfoContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotDisplayInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -422,11 +385,8 @@ public:
virtual ~ScXMLDataPilotDisplayInfoContext() override;
};
-class ScXMLDataPilotSortInfoContext : public SvXMLImportContext
+class ScXMLDataPilotSortInfoContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotSortInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -437,11 +397,8 @@ public:
virtual ~ScXMLDataPilotSortInfoContext() override;
};
-class ScXMLDataPilotLayoutInfoContext : public SvXMLImportContext
+class ScXMLDataPilotLayoutInfoContext : public ScXMLImportContext
{
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotLayoutInfoContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -452,7 +409,7 @@ public:
virtual ~ScXMLDataPilotLayoutInfoContext() override;
};
-class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext
+class ScXMLDataPilotSubTotalsContext : public ScXMLImportContext
{
ScXMLDataPilotFieldContext* pDataPilotField;
@@ -460,9 +417,6 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext
sal_uInt16* pFunctions;
OUString maDisplayName;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
const OUString& rLName,
@@ -480,13 +434,10 @@ public:
void SetDisplayName(const OUString& rName);
};
-class ScXMLDataPilotSubTotalContext : public SvXMLImportContext
+class ScXMLDataPilotSubTotalContext : public ScXMLImportContext
{
ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -503,13 +454,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDataPilotMembersContext : public SvXMLImportContext
+class ScXMLDataPilotMembersContext : public ScXMLImportContext
{
ScXMLDataPilotFieldContext* pDataPilotField;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotMembersContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -526,7 +474,7 @@ public:
virtual void EndElement() override;
};
-class ScXMLDataPilotMemberContext : public SvXMLImportContext
+class ScXMLDataPilotMemberContext : public ScXMLImportContext
{
ScXMLDataPilotFieldContext* pDataPilotField;
@@ -536,9 +484,6 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext
bool bDisplayDetails;
bool bHasName;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -555,13 +500,10 @@ public:
virtual void EndElement() override;
};
-class ScXMLDataPilotGroupsContext : public SvXMLImportContext
+class ScXMLDataPilotGroupsContext : public ScXMLImportContext
{
ScXMLDataPilotFieldContext* pDataPilotField;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotGroupsContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -578,16 +520,13 @@ public:
virtual void EndElement() override;
};
-class ScXMLDataPilotGroupContext : public SvXMLImportContext
+class ScXMLDataPilotGroupContext : public ScXMLImportContext
{
ScXMLDataPilotFieldContext* pDataPilotField;
OUString sName;
::std::vector<OUString> aMembers;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotGroupContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
@@ -606,15 +545,11 @@ public:
void AddMember(const OUString& sMember) { aMembers.push_back(sMember); }
};
-class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext
+class ScXMLDataPilotGroupMemberContext : public ScXMLImportContext
{
ScXMLDataPilotGroupContext* pDataPilotGroup;
-
OUString sName;
- const ScXMLImport& GetScImport() const { return static_cast<const ScXMLImport&>(GetImport()); }
- ScXMLImport& GetScImport() { return static_cast<ScXMLImport&>(GetImport()); }
-
public:
ScXMLDataPilotGroupMemberContext( ScXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 641a039..82ca937 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -62,7 +62,7 @@ ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ ) :
- SvXMLImportContext( rImport, nPrfx, rLName )
+ ScXMLImportContext( rImport, nPrfx, rLName )
{
// has no attributes
rImport.LockSolarMutex();
@@ -104,7 +104,7 @@ ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
mpQueryParam(new ScQueryParam),
sDatabaseRangeName(STR_DB_LOCAL_NONAME),
aSortSequence(),
@@ -487,7 +487,7 @@ ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDatabaseRangeContext(pTempDatabaseRangeContext)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -558,7 +558,7 @@ ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDatabaseRangeContext(pTempDatabaseRangeContext)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -624,7 +624,7 @@ ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
pDatabaseRangeContext(pTempDatabaseRangeContext)
{
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
@@ -690,7 +690,7 @@ ScXMLConResContext::ScXMLConResContext( ScXMLImport& rImport,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) :
- SvXMLImportContext( rImport, nPrfx, rLName ),
+ ScXMLImportContext( rImport, nPrfx, rLName ),
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list