summaryrefslogtreecommitdiff
path: root/include/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'include/xmloff')
-rw-r--r--include/xmloff/XMLDrawingPageStyleContext.hxx8
-rw-r--r--include/xmloff/XMLGraphicsDefaultStyle.hxx3
-rw-r--r--include/xmloff/XMLShapeStyleContext.hxx2
-rw-r--r--include/xmloff/XMLTextShapeStyleContext.hxx3
-rw-r--r--include/xmloff/prstylei.hxx3
-rw-r--r--include/xmloff/txtstyli.hxx3
-rw-r--r--include/xmloff/xmlnumi.hxx8
-rw-r--r--include/xmloff/xmlstyle.hxx17
8 files changed, 9 insertions, 38 deletions
diff --git a/include/xmloff/XMLDrawingPageStyleContext.hxx b/include/xmloff/XMLDrawingPageStyleContext.hxx
index 5587e5ddde07..9ef8d060bb56 100644
--- a/include/xmloff/XMLDrawingPageStyleContext.hxx
+++ b/include/xmloff/XMLDrawingPageStyleContext.hxx
@@ -27,11 +27,9 @@
class XMLOFF_DLLPUBLIC XMLDrawingPageStyleContext : public XMLPropStyleContext
{
public:
- XMLDrawingPageStyleContext(
- SvXMLImport& rImport, sal_Int32 nElement,
- css::uno::Reference<css::xml::sax::XFastAttributeList> const& xAttrList,
- SvXMLStylesContext& rStyles, ContextID_Index_Pair const pContextIDs[],
- XmlStyleFamily const pFamilies[]);
+ XMLDrawingPageStyleContext(SvXMLImport& rImport, SvXMLStylesContext& rStyles,
+ ContextID_Index_Pair const pContextIDs[],
+ XmlStyleFamily const pFamilies[]);
virtual void
FillPropertySet(css::uno::Reference<css::beans::XPropertySet> const& rPropSet) override;
diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index 20c6c1dbfe7e..229b480d1fd5 100644
--- a/include/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -28,8 +28,7 @@ class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle final : public XMLPropStyleContex
{
public:
- XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList,
+ XMLGraphicsDefaultStyle( SvXMLImport& rImport,
SvXMLStylesContext& rStyles);
virtual ~XMLGraphicsDefaultStyle() override;
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index 86f18a8340c3..556cfec7cdfc 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -44,8 +44,6 @@ public:
XMLShapeStyleContext(
SvXMLImport& rImport,
- sal_Int32 nElement,
- const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList,
SvXMLStylesContext& rStyles,
XmlStyleFamily nFamily);
virtual ~XMLShapeStyleContext() override;
diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx
index 3d03dcc578af..77e2bcbe58b1 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -36,8 +36,7 @@ class XMLOFF_DLLPUBLIC XMLTextShapeStyleContext final : public XMLShapeStyleCont
public:
- XMLTextShapeStyleContext( SvXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList,
+ XMLTextShapeStyleContext( SvXMLImport& rImport,
SvXMLStylesContext& rStyles, XmlStyleFamily nFamily );
virtual ~XMLTextShapeStyleContext() override;
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 38d0147eb148..b79ae267f9b1 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -88,8 +88,7 @@ protected:
public:
- XMLPropStyleContext( SvXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList,
+ XMLPropStyleContext( SvXMLImport& rImport,
SvXMLStylesContext& rStyles, XmlStyleFamily nFamily,
bool bDefaultStyle=false );
virtual ~XMLPropStyleContext() override;
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index 4224d49e4869..bb570ac9095c 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -53,8 +53,7 @@ protected:
public:
- XMLTextStyleContext( SvXMLImport& rImport, sal_Int32 nElement,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList,
+ XMLTextStyleContext( SvXMLImport& rImport,
SvXMLStylesContext& rStyles, XmlStyleFamily nFamily,
bool bDefaultStyle = false );
~XMLTextStyleContext() override;
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index b1a7391acea2..e8d0b1def920 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -51,16 +51,12 @@ public:
SvxXMLListStyleContext(
SvXMLImport& rImport,
- sal_Int32 nElement,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList,
bool bOutl = false );
~SvxXMLListStyleContext() override;
- virtual SvXMLImportContextRef CreateChildContext(
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
+ virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext(
+ sal_Int32 nElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& AttrList ) override;
void FillUnoNumRule(
const css::uno::Reference< css::container::XIndexReplace> & rNumRule) const;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 4fdfcec0ebbe..991b22edc9fa 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -85,29 +85,12 @@ protected:
public:
-
- SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
- const OUString& rLName,
- const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
- XmlStyleFamily nFamily=XmlStyleFamily::DATA_STYLE,
- bool bDefaultStyle = false );
-
- SvXMLStyleContext( SvXMLImport& rImport,
- sal_Int32 nElement,
- const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList,
- XmlStyleFamily nFamily=XmlStyleFamily::DATA_STYLE,
- bool bDefaultStyle = false );
-
- // Fast-parser constructor
SvXMLStyleContext( SvXMLImport& rImport,
XmlStyleFamily nFamily=XmlStyleFamily::DATA_STYLE,
bool bDefaultStyle = false );
virtual ~SvXMLStyleContext() override;
- virtual void StartElement(
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) final override;
-
virtual void SAL_CALL startFastElement(
sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) override;