[Libreoffice-commits] core.git: dbaccess/source editeng/source include/xmloff linguistic/source reportdesign/source sc/source starmath/source svx/source sw/inc sw/source xmloff/inc xmloff/source
Caolán McNamara
caolanm at redhat.com
Fri Sep 22 09:02:31 UTC 2017
dbaccess/source/filter/xml/xmlConnectionData.cxx | 2
dbaccess/source/filter/xml/xmlConnectionData.hxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 2
dbaccess/source/filter/xml/xmlDataSource.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 2
dbaccess/source/filter/xml/xmlDataSourceSetting.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 2
dbaccess/source/filter/xml/xmlDataSourceSettings.hxx | 2
dbaccess/source/filter/xml/xmlDatabase.cxx | 2
dbaccess/source/filter/xml/xmlDatabase.hxx | 2
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 2
dbaccess/source/filter/xml/xmlDatabaseDescription.hxx | 2
dbaccess/source/filter/xml/xmlDocuments.cxx | 2
dbaccess/source/filter/xml/xmlDocuments.hxx | 2
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 2
dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 2
dbaccess/source/filter/xml/xmlQuery.cxx | 22 +-
dbaccess/source/filter/xml/xmlQuery.hxx | 2
dbaccess/source/filter/xml/xmlTable.cxx | 2
dbaccess/source/filter/xml/xmlTable.hxx | 2
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 2
dbaccess/source/filter/xml/xmlTableFilterList.hxx | 2
editeng/source/xml/xmltxtimp.cxx | 6
include/xmloff/DocumentSettingsContext.hxx | 2
include/xmloff/XMLEventsImportContext.hxx | 2
include/xmloff/XMLGraphicsDefaultStyle.hxx | 2
include/xmloff/XMLShapeStyleContext.hxx | 2
include/xmloff/XMLTextMasterPageContext.hxx | 2
include/xmloff/XMLTextShapeStyleContext.hxx | 2
include/xmloff/prstylei.hxx | 2
include/xmloff/shapeimport.hxx | 2
include/xmloff/txtstyli.hxx | 2
include/xmloff/xmlictxt.hxx | 8
include/xmloff/xmlmetai.hxx | 2
include/xmloff/xmlnumfi.hxx | 2
include/xmloff/xmlnumi.hxx | 2
include/xmloff/xmlprcon.hxx | 4
include/xmloff/xmlscripti.hxx | 2
include/xmloff/xmlstyle.hxx | 4
linguistic/source/convdicxml.cxx | 16 -
reportdesign/source/filter/xml/xmlCell.cxx | 2
reportdesign/source/filter/xml/xmlCell.hxx | 2
reportdesign/source/filter/xml/xmlColumn.cxx | 2
reportdesign/source/filter/xml/xmlColumn.hxx | 2
reportdesign/source/filter/xml/xmlControlProperty.cxx | 2
reportdesign/source/filter/xml/xmlControlProperty.hxx | 2
reportdesign/source/filter/xml/xmlFixedContent.cxx | 18 -
reportdesign/source/filter/xml/xmlFixedContent.hxx | 2
reportdesign/source/filter/xml/xmlGroup.cxx | 2
reportdesign/source/filter/xml/xmlGroup.hxx | 2
reportdesign/source/filter/xml/xmlMasterFields.cxx | 3
reportdesign/source/filter/xml/xmlMasterFields.hxx | 2
reportdesign/source/filter/xml/xmlReport.cxx | 31 +-
reportdesign/source/filter/xml/xmlReport.hxx | 2
reportdesign/source/filter/xml/xmlReportElement.cxx | 4
reportdesign/source/filter/xml/xmlReportElement.hxx | 2
reportdesign/source/filter/xml/xmlReportElementBase.cxx | 12 -
reportdesign/source/filter/xml/xmlReportElementBase.hxx | 4
reportdesign/source/filter/xml/xmlSection.cxx | 3
reportdesign/source/filter/xml/xmlSection.hxx | 2
reportdesign/source/filter/xml/xmlSubDocument.cxx | 20 -
reportdesign/source/filter/xml/xmlSubDocument.hxx | 2
reportdesign/source/filter/xml/xmlTable.cxx | 3
reportdesign/source/filter/xml/xmlTable.hxx | 2
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 4
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 4
sc/source/filter/xml/XMLTableShapesContext.cxx | 2
sc/source/filter/xml/XMLTableShapesContext.hxx | 2
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 38 +--
sc/source/filter/xml/xmlannoi.cxx | 20 -
sc/source/filter/xml/xmlannoi.hxx | 2
sc/source/filter/xml/xmlcelli.cxx | 2
sc/source/filter/xml/xmlcelli.hxx | 2
sc/source/filter/xml/xmlconti.cxx | 2
sc/source/filter/xml/xmlconti.hxx | 2
sc/source/filter/xml/xmlcvali.cxx | 16 -
sc/source/filter/xml/xmlimprt.cxx | 8
sc/source/filter/xml/xmlstyli.cxx | 18 -
sc/source/filter/xml/xmlstyli.hxx | 2
sc/source/filter/xml/xmltabi.cxx | 2
sc/source/filter/xml/xmltabi.hxx | 2
starmath/source/mathmlimport.cxx | 70 +++---
svx/source/xml/xmlxtimp.cxx | 4
sw/inc/SwXMLSectionList.hxx | 2
sw/source/core/swg/SwXMLSectionList.cxx | 2
sw/source/filter/xml/xmlbrsh.cxx | 2
sw/source/filter/xml/xmlbrshi.hxx | 2
sw/source/filter/xml/xmlfmt.cxx | 30 +-
sw/source/filter/xml/xmlimp.cxx | 12 -
sw/source/filter/xml/xmlitem.cxx | 4
sw/source/filter/xml/xmlitem.hxx | 4
sw/source/filter/xml/xmlitemi.cxx | 18 -
sw/source/filter/xml/xmltbli.cxx | 18 -
sw/source/filter/xml/xmltbli.hxx | 2
sw/source/filter/xml/xmltext.cxx | 4
sw/source/uibase/config/StoredChapterNumbering.cxx | 2
xmloff/inc/DomBuilderContext.hxx | 2
xmloff/inc/PageMasterImportContext.hxx | 2
xmloff/inc/XMLBackgroundImageContext.hxx | 2
xmloff/inc/XMLChartStyleContext.hxx | 2
xmloff/inc/XMLEmbeddedObjectImportContext.hxx | 2
xmloff/inc/XMLFootnoteConfigurationImportContext.hxx | 2
xmloff/inc/XMLImageMapContext.hxx | 2
xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx | 2
xmloff/inc/XMLLineNumberingImportContext.hxx | 2
xmloff/inc/XMLNumberStylesImport.hxx | 2
xmloff/inc/XMLReplacementImageContext.hxx | 2
xmloff/inc/XMLShapePropertySetContext.hxx | 2
xmloff/inc/XMLStringBufferImportContext.hxx | 2
xmloff/inc/XMLTextColumnsContext.hxx | 2
xmloff/inc/XMLTextHeaderFooterContext.hxx | 2
xmloff/inc/animationimport.hxx | 2
xmloff/inc/animimp.hxx | 2
xmloff/inc/txtfldi.hxx | 10
xmloff/inc/txtvfldi.hxx | 2
xmloff/inc/xmltabi.hxx | 2
xmloff/inc/xmlversion.hxx | 2
xmloff/source/chart/SchXMLAxisContext.cxx | 2
xmloff/source/chart/SchXMLAxisContext.hxx | 2
xmloff/source/chart/SchXMLCalculationSettingsContext.cxx | 2
xmloff/source/chart/SchXMLCalculationSettingsContext.hxx | 2
xmloff/source/chart/SchXMLChartContext.cxx | 4
xmloff/source/chart/SchXMLChartContext.hxx | 4
xmloff/source/chart/SchXMLParagraphContext.cxx | 2
xmloff/source/chart/SchXMLParagraphContext.hxx | 2
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 12 -
xmloff/source/chart/SchXMLPlotAreaContext.hxx | 6
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 10
xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx | 2
xmloff/source/chart/SchXMLSeries2Context.cxx | 2
xmloff/source/chart/SchXMLSeries2Context.hxx | 2
xmloff/source/chart/SchXMLTableContext.cxx | 14 -
xmloff/source/chart/SchXMLTableContext.hxx | 10
xmloff/source/chart/SchXMLTextListContext.cxx | 6
xmloff/source/chart/SchXMLTextListContext.hxx | 2
xmloff/source/chart/XMLChartPropertyContext.cxx | 14 -
xmloff/source/chart/XMLChartPropertyContext.hxx | 2
xmloff/source/chart/XMLChartStyleContext.cxx | 12 -
xmloff/source/chart/XMLLabelSeparatorContext.cxx | 2
xmloff/source/chart/XMLLabelSeparatorContext.hxx | 2
xmloff/source/chart/XMLSymbolImageContext.cxx | 2
xmloff/source/chart/XMLSymbolImageContext.hxx | 2
xmloff/source/chart/contexts.cxx | 36 +--
xmloff/source/chart/contexts.hxx | 6
xmloff/source/core/DocumentSettingsContext.cxx | 18 -
xmloff/source/core/DomBuilderContext.cxx | 2
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx | 6
xmloff/source/core/xmlictxt.cxx | 2
xmloff/source/core/xmlimp.cxx | 2
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 12 -
xmloff/source/draw/XMLImageMapContext.cxx | 18 -
xmloff/source/draw/XMLNumberStyles.cxx | 14 -
xmloff/source/draw/XMLReplacementImageContext.cxx | 2
xmloff/source/draw/XMLShapePropertySetContext.cxx | 14 -
xmloff/source/draw/XMLShapeStyleContext.cxx | 12 -
xmloff/source/draw/animationimport.cxx | 2
xmloff/source/draw/animimp.cxx | 6
xmloff/source/draw/eventimp.cxx | 6
xmloff/source/draw/eventimp.hxx | 2
xmloff/source/draw/layerimp.cxx | 6
xmloff/source/draw/layerimp.hxx | 2
xmloff/source/draw/sdxmlimp.cxx | 34 +--
xmloff/source/draw/shapeimport.cxx | 10
xmloff/source/draw/ximp3dscene.cxx | 22 +-
xmloff/source/draw/ximp3dscene.hxx | 2
xmloff/source/draw/ximpbody.cxx | 30 +-
xmloff/source/draw/ximpbody.hxx | 4
xmloff/source/draw/ximpcustomshape.cxx | 2
xmloff/source/draw/ximpcustomshape.hxx | 2
xmloff/source/draw/ximpgrp.cxx | 16 -
xmloff/source/draw/ximpgrp.hxx | 2
xmloff/source/draw/ximplink.cxx | 2
xmloff/source/draw/ximplink.hxx | 2
xmloff/source/draw/ximppage.cxx | 38 +--
xmloff/source/draw/ximppage.hxx | 2
xmloff/source/draw/ximpshap.cxx | 104 ++++------
xmloff/source/draw/ximpshap.hxx | 18 -
xmloff/source/draw/ximpshow.cxx | 2
xmloff/source/draw/ximpshow.hxx | 2
xmloff/source/draw/ximpstyl.cxx | 90 ++++----
xmloff/source/draw/ximpstyl.hxx | 8
xmloff/source/forms/elementimport.cxx | 10
xmloff/source/forms/elementimport.hxx | 14 -
xmloff/source/forms/officeforms.cxx | 2
xmloff/source/forms/officeforms.hxx | 2
xmloff/source/forms/propertyimport.cxx | 8
xmloff/source/forms/propertyimport.hxx | 8
xmloff/source/meta/xmlmetai.cxx | 6
xmloff/source/meta/xmlversion.cxx | 2
xmloff/source/script/XMLEventsImportContext.cxx | 2
xmloff/source/script/xmlbasici.cxx | 4
xmloff/source/script/xmlbasici.hxx | 4
xmloff/source/script/xmlscripti.cxx | 28 +-
xmloff/source/style/FillStyleContext.cxx | 2
xmloff/source/style/FillStyleContext.hxx | 2
xmloff/source/style/PageHeaderFooterContext.cxx | 12 -
xmloff/source/style/PageHeaderFooterContext.hxx | 2
xmloff/source/style/PageMasterImportContext.cxx | 2
xmloff/source/style/PagePropertySetContext.cxx | 16 -
xmloff/source/style/PagePropertySetContext.hxx | 2
xmloff/source/style/XMLBackgroundImageContext.cxx | 2
xmloff/source/style/XMLFontStylesContext.cxx | 6
xmloff/source/style/XMLFontStylesContext_impl.hxx | 6
xmloff/source/style/prstylei.cxx | 12 -
xmloff/source/style/xmlnumfi.cxx | 18 -
xmloff/source/style/xmlnumi.cxx | 18 -
xmloff/source/style/xmlprcon.cxx | 4
xmloff/source/style/xmlstyle.cxx | 4
xmloff/source/style/xmltabi.cxx | 6
xmloff/source/table/XMLTableImport.cxx | 24 +-
xmloff/source/text/XMLAutoTextContainerEventImport.cxx | 2
xmloff/source/text/XMLAutoTextContainerEventImport.hxx | 2
xmloff/source/text/XMLChangeElementImportContext.cxx | 14 -
xmloff/source/text/XMLChangeElementImportContext.hxx | 2
xmloff/source/text/XMLChangeInfoContext.cxx | 16 -
xmloff/source/text/XMLChangeInfoContext.hxx | 2
xmloff/source/text/XMLChangedRegionImportContext.cxx | 16 -
xmloff/source/text/XMLChangedRegionImportContext.hxx | 2
xmloff/source/text/XMLFootnoteBodyImportContext.cxx | 2
xmloff/source/text/XMLFootnoteBodyImportContext.hxx | 2
xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx | 14 -
xmloff/source/text/XMLFootnoteImportContext.cxx | 13 -
xmloff/source/text/XMLFootnoteImportContext.hxx | 2
xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx | 2
xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx | 2
xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx | 2
xmloff/source/text/XMLIndexBibliographySourceContext.cxx | 2
xmloff/source/text/XMLIndexBibliographySourceContext.hxx | 2
xmloff/source/text/XMLIndexBodyContext.cxx | 2
xmloff/source/text/XMLIndexBodyContext.hxx | 2
xmloff/source/text/XMLIndexIllustrationSourceContext.cxx | 2
xmloff/source/text/XMLIndexIllustrationSourceContext.hxx | 2
xmloff/source/text/XMLIndexObjectSourceContext.cxx | 2
xmloff/source/text/XMLIndexObjectSourceContext.hxx | 2
xmloff/source/text/XMLIndexSourceBaseContext.cxx | 14 -
xmloff/source/text/XMLIndexSourceBaseContext.hxx | 2
xmloff/source/text/XMLIndexTOCContext.cxx | 28 +-
xmloff/source/text/XMLIndexTOCContext.hxx | 2
xmloff/source/text/XMLIndexTOCSourceContext.cxx | 3
xmloff/source/text/XMLIndexTOCSourceContext.hxx | 2
xmloff/source/text/XMLIndexTOCStylesContext.cxx | 2
xmloff/source/text/XMLIndexTOCStylesContext.hxx | 2
xmloff/source/text/XMLIndexTableSourceContext.cxx | 4
xmloff/source/text/XMLIndexTableSourceContext.hxx | 2
xmloff/source/text/XMLIndexTemplateContext.cxx | 2
xmloff/source/text/XMLIndexTemplateContext.hxx | 2
xmloff/source/text/XMLIndexUserSourceContext.cxx | 4
xmloff/source/text/XMLIndexUserSourceContext.hxx | 2
xmloff/source/text/XMLLineNumberingImportContext.cxx | 2
xmloff/source/text/XMLSectionImportContext.cxx | 2
xmloff/source/text/XMLSectionImportContext.hxx | 2
xmloff/source/text/XMLSectionSourceDDEImportContext.cxx | 2
xmloff/source/text/XMLSectionSourceDDEImportContext.hxx | 2
xmloff/source/text/XMLSectionSourceImportContext.cxx | 2
xmloff/source/text/XMLSectionSourceImportContext.hxx | 2
xmloff/source/text/XMLStringBufferImportContext.cxx | 2
xmloff/source/text/XMLTextColumnsContext.cxx | 2
xmloff/source/text/XMLTextFrameContext.cxx | 51 ++--
xmloff/source/text/XMLTextFrameContext.hxx | 2
xmloff/source/text/XMLTextFrameHyperlinkContext.cxx | 2
xmloff/source/text/XMLTextFrameHyperlinkContext.hxx | 2
xmloff/source/text/XMLTextHeaderFooterContext.cxx | 2
xmloff/source/text/XMLTextListBlockContext.cxx | 2
xmloff/source/text/XMLTextListBlockContext.hxx | 2
xmloff/source/text/XMLTextListItemContext.cxx | 2
xmloff/source/text/XMLTextListItemContext.hxx | 2
xmloff/source/text/XMLTextMarkImportContext.cxx | 2
xmloff/source/text/XMLTextMarkImportContext.hxx | 2
xmloff/source/text/XMLTextMasterPageContext.cxx | 10
xmloff/source/text/XMLTextPropertySetContext.cxx | 21 --
xmloff/source/text/XMLTextPropertySetContext.hxx | 2
xmloff/source/text/XMLTextShapeStyleContext.cxx | 32 +--
xmloff/source/text/XMLTrackedChangesImportContext.cxx | 12 -
xmloff/source/text/XMLTrackedChangesImportContext.hxx | 2
xmloff/source/text/txtfldi.cxx | 21 --
xmloff/source/text/txtparai.cxx | 51 ++--
xmloff/source/text/txtparai.hxx | 4
xmloff/source/text/txtstyli.cxx | 14 -
xmloff/source/text/txtvfldi.cxx | 12 -
xmloff/source/xforms/TokenContext.cxx | 2
xmloff/source/xforms/TokenContext.hxx | 2
xmloff/source/xforms/XFormsInstanceContext.cxx | 2
xmloff/source/xforms/XFormsInstanceContext.hxx | 2
283 files changed, 971 insertions(+), 1009 deletions(-)
New commits:
commit 442df6cf8345f8029d5a3b470bc4981a5aa2bf20
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Sep 21 12:12:33 2017 +0100
ofz: don't leak in face of exceptions
Change-Id: Ic15590a13bd3770ee5dd7db76b21c830a4fe73e2
Reviewed-on: https://gerrit.libreoffice.org/42587
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index c3be7fedaf49..b56f963fa10e 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -48,7 +48,7 @@ OXMLConnectionData::~OXMLConnectionData()
}
-SvXMLImportContext* OXMLConnectionData::CreateChildContext(
+SvXMLImportContextRef OXMLConnectionData::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx
index ccf15831edca..57d0c07ef9fa 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.hxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx
@@ -37,7 +37,7 @@ namespace dbaxml
const OUString& rLName);
virtual ~OXMLConnectionData() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index e57ba90947d7..c7cabc302183 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -204,7 +204,7 @@ OXMLDataSource::~OXMLDataSource()
}
-SvXMLImportContext* OXMLDataSource::CreateChildContext(
+SvXMLImportContextRef OXMLDataSource::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx
index 4c863c4d2cde..d78fec0c6d4f 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.hxx
@@ -43,7 +43,7 @@ namespace dbaxml
const UsedFor _eUsedFor = eDataSource );
virtual ~OXMLDataSource() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index fe0b336a74a5..381ba18ac550 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -100,7 +100,7 @@ OXMLDataSourceSetting::~OXMLDataSourceSetting()
{
}
-SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext(
+SvXMLImportContextRef OXMLDataSourceSetting::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
index 3f3afb7ada7a..293a9004185b 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
@@ -44,7 +44,7 @@ namespace dbaxml
,OXMLDataSourceSetting* _pContainer = nullptr);
virtual ~OXMLDataSourceSetting() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index e9378590dd1d..0ac34592f065 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@ -47,7 +47,7 @@ OXMLDataSourceSettings::~OXMLDataSourceSettings()
}
-SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext(
+SvXMLImportContextRef OXMLDataSourceSettings::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
index 86259047b310..1812212479f0 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
@@ -32,7 +32,7 @@ namespace dbaxml
OXMLDataSourceSettings( ODBFilter& rImport, sal_uInt16 nPrfx,const OUString& rLName);
virtual ~OXMLDataSourceSettings() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx
index e79c57efe3e0..e4d0651ff852 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -51,7 +51,7 @@ OXMLDatabase::~OXMLDatabase()
}
-SvXMLImportContext* OXMLDatabase::CreateChildContext(
+SvXMLImportContextRef OXMLDatabase::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx
index 93e3167c2501..73dd1cfa8de4 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.hxx
@@ -33,7 +33,7 @@ namespace dbaxml
const OUString& rLName );
virtual ~OXMLDatabase() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index bc6b1eb1c72a..c03537f74270 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@ -46,7 +46,7 @@ OXMLDatabaseDescription::~OXMLDatabaseDescription()
}
-SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext(
+SvXMLImportContextRef OXMLDatabaseDescription::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
index 7004cf1b0c18..a95f1f546901 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
@@ -37,7 +37,7 @@ namespace dbaxml
const OUString& rLName);
virtual ~OXMLDatabaseDescription() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index b8137f2233a4..b7d3d364837a 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -65,7 +65,7 @@ OXMLDocuments::~OXMLDocuments()
}
-SvXMLImportContext* OXMLDocuments::CreateChildContext(
+SvXMLImportContextRef OXMLDocuments::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx
index 6ee6fe85164b..d0141d632550 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.hxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.hxx
@@ -54,7 +54,7 @@ namespace dbaxml
virtual ~OXMLDocuments() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 9d82f99b5622..ce76062cecad 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -110,7 +110,7 @@ OXMLHierarchyCollection::~OXMLHierarchyCollection()
}
-SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
+SvXMLImportContextRef OXMLHierarchyCollection::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
index 601d858111aa..4552b50b7094 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
@@ -54,7 +54,7 @@ namespace dbaxml
);
virtual ~OXMLHierarchyCollection() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index e93d411df2af..fce31f35dc3c 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -76,32 +76,32 @@ OXMLQuery::~OXMLQuery()
}
-SvXMLImportContext* OXMLQuery::CreateChildContext(
+SvXMLImportContextRef OXMLQuery::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext* pContext = OXMLTable::CreateChildContext(nPrefix, rLocalName,xAttrList );
- if ( !pContext )
+ SvXMLImportContextRef xContext = OXMLTable::CreateChildContext(nPrefix, rLocalName,xAttrList );
+ if (!xContext)
{
const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
case XML_TOK_UPDATE_TABLE:
- {
- GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- OUString s1;
- fillAttributes(xAttrList,s1,m_sTable,m_sSchema,m_sCatalog);
- }
+ {
+ GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
+ OUString s1;
+ fillAttributes(xAttrList,s1,m_sTable,m_sSchema,m_sCatalog);
break;
+ }
}
}
- if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ if (!xContext)
+ xContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
- return pContext;
+ return xContext;
}
void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp )
diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx
index 37668d3ec6b5..995d406a9d39 100644
--- a/dbaccess/source/filter/xml/xmlQuery.hxx
+++ b/dbaccess/source/filter/xml/xmlQuery.hxx
@@ -42,7 +42,7 @@ namespace dbaxml
);
virtual ~OXMLQuery() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index b6ca98b0d84a..e5ba49dae372 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -103,7 +103,7 @@ OXMLTable::~OXMLTable()
}
-SvXMLImportContext* OXMLTable::CreateChildContext(
+SvXMLImportContextRef OXMLTable::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< XAttributeList > & xAttrList )
diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx
index 601fbec12677..b9cd2e14c68f 100644
--- a/dbaccess/source/filter/xml/xmlTable.hxx
+++ b/dbaccess/source/filter/xml/xmlTable.hxx
@@ -62,7 +62,7 @@ namespace dbaxml
);
virtual ~OXMLTable() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override;
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index 20427c2a0df6..cfcc00a7a88b 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -46,7 +46,7 @@ OXMLTableFilterList::~OXMLTableFilterList()
{
}
-SvXMLImportContext* OXMLTableFilterList::CreateChildContext(
+SvXMLImportContextRef OXMLTableFilterList::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & /*xAttrList*/ )
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
index 3360131e6286..7df344594135 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
@@ -38,7 +38,7 @@ namespace dbaxml
virtual ~OXMLTableFilterList() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index c44cc8ad0994..9bf8d80d5def 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -60,9 +60,7 @@ class SvxXMLTextImportContext : public SvXMLImportContext
public:
SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XText >& xText );
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override;
-
-// SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override;
private:
const uno::Reference< XText > mxText;
@@ -74,7 +72,7 @@ SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt
{
}
-SvXMLImportContext *SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
+SvXMLImportContextRef SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
{
SvXMLImportContext* pContext = nullptr;
if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index 01443e57094b..9fd34a38a44d 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -38,7 +38,7 @@ public:
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList);
virtual ~XMLDocumentSettingsContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override;
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index edbb27aee733..ee45e1b95f0e 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -109,7 +109,7 @@ protected:
virtual void EndElement() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override;
diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index b53806c69e96..816ff0db2f46 100644
--- a/include/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -40,7 +40,7 @@ public:
virtual ~XMLGraphicsDefaultStyle() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index 8163a9e49c28..a0eace1100a9 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -52,7 +52,7 @@ public:
sal_uInt16 nFamily);
virtual ~XMLShapeStyleContext() override;
- SvXMLImportContext * CreateChildContext(
+ SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx
index f439f9262e51..eab02ed18899 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -59,7 +59,7 @@ public:
bool bOverwrite );
virtual ~XMLTextMasterPageContext() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx
index 9c773e91f0d8..f1f9bf5a49d5 100644
--- a/include/xmloff/XMLTextShapeStyleContext.hxx
+++ b/include/xmloff/XMLTextShapeStyleContext.hxx
@@ -46,7 +46,7 @@ public:
SvXMLStylesContext& rStyles, sal_uInt16 nFamily );
virtual ~XMLTextShapeStyleContext() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index cd843faf2c9d..636e4042f1e6 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -95,7 +95,7 @@ public:
bool bDefaultStyle=false );
virtual ~XMLPropStyleContext() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 58387766c3a0..080b71a02d0f 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -270,7 +270,7 @@ public:
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
css::uno::Reference< css::drawing::XShapes > const & rShapes,
const css::uno::Reference< css::xml::sax::XAttributeList >& xFrameAttrList);
- static SvXMLImportContext* CreateFrameChildContext(
+ static SvXMLImportContextRef CreateFrameChildContext(
SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index 0c7e5891ae57..85efa3f79d7c 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -65,7 +65,7 @@ public:
XMLTextStyleContext(const XMLTextStyleContext &) = delete;
XMLTextStyleContext operator=(const XMLTextStyleContext &) = delete;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 554ecbe4e9e2..d22a72394504 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -34,6 +34,10 @@
class SvXMLNamespaceMap;
class SvXMLImport;
+class SvXMLImportContext;
+
+typedef rtl::Reference<SvXMLImportContext> SvXMLImportContextRef;
+
class XMLOFF_DLLPUBLIC SvXMLImportContext : public cppu::WeakImplHelper< css::xml::sax::XFastContextHandler >
{
friend class SvXMLImport;
@@ -75,7 +79,7 @@ public:
/** Create a children element context. By default, the import's
* CreateContext method is called to create a new default context. */
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );
@@ -118,8 +122,6 @@ public:
void ReleaseRef();
};
-typedef rtl::Reference<SvXMLImportContext> SvXMLImportContextRef;
-
#endif // INCLUDED_XMLOFF_XMLICTXT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index e84eb3b8b5a4..2b9160251bc0 100644
--- a/include/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
@@ -49,7 +49,7 @@ public:
virtual ~SvXMLMetaDocumentContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index cedad8c08436..d62866d9c4a6 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -171,7 +171,7 @@ public:
SvXMLStylesContext& rStyles );
virtual ~SvXMLNumFormatContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void CreateAndInsert(bool bOverwrite) override;
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index b4a130c45636..57898f76d254 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -67,7 +67,7 @@ public:
~SvxXMLListStyleContext() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index 3961efe9bd8d..012bf1b26a13 100644
--- a/include/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
@@ -49,14 +49,14 @@ public:
virtual ~SvXMLPropertySetContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
// This method is called from this instance implementation of
// CreateChildContext if the element matches an entry in the
// SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT_ITEM_IMPORT
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
::std::vector< XMLPropertyState > &rProperties,
diff --git a/include/xmloff/xmlscripti.hxx b/include/xmloff/xmlscripti.hxx
index 85043df4a226..16fdc20e0d13 100644
--- a/include/xmloff/xmlscripti.hxx
+++ b/include/xmloff/xmlscripti.hxx
@@ -40,7 +40,7 @@ public:
virtual ~XMLScriptContext() override;
// Create child element.
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 5ef5fc5d6596..1c06b1388aed 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -95,7 +95,7 @@ public:
virtual ~SvXMLStyleContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
@@ -205,7 +205,7 @@ public:
virtual ~SvXMLStylesContext() override;
// Create child element.
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 7829d2c891f4..e4bc13ed3597 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -96,7 +96,7 @@ public:
// SvXMLImportContext
virtual void Characters( const OUString &rChars ) override;
- virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList) override;
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList) override;
};
@@ -117,7 +117,7 @@ public:
// SvXMLImportContext
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
- virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override;
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override;
};
@@ -136,7 +136,7 @@ public:
// SvXMLImportContext
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
- virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override;
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override;
const OUString & GetLeftText() const { return aLeftText; }
};
@@ -160,7 +160,7 @@ public:
// SvXMLImportContext
virtual void EndElement() override;
- virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override;
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &rxAttrList ) override;
virtual void Characters( const OUString &rChars ) override;
const OUString & GetRightText() const { return aRightText; }
@@ -180,7 +180,7 @@ void ConvDicXMLImportContext::Characters(const OUString & /*rChars*/)
}
-SvXMLImportContext * ConvDicXMLImportContext::CreateChildContext(
+SvXMLImportContextRef ConvDicXMLImportContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ )
{
@@ -215,7 +215,7 @@ void ConvDicXMLDictionaryContext_Impl::StartElement(
}
-SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext(
+SvXMLImportContextRef ConvDicXMLDictionaryContext_Impl::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ )
{
@@ -228,7 +228,7 @@ SvXMLImportContext * ConvDicXMLDictionaryContext_Impl::CreateChildContext(
}
-SvXMLImportContext * ConvDicXMLEntryTextContext_Impl::CreateChildContext(
+SvXMLImportContextRef ConvDicXMLEntryTextContext_Impl::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ )
{
@@ -258,7 +258,7 @@ void ConvDicXMLEntryTextContext_Impl::StartElement(
}
-SvXMLImportContext * ConvDicXMLRightTextContext_Impl::CreateChildContext(
+SvXMLImportContextRef ConvDicXMLRightTextContext_Impl::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & /*rxAttrList*/ )
{
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index b2887720d4cd..5366b150be89 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -95,7 +95,7 @@ OXMLCell::~OXMLCell()
{
}
-SvXMLImportContext* OXMLCell::CreateChildContext(
+SvXMLImportContextRef OXMLCell::CreateChildContext(
sal_uInt16 _nPrefix,
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx
index 8cc8e5ab0450..059d58f3636f 100644
--- a/reportdesign/source/filter/xml/xmlCell.hxx
+++ b/reportdesign/source/filter/xml/xmlCell.hxx
@@ -49,7 +49,7 @@ namespace rptxml
,OXMLCell* _pCell = nullptr);
virtual ~OXMLCell() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index a563799502c2..611f926a758c 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -80,7 +80,7 @@ OXMLRowColumn::~OXMLRowColumn()
{
}
-SvXMLImportContext* OXMLRowColumn::CreateChildContext(
+SvXMLImportContextRef OXMLRowColumn::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx
index c685bbeda5a6..0aa34130d8d1 100644
--- a/reportdesign/source/filter/xml/xmlColumn.hxx
+++ b/reportdesign/source/filter/xml/xmlColumn.hxx
@@ -44,7 +44,7 @@ namespace rptxml
);
virtual ~OXMLRowColumn() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual void EndElement() override;
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 3532042a8af4..75b7520145ed 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -116,7 +116,7 @@ OXMLControlProperty::~OXMLControlProperty()
{
}
-SvXMLImportContext* OXMLControlProperty::CreateChildContext(
+SvXMLImportContextRef OXMLControlProperty::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index f06bc740cc0e..8b2bf6440be2 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -52,7 +52,7 @@ namespace rptxml
,OXMLControlProperty* _pContainer = nullptr);
virtual ~OXMLControlProperty() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index d8ce3fa9cd2e..915a77a72abb 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -124,14 +124,14 @@ OXMLFixedContent::~OXMLFixedContent()
}
-SvXMLImportContext* OXMLFixedContent::CreateChildContext_(
+SvXMLImportContextRef OXMLFixedContent::CreateChildContext_(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = OXMLReportElementBase::CreateChildContext_(nPrefix,rLocalName,xAttrList);
- if ( pContext )
- return pContext;
+ SvXMLImportContextRef xContext = OXMLReportElementBase::CreateChildContext_(nPrefix,rLocalName,xAttrList);
+ if (xContext)
+ return xContext;
static const char s_sStringConcat[] = " & ";
const SvXMLTokenMap& rTokenMap = m_rImport.GetCellElemTokenMap();
@@ -141,22 +141,22 @@ SvXMLImportContext* OXMLFixedContent::CreateChildContext_(
switch( nToken )
{
case XML_TOK_P:
- pContext = new OXMLFixedContent(m_rImport,nPrefix, rLocalName,m_rCell,m_pContainer,this);
+ xContext = new OXMLFixedContent(m_rImport,nPrefix, rLocalName,m_rCell,m_pContainer,this);
break;
case XML_TOK_TEXT_TAB_STOP:
- pContext = new OXMLCharContent( m_rImport, this,nPrefix,
+ xContext = new OXMLCharContent( m_rImport, this,nPrefix,
rLocalName, xAttrList,
0x0009, false );
break;
case XML_TOK_TEXT_LINE_BREAK:
- pContext = new OXMLCharContent( m_rImport, this,nPrefix,
+ xContext = new OXMLCharContent( m_rImport, this,nPrefix,
rLocalName, xAttrList,
ControlCharacter::LINE_BREAK );
break;
case XML_TOK_TEXT_S:
- pContext = new OXMLCharContent( m_rImport, this,nPrefix,
+ xContext = new OXMLCharContent( m_rImport, this,nPrefix,
rLocalName, xAttrList,
0x0020, true );
break;
@@ -171,7 +171,7 @@ SvXMLImportContext* OXMLFixedContent::CreateChildContext_(
default:
;
}
- return pContext;
+ return xContext;
}
void OXMLFixedContent::EndElement()
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx
index 6ec8fac79fce..78f85760cb1d 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.hxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx
@@ -36,7 +36,7 @@ namespace rptxml
bool m_bFormattedField;
protected:
- virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext_( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
private:
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 8c32ad4c8957..2c11e4853c4f 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -190,7 +190,7 @@ OXMLGroup::~OXMLGroup()
}
-SvXMLImportContext* OXMLGroup::CreateChildContext(
+SvXMLImportContextRef OXMLGroup::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx
index 2cb370d2e8a9..ce0667f765e8 100644
--- a/reportdesign/source/filter/xml/xmlGroup.hxx
+++ b/reportdesign/source/filter/xml/xmlGroup.hxx
@@ -45,7 +45,7 @@ namespace rptxml
);
virtual ~OXMLGroup() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 6c26fa6b804d..777a2c45c6b5 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -75,8 +75,7 @@ OXMLMasterFields::~OXMLMasterFields()
{
}
-
-SvXMLImportContext* OXMLMasterFields::CreateChildContext(
+SvXMLImportContextRef OXMLMasterFields::CreateChildContext(
sal_uInt16 _nPrefix,
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx
index 958b7318be5d..1e0d70eae156 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.hxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx
@@ -37,7 +37,7 @@ namespace rptxml
,IMasterDetailFieds* _pReport);
virtual ~OXMLMasterFields() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 8f572dad4dde..052842d60230 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -126,14 +126,14 @@ void OXMLReport::impl_initRuntimeDefaults() const
}
-SvXMLImportContext* OXMLReport::CreateChildContext(
+SvXMLImportContextRef OXMLReport::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = CreateChildContext_(nPrefix,rLocalName,xAttrList);
- if ( pContext )
- return pContext;
+ SvXMLImportContextRef xContext = CreateChildContext_(nPrefix,rLocalName,xAttrList);
+ if (xContext)
+ return xContext;
const SvXMLTokenMap& rTokenMap = m_rImport.GetReportElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
@@ -141,60 +141,59 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
case XML_TOK_REPORT_FUNCTION:
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- pContext = new OXMLFunction( m_rImport, nPrefix, rLocalName,xAttrList,m_xReportDefinition.get(),true);
+ xContext = new OXMLFunction( m_rImport, nPrefix, rLocalName,xAttrList,m_xReportDefinition.get(),true);
}
break;
case XML_TOK_MASTER_DETAIL_FIELDS:
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- pContext = new OXMLMasterFields(m_rImport, nPrefix, rLocalName,xAttrList ,this);
+ xContext = new OXMLMasterFields(m_rImport, nPrefix, rLocalName,xAttrList ,this);
break;
case XML_TOK_REPORT_HEADER:
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
m_xReportDefinition->setReportHeaderOn(true);
- pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getReportHeader());
+ xContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getReportHeader());
}
break;
case XML_TOK_PAGE_HEADER:
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
m_xReportDefinition->setPageHeaderOn(true);
- pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getPageHeader());
+ xContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getPageHeader());
}
break;
case XML_TOK_GROUP:
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- pContext = new OXMLGroup( m_rImport, nPrefix, rLocalName,xAttrList);
+ xContext = new OXMLGroup( m_rImport, nPrefix, rLocalName,xAttrList);
break;
case XML_TOK_DETAIL:
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getDetail());
+ xContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getDetail());
}
break;
case XML_TOK_PAGE_FOOTER:
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
m_xReportDefinition->setPageFooterOn(true);
- pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getPageFooter(),false);
+ xContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getPageFooter(),false);
}
break;
case XML_TOK_REPORT_FOOTER:
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
m_xReportDefinition->setReportFooterOn(true);
- pContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getReportFooter());
+ xContext = new OXMLSection( m_rImport, nPrefix, rLocalName,xAttrList, m_xReportDefinition->getReportFooter());
}
break;
default:
break;
}
- if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ if (!xContext)
+ xContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-
- return pContext;
+ return xContext;
}
void OXMLReport::EndElement()
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx
index 590bbe38a1b0..ba5702c0bdc6 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -40,7 +40,7 @@ namespace rptxml
,const css::uno::Reference< css::report::XReportDefinition >& _xComponent);
virtual ~OXMLReport() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 9a68bd59c7a6..fa7f06e939f8 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -79,11 +79,9 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
OXMLReportElement::~OXMLReportElement()
{
-
}
-
-SvXMLImportContext* OXMLReportElement::CreateChildContext(
+SvXMLImportContextRef OXMLReportElement::CreateChildContext(
sal_uInt16 _nPrefix,
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx
index faef0ded8f56..a5d11ac73605 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.hxx
@@ -39,7 +39,7 @@ namespace rptxml
,const css::uno::Reference< css::report::XReportControlModel >& _xComponent);
virtual ~OXMLReportElement() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index b1c8e8065bc1..54eb0494217e 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -47,18 +47,18 @@ OXMLReportElementBase::~OXMLReportElementBase()
{
}
-SvXMLImportContext* OXMLReportElementBase::CreateChildContext(
+SvXMLImportContextRef OXMLReportElementBase::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = CreateChildContext_(nPrefix,rLocalName,xAttrList);
- if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
- return pContext;
+ SvXMLImportContextRef xContext = CreateChildContext_(nPrefix,rLocalName,xAttrList);
+ if (!xContext)
+ xContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
+ return xContext;
}
-SvXMLImportContext* OXMLReportElementBase::CreateChildContext_(
+SvXMLImportContextRef OXMLReportElementBase::CreateChildContext_(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index c46485cc5350..b8fc8361c9b1 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -46,7 +46,7 @@ namespace rptxml
OXMLTable* m_pContainer;
css::uno::Reference< css::report::XReportComponent > m_xReportComponent;
- virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext_( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
public:
@@ -58,7 +58,7 @@ namespace rptxml
,OXMLTable* _pContainer);
virtual ~OXMLReportElementBase() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index f69b5e3edffa..394c8053000f 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -101,8 +101,7 @@ OXMLSection::~OXMLSection()
{
}
-
-SvXMLImportContext* OXMLSection::CreateChildContext(
+SvXMLImportContextRef OXMLSection::CreateChildContext(
sal_uInt16 _nPrefix,
const OUString& _rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx
index e9162a289d30..b677d3cb5cfb 100644
--- a/reportdesign/source/filter/xml/xmlSection.hxx
+++ b/reportdesign/source/filter/xml/xmlSection.hxx
@@ -44,7 +44,7 @@ namespace rptxml
,bool _bPageHeader = true);
virtual ~OXMLSection() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
};
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index f6ab531492d9..4c84af1e728f 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -50,20 +50,18 @@ OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport,
}
-
OXMLSubDocument::~OXMLSubDocument()
{
}
-
-SvXMLImportContext* OXMLSubDocument::CreateChildContext_(
+SvXMLImportContextRef OXMLSubDocument::CreateChildContext_(
sal_uInt16 _nPrefix,
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext = OXMLReportElementBase::CreateChildContext_(_nPrefix,_rLocalName,xAttrList);
- if ( pContext )
- return pContext;
+ SvXMLImportContextRef xContext = OXMLReportElementBase::CreateChildContext_(_nPrefix,_rLocalName,xAttrList);
+ if (xContext)
+ return xContext;
const SvXMLTokenMap& rTokenMap = static_cast<ORptFilter&>(GetImport()).GetReportElemTokenMap();
switch( rTokenMap.Get( _nPrefix, _rLocalName ) )
@@ -71,7 +69,7 @@ SvXMLImportContext* OXMLSubDocument::CreateChildContext_(
case XML_TOK_MASTER_DETAIL_FIELDS:
{
GetImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- pContext = new OXMLMasterFields(static_cast<ORptFilter&>(GetImport()), _nPrefix, _rLocalName,xAttrList ,this);
+ xContext = new OXMLMasterFields(static_cast<ORptFilter&>(GetImport()), _nPrefix, _rLocalName,xAttrList ,this);
}
break;
case XML_TOK_SUB_FRAME:
@@ -80,7 +78,7 @@ SvXMLImportContext* OXMLSubDocument::CreateChildContext_(
m_nCurrentCount = m_pContainer->getSection()->getCount();
rtl::Reference< XMLShapeImportHelper > xShapeImportHelper = GetImport().GetShapeImport();
uno::Reference< drawing::XShapes > xShapes = m_pContainer->getSection().get();
- pContext = xShapeImportHelper->CreateGroupChildContext(GetImport(),_nPrefix,_rLocalName,xAttrList,xShapes);
+ xContext = xShapeImportHelper->CreateGroupChildContext(GetImport(),_nPrefix,_rLocalName,xAttrList,xShapes);
m_bContainsShape = true;
if (m_pCellParent)
{
@@ -93,10 +91,10 @@ SvXMLImportContext* OXMLSubDocument::CreateChildContext_(
break;
}
- if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName );
+ if (!xContext)
+ xContext = new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName );
- return pContext;
+ return xContext;
}
void OXMLSubDocument::EndElement()
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx
index 857ecb699c82..3c0a0d33c6d4 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.hxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx
@@ -39,7 +39,7 @@ namespace rptxml
OXMLSubDocument(const OXMLSubDocument&) = delete;
void operator =(const OXMLSubDocument&) = delete;
- virtual SvXMLImportContext* CreateChildContext_( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext_( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
public:
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 5ff337bcaf4f..2e9ae7da2ecf 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -116,8 +116,7 @@ OXMLTable::~OXMLTable()
{
}
-
-SvXMLImportContext* OXMLTable::CreateChildContext(
+SvXMLImportContextRef OXMLTable::CreateChildContext(
sal_uInt16 _nPrefix,
const OUString& _rLocalName,
const Reference< XAttributeList > & xAttrList )
diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx
index 4a24c518d94c..d8d76f2814e6 100644
--- a/reportdesign/source/filter/xml/xmlTable.hxx
+++ b/reportdesign/source/filter/xml/xmlTable.hxx
@@ -62,7 +62,7 @@ namespace rptxml
);
virtual ~OXMLTable() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index 9feeb9308595..357a7655e807 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -102,7 +102,7 @@ XMLTableHeaderFooterContext::~XMLTableHeaderFooterContext()
{
}
-SvXMLImportContext *XMLTableHeaderFooterContext::CreateChildContext(
+SvXMLImportContextRef XMLTableHeaderFooterContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
@@ -211,7 +211,7 @@ XMLHeaderFooterRegionContext::~XMLHeaderFooterRegionContext()
{
}
-SvXMLImportContext *XMLHeaderFooterRegionContext::CreateChildContext(
+SvXMLImportContextRef XMLHeaderFooterRegionContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
index 8a26a55aac0a..685deee25eff 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx
@@ -57,7 +57,7 @@ public:
virtual ~XMLTableHeaderFooterContext() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
@@ -79,7 +79,7 @@ public:
virtual ~XMLHeaderFooterRegionContext() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index 6225a7742057..c601ba975968 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -34,7 +34,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext()
{
}
-SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLTableShapesContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList )
{
diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx
index 743e4e7f0c74..32c4c65daf4a 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.hxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.hxx
@@ -31,7 +31,7 @@ public:
virtual ~ScXMLTableShapesContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
};
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index d8aba927a656..15d24dbd2b6f 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -53,7 +53,7 @@ public:
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
@@ -162,7 +162,7 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLChangeCellContext* pChangeCellContext);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
@@ -195,7 +195,7 @@ public:
OUString& rInputString, double& fValue, sal_uInt16& nType,
ScMatrixMode& nMatrixFlag, sal_Int32& nMatrixCols, sal_Int32& nMatrixRows);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
@@ -273,7 +273,7 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override;
@@ -288,7 +288,7 @@ public:
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override;
@@ -302,7 +302,7 @@ public:
ScXMLCutOffsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void EndElement() override;
@@ -317,7 +317,7 @@ public:
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
@@ -440,7 +440,7 @@ ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport,
}
}
-SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
@@ -709,11 +709,11 @@ ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport,
// here are no attributes
}
-SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix,
+SvXMLImportContextRef ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTempPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xTempAttrList )
{
- SvXMLImportContext *pContext(nullptr);
+ SvXMLImportContextRef xContext;
if ((nPrefix == XML_NAMESPACE_TEXT) && (IsXMLToken(rLName, XML_S)) && !pTextPContext)
{
@@ -750,14 +750,14 @@ SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( sal_uInt16 nTem
{
if (!bWasContext)
pTextPContext->Characters(sText.makeStringAndClear());
- pContext = pTextPContext->CreateChildContext(nTempPrefix, rLName, xTempAttrList);
+ xContext = pTextPContext->CreateChildContext(nTempPrefix, rLName, xTempAttrList);
}
}
- if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ if (!xContext)
+ xContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
- return pContext;
+ return xContext;
}
void ScXMLChangeTextPContext::Characters( const OUString& rChars )
@@ -857,7 +857,7 @@ ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport,
nMatrixFlag = ScMatrixMode::Formula;
}
-SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLChangeCellContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList )
{
@@ -1198,7 +1198,7 @@ ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
pChangeTrackingImportHelper->SetInsertionCutOff(nID, nPosition);
}
-SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLInsertionCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ )
{
@@ -1257,7 +1257,7 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport,
pChangeTrackingImportHelper->AddMoveCutOff(nID, nStartPosition, nEndPosition);
}
-SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLMovementCutOffContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ )
{
@@ -1278,7 +1278,7 @@ ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport,
// here are no attributes
}
-SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLCutOffsContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList )
{
@@ -1362,7 +1362,7 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
pChangeTrackingImportHelper->SetMultiSpanned(static_cast<sal_Int16>(nMultiSpanned));
}
-SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLDeletionContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 42d7de994fd9..5f5216cf09d6 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -114,35 +114,35 @@ void ScXMLAnnotationContext::StartElement(const css::uno::Reference< css::xml::s
pShapeContext->StartElement(xAttrList);
}
-SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLAnnotationContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList )
{
- SvXMLImportContext *pContext = nullptr;
+ SvXMLImportContextRef xContext;
if( XML_NAMESPACE_DC == nPrefix )
{
if( IsXMLToken( rLName, XML_CREATOR ) )
- pContext = new ScXMLContentContext(GetScImport(), nPrefix,
+ xContext = new ScXMLContentContext(GetScImport(), nPrefix,
rLName, maAuthorBuffer);
else if( IsXMLToken( rLName, XML_DATE ) )
- pContext = new ScXMLContentContext(GetScImport(), nPrefix,
+ xContext = new ScXMLContentContext(GetScImport(), nPrefix,
rLName, maCreateDateBuffer);
}
else if( XML_NAMESPACE_META == nPrefix )
{
if( IsXMLToken( rLName, XML_DATE_STRING ) )
- pContext = new ScXMLContentContext(GetScImport(), nPrefix,
+ xContext = new ScXMLContentContext(GetScImport(), nPrefix,
rLName, maCreateDateStringBuffer);
}
- if( !pContext && pShapeContext )
- pContext = pShapeContext->CreateChildContext(nPrefix, rLName, xAttrList);
+ if( !xContext && pShapeContext )
+ xContext = pShapeContext->CreateChildContext(nPrefix, rLName, xAttrList);
- if( !pContext )
- pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
+ if (!xContext)
+ xContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
- return pContext;
+ return xContext;
}
void ScXMLAnnotationContext::Characters( const OUString& rChars )
diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx
index 2c2480e5368a..0e62d99f7e90 100644
--- a/sc/source/filter/xml/xmlannoi.hxx
+++ b/sc/source/filter/xml/xmlannoi.hxx
@@ -74,7 +74,7 @@ public:
virtual ~ScXMLAnnotationContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 244fa2d069d6..30acfd032115 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -639,7 +639,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd()
++mnCurParagraph;
}
-SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLTableRowCellContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList )
{
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index bc30cf4b32be..d816dec3ef67 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -135,7 +135,7 @@ public:
virtual ~ScXMLTableRowCellContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index 5d139567080d..b358a1e43f93 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -43,7 +43,7 @@ ScXMLContentContext::~ScXMLContentContext()
{
}
-SvXMLImportContext *ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLContentContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList )
{
diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx
index fd5a39a0dd0c..afd37d91877a 100644
--- a/sc/source/filter/xml/xmlconti.hxx
+++ b/sc/source/filter/xml/xmlconti.hxx
@@ -37,7 +37,7 @@ public:
virtual ~ScXMLContentContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 5a37734be65c..3e03a6df3731 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -61,7 +61,7 @@ public:
ScXMLContentValidationContext( ScXMLImport& rImport,
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList );
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
@@ -90,7 +90,7 @@ public:
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScXMLContentValidationContext* pValidationContext);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
@@ -113,7 +113,7 @@ public:
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScXMLContentValidationContext* pValidationContext);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
@@ -132,7 +132,7 @@ public:
const rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList,
ScXMLContentValidationContext* pValidationContext);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override;
@@ -219,7 +219,7 @@ ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImpo
}
}
-SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLContentValidationContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
@@ -467,7 +467,7 @@ ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport,
}
}
-SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLHelpMessageContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
@@ -528,7 +528,7 @@ ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport,
}
}
-SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLErrorMessageContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
@@ -583,7 +583,7 @@ ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport,
}
}
-SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLErrorMacroContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /* xAttrList */ )
{
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 5ffc31cbf86a..a88c94fe73b9 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -237,7 +237,7 @@ public:
ScXMLDocContext_Impl( ScXMLImport& rImport );
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList ) override;
@@ -277,7 +277,7 @@ public:
ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport,
const uno::Reference<document::XDocumentProperties>& i_xDocProps);
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override;
@@ -309,7 +309,7 @@ SvXMLMetaDocumentContext(i_rImport, i_xDocProps)
{
}
-SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext(
+SvXMLImportContextRef ScXMLFlatDocContext_Impl::CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
{
@@ -369,7 +369,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
return GetScImport().CreateBodyContext( pAttribList );
}
-SvXMLImportContext *ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 42ddf57fc7c1..82808931eb62 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -284,7 +284,7 @@ class XMLTableCellPropsContext : public SvXMLPropertySetContext
::std::vector< XMLPropertyState > &rProps,
const rtl::Reference < SvXMLImportPropertyMapper > &rMap);
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
::std::vector< XMLPropertyState > &rProperties,
@@ -303,7 +303,7 @@ XMLTableCellPropsContext::XMLTableCellPropsContext(
{
}
-SvXMLImportContext* XMLTableCellPropsContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef XMLTableCellPropsContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList,
::std::vector< XMLPropertyState > &rProperties,
@@ -448,12 +448,12 @@ XMLTableStyleContext::~XMLTableStyleContext()
delete mpCondFormat;
}
-SvXMLImportContext *XMLTableStyleContext::CreateChildContext(
+SvXMLImportContextRef XMLTableStyleContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< XAttributeList > & xAttrList )
{
- SvXMLImportContext *pContext(nullptr);
+ SvXMLImportContextRef xContext;
if( (XML_NAMESPACE_STYLE == nPrefix) &&
IsXMLToken(rLocalName, XML_MAP ) )
@@ -461,7 +461,7 @@ SvXMLImportContext *XMLTableStyleContext::CreateChildContext(
if(!mpCondFormat)
mpCondFormat = new ScConditionalFormat( 0, GetScImport().GetDocument() );
ScXMLMapContext* pMapContext = new ScXMLMapContext(GetImport(), nPrefix, rLocalName, xAttrList);
- pContext = pMapContext;
+ xContext = pMapContext;
mpCondFormat->AddEntry(pMapContext->CreateConditionEntry());
}
else if ( ( XML_NAMESPACE_STYLE == nPrefix) &&
@@ -471,17 +471,17 @@ SvXMLImportContext *XMLTableStyleContext::CreateChildContext(
GetStyles()->GetImportPropertyMapper(
GetFamily() );
if( xImpPrMap.is() )
- pContext = new XMLTableCellPropsContext( GetImport(), nPrefix,
+ xContext = new XMLTableCellPropsContext( GetImport(), nPrefix,
rLocalName, xAttrList,
XML_TYPE_PROP_TABLE_CELL,
GetProperties(),
xImpPrMap );
}
- if (!pContext)
- pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
+ if (!xContext)
+ xContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName,
xAttrList );
- return pContext;
+ return xContext;
}
void XMLTableStyleContext::ApplyCondFormat( const uno::Sequence<table::CellRangeAddress>& xCellRanges )
diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx
index 4e568fc15a35..f629817246f1 100644
--- a/sc/source/filter/xml/xmlstyli.hxx
+++ b/sc/source/filter/xml/xmlstyli.hxx
@@ -96,7 +96,7 @@ public:
SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle = false );
virtual ~XMLTableStyleContext() override;
- virtual SvXMLImportContext *CreateChildContext(
+ virtual SvXMLImportContextRef CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index a0cd76246fc7..efda387746bb 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -210,7 +210,7 @@ ScXMLTableContext::~ScXMLTableContext()
{
}
-SvXMLImportContext *ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
+SvXMLImportContextRef ScXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLName,
const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttrList*/ )
{
diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx
index f880a6ad18c8..3071faf1d441 100644
--- a/sc/source/filter/xml/xmltabi.hxx
+++ b/sc/source/filter/xml/xmltabi.hxx
@@ -53,7 +53,7 @@ public:
virtual ~ScXMLTableContext() override;
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList ) override;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 97193e119172..230ad06bdd8d 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -540,7 +540,7 @@ public:
virtual void TCharacters(const OUString & /*rChars*/);
virtual void Characters(const OUString &rChars) override;
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/) override;
+ virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 /*nPrefix*/, const OUString& /*rLocalName*/, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/) override;
};
void SmXMLImportContext::TCharacters(const OUString & /*rChars*/)
@@ -561,7 +561,7 @@ void SmXMLImportContext::Characters(const OUString &rChars)
TCharacters(rChars2/*.collapse()*/);
}
-SvXMLImportContext * SmXMLImportContext::CreateChildContext(sal_uInt16 /*nPrefix*/,
+SvXMLImportContextRef SmXMLImportContext::CreateChildContext(sal_uInt16 /*nPrefix*/,
const OUString& /*rLocalName*/,
const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/)
{
@@ -885,7 +885,7 @@ public:
const OUString& rLName)
: SmXMLImportContext(rImport,nPrfx,rLName) {}
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
+ virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
void EndElement() override;
};
@@ -903,7 +903,7 @@ public:
: SmXMLDocContext_Impl(rImport,nPrefix,rLName)
{ nElementCount = GetSmImport().GetNodeStack().size(); }
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
+ virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
SvXMLImportContext *StrictCreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName);
@@ -1802,7 +1802,7 @@ public:
bHasPrescripts(false) {}
void EndElement() override;
- SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
+ SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
};
@@ -1848,7 +1848,7 @@ public:
SmXMLRowContext_Impl(rImport,nPrefix,rLName)
{}
- SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
+ SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
};
@@ -1863,7 +1863,7 @@ public:
{}
void EndElement() override;
- SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix,
+ SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
};
@@ -1919,10 +1919,10 @@ public:
const OUString& rLName)
: SvXMLImportContext(rImport,nPrfx,rLName) {}
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
+ virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > &xAttrList) override;
};
-SvXMLImportContext *SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPrefix,
+SvXMLImportContextRef SmXMLOfficeContext_Impl::CreateChildContext(sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > &xAttrList)
{
@@ -1955,7 +1955,7 @@ public:
sal_uInt16 i_nPrefix, const OUString & i_rLName,
const uno::Reference<document::XDocumentProperties>& i_xDocProps);
- virtual SvXMLImportContext *CreateChildContext(sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override;
+ virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override;
};
SmXMLFlatDocContext_Impl::SmXMLFlatDocContext_Impl( SmXMLImport& i_rImport,
@@ -1968,7 +1968,7 @@ SmXMLFlatDocContext_Impl::SmXMLFlatDocContext_Impl( SmXMLImport& i_rImport,
{
}
-SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext(
+SvXMLImportContextRef SmXMLFlatDocContext_Impl::CreateChildContext(
sal_uInt16 i_nPrefix, const OUString& i_rLocalName,
const uno::Reference<xml::sax::XAttributeList>& i_xAttrList)
{
@@ -2186,7 +2186,7 @@ const SvXMLTokenMap& SmXMLImport::GetMspaceAttrTokenMap()
}
-SvXMLImportContext *SmXMLDocContext_Impl::CreateChildContext(
+SvXMLImportContextRef SmXMLDocContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& /*xAttrList*/)
@@ -2466,8 +2466,7 @@ void SmXMLRowContext_Impl::EndElement()
rNodeStack.push_front(std::move(pSNode));
}
-
-SvXMLImportContext *SmXMLRowContext_Impl::StrictCreateChildContext(
+SvXMLImportContext* SmXMLRowContext_Impl::StrictCreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName)
{
@@ -2513,31 +2512,30 @@ SvXMLImportContext *SmXMLRowContext_Impl::StrictCreateChildContext(
}
-SvXMLImportContext *SmXMLRowContext_Impl::CreateChildContext(
+SvXMLImportContextRef SmXMLRowContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
- SvXMLImportContext* pContext = StrictCreateChildContext(nPrefix,
+ SvXMLImportContextRef xContext = StrictCreateChildContext(nPrefix,
rLocalName);
- if (!pContext)
+ if (!xContext)
{
//Hmm, unrecognized for this level, check to see if its
//an element that can have an implicit schema around it
- pContext = SmXMLDocContext_Impl::CreateChildContext(nPrefix,
+ xContext = SmXMLDocContext_Impl::CreateChildContext(nPrefix,
rLocalName,xAttrList);
}
- return pContext;
+ return xContext;
}
-
-SvXMLImportContext *SmXMLMultiScriptsContext_Impl::CreateChildContext(
+SvXMLImportContextRef SmXMLMultiScriptsContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
- SvXMLImportContext* pContext = nullptr;
+ SvXMLImportContextRef xContext;
const SvXMLTokenMap& rTokenMap = GetSmImport().
GetPresScriptEmptyElemTokenMap();
@@ -2546,18 +2544,18 @@ SvXMLImportContext *SmXMLMultiScriptsContext_Impl::CreateChildContext(
case XML_TOK_MPRESCRIPTS:
bHasPrescripts = true;
ProcessSubSupPairs(false);
- pContext = GetSmImport().CreatePrescriptsContext(nPrefix,
+ xContext = GetSmImport().CreatePrescriptsContext(nPrefix,
rLocalName);
break;
case XML_TOK_NONE:
- pContext = GetSmImport().CreateNoneContext(nPrefix,rLocalName);
+ xContext = GetSmImport().CreateNoneContext(nPrefix,rLocalName);
break;
default:
- pContext = SmXMLRowContext_Impl::CreateChildContext(nPrefix,
+ xContext = SmXMLRowContext_Impl::CreateChildContext(nPrefix,
rLocalName,xAttrList);
break;
}
- return pContext;
+ return xContext;
}
void SmXMLMultiScriptsContext_Impl::ProcessSubSupPairs(bool bIsPrescript)
@@ -2685,49 +2683,49 @@ void SmXMLTableContext_Impl::EndElement()
rNodeStack.push_front(std::move(pSNode));
}
-SvXMLImportContext *SmXMLTableRowContext_Impl::CreateChildContext(
+SvXMLImportContextRef SmXMLTableRowContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
- SvXMLImportContext* pContext = nullptr;
+ SvXMLImportContextRef xContext;
const SvXMLTokenMap& rTokenMap = GetSmImport().
GetPresTableElemTokenMap();
switch(rTokenMap.Get(nPrefix, rLocalName))
{
case XML_TOK_MTD:
- pContext = GetSmImport().CreateTableCellContext(nPrefix,
+ xContext = GetSmImport().CreateTableCellContext(nPrefix,
rLocalName);
break;
default:
- pContext = SmXMLRowContext_Impl::CreateChildContext(nPrefix,
+ xContext = SmXMLRowContext_Impl::CreateChildContext(nPrefix,
rLocalName,xAttrList);
break;
}
- return pContext;
+ return xContext;
}
-SvXMLImportContext *SmXMLTableContext_Impl::CreateChildContext(
+SvXMLImportContextRef SmXMLTableContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList)
{
- SvXMLImportContext* pContext = nullptr;
+ SvXMLImportContextRef xContext;
const SvXMLTokenMap& rTokenMap = GetSmImport().
GetPresTableElemTokenMap();
switch(rTokenMap.Get(nPrefix, rLocalName))
{
case XML_TOK_MTR:
- pContext = GetSmImport().CreateTableRowContext(nPrefix,rLocalName);
+ xContext = GetSmImport().CreateTableRowContext(nPrefix,rLocalName);
break;
default:
- pContext = SmXMLTableRowContext_Impl::CreateChildContext(nPrefix,
+ xContext = SmXMLTableRowContext_Impl::CreateChildContext(nPrefix,
rLocalName,xAttrList);
break;
}
- return pContext;
+ return xContext;
}
void SmXMLMultiScriptsContext_Impl::EndElement()
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 1faf0d17d407..f69b54a0c775 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -74,7 +74,7 @@ public:
SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable,
bool bOOoFormat );
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override;
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override;
protected:
void importColor( const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
@@ -97,7 +97,7 @@ SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uI
{
}
-SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
+SvXMLImportContextRef SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
{
if( XML_NAMESPACE_DRAW == nPrefix )
{
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index 666bbe832d8d..ab254c0da2bf 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -50,7 +50,7 @@ public:
sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList );
- virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override;
virtual ~SvXMLSectionListContext() override;
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index 8e051f39c38f..01a08f9abcf5 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -84,7 +84,7 @@ SvXMLSectionListContext::SvXMLSectionListContext(
{
}
-SvXMLImportContext *SvXMLSectionListContext::CreateChildContext(
+SvXMLImportContextRef SvXMLSectionListContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index a8530e4dd172..415751bdee1f 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -108,7 +108,7 @@ void SwXMLBrushItemImportContext::ProcessAttrs(
}
-SvXMLImportContext *SwXMLBrushItemImportContext::CreateChildContext(
+SvXMLImportContextRef SwXMLBrushItemImportContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference< xml::sax::XAttributeList > & xAttrList )
{
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list