diff options
283 files changed, 971 insertions, 1009 deletions
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 index a73fbe0ba3df..75d5da234cca 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -63,7 +63,7 @@ public: virtual ~SwXMLBrushItemImportContext() 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/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 904a102722b1..4b0af71ddf6b 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -275,7 +275,7 @@ public: sal_uInt16 nFamily, SvXMLStylesContext& rStyles ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -359,12 +359,12 @@ SwXMLTextStyleContext_Impl::SwXMLTextStyleContext_Impl( SwXMLImport& rImport, { } -SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLTextStyleContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_MAP ) ) { @@ -377,14 +377,14 @@ SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext( pConditions = o3tl::make_unique<SwXMLConditions_Impl>(); pConditions->push_back( xCond ); } - pContext = xCond.get(); + xContext = xCond.get(); } - if( !pContext ) - pContext = XMLTextStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = XMLTextStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } class SwXMLItemSetStyleContext_Impl : public SvXMLStyleContext @@ -425,7 +425,7 @@ public: virtual void CreateAndInsert( bool bOverwrite ) override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -537,12 +537,12 @@ void SwXMLItemSetStyleContext_Impl::CreateAndInsert( bool bOverwrite ) pTextStyle->CreateAndInsert( bOverwrite ); } -SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLItemSetStyleContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix ) { @@ -551,7 +551,7 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateChildContext( IsXMLToken( rLocalName, XML_TABLE_ROW_PROPERTIES ) || IsXMLToken( rLocalName, XML_TABLE_CELL_PROPERTIES ) ) { - pContext = CreateItemSetContext( nPrefix, rLocalName, xAttrList ); + xContext = CreateItemSetContext( nPrefix, rLocalName, xAttrList ); } else if( IsXMLToken( rLocalName, XML_TEXT_PROPERTIES ) || IsXMLToken( rLocalName, XML_PARAGRAPH_PROPERTIES )) @@ -568,15 +568,15 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateChildContext( pTextStyle->StartElement( xTmpAttrList ); rStyles.AddStyle( *pTextStyle ); } - pContext = pTextStyle->CreateChildContext( nPrefix, rLocalName, xAttrList ); + xContext = pTextStyle->CreateChildContext( nPrefix, rLocalName, xAttrList ); } } - if( !pContext ) - pContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void SwXMLItemSetStyleContext_Impl::ConnectPageDesc() diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index fba57d39370a..c82a9303b3e3 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -130,7 +130,7 @@ public: SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; }; @@ -165,7 +165,7 @@ SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, } } -SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLBodyContext_Impl::CreateChildContext( sal_uInt16 /*nPrefix*/, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & /*xAttrList*/ ) @@ -188,7 +188,7 @@ public: SwXMLDocContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; }; @@ -199,7 +199,7 @@ SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport, { } -SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -267,7 +267,7 @@ public: const OUString& rLName, const Reference< document::XDocumentProperties >& xDocProps); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -284,7 +284,7 @@ SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl( { } -SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLOfficeDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx index bc5fdca40e03..55736082e326 100644 --- a/sw/source/filter/xml/xmlitem.cxx +++ b/sw/source/filter/xml/xmlitem.cxx @@ -42,7 +42,7 @@ SvXMLItemSetContext::~SvXMLItemSetContext() { } -SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { @@ -61,7 +61,7 @@ SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, CreateChildContext if the element matches an entry in the SvXMLImportItemMapper with the mid flag MID_SW_FLAG_ELEMENT */ -SvXMLImportContext *SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SvXMLItemSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/, SfxItemSet& /*rItemSet*/, diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx index 34276bee4538..b8248ad6dc6f 100644 --- a/sw/source/filter/xml/xmlitem.hxx +++ b/sw/source/filter/xml/xmlitem.hxx @@ -48,14 +48,14 @@ public: virtual ~SvXMLItemSetContext() 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_SW_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, SfxItemSet& rItemSet, diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index 07e693edd65b..36b7ad9ccc46 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -246,7 +246,7 @@ public: const SvXMLUnitConverter& rUnitConv ); virtual ~SwXMLItemSetContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::uno::Reference< xml::sax::XAttributeList > & xAttrList, SfxItemSet& rItemSet, @@ -276,7 +276,7 @@ SwXMLItemSetContext_Impl::~SwXMLItemSetContext_Impl() } } -SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLItemSetContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList, @@ -284,7 +284,7 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext( const SvXMLItemMapEntry& rEntry, const SvXMLUnitConverter& _rUnitConv ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; switch( rEntry.nWhichId ) { @@ -294,27 +294,27 @@ SvXMLImportContext *SwXMLItemSetContext_Impl::CreateChildContext( if( SfxItemState::SET == _rItemSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { - pContext = new SwXMLBrushItemImportContext( + xContext = new SwXMLBrushItemImportContext( GetImport(), nPrefix, rLocalName, xAttrList, _rUnitConv, *static_cast<const SvxBrushItem *>(pItem) ); } else { - pContext = new SwXMLBrushItemImportContext( + xContext = new SwXMLBrushItemImportContext( GetImport(), nPrefix, rLocalName, xAttrList, _rUnitConv, RES_BACKGROUND ); } - xBackground = pContext; + xBackground = xContext; } break; } - if( !pContext ) - pContext = SvXMLItemSetContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = SvXMLItemSetContext::CreateChildContext( nPrefix, rLocalName, xAttrList, _rItemSet, rEntry, _rUnitConv ); - return pContext; + return xContext; } void SwXMLImport::InitItemImport() diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 2a78d10e814d..a9280da72b13 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -421,7 +421,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; virtual void EndElement() override; @@ -583,7 +583,7 @@ inline void SwXMLTableCellContext_Impl::InsertContent( bHasTableContent = true; } -SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLTableCellContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -801,7 +801,7 @@ public: const OUString& rLName, SwXMLTableContext *pTable ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -816,7 +816,7 @@ SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl( { } -SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLTableColsContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -851,7 +851,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable, bool bInHead=false ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -920,7 +920,7 @@ void SwXMLTableRowContext_Impl::EndElement() } } -SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLTableRowContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -963,7 +963,7 @@ public: SwXMLTableContext *pTable, bool bHead ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -981,7 +981,7 @@ SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport, { } -SvXMLImportContext *SwXMLTableRowsContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLTableRowsContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -1386,7 +1386,7 @@ SwXMLTableContext::~SwXMLTableContext() GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false); } -SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index 2c1ec4c33fd8..0f2fc81c8031 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -137,7 +137,7 @@ public: virtual ~SwXMLTableContext() 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/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index 14257d6f81b7..3f2d2076beee 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -32,7 +32,7 @@ public: SwXMLBodyContentContext_Impl( SwXMLImport& rImport, const OUString& rLName ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -47,7 +47,7 @@ SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport { } -SvXMLImportContext *SwXMLBodyContentContext_Impl::CreateChildContext( +SvXMLImportContextRef SwXMLBodyContentContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx index 92e94e8ef4a0..e0bc40a9ed02 100644 --- a/sw/source/uibase/config/StoredChapterNumbering.cxx +++ b/sw/source/uibase/config/StoredChapterNumbering.cxx @@ -344,7 +344,7 @@ public: } } - virtual SvXMLImportContext * CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 const nPrefix, OUString const& rLocalName, uno::Reference<xml::sax::XAttributeList> const& xAttrList) override { diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx index b298df0ad813..0df0f6de135d 100644 --- a/xmloff/inc/DomBuilderContext.hxx +++ b/xmloff/inc/DomBuilderContext.hxx @@ -71,7 +71,7 @@ public: // implement SvXMLImportContext methods: - 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/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index 09365e18ed5f..ad0e483f7254 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -45,7 +45,7 @@ public: bool bDefaultStyle); virtual ~PageStyleContext() 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/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index 9688b8a5d75f..e965935206a6 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -61,7 +61,7 @@ public: virtual ~XMLBackgroundImageContext() override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx index 6e32fc1e6b88..cef31d3f5f1c 100644 --- a/xmloff/inc/XMLChartStyleContext.hxx +++ b/xmloff/inc/XMLChartStyleContext.hxx @@ -48,7 +48,7 @@ public: const css::uno::Reference<css::beans::XPropertySet > & rPropSet ) override; /// necessary for property context (element-property symbol-image) - 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/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index 206707ce1409..eaf322305309 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -45,7 +45,7 @@ public: virtual ~XMLEmbeddedObjectImportContext() 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/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 6153f68c4c33..096714d33fdc 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -80,7 +80,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; /// for footnotes, also parse begin and end notices - 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/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx index f535a2ad3cf9..646b707b0d02 100644 --- a/xmloff/inc/XMLImageMapContext.hxx +++ b/xmloff/inc/XMLImageMapContext.hxx @@ -52,7 +52,7 @@ public: virtual ~XMLImageMapContext() 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/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index 368161dab1a9..83461d1a25c2 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -81,7 +81,7 @@ protected: virtual void CreateAndInsert( bool bOverwrite ) 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/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index ad01b45f61cf..3216070020ef 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -101,7 +101,7 @@ protected: virtual void CreateAndInsert(bool bOverwrite) 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/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index 4f4d1c8e849a..0dbdc9f94fe8 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -57,7 +57,7 @@ public: virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; sal_Int32 GetDrawKey() const { return mnKey; } diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx index dd6a3fa733f8..217dbaba3aed 100644 --- a/xmloff/inc/XMLReplacementImageContext.hxx +++ b/xmloff/inc/XMLReplacementImageContext.hxx @@ -48,7 +48,7 @@ public: virtual void EndElement() override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx index d583983d9005..2a5ac3c81129 100644 --- a/xmloff/inc/XMLShapePropertySetContext.hxx +++ b/xmloff/inc/XMLShapePropertySetContext.hxx @@ -42,7 +42,7 @@ public: virtual void EndElement() override; using SvXMLPropertySetContext::CreateChildContext; - 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/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx index c3bb802f0e11..d3215963ab04 100644 --- a/xmloff/inc/XMLStringBufferImportContext.hxx +++ b/xmloff/inc/XMLStringBufferImportContext.hxx @@ -45,7 +45,7 @@ public: virtual ~XMLStringBufferImportContext() 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/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 424ff41c7f9d..fdc969b3e2e1 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -58,7 +58,7 @@ public: const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); - 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/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 46f7798a6f67..47688ba08021 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -53,7 +53,7 @@ public: virtual ~XMLTextHeaderFooterContext() 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/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx index 6e77eea29ee8..6d59ad9a4898 100644 --- a/xmloff/inc/animationimport.hxx +++ b/xmloff/inc/animationimport.hxx @@ -51,7 +51,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; static void postProcessRootNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, css::uno::Reference< css::beans::XPropertySet > const & xPageProps ); diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index 0a07b3fe0e28..971071e82d79 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -40,7 +40,7 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index e42ee3b51d96..f2812dbb52cb 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -432,7 +432,7 @@ public: const css::uno::Reference< css::beans::XPropertySet> & xPropertySet) override; /// handle database-location children - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; @@ -913,7 +913,7 @@ public: protected: /// for <office:events> children - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; @@ -971,7 +971,7 @@ public: sal_uInt16 nPrfx, const OUString& sLocalName); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; @@ -1145,7 +1145,7 @@ protected: virtual void PrepareField( const css::uno::Reference< css::beans::XPropertySet > & xPropertySet) override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; @@ -1218,7 +1218,7 @@ public: sal_uInt16 nPrfx, const OUString& sLocalName); - 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/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index a4c05bcd37ae..78f9fc6565b9 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -391,7 +391,7 @@ public: const OUString& rLocalName, /// element name w/o prefix enum VarType eVarType); /// variable type - 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/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index d9f349f421c3..90ddd625f7cd 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -41,7 +41,7 @@ public: const XMLPropertyState& rProp, ::std::vector< XMLPropertyState > &rProps ); - 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/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx index 0c8f69fdcc4e..e709efb6f5a4 100644 --- a/xmloff/inc/xmlversion.hxx +++ b/xmloff/inc/xmlversion.hxx @@ -87,7 +87,7 @@ public: virtual ~XMLVersionListContext() 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/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 667305fa6902..fb186a947687 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -613,7 +613,7 @@ public: struct theAxisChildTokenMap : public rtl::Static< AxisChildTokenMap, theAxisChildTokenMap > {}; } -SvXMLImportContext* SchXMLAxisContext::CreateChildContext( +SvXMLImportContextRef SchXMLAxisContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& xAttrList ) diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx index 68b6ed740d91..287548262f7a 100644 --- a/xmloff/source/chart/SchXMLAxisContext.hxx +++ b/xmloff/source/chart/SchXMLAxisContext.hxx @@ -38,7 +38,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; 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/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 5464c5c4d936..c9891ce490aa 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -56,7 +56,7 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& } } } -SvXMLImportContext* SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SchXMLCalculationSettingsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx index 7d6ae3e84f2d..0fbe3056a162 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.hxx @@ -31,7 +31,7 @@ public: 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; diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 364c687fe685..596f9e580b50 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -1042,7 +1042,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() } } -SvXMLImportContext* SchXMLChartContext::CreateChildContext( +SvXMLImportContextRef SchXMLChartContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) @@ -1248,7 +1248,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut } } -SvXMLImportContext* SchXMLTitleContext::CreateChildContext( +SvXMLImportContextRef SchXMLTitleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx index 14782920b4c2..c816b4492305 100644 --- a/xmloff/source/chart/SchXMLChartContext.hxx +++ b/xmloff/source/chart/SchXMLChartContext.hxx @@ -82,7 +82,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; 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; @@ -141,7 +141,7 @@ public: virtual ~SchXMLTitleContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) 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/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index 5fa8ecf4b053..b073e9da370d 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -80,7 +80,7 @@ void SchXMLParagraphContext::EndElement() mrText = maBuffer.makeStringAndClear(); } -SvXMLImportContext* SchXMLParagraphContext::CreateChildContext( +SvXMLImportContextRef SchXMLParagraphContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index f0b6d227b6b8..fade1b355317 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -43,7 +43,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; 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/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index bed146edf7b6..b724655f7066 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -410,7 +410,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri } } -SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext( +SvXMLImportContextRef SchXMLPlotAreaContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) @@ -1148,14 +1148,4 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax } } -SvXMLImportContext* SchXMLStatisticsObjectContext::CreateChildContext( - sal_uInt16 nPrefix, - const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList >& xAttrList ) -{ - SvXMLImportContext* pContext = nullptr; - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index d369af474998..6c21c93f3b18 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -98,7 +98,7 @@ public: virtual ~SchXMLPlotAreaContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -244,10 +244,6 @@ public: virtual ~SchXMLStatisticsObjectContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, - const OUString& rLocalName, - const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: SchXMLImportHelper & mrImportHelper; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index 7e06dcebdb7b..a7cf77f69fd7 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -82,24 +82,24 @@ void SchXMLRegressionCurveObjectContext::StartElement( const uno::Reference< xml mrRegressionStyleList.push_back( aStyle ); } -SvXMLImportContext* SchXMLRegressionCurveObjectContext::CreateChildContext( +SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) ) { - pContext = new SchXMLEquationContext( + xContext = new SchXMLEquationContext( mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleList.back()); } else { - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); } - return pContext; + return xContext; } SchXMLEquationContext::SchXMLEquationContext( diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index 6de26ae03b51..0d6fc2fea29e 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -42,7 +42,7 @@ public: virtual ~SchXMLRegressionCurveObjectContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) 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/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index a40d23c3a6a5..5aa8eec6e80a 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -635,7 +635,7 @@ void SchXMLSeries2Context::EndElement() maPostponedSequences.clear(); } -SvXMLImportContext* SchXMLSeries2Context::CreateChildContext( +SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx index c3ebf3a000c5..82a5542f8a9f 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.hxx +++ b/xmloff/source/chart/SchXMLSeries2Context.hxx @@ -86,7 +86,7 @@ public: virtual ~SchXMLSeries2Context() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) 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/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index f68f4b27c873..4d9a6d6333fd 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -226,7 +226,7 @@ SchXMLTableContext::~SchXMLTableContext() { } -SvXMLImportContext *SchXMLTableContext::CreateChildContext( +SvXMLImportContextRef SchXMLTableContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) @@ -415,7 +415,7 @@ SchXMLTableColumnsContext::~SchXMLTableColumnsContext() { } -SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext( +SvXMLImportContextRef SchXMLTableColumnsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) @@ -509,7 +509,7 @@ SchXMLTableRowsContext::~SchXMLTableRowsContext() { } -SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext( +SvXMLImportContextRef SchXMLTableRowsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) @@ -552,7 +552,7 @@ SchXMLTableRowContext::~SchXMLTableRowContext() { } -SvXMLImportContext* SchXMLTableRowContext::CreateChildContext( +SvXMLImportContextRef SchXMLTableRowContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) @@ -590,7 +590,7 @@ public: const OUString& rLocalName, OUString& rRangeString ); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -664,7 +664,7 @@ void SchXMLTableCellContext::StartElement( const uno::Reference< xml::sax::XAttr mrTable.nMaxColumnIndex = mrTable.nColumnIndex; } -SvXMLImportContext* SchXMLTableCellContext::CreateChildContext( +SvXMLImportContextRef SchXMLTableCellContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) @@ -1087,7 +1087,7 @@ SchXMLRangeSomewhereContext::SchXMLRangeSomewhereContext( SvXMLImport& rImport, { } -SvXMLImportContext* SchXMLRangeSomewhereContext::CreateChildContext( +SvXMLImportContextRef SchXMLRangeSomewhereContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx index af5f2b155c4c..1c790a50e1c2 100644 --- a/xmloff/source/chart/SchXMLTableContext.hxx +++ b/xmloff/source/chart/SchXMLTableContext.hxx @@ -53,7 +53,7 @@ public: SchXMLTable& aTable ); virtual ~SchXMLTableContext() override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -97,7 +97,7 @@ public: SchXMLTable& aTable ); virtual ~SchXMLTableColumnsContext() override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -131,7 +131,7 @@ public: SchXMLTable& aTable ); virtual ~SchXMLTableRowsContext() override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -150,7 +150,7 @@ public: SchXMLTable& aTable ); virtual ~SchXMLTableRowContext() override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -174,7 +174,7 @@ public: SchXMLTable& aTable ); virtual ~SchXMLTableCellContext() 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/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index 0893f42ff930..8abd79e8cf39 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -38,7 +38,7 @@ public: virtual void StartElement( const Reference< xml::sax::XAttributeList >& xAttrList ) override; 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; @@ -64,7 +64,7 @@ void SchXMLListItemContext::EndElement() { } -SvXMLImportContext* SchXMLListItemContext::CreateChildContext( +SvXMLImportContextRef SchXMLListItemContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { @@ -103,7 +103,7 @@ void SchXMLTextListContext::EndElement() m_rTextList[nN]=m_aTextVector[nN]; } -SvXMLImportContext* SchXMLTextListContext::CreateChildContext( +SvXMLImportContextRef SchXMLTextListContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { diff --git a/xmloff/source/chart/SchXMLTextListContext.hxx b/xmloff/source/chart/SchXMLTextListContext.hxx index 87c52345bfbe..4c2c6c9c38cc 100644 --- a/xmloff/source/chart/SchXMLTextListContext.hxx +++ b/xmloff/source/chart/SchXMLTextListContext.hxx @@ -37,7 +37,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; 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/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx index 5866ef13b156..eca08cccf629 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.cxx +++ b/xmloff/source/chart/XMLChartPropertyContext.cxx @@ -41,33 +41,33 @@ XMLChartPropertyContext::XMLChartPropertyContext( XMLChartPropertyContext::~XMLChartPropertyContext() {} -SvXMLImportContext* XMLChartPropertyContext::CreateChildContext( +SvXMLImportContextRef XMLChartPropertyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; switch( mxMapper->getPropertySetMapper()->GetEntryContextId( rProp.mnIndex ) ) { case XML_SCH_CONTEXT_SPECIAL_SYMBOL_IMAGE: - pContext = new XMLSymbolImageContext( GetImport(), nPrefix, rLocalName, rProp, rProperties ); + xContext = new XMLSymbolImageContext( GetImport(), nPrefix, rLocalName, rProp, rProperties ); break; case XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR: - pContext = new XMLLabelSeparatorContext( GetImport(), nPrefix, rLocalName, rProp, rProperties ); + xContext = new XMLLabelSeparatorContext( GetImport(), nPrefix, rLocalName, rProp, rProperties ); break; } // default / no context yet: create child context by base class - if( !pContext ) + if (!xContext) { - pContext = SvXMLPropertySetContext::CreateChildContext( + xContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, xAttrList, rProperties, rProp ); } - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index 7f888c2040cd..ba572e7e5c9e 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -34,7 +34,7 @@ public: virtual ~XMLChartPropertyContext() override; using SvXMLPropertySetContext::CreateChildContext; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList, diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index b93eee5d14ee..07541e396e5f 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -105,12 +105,12 @@ void XMLChartStyleContext::FillPropertySet( lcl_NumberFormatStyleToProperty( msPercentageDataStyleName, "PercentageNumberFormat", mrStyles, rPropSet ); } -SvXMLImportContext *XMLChartStyleContext::CreateChildContext( +SvXMLImportContextRef XMLChartStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) { @@ -128,17 +128,17 @@ SvXMLImportContext *XMLChartStyleContext::CreateChildContext( rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) - pContext = new XMLChartPropertyContext( + xContext = new XMLChartPropertyContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, GetProperties(), xImpPrMap ); } } - if( !pContext ) - pContext = XMLShapeStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = XMLShapeStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index 321f266c0f68..3775da281814 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -47,7 +47,7 @@ void XMLLabelSeparatorContext::StartElement( const uno::Reference< xml::sax::XAt { } -SvXMLImportContext* XMLLabelSeparatorContext::CreateChildContext( +SvXMLImportContextRef XMLLabelSeparatorContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ ) { diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx index 641787c5e7ec..7307924d2a5d 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx @@ -32,7 +32,7 @@ public: virtual ~XMLLabelSeparatorContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) 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/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index c3ee0e29c763..d90119809028 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -88,7 +88,7 @@ void XMLSymbolImageContext::StartElement( const uno::Reference< xml::sax::XAttri } } -SvXMLImportContext* XMLSymbolImageContext::CreateChildContext( +SvXMLImportContextRef XMLSymbolImageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx index 9e9a8a4dfe02..a26d85212d5c 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.hxx +++ b/xmloff/source/chart/XMLSymbolImageContext.hxx @@ -36,7 +36,7 @@ public: virtual ~XMLSymbolImageContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) 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/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index 2708d37bf18e..79a3b6bca37c 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -41,7 +41,7 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; }; @@ -54,7 +54,7 @@ SchXMLBodyContext_Impl::SchXMLBodyContext_Impl( { } -SvXMLImportContext *SchXMLBodyContext_Impl::CreateChildContext( +SvXMLImportContextRef SchXMLBodyContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & ) @@ -81,12 +81,12 @@ SchXMLDocContext::~SchXMLDocContext() {} -SvXMLImportContext* SchXMLDocContext::CreateChildContext( +SvXMLImportContextRef SchXMLDocContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; const SvXMLTokenMap& rTokenMap = mrImportHelper.GetDocElemTokenMap(); SvXMLImportFlags nFlags = GetImport().getImportFlags(); @@ -96,30 +96,30 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext( if( nFlags & SvXMLImportFlags::AUTOSTYLES ) // not nice, but this is safe, as the SchXMLDocContext class can only by // instantiated by the chart import class SchXMLImport (header is not exported) - pContext = + xContext = static_cast< SchXMLImport& >( GetImport() ).CreateStylesContext( rLocalName, xAttrList ); break; case XML_TOK_DOC_STYLES: // for draw styles containing gradients/hatches/markers and dashes if( nFlags & SvXMLImportFlags::STYLES ) - pContext = new SvXMLStylesContext( GetImport(), nPrefix, rLocalName, xAttrList ); + xContext = new SvXMLStylesContext( GetImport(), nPrefix, rLocalName, xAttrList ); break; case XML_TOK_DOC_META: // we come here in the flat ODF file format, // if XDocumentPropertiesSupplier is not supported at the model - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); break; case XML_TOK_DOC_BODY: if( nFlags & SvXMLImportFlags::CONTENT ) - pContext = new SchXMLBodyContext_Impl( mrImportHelper, GetImport(), nPrefix, rLocalName ); + xContext = new SchXMLBodyContext_Impl( mrImportHelper, GetImport(), nPrefix, rLocalName ); break; } // call parent when no own context was created - if( ! pContext ) - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl( @@ -134,7 +134,7 @@ SchXMLFlatDocContext_Impl::SchXMLFlatDocContext_Impl( { } -SvXMLImportContext *SchXMLFlatDocContext_Impl::CreateChildContext( +SvXMLImportContextRef SchXMLFlatDocContext_Impl::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) { @@ -168,18 +168,18 @@ void SchXMLBodyContext::EndElement() { } -SvXMLImportContext* SchXMLBodyContext::CreateChildContext( +SvXMLImportContextRef SchXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; // <chart:chart> element if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_CHART ) ) { - pContext = mrImportHelper.CreateChartContext( GetImport(), + xContext = mrImportHelper.CreateChartContext( GetImport(), nPrefix, rLocalName, GetImport().GetModel(), xAttrList ); @@ -188,14 +188,14 @@ SvXMLImportContext* SchXMLBodyContext::CreateChildContext( IsXMLToken( rLocalName, XML_CALCULATION_SETTINGS )) { // i99104 handle null date correctly - pContext = new SchXMLCalculationSettingsContext ( GetImport(), nPrefix, rLocalName, xAttrList); + xContext = new SchXMLCalculationSettingsContext ( GetImport(), nPrefix, rLocalName, xAttrList); } else { - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); } - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 2f77de2bce8a..7fe73de90ef9 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -50,7 +50,7 @@ public: virtual ~SchXMLDocContext() override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -67,7 +67,7 @@ public: sal_uInt16 i_nPrefix, const OUString & i_rLName, const css::uno::Reference<css::document::XDocumentProperties>& i_xDocProps); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList>& i_xAttrList) override; }; @@ -86,7 +86,7 @@ public: virtual ~SchXMLBodyContext() override; 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/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 6d2627f77e6d..dd875a91db82 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -151,7 +151,7 @@ public: const OUString& rItemName, XMLConfigBaseContext* pBaseContext); - 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 Characters( const OUString& rChars ) override; @@ -169,7 +169,7 @@ public: css::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); - 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; @@ -184,7 +184,7 @@ public: css::uno::Any& rAny, XMLConfigBaseContext* pBaseContext); - 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; @@ -204,7 +204,7 @@ public: const OUString& rConfigItemName, XMLConfigBaseContext* pBaseContext); - 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; @@ -288,7 +288,7 @@ XMLDocumentSettingsContext::~XMLDocumentSettingsContext() { } -SvXMLImportContext *XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix, +SvXMLImportContextRef XMLDocumentSettingsContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { @@ -441,7 +441,7 @@ XMLConfigItemSetContext::XMLConfigItemSetContext(SvXMLImport& rImport, sal_uInt1 // here are no attributes } -SvXMLImportContext *XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef XMLConfigItemSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { @@ -482,7 +482,7 @@ XMLConfigItemContext::XMLConfigItemContext(SvXMLImport& rImport, sal_uInt16 nPrf } } -SvXMLImportContext *XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef XMLConfigItemContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& ) { @@ -645,7 +645,7 @@ XMLConfigItemMapNamedContext::XMLConfigItemMapNamedContext(SvXMLImport& rImport, { } -SvXMLImportContext *XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef XMLConfigItemMapNamedContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { @@ -675,7 +675,7 @@ XMLConfigItemMapIndexedContext::XMLConfigItemMapIndexedContext(SvXMLImport& rImp { } -SvXMLImportContext *XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef XMLConfigItemMapIndexedContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { diff --git a/xmloff/source/core/DomBuilderContext.cxx b/xmloff/source/core/DomBuilderContext.cxx index 354358fa88ea..281c4fbee953 100644 --- a/xmloff/source/core/DomBuilderContext.cxx +++ b/xmloff/source/core/DomBuilderContext.cxx @@ -93,7 +93,7 @@ Reference<XDocument> DomBuilderContext::getTree() return mxNode->getOwnerDocument(); } -SvXMLImportContext* DomBuilderContext::CreateChildContext( +SvXMLImportContextRef DomBuilderContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& ) diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 50401c3dc7ee..5669dad5b969 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -49,7 +49,7 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHandler ); - 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; @@ -70,7 +70,7 @@ XMLEmbeddedObjectImportContext_Impl::XMLEmbeddedObjectImportContext_Impl( { } -SvXMLImportContext *XMLEmbeddedObjectImportContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLEmbeddedObjectImportContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& ) @@ -221,7 +221,7 @@ XMLEmbeddedObjectImportContext::~XMLEmbeddedObjectImportContext() { } -SvXMLImportContext *XMLEmbeddedObjectImportContext::CreateChildContext( +SvXMLImportContextRef XMLEmbeddedObjectImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& ) { diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index a16dfa2f0beb..f2242af256de 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -47,7 +47,7 @@ SvXMLImportContext::~SvXMLImportContext() { } -SvXMLImportContext *SvXMLImportContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SvXMLImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 883e471b3d9a..a4635551c622 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -703,7 +703,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName, SvXMLImportContextRef xContext; if(!maContexts.empty()) { - xContext.set(maContexts.top()->CreateChildContext(nPrefix, aLocalName, xAttrList)); + xContext = maContexts.top()->CreateChildContext(nPrefix, aLocalName, xAttrList); SAL_WARN_IF( !xContext.is() || (xContext->GetPrefix() != nPrefix), "xmloff.core", "SvXMLImport::startElement: created context has wrong prefix" ); } diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 8abc0ed7185b..d04fb00d2a3a 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -55,9 +55,9 @@ XMLGraphicsDefaultStyle::~XMLGraphicsDefaultStyle() { } -SvXMLImportContext *XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) +SvXMLImportContextRef XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) { @@ -72,14 +72,14 @@ SvXMLImportContext *XMLGraphicsDefaultStyle::CreateChildContext( sal_uInt16 nPre { rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) - pContext = new XMLShapePropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, GetProperties(), xImpPrMap ); + xContext = new XMLShapePropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, GetProperties(), xImpPrMap ); } } - if( !pContext ) - pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + if (!xContext) + xContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } struct XMLPropertyByIndex { diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 0fafed0fc439..490a5238e9b2 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -123,7 +123,7 @@ public: void EndElement() override; - SvXMLImportContext *CreateChildContext( + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList ) override; @@ -204,7 +204,7 @@ void XMLImageMapObjectContext::EndElement() // else: not valid -> don't create and insert } -SvXMLImportContext* XMLImageMapObjectContext::CreateChildContext( +SvXMLImportContextRef XMLImageMapObjectContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) @@ -572,36 +572,36 @@ XMLImageMapContext::~XMLImageMapContext() { } -SvXMLImportContext *XMLImageMapContext::CreateChildContext( +SvXMLImportContextRef XMLImageMapContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if ( XML_NAMESPACE_DRAW == nPrefix ) { if ( IsXMLToken(rLocalName, XML_AREA_RECTANGLE) ) { - pContext = new XMLImageMapRectangleContext( + xContext = new XMLImageMapRectangleContext( GetImport(), nPrefix, rLocalName, xImageMap); } else if ( IsXMLToken(rLocalName, XML_AREA_POLYGON) ) { - pContext = new XMLImageMapPolygonContext( + xContext = new XMLImageMapPolygonContext( GetImport(), nPrefix, rLocalName, xImageMap); } else if ( IsXMLToken(rLocalName, XML_AREA_CIRCLE) ) { - pContext = new XMLImageMapCircleContext( + xContext = new XMLImageMapCircleContext( GetImport(), nPrefix, rLocalName, xImageMap); } } else - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } void XMLImageMapContext::EndElement() diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 909c0d69372d..81d91a03f5e1 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -484,7 +484,7 @@ private: bool mbTextual; bool mbDecimal02; OUString maText; - rtl::Reference< SvXMLImportContext > mxSlaveContext; + SvXMLImportContextRef mxSlaveContext; public: @@ -493,9 +493,9 @@ public: const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, - SvXMLImportContext* pSlaveContext ); + const SvXMLImportContextRef& rSlaveContext ); - 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; @@ -507,11 +507,11 @@ public: }; -SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) +SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, const SvXMLImportContextRef& rSlaveContext ) : SvXMLImportContext(rImport, nPrfx, rLocalName), mpParent( pParent ), maNumberStyle( rLocalName ), - mxSlaveContext( pSlaveContext ) + mxSlaveContext( rSlaveContext ) { mbLong = false; mbTextual = false; @@ -544,7 +544,7 @@ SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXM } -SvXMLImportContext *SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SdXMLNumberFormatMemberImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) { @@ -705,7 +705,7 @@ void SdXMLNumberFormatImportContext::EndElement() } } -SvXMLImportContext * SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContextRef SdXMLNumberFormatImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLNumberFormatMemberImportContext( GetImport(), nPrefix, rLocalName, xAttrList, this, SvXMLNumFormatContext::CreateChildContext( nPrefix, rLocalName, xAttrList ) ); } diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index 4ceca19a46ac..4d3807c5588b 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -97,7 +97,7 @@ void XMLReplacementImageContext::EndElement() m_xPropSet->setPropertyValue( m_sGraphicURL, makeAny( sHRef ) ); } -SvXMLImportContext *XMLReplacementImageContext::CreateChildContext( +SvXMLImportContextRef XMLReplacementImageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index ef0453f802dc..072a5c9a9c89 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -63,34 +63,34 @@ void XMLShapePropertySetContext::EndElement() SvXMLPropertySetContext::EndElement(); } -SvXMLImportContext *XMLShapePropertySetContext::CreateChildContext( +SvXMLImportContextRef XMLShapePropertySetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; switch( mxMapper->getPropertySetMapper()->GetEntryContextId( rProp.mnIndex ) ) { case CTF_NUMBERINGRULES: mnBulletIndex = rProp.mnIndex; - mxBulletStyle = pContext = new SvxXMLListStyleContext( GetImport(), nPrefix, rLocalName, xAttrList ); + mxBulletStyle = xContext = new SvxXMLListStyleContext( GetImport(), nPrefix, rLocalName, xAttrList ); break; case CTF_TABSTOP: - pContext = new SvxXMLTabStopImportContext( GetImport(), nPrefix, + xContext = new SvxXMLTabStopImportContext( GetImport(), nPrefix, rLocalName, rProp, rProperties ); break; } - if( !pContext ) - pContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, xAttrList, rProperties, rProp ); - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 78ee86693777..80f31a57f9bc 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -86,12 +86,12 @@ void XMLShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, const OUString& } } -SvXMLImportContext *XMLShapeStyleContext::CreateChildContext( +SvXMLImportContextRef XMLShapeStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) { @@ -107,7 +107,7 @@ SvXMLImportContext *XMLShapeStyleContext::CreateChildContext( rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) - pContext = new XMLShapePropertySetContext( GetImport(), nPrefix, + xContext = new XMLShapePropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, GetProperties(), @@ -115,11 +115,11 @@ SvXMLImportContext *XMLShapeStyleContext::CreateChildContext( } } - if( !pContext ) - pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void XMLShapeStyleContext::FillPropertySet( const Reference< beans::XPropertySet > & rPropSet ) diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index dd5eb993b7e1..3bb5c93cc5a7 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -1233,7 +1233,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: } } -SvXMLImportContext * AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, +SvXMLImportContextRef AnimationNodeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( mxNode.is()) diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index fb520bb9e3b7..faa16a01b48e 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -387,7 +387,7 @@ public: virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; }; @@ -521,7 +521,7 @@ XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, s } } -SvXMLImportContext * XMLAnimationsEffectContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) +SvXMLImportContextRef XMLAnimationsEffectContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) { return new XMLAnimationsSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this ); } @@ -625,7 +625,7 @@ XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPr { } -SvXMLImportContext * XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, +SvXMLImportContextRef XMLAnimationsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new XMLAnimationsEffectContext( GetImport(), nPrefix, rLocalName, xAttrList, mpImpl ); diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 38c3460df817..6f0cfbd623b4 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -78,7 +78,7 @@ public: SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) override; virtual void EndElement() override; bool mbValid; @@ -246,7 +246,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons mbValid = !sEventName.isEmpty(); } -SvXMLImportContext * SdXMLEventContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) +SvXMLImportContextRef SdXMLEventContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) { return new XMLEventSoundContext( GetImport(), nPrefix, rLocalName, xAttrList, this ); } @@ -467,7 +467,7 @@ SdXMLEventsContext::~SdXMLEventsContext() { } -SvXMLImportContext * SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLocalName, +SvXMLImportContextRef SdXMLEventsContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLEventContext( GetImport(), nPrfx, rLocalName, xAttrList, mxShape ); diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index cf2e2b04c3ad..5f7937a529b3 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -39,7 +39,7 @@ public: const css::uno::Reference< css::drawing::XShape >& rxShape ); virtual ~SdXMLEventsContext() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 4b4d516096a2..a3b3a50bf757 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -52,7 +52,7 @@ class SdXMLLayerContext : public SvXMLImportContext public: SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XNameAccess >& xLayerManager ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; virtual void EndElement() override; private: @@ -84,7 +84,7 @@ SdXMLLayerContext::SdXMLLayerContext( SvXMLImport& rImport, sal_uInt16 nPrefix, } -SvXMLImportContext * SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& ) +SvXMLImportContextRef SdXMLLayerContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& ) { if( (XML_NAMESPACE_SVG == nPrefix) && IsXMLToken(rLocalName, XML_TITLE) ) { @@ -150,7 +150,7 @@ SdXMLLayerSetContext::~SdXMLLayerSetContext() { } -SvXMLImportContext * SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, +SvXMLImportContextRef SdXMLLayerSetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { return new SdXMLLayerContext( GetImport(), nPrefix, rLocalName, xAttrList, mxLayerManager ); diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index 882f5cb3dd55..031a4a1b44cc 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -38,7 +38,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLLayerSetContext() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index b99022d4f471..a62f92ea21f6 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -62,7 +62,7 @@ public: const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; }; @@ -74,7 +74,7 @@ SdXMLBodyContext_Impl::SdXMLBodyContext_Impl( SdXMLImport& rImport, { } -SvXMLImportContext *SdXMLBodyContext_Impl::CreateChildContext( +SvXMLImportContextRef SdXMLBodyContext_Impl::CreateChildContext( sal_uInt16 /*nPrefix*/, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) @@ -96,7 +96,7 @@ public: const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList); - virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) override; }; @@ -110,26 +110,26 @@ SdXMLDocContext_Impl::SdXMLDocContext_Impl( { } -SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( +SvXMLImportContextRef SdXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; const SvXMLTokenMap& rTokenMap = GetSdImport().GetDocElemTokenMap(); switch(rTokenMap.Get(nPrefix, rLocalName)) { case XML_TOK_DOC_FONTDECLS: { - pContext = GetSdImport().CreateFontDeclsContext( rLocalName, xAttrList ); + xContext = GetSdImport().CreateFontDeclsContext( rLocalName, xAttrList ); break; } case XML_TOK_DOC_SETTINGS: { if( GetImport().getImportFlags() & SvXMLImportFlags::SETTINGS ) { - pContext = new XMLDocumentSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList ); + xContext = new XMLDocumentSettingsContext(GetImport(), nPrefix, rLocalName, xAttrList ); } break; } @@ -138,7 +138,7 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( if( GetImport().getImportFlags() & SvXMLImportFlags::STYLES ) { // office:styles inside office:document - pContext = GetSdImport().CreateStylesContext(rLocalName, xAttrList); + xContext = GetSdImport().CreateStylesContext(rLocalName, xAttrList); } break; } @@ -147,7 +147,7 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( if( GetImport().getImportFlags() & SvXMLImportFlags::AUTOSTYLES ) { // office:automatic-styles inside office:document - pContext = GetSdImport().CreateAutoStylesContext(rLocalName, xAttrList); + xContext = GetSdImport().CreateAutoStylesContext(rLocalName, xAttrList); } break; } @@ -156,7 +156,7 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( if( GetImport().getImportFlags() & SvXMLImportFlags::MASTERSTYLES ) { // office:master-styles inside office:document - pContext = GetSdImport().CreateMasterStylesContext(rLocalName, xAttrList); + xContext = GetSdImport().CreateMasterStylesContext(rLocalName, xAttrList); } break; } @@ -170,7 +170,7 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( if( GetImport().getImportFlags() & SvXMLImportFlags::SCRIPTS ) { // office:script inside office:document - pContext = GetSdImport().CreateScriptContext( rLocalName ); + xContext = GetSdImport().CreateScriptContext( rLocalName ); } break; } @@ -179,7 +179,7 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( if( GetImport().getImportFlags() & SvXMLImportFlags::CONTENT ) { // office:body inside office:document - pContext = new SdXMLBodyContext_Impl(GetSdImport(),nPrefix, + xContext = new SdXMLBodyContext_Impl(GetSdImport(),nPrefix, rLocalName, xAttrList); } break; @@ -187,10 +187,10 @@ SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( } // call parent when no own context was created - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } // context for flat file xml format @@ -203,7 +203,7 @@ public: const uno::Reference<xml::sax::XAttributeList>& i_xAttrList, 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; }; @@ -219,7 +219,7 @@ SdXMLFlatDocContext_Impl::SdXMLFlatDocContext_Impl( SdXMLImport& i_rImport, { } -SvXMLImportContext *SdXMLFlatDocContext_Impl::CreateChildContext( +SvXMLImportContextRef SdXMLFlatDocContext_Impl::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) { diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index e7f9f61c5858..cc541900fcb9 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -628,19 +628,19 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateFrameChildContext( return pContext; } -SvXMLImportContext *XMLShapeImportHelper::CreateFrameChildContext( +SvXMLImportContextRef XMLShapeImportHelper::CreateFrameChildContext( SvXMLImportContext *pThisContext, sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext * pContext = nullptr; + SvXMLImportContextRef xContext; SdXMLFrameShapeContext *pFrameContext = dynamic_cast<SdXMLFrameShapeContext*>( pThisContext ); - if( pFrameContext ) - pContext = pFrameContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); + if (pFrameContext) + xContext = pFrameContext->CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } /** this function is called whenever the implementation classes like to add this new diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index d6bcbeea619d..62ffb7098f5e 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -167,44 +167,44 @@ void SdXML3DSceneShapeContext::EndElement() } } -SvXMLImportContext* SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SdXML3DSceneShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; // #i68101# if( nPrefix == XML_NAMESPACE_SVG && (IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) ) { - pContext = new SdXMLDescriptionContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); + xContext = new SdXMLDescriptionContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); } else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) { - pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); + xContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); } // look for local light context first else if(nPrefix == XML_NAMESPACE_DR3D && IsXMLToken( rLocalName, XML_LIGHT ) ) { // dr3d:light inside dr3d:scene context - pContext = create3DLightContext( nPrefix, rLocalName, xAttrList ); + xContext = create3DLightContext( nPrefix, rLocalName, xAttrList ); } // call GroupChildContext function at common ShapeImport - if(!pContext) + if (!xContext) { - pContext = GetImport().GetShapeImport()->Create3DSceneChildContext( + xContext = GetImport().GetShapeImport()->Create3DSceneChildContext( GetImport(), nPrefix, rLocalName, xAttrList, mxChildren); - } + } // call parent when no own context was created - if(!pContext) + if (!xContext) { - pContext = SvXMLImportContext::CreateChildContext( + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); } - return pContext; + return xContext; } SdXML3DSceneAttributesHelper::SdXML3DSceneAttributesHelper( SvXMLImport& rImporter ) diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index e99b3b5bdefa..63ab0bde3be4 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -48,7 +48,7 @@ public: virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; 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/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index be23c0725876..6556ab45aa53 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -211,11 +211,11 @@ SdXMLDrawPageContext::~SdXMLDrawPageContext() { } -SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; const SvXMLTokenMap& rTokenMap = GetSdImport().GetDrawPageElemTokenMap(); // some special objects inside draw:page context @@ -236,7 +236,7 @@ SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix if(xNewShapes.is()) { // presentation:notes inside draw:page context - pContext = new SdXMLNotesContext( GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes); + xContext = new SdXMLNotesContext( GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes); } } } @@ -251,7 +251,7 @@ SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix uno::Reference< animations::XAnimationNodeSupplier > xNodeSupplier(GetLocalShapesContext(), uno::UNO_QUERY); if(xNodeSupplier.is()) { - pContext = new xmloff::AnimationNodeContext( xNodeSupplier->getAnimationNode(), GetSdImport(), nPrefix, rLocalName, xAttrList ); + xContext = new xmloff::AnimationNodeContext( xNodeSupplier->getAnimationNode(), GetSdImport(), nPrefix, rLocalName, xAttrList ); mbHadSMILNodes = true; } } @@ -260,10 +260,10 @@ SvXMLImportContext *SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPrefix } // call parent when no own context was created - if(!pContext) - pContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } void SdXMLDrawPageContext::EndElement() @@ -290,12 +290,12 @@ SdXMLBodyContext::~SdXMLBodyContext() { } -SvXMLImportContext *SdXMLBodyContext::CreateChildContext( +SvXMLImportContextRef SdXMLBodyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; const SvXMLTokenMap& rTokenMap = GetSdImport().GetBodyElemTokenMap(); switch(rTokenMap.Get(nPrefix, rLocalName)) @@ -304,7 +304,7 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext( case XML_TOK_BODY_FOOTER_DECL: case XML_TOK_BODY_DATE_TIME_DECL: { - pContext = new SdXMLHeaderFooterDeclContext( GetImport(), nPrefix, rLocalName, xAttrList ); + xContext = new SdXMLHeaderFooterDeclContext( GetImport(), nPrefix, rLocalName, xAttrList ); break; } case XML_TOK_BODY_PAGE: @@ -340,7 +340,7 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext( if(xNewShapes.is()) { // draw:page inside office:body context - pContext = new SdXMLDrawPageContext(GetSdImport(), nPrefix, rLocalName, xAttrList, + xContext = new SdXMLDrawPageContext(GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes); } } @@ -349,15 +349,15 @@ SvXMLImportContext *SdXMLBodyContext::CreateChildContext( } case XML_TOK_BODY_SETTINGS: { - pContext = new SdXMLShowsContext( GetSdImport(), nPrefix, rLocalName, xAttrList ); + xContext = new SdXMLShowsContext( GetSdImport(), nPrefix, rLocalName, xAttrList ); } } // call parent when no own context was created - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx index 3616480b2fbc..801fa0e2eca8 100644 --- a/xmloff/source/draw/ximpbody.hxx +++ b/xmloff/source/draw/ximpbody.hxx @@ -43,7 +43,7 @@ public: css::uno::Reference< css::drawing::XShapes > const & rShapes); virtual ~SdXMLDrawPageContext() override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; @@ -61,7 +61,7 @@ public: SdXMLBodyContext( SdXMLImport& rImport, const OUString& rLocalName ); virtual ~SdXMLBodyContext() 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/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 0a9dc7be5b43..5f6ae87e1358 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -1292,7 +1292,7 @@ void XMLEnhancedCustomShapeContext::EndElement() SdXMLCustomShapePropertyMerge( mrCustomShapeGeometry, maHandles, EASGet( EAS_Handles ) ); } -SvXMLImportContext* XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const OUString& rLocalName, +SvXMLImportContextRef XMLEnhancedCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix,const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList> & xAttrList ) { EnhancedCustomShapeTokenEnum aTokenEnum = EASGet( rLocalName ); diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index 74318059d52a..218f6e5267bb 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -58,7 +58,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList> & xAttrList ) override; }; diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 555f446433b6..3e3284bdccbf 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -42,21 +42,21 @@ SdXMLGroupShapeContext::~SdXMLGroupShapeContext() { } -SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; // #i68101# if( nPrefix == XML_NAMESPACE_SVG && (IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) ) { - pContext = new SdXMLDescriptionContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); + xContext = new SdXMLDescriptionContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); } else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) { - pContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); + xContext = new SdXMLEventsContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShape ); } else if( nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_GLUE_POINT ) ) { @@ -65,16 +65,16 @@ SvXMLImportContext* SdXMLGroupShapeContext::CreateChildContext( sal_uInt16 nPref else { // call GroupChildContext function at common ShapeImport - pContext = GetImport().GetShapeImport()->CreateGroupChildContext( + xContext = GetImport().GetShapeImport()->CreateGroupChildContext( GetImport(), nPrefix, rLocalName, xAttrList, mxChildren); } // call parent when no own context was created - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext( + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } void SdXMLGroupShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&) diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 665b1639aeb9..7c585ebf2342 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -41,7 +41,7 @@ public: bool bTemporaryShape); virtual ~SdXMLGroupShapeContext() override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index 3bbe4271d89d..728dd0d35728 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -48,7 +48,7 @@ SdXMLShapeLinkContext::~SdXMLShapeLinkContext() { } -SvXMLImportContext* SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SdXMLShapeLinkContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index dac00fdbec70..c930f9b0f7e7 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -44,7 +44,7 @@ public: css::uno::Reference< css::drawing::XShapes > const & rShapes); virtual ~SdXMLShapeLinkContext() 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/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 35deee58ab56..cfa7bfdd3668 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -60,7 +60,7 @@ class DrawAnnotationContext : public SvXMLImportContext public: DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,const Reference< xml::sax::XAttributeList>& xAttrList, const Reference< XAnnotationAccess >& xAnnotationAccess ); - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; private: @@ -130,23 +130,23 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, sal_uInt16 n } } -SvXMLImportContext * DrawAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) +SvXMLImportContextRef DrawAnnotationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) { - SvXMLImportContext * pContext = nullptr; + SvXMLImportContextRef xContext; if( mxAnnotation.is() ) { if( XML_NAMESPACE_DC == nPrefix ) { if( IsXMLToken( rLocalName, XML_CREATOR ) ) - pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, maAuthorBuffer); + xContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, maAuthorBuffer); else if( IsXMLToken( rLocalName, XML_DATE ) ) - pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, maDateBuffer); + xContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, maDateBuffer); } else if( (XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix) && IsXMLToken(rLocalName, XML_SENDER_INITIALS) ) { - pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, maInitialsBuffer); + xContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, maInitialsBuffer); } else { @@ -166,16 +166,16 @@ SvXMLImportContext * DrawAnnotationContext::CreateChildContext( sal_uInt16 nPref // if we have a text cursor, lets try to import some text if( mxCursor.is() ) { - pContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), nPrefix, rLocalName, xAttrList ); + xContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), nPrefix, rLocalName, xAttrList ); } } } // call parent for content - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void DrawAnnotationContext::EndElement() @@ -242,38 +242,38 @@ void SdXMLGenericPageContext::StartElement( const Reference< css::xml::sax::XAtt GetImport().GetFormImport()->startPage( Reference< drawing::XDrawPage >::query( mxShapes ) ); } -SvXMLImportContext* SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SdXMLGenericPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if( nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_ANIMATIONS ) ) { - pContext = new XMLAnimationsContext( GetImport(), nPrefix, rLocalName, xAttrList ); + xContext = new XMLAnimationsContext( GetImport(), nPrefix, rLocalName, xAttrList ); } else if( nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_FORMS ) ) { if( GetImport().IsFormsSupported() ) - pContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext( GetImport(), nPrefix, rLocalName ); + xContext = xmloff::OFormLayerXMLImport::createOfficeFormsContext( GetImport(), nPrefix, rLocalName ); } else if( ((nPrefix == XML_NAMESPACE_OFFICE) || (nPrefix == XML_NAMESPACE_OFFICE_EXT)) && IsXMLToken( rLocalName, XML_ANNOTATION ) ) { if( mxAnnotationAccess.is() ) - pContext = new DrawAnnotationContext( GetImport(), nPrefix, rLocalName, xAttrList, mxAnnotationAccess ); + xContext = new DrawAnnotationContext( GetImport(), nPrefix, rLocalName, xAttrList, mxAnnotationAccess ); } else { // call GroupChildContext function at common ShapeImport - pContext = GetImport().GetShapeImport()->CreateGroupChildContext( + xContext = GetImport().GetShapeImport()->CreateGroupChildContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShapes); } // call parent when no own context was created - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } void SdXMLGenericPageContext::EndElement() diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index 938ad814c968..024d35284b62 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -67,7 +67,7 @@ public: virtual ~SdXMLGenericPageContext() override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; - virtual SvXMLImportContext *CreateChildContext( + 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/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 0cf5d26693fd..a267d57a56f6 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -166,21 +166,21 @@ SdXMLShapeContext::~SdXMLShapeContext() { } -SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, +SvXMLImportContextRef SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext * pContext = nullptr; + SvXMLImportContextRef xContext; // #i68101# if( p_nPrefix == XML_NAMESPACE_SVG && (IsXMLToken( rLocalName, XML_TITLE ) || IsXMLToken( rLocalName, XML_DESC ) ) ) { - pContext = new SdXMLDescriptionContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape ); + xContext = new SdXMLDescriptionContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape ); } else if( p_nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) { - pContext = new SdXMLEventsContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape ); + xContext = new SdXMLEventsContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape ); } else if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_GLUE_POINT ) ) { @@ -233,17 +233,17 @@ SvXMLImportContext *SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, // if we have a text cursor, lets try to import some text if( mxCursor.is() ) { - pContext = GetImport().GetTextImport()->CreateTextChildContext( + xContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), p_nPrefix, rLocalName, xAttrList, ( mbTextBox ? XMLTextType::TextBox : XMLTextType::Shape ) ); } } // call parent for content - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList ); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void SdXMLShapeContext::addGluePoint( const uno::Reference< xml::sax::XAttributeList>& xAttrList ) @@ -2462,11 +2462,11 @@ void SdXMLGraphicObjectShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( +SvXMLImportContextRef SdXMLGraphicObjectShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) ) @@ -2475,18 +2475,18 @@ SvXMLImportContext* SdXMLGraphicObjectShapeContext::CreateChildContext( { mxBase64Stream = GetImport().GetStreamForGraphicObjectURLFromBase64(); if( mxBase64Stream.is() ) - pContext = new XMLBase64ImportContext( GetImport(), nPrefix, + xContext = new XMLBase64ImportContext( GetImport(), nPrefix, rLocalName, xAttrList, mxBase64Stream ); } } // delegate to parent class if no context could be created - if ( nullptr == pContext ) - pContext = SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, + if (!xContext) + xContext = SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext() @@ -2582,7 +2582,7 @@ void SdXMLChartShapeContext::Characters( const OUString& rChars ) mxChartContext->Characters( rChars ); } -SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, +SvXMLImportContextRef SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( mxChartContext.is() ) @@ -2758,27 +2758,27 @@ void SdXMLObjectShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStri SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( +SvXMLImportContextRef SdXMLObjectShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if((XML_NAMESPACE_OFFICE == nPrefix) && IsXMLToken(rLocalName, XML_BINARY_DATA)) { mxBase64Stream = GetImport().GetStreamForEmbeddedObjectURLFromBase64(); if( mxBase64Stream.is() ) - pContext = new XMLBase64ImportContext( GetImport(), nPrefix, + xContext = new XMLBase64ImportContext( GetImport(), nPrefix, rLocalName, xAttrList, mxBase64Stream ); } else if( ((XML_NAMESPACE_OFFICE == nPrefix) && IsXMLToken(rLocalName, XML_DOCUMENT)) || ((XML_NAMESPACE_MATH == nPrefix) && IsXMLToken(rLocalName, XML_MATH)) ) { - XMLEmbeddedObjectImportContext *pEContext = - new XMLEmbeddedObjectImportContext( GetImport(), nPrefix, - rLocalName, xAttrList ); - maCLSID = pEContext->GetFilterCLSID(); + rtl::Reference<XMLEmbeddedObjectImportContext> xEContext( + new XMLEmbeddedObjectImportContext(GetImport(), nPrefix, + rLocalName, xAttrList)); + maCLSID = xEContext->GetFilterCLSID(); if( !maCLSID.isEmpty() ) { uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY); @@ -2789,20 +2789,19 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( uno::Reference< lang::XComponent > xComp; xPropSet->getPropertyValue("Model") >>= xComp; SAL_WARN_IF( !xComp.is(), "xmloff", "no xModel for own OLE format" ); - pEContext->SetComponent( xComp ); + xEContext->SetComponent(xComp); } } - pContext = pEContext; + xContext = xEContext.get(); } // delegate to parent class if no context could be created - if(!pContext) - pContext = SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } - SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, @@ -2910,7 +2909,7 @@ void SdXMLAppletShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContextRef SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3180,7 +3179,7 @@ void SdXMLPluginShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContextRef SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { if( p_nPrefix == XML_NAMESPACE_DRAW && IsXMLToken( rLocalName, XML_PARAM ) ) { @@ -3400,18 +3399,18 @@ OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImpor return aRetval; } -SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext * pContext = nullptr; + SvXMLImportContextRef xContext; if( !mxImplContext.is() ) { SvXMLShapeContext* pShapeContext= GetImport().GetShapeImport()->CreateFrameChildContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShapes, mxAttrList ); - pContext = pShapeContext; + xContext = pShapeContext; // propagate the hyperlink to child context if ( !msHyperlink.isEmpty() ) @@ -3430,11 +3429,11 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref } #endif - mxImplContext = pContext; + mxImplContext = xContext; mbSupportsReplacement = IsXMLToken(rLocalName, XML_OBJECT ) || IsXMLToken(rLocalName, XML_OBJECT_OLE); setSupportsMultipleContents(IsXMLToken(rLocalName, XML_IMAGE)); - if(getSupportsMultipleContents() && dynamic_cast< SdXMLGraphicObjectShapeContext* >(pContext)) + if(getSupportsMultipleContents() && dynamic_cast< SdXMLGraphicObjectShapeContext* >(xContext.get())) { addContent(*mxImplContext.get()); } @@ -3442,11 +3441,11 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref else if(getSupportsMultipleContents() && XML_NAMESPACE_DRAW == nPrefix && IsXMLToken(rLocalName, XML_IMAGE)) { // read another image - pContext = GetImport().GetShapeImport()->CreateFrameChildContext( + xContext = GetImport().GetShapeImport()->CreateFrameChildContext( GetImport(), nPrefix, rLocalName, xAttrList, mxShapes, mxAttrList); - mxImplContext = pContext; + mxImplContext = xContext; - if(dynamic_cast< SdXMLGraphicObjectShapeContext* >(pContext)) + if(dynamic_cast< SdXMLGraphicObjectShapeContext* >(xContext.get())) { addContent(*mxImplContext.get()); } @@ -3465,9 +3464,9 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref pSContext->getShape(), uno::UNO_QUERY ); if( xPropSet.is() ) { - pContext = new XMLReplacementImageContext( GetImport(), + xContext = new XMLReplacementImageContext( GetImport(), nPrefix, rLocalName, xAttrList, xPropSet ); - mxReplImplContext = pContext; + mxReplImplContext = xContext; } } } @@ -3484,7 +3483,7 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref mxImplContext = solveMultipleImages(); } SvXMLImportContext *pImplContext = mxImplContext.get(); - pContext = dynamic_cast<SdXMLShapeContext&>(*pImplContext).CreateChildContext( nPrefix, + xContext = dynamic_cast<SdXMLShapeContext&>(*pImplContext).CreateChildContext( nPrefix, rLocalName, xAttrList ); } else if ( (XML_NAMESPACE_DRAW == nPrefix) && IsXMLToken( rLocalName, XML_IMAGE_MAP ) ) @@ -3500,15 +3499,15 @@ SvXMLImportContext *SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPref uno::Reference < beans::XPropertySet > xPropSet( pSContext->getShape(), uno::UNO_QUERY ); if (xPropSet.is()) { - pContext = new XMLImageMapContext(GetImport(), nPrefix, rLocalName, xPropSet); + xContext = new XMLImageMapContext(GetImport(), nPrefix, rLocalName, xPropSet); } } } // call parent for content - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void SdXMLFrameShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>&) @@ -3823,28 +3822,27 @@ void SdXMLCustomShapeContext::EndElement() } } -SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( +SvXMLImportContextRef SdXMLCustomShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if ( XML_NAMESPACE_DRAW == nPrefix ) { if ( IsXMLToken( rLocalName, XML_ENHANCED_GEOMETRY ) ) { uno::Reference< beans::XPropertySet > xPropSet( mxShape,uno::UNO_QUERY ); if ( xPropSet.is() ) - pContext = new XMLEnhancedCustomShapeContext( GetImport(), mxShape, nPrefix, rLocalName, maCustomShapeGeometry ); + xContext = new XMLEnhancedCustomShapeContext( GetImport(), mxShape, nPrefix, rLocalName, maCustomShapeGeometry ); } } // delegate to parent class if no context could be created - if ( nullptr == pContext ) - pContext = SdXMLShapeContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = SdXMLShapeContext::CreateChildContext( nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } - SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, css::uno::Reference< css::drawing::XShapes > const & rShapes ) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false ) { @@ -3985,7 +3983,7 @@ void SdXMLTableShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStrin SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -SvXMLImportContext* SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) +SvXMLImportContextRef SdXMLTableShapeContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { if( mxTableImportContext.is() && (nPrefix == XML_NAMESPACE_TABLE) ) return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, xAttrList); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 71dfad28d06c..f1dbfde62ce6 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -117,7 +117,7 @@ public: virtual void StartElement(const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -396,7 +396,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -420,7 +420,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; virtual void Characters( const OUString& rChars ) override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; @@ -445,7 +445,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -475,7 +475,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -504,7 +504,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -561,7 +561,7 @@ public: bool bTemporaryShape); virtual ~SdXMLFrameShapeContext() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -591,7 +591,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list @@ -613,7 +613,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; // this is called from the parent group for each unparsed attribute in the attribute list virtual void processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) override; diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index caed5664e6ef..d9e2a4e95651 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -184,7 +184,7 @@ SdXMLShowsContext::~SdXMLShowsContext() } } -SvXMLImportContext * SdXMLShowsContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) +SvXMLImportContextRef SdXMLShowsContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList ) { if( mpImpl && p_nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_SHOW ) ) { diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index af59f8eec008..3764b5922879 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -40,7 +40,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLShowsContext() override; - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; }; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 8a5751f7d526..5ceaffdadd07 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -65,7 +65,7 @@ public: const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); using SvXMLPropertySetContext::CreateChildContext; - 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, @@ -84,14 +84,14 @@ SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext( { } -SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext( +SvXMLImportContextRef SdXMLDrawingPagePropertySetContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; switch( mxMapper->getPropertySetMapper()->GetEntryContextId( rProp.mnIndex ) ) { @@ -114,12 +114,12 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext( } } - if( !pContext ) - pContext = SvXMLPropertySetContext::CreateChildContext( p_nPrefix, rLocalName, + if (!xContext) + xContext = SvXMLPropertySetContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList, rProperties, rProp ); - return pContext; + return xContext; } class SdXMLDrawingPageStyleContext : public XMLPropStyleContext @@ -134,7 +134,7 @@ public: SvXMLStylesContext& rStyles, sal_uInt16 nFamily = XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID); - SvXMLImportContext * CreateChildContext( + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; @@ -157,12 +157,12 @@ SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext( { } -SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext( +SvXMLImportContextRef SdXMLDrawingPageStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_DRAWING_PAGE_PROPERTIES ) ) @@ -170,17 +170,17 @@ SvXMLImportContext *SdXMLDrawingPageStyleContext::CreateChildContext( rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) - pContext = new SdXMLDrawingPagePropertySetContext( GetImport(), nPrefix, + xContext = new SdXMLDrawingPagePropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, GetProperties(), xImpPrMap ); } - if( !pContext ) - pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void SdXMLDrawingPageStyleContext::Finish( bool bOverwrite ) @@ -395,28 +395,27 @@ SdXMLPageMasterContext::SdXMLPageMasterContext( } } -SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext( +SvXMLImportContextRef SdXMLPageMasterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if(nPrefix == XML_NAMESPACE_STYLE && IsXMLToken( rLocalName, XML_PAGE_LAYOUT_PROPERTIES) ) { DBG_ASSERT(!mxPageMasterStyle.is(), "PageMasterStyle is set, there seem to be two of them (!)"); mxPageMasterStyle.set(new SdXMLPageMasterStyleContext(GetSdImport(), nPrefix, rLocalName, xAttrList)); - pContext = mxPageMasterStyle.get(); + xContext = mxPageMasterStyle.get(); } // call base class - if(!pContext) - pContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } - SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, sal_uInt16 nPrfx, @@ -442,29 +441,29 @@ SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext( } } -SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext( +SvXMLImportContextRef SdXMLPresentationPageLayoutContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if(nPrefix == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_PLACEHOLDER ) ) { - const rtl::Reference< SdXMLPresentationPlaceholderContext > xContext{ + const rtl::Reference< SdXMLPresentationPlaceholderContext > xLclContext{ new SdXMLPresentationPlaceholderContext(GetSdImport(), nPrefix, rLocalName, xAttrList)}; // presentation:placeholder inside style:presentation-page-layout context - pContext = xContext.get(); + xContext = xLclContext.get(); // remember SdXMLPresentationPlaceholderContext for later evaluation - maList.push_back( xContext ); + maList.push_back(xLclContext); } // call base class - if(!pContext) - pContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } void SdXMLPresentationPageLayoutContext::EndElement() @@ -843,12 +842,12 @@ void SdXMLMasterPageContext::EndElement() GetImport().GetShapeImport()->endPage(GetLocalShapesContext()); } -SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext( +SvXMLImportContextRef SdXMLMasterPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; const SvXMLTokenMap& rTokenMap = GetSdImport().GetMasterPageElemTokenMap(); // some special objects inside style:masterpage context @@ -865,7 +864,7 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext( XML_STYLE_FAMILY_SD_PRESENTATION_ID); // add this style to the outer StylesContext class for later processing - pContext = pNew; + xContext = pNew; GetSdImport().GetShapeImport()->GetStylesContext()->AddStyle(*pNew); } break; @@ -885,7 +884,7 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext( if(xNewShapes.is()) { // presentation:notes inside master-page context - pContext = new SdXMLNotesContext( GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes); + xContext = new SdXMLNotesContext( GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes); } } } @@ -894,13 +893,12 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext( } // call base class - if(!pContext) - pContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SdXMLGenericPageContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } - SdXMLStylesContext::SdXMLStylesContext( SdXMLImport& rImport, const OUString& rLName, @@ -1414,12 +1412,12 @@ SdXMLMasterStylesContext::SdXMLMasterStylesContext( { } -SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( +SvXMLImportContextRef SdXMLMasterStylesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if(nPrefix == XML_NAMESPACE_STYLE && IsXMLToken( rLocalName, XML_MASTER_PAGE ) ) @@ -1449,11 +1447,11 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( uno::Reference< drawing::XShapes > xNewShapes(xNewMasterPage, uno::UNO_QUERY); if(xNewShapes.is() && GetSdImport().GetShapeImport()->GetStylesContext()) { - const rtl::Reference<SdXMLMasterPageContext> xContext{ + const rtl::Reference<SdXMLMasterPageContext> xLclContext{ new SdXMLMasterPageContext(GetSdImport(), nPrefix, rLocalName, xAttrList, xNewShapes)}; - pContext = xContext.get(); - maMasterPageList.push_back(xContext); + xContext = xLclContext.get(); + maMasterPageList.push_back(xLclContext); } } } @@ -1467,21 +1465,21 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext( uno::Reference< drawing::XShapes > xHandoutPage( xHandoutSupp->getHandoutMasterPage(), uno::UNO_QUERY ); if(xHandoutPage.is() && GetSdImport().GetShapeImport()->GetStylesContext()) { - pContext = new SdXMLMasterPageContext(GetSdImport(), + xContext = new SdXMLMasterPageContext(GetSdImport(), nPrefix, rLocalName, xAttrList, xHandoutPage); } } } else if( (nPrefix == XML_NAMESPACE_DRAW )&& IsXMLToken( rLocalName, XML_LAYER_SET ) ) { - pContext = new SdXMLLayerSetContext( GetImport(), nPrefix, rLocalName, xAttrList ); + xContext = new SdXMLLayerSetContext( GetImport(), nPrefix, rLocalName, xAttrList ); } // call base class - if(!pContext) - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } SdXMLHeaderFooterDeclContext::SdXMLHeaderFooterDeclContext(SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index c33bcf092264..d70fc8cfca88 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -82,7 +82,7 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -108,7 +108,7 @@ public: css::uno::Reference< css::drawing::XShapes > const & rShapes); virtual ~SdXMLMasterPageContext() override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -163,7 +163,7 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; @@ -236,7 +236,7 @@ public: SdXMLImport& rImport, const OUString& rLName); - 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/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 322297d81672..66e436c37f11 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -160,7 +160,7 @@ namespace xmloff OPropertyImport::StartElement( _rxAttrList ); } - SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, + SvXMLImportContextRef OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && (XML_NAMESPACE_OFFICE == _nPrefix)) @@ -1351,7 +1351,7 @@ namespace xmloff enableTrackAttributes(); } - SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, + SvXMLImportContextRef OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList ) { if ( ( XML_NAMESPACE_TEXT == _nPrefix ) && _rLocalName.equalsIgnoreAsciiCase("p") ) @@ -1536,7 +1536,7 @@ namespace xmloff enableTrackAttributes(); } - SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, + SvXMLImportContextRef OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { // is it the "option" sub tag of a listbox ? @@ -1818,7 +1818,7 @@ namespace xmloff ,m_rEventManager(_rEventManager) { } - SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, + SvXMLImportContextRef OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { OControlImport* pReturn = implCreateChildContext(_nPrefix, _rLocalName, OElementNameMap::getElementType(_rLocalName)); @@ -1896,7 +1896,7 @@ namespace xmloff enableTrackAttributes(); } - SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, + SvXMLImportContextRef OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_FORM) ) diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 61ec30b228ea..cf81af025784 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -116,7 +116,7 @@ namespace xmloff // SvXMLImportContext overridables virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; @@ -441,7 +441,7 @@ namespace xmloff // SvXMLImportContext overridables virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; @@ -491,7 +491,7 @@ namespace xmloff // SvXMLImportContext overridables virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void EndElement() override; @@ -572,7 +572,7 @@ namespace xmloff } // SvXMLImportContext overridables - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) SAL_OVERRIDE; virtual void EndElement() SAL_OVERRIDE; @@ -627,7 +627,7 @@ namespace xmloff const css::uno::Reference< css::container::XNameContainer >& _rxParentContainer); // SvXMLImportContext overridables - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( @@ -670,7 +670,7 @@ namespace xmloff protected: // SvXMLImportContext overridables - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; virtual void StartElement( @@ -707,7 +707,7 @@ namespace xmloff //= OContainerImport template <class BASE> - inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( + inline SvXMLImportContextRef OContainerImport< BASE >::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) { diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 8e4f8f91bbb8..34b26f8090b0 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -48,7 +48,7 @@ namespace xmloff { } - SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, + SvXMLImportContextRef OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList>& xAttrList ) { SvXMLImportContext* pRet = nullptr; diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 2279f3dc8a32..027f095b877c 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -42,7 +42,7 @@ namespace xmloff virtual ~OFormsRootImport() override; // SvXMLImportContext overridable - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 09d1ba7161be..9bced59ecdd0 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -257,7 +257,7 @@ OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 { } -SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, +SvXMLImportContextRef OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTIES) ) @@ -352,7 +352,7 @@ OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uI { } -SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, +SvXMLImportContextRef OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTY ) ) @@ -395,7 +395,7 @@ OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 { } -SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, +SvXMLImportContextRef OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { OSL_FAIL(OStringBuffer("OSinglePropertyContext::CreateChildContext: unknown child element (\""). @@ -526,7 +526,7 @@ void OListPropertyContext::EndElement() m_xPropertyImporter->implPushBackGenericPropertyValue( aSequenceValue ); } -SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) +SvXMLImportContextRef OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) { if ( token::IsXMLToken( _rLocalName, token::XML_LIST_VALUE ) ) { diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 70b1dd71ec84..9d497e01497b 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -95,7 +95,7 @@ namespace xmloff public: OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; @@ -164,7 +164,7 @@ namespace xmloff OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; @@ -186,7 +186,7 @@ namespace xmloff OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; @@ -211,7 +211,7 @@ namespace xmloff virtual void EndElement() override; - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& _rxAttrList) override; }; diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index ca5f21e7349c..ba733bd73a20 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -46,7 +46,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, const css::uno::Reference< css::xml::dom::XSAXDocumentBuilder2>& rDocBuilder); - 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; @@ -66,7 +66,7 @@ XMLDocumentBuilderContext::XMLDocumentBuilderContext(SvXMLImport& rImport, { } -SvXMLImportContext * +SvXMLImportContextRef XMLDocumentBuilderContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& rAttrs) @@ -178,7 +178,7 @@ SvXMLMetaDocumentContext::~SvXMLMetaDocumentContext() { } -SvXMLImportContext *SvXMLMetaDocumentContext::CreateChildContext( +SvXMLImportContextRef SvXMLMetaDocumentContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& rAttrs) { diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 13410f4aaad8..080a954536aa 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -144,7 +144,7 @@ XMLVersionListContext::XMLVersionListContext( XMLVersionListImport& rImport, XMLVersionListContext::~XMLVersionListContext() {} -SvXMLImportContext *XMLVersionListContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef XMLVersionListContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx index 07ffa2f048b0..3a6e988634b0 100644 --- a/xmloff/source/script/XMLEventsImportContext.cxx +++ b/xmloff/source/script/XMLEventsImportContext.cxx @@ -86,7 +86,7 @@ void XMLEventsImportContext::EndElement() // nothing to be done } -SvXMLImportContext* XMLEventsImportContext::CreateChildContext( +SvXMLImportContextRef XMLEventsImportContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/script/xmlbasici.cxx b/xmloff/source/script/xmlbasici.cxx index 8e884c9c211b..a9ab4dae7a64 100644 --- a/xmloff/source/script/xmlbasici.cxx +++ b/xmloff/source/script/xmlbasici.cxx @@ -45,7 +45,7 @@ XMLBasicImportContext::~XMLBasicImportContext() { } -SvXMLImportContext* XMLBasicImportContext::CreateChildContext( +SvXMLImportContextRef XMLBasicImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& ) { @@ -116,7 +116,7 @@ XMLBasicImportChildContext::~XMLBasicImportChildContext() { } -SvXMLImportContext* XMLBasicImportChildContext::CreateChildContext( +SvXMLImportContextRef XMLBasicImportChildContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& ) { diff --git a/xmloff/source/script/xmlbasici.hxx b/xmloff/source/script/xmlbasici.hxx index e74e8d737b59..ac85c18fc372 100644 --- a/xmloff/source/script/xmlbasici.hxx +++ b/xmloff/source/script/xmlbasici.hxx @@ -38,7 +38,7 @@ public: virtual ~XMLBasicImportContext() override; - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& rxAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& rxAttrList ) override; @@ -61,7 +61,7 @@ public: virtual ~XMLBasicImportChildContext() override; - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx index 31bb0398c45a..4844fcb04da4 100644 --- a/xmloff/source/script/xmlscripti.cxx +++ b/xmloff/source/script/xmlscripti.cxx @@ -50,7 +50,7 @@ public: const css::uno::Reference< css::frame::XModel>& rxModel, const OUString& rLanguage ); - virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -65,11 +65,11 @@ XMLScriptChildContext::XMLScriptChildContext( SvXMLImport& rImport, sal_uInt16 n { } -SvXMLImportContext* XMLScriptChildContext::CreateChildContext( +SvXMLImportContextRef XMLScriptChildContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if ( m_xDocumentScripts.is() ) { // document supports embedding scripts/macros @@ -77,13 +77,13 @@ SvXMLImportContext* XMLScriptChildContext::CreateChildContext( aBasic += ":Basic"; if ( m_aLanguage == aBasic && nPrefix == XML_NAMESPACE_OOO && IsXMLToken( rLocalName, XML_LIBRARIES ) ) - pContext = new XMLBasicImportContext( GetImport(), nPrefix, rLocalName, m_xModel ); + xContext = new XMLBasicImportContext( GetImport(), nPrefix, rLocalName, m_xModel ); } - if ( !pContext ) - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void XMLScriptChildContext::EndElement() @@ -103,18 +103,18 @@ XMLScriptContext::~XMLScriptContext() { } -SvXMLImportContext* XMLScriptContext::CreateChildContext( +SvXMLImportContextRef XMLScriptContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if ( nPrefix == XML_NAMESPACE_OFFICE ) { if ( IsXMLToken( rLName, XML_EVENT_LISTENERS ) ) { Reference< XEventsSupplier> xSupplier( GetImport().GetModel(), UNO_QUERY ); - pContext = new XMLEventsImportContext( GetImport(), nPrefix, rLName, xSupplier ); + xContext = new XMLEventsImportContext( GetImport(), nPrefix, rLName, xSupplier ); } else if ( IsXMLToken( rLName, XML_SCRIPT ) ) { @@ -133,16 +133,16 @@ SvXMLImportContext* XMLScriptContext::CreateChildContext( aMedDescr[nNewLen-1].Value <<= true; m_xModel->attachResource( m_xModel->getURL(), aMedDescr ); - pContext = new XMLScriptChildContext( GetImport(), nPrefix, rLName, m_xModel, aLanguage ); + xContext = new XMLScriptChildContext( GetImport(), nPrefix, rLName, m_xModel, aLanguage ); } } } } - if ( !pContext ) - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLName, xAttrList); + if (!xContext) + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLName, xAttrList); - return pContext; + return xContext; } void XMLScriptContext::EndElement() diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx index 1c02a68e77b0..13c20eed836a 100644 --- a/xmloff/source/style/FillStyleContext.cxx +++ b/xmloff/source/style/FillStyleContext.cxx @@ -133,7 +133,7 @@ XMLBitmapStyleContext::~XMLBitmapStyleContext() { } -SvXMLImportContext* XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) +SvXMLImportContextRef XMLBitmapStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = nullptr; if( (XML_NAMESPACE_OFFICE == nPrefix) && xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) ) diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index 7d0b90f5c39a..d351f619de68 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -77,7 +77,7 @@ public: const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); virtual ~XMLBitmapStyleContext() 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/xmloff/source/style/PageHeaderFooterContext.cxx b/xmloff/source/style/PageHeaderFooterContext.cxx index 45309e0691f9..9689f649b8eb 100644 --- a/xmloff/source/style/PageHeaderFooterContext.cxx +++ b/xmloff/source/style/PageHeaderFooterContext.cxx @@ -48,28 +48,28 @@ PageHeaderFooterContext::~PageHeaderFooterContext() { } -SvXMLImportContext *PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef PageHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLName, XML_HEADER_FOOTER_PROPERTIES ) ) { PageContextType aType = Header; if (!bHeader) aType = Footer; - pContext = new PagePropertySetContext( GetImport(), nPrefix, + xContext = new PagePropertySetContext( GetImport(), nPrefix, rLName, xAttrList, XML_TYPE_PROP_HEADER_FOOTER, rProperties, rMap, nStartIndex, nEndIndex, aType); } - if( !pContext ) - pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); + if (!xContext) + xContext = new SvXMLImportContext( GetImport(), nPrefix, rLName ); - return pContext; + return xContext; } void PageHeaderFooterContext::EndElement() diff --git a/xmloff/source/style/PageHeaderFooterContext.hxx b/xmloff/source/style/PageHeaderFooterContext.hxx index b955fbbb1467..fb3e034a6416 100644 --- a/xmloff/source/style/PageHeaderFooterContext.hxx +++ b/xmloff/source/style/PageHeaderFooterContext.hxx @@ -41,7 +41,7 @@ public: virtual ~PageHeaderFooterContext() 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/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 7d79145893e3..a4dbacece337 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -73,7 +73,7 @@ PageStyleContext::~PageStyleContext() { } -SvXMLImportContext *PageStyleContext::CreateChildContext( +SvXMLImportContextRef PageStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx index a225f298dbd8..160ec5b2d8ff 100644 --- a/xmloff/source/style/PagePropertySetContext.cxx +++ b/xmloff/source/style/PagePropertySetContext.cxx @@ -47,7 +47,7 @@ PagePropertySetContext::~PagePropertySetContext() { } -SvXMLImportContext *PagePropertySetContext::CreateChildContext( +SvXMLImportContextRef PagePropertySetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList, @@ -73,7 +73,7 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext( default: break; } - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; switch( mxMapper->getPropertySetMapper() ->GetEntryContextId( rProp.mnIndex ) ) @@ -87,7 +87,7 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext( nFil == mxMapper->getPropertySetMapper() ->GetEntryContextId( rProp.mnIndex-1 ), "invalid property map!"); - pContext = + xContext = new XMLBackgroundImageContext( GetImport(), nPrefix, rLocalName, xAttrList, rProp, @@ -99,24 +99,24 @@ SvXMLImportContext *PagePropertySetContext::CreateChildContext( break; case CTF_PM_TEXTCOLUMNS: - pContext = new XMLTextColumnsContext( GetImport(), nPrefix, + xContext = new XMLTextColumnsContext( GetImport(), nPrefix, rLocalName, xAttrList, rProp, rProperties ); break; case CTF_PM_FTN_LINE_WEIGHT: - pContext = new XMLFootnoteSeparatorImport( + xContext = new XMLFootnoteSeparatorImport( GetImport(), nPrefix, rLocalName, rProperties, mxMapper->getPropertySetMapper(), rProp.mnIndex); break; } - if( !pContext ) - pContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, xAttrList, rProperties, rProp ); - return pContext; + return xContext; } diff --git a/xmloff/source/style/PagePropertySetContext.hxx b/xmloff/source/style/PagePropertySetContext.hxx index 3f82d6b99389..31b4d7341300 100644 --- a/xmloff/source/style/PagePropertySetContext.hxx +++ b/xmloff/source/style/PagePropertySetContext.hxx @@ -46,7 +46,7 @@ public: virtual ~PagePropertySetContext() override; using SvXMLPropertySetContext::CreateChildContext; - 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/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index e9981daed89e..dc5de6953e68 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -344,7 +344,7 @@ XMLBackgroundImageContext::~XMLBackgroundImageContext() { } -SvXMLImportContext *XMLBackgroundImageContext::CreateChildContext( +SvXMLImportContextRef XMLBackgroundImageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx index f63d70769668..d2d08f0973b8 100644 --- a/xmloff/source/style/XMLFontStylesContext.cxx +++ b/xmloff/source/style/XMLFontStylesContext.cxx @@ -172,7 +172,7 @@ void XMLFontStyleContextFontFace::FillProperties( } } -SvXMLImportContext * XMLFontStyleContextFontFace::CreateChildContext( +SvXMLImportContextRef XMLFontStyleContextFontFace::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) @@ -217,7 +217,7 @@ XMLFontStyleContextFontFaceSrc::XMLFontStyleContextFontFaceSrc( SvXMLImport& rIm { } -SvXMLImportContext * XMLFontStyleContextFontFaceSrc::CreateChildContext( +SvXMLImportContextRef XMLFontStyleContextFontFaceSrc::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) @@ -237,7 +237,7 @@ XMLFontStyleContextFontFaceUri::XMLFontStyleContextFontFaceUri( SvXMLImport& rIm { } -SvXMLImportContext * XMLFontStyleContextFontFaceUri::CreateChildContext( +SvXMLImportContextRef XMLFontStyleContextFontFaceUri::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx index ef387927681c..e1baa2dd1ed0 100644 --- a/xmloff/source/style/XMLFontStylesContext_impl.hxx +++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx @@ -64,7 +64,7 @@ public: OUString familyName() const; - SvXMLImportContext * CreateChildContext( + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; @@ -81,7 +81,7 @@ public: const OUString& rLName, const XMLFontStyleContextFontFace& font ); - virtual SvXMLImportContext * CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; @@ -111,7 +111,7 @@ public: const OUString& rValue ) override; void SetFormat( const OUString& rFormat ); void EndElement() override; - SvXMLImportContext * CreateChildContext( + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 97a6c7861728..51b3578029af 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -172,12 +172,12 @@ const OldFillStyleDefinitionSet& XMLPropStyleContext::getFooterSet() return theFooterSet::get(); } -SvXMLImportContext *XMLPropStyleContext::CreateChildContext( +SvXMLImportContextRef XMLPropStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; sal_uInt32 nFamily = 0; if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) @@ -211,18 +211,18 @@ SvXMLImportContext *XMLPropStyleContext::CreateChildContext( static_cast<SvXMLStylesContext *>(mxStyles.get())->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) - pContext = new SvXMLPropertySetContext( GetImport(), nPrefix, + xContext = new SvXMLPropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, maProperties, xImpPrMap ); } - if( !pContext ) - pContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void XMLPropStyleContext::FillPropertySet( diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index 4d5b7c93d7a3..895db57dfecf 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -140,7 +140,7 @@ public: SvXMLNumFormatContext& rParentContext, sal_uInt16 nNewType, 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 void Characters( const OUString& rChars ) override; @@ -161,7 +161,7 @@ public: SvXMLNumFmtElementContext& rParentContext, 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 void Characters( const OUString& rChars ) override; @@ -180,7 +180,7 @@ public: SvXMLNumFormatContext& rParentContext, 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 void Characters( const OUString& rChars ) override; @@ -199,7 +199,7 @@ public: SvXMLNumFormatContext& rParentContext, 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 void Characters( const OUString& rChars ) override; @@ -617,7 +617,7 @@ SvXMLNumFmtMapContext::SvXMLNumFmtMapContext( SvXMLImport& rImport, } } -SvXMLImportContext* SvXMLNumFmtMapContext::CreateChildContext( +SvXMLImportContextRef SvXMLNumFmtMapContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { @@ -661,7 +661,7 @@ SvXMLNumFmtPropContext::SvXMLNumFmtPropContext( SvXMLImport& rImport, } } -SvXMLImportContext* SvXMLNumFmtPropContext::CreateChildContext( +SvXMLImportContextRef SvXMLNumFmtPropContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { @@ -708,7 +708,7 @@ SvXMLNumFmtEmbeddedTextContext::SvXMLNumFmtEmbeddedTextContext( SvXMLImport& rIm } } -SvXMLImportContext* SvXMLNumFmtEmbeddedTextContext::CreateChildContext( +SvXMLImportContextRef SvXMLNumFmtEmbeddedTextContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& ) { @@ -1073,7 +1073,7 @@ SvXMLNumFmtElementContext::SvXMLNumFmtElementContext( SvXMLImport& rImport, aNumInfo.aIntegerFractionDelimiter = " "; } -SvXMLImportContext* SvXMLNumFmtElementContext::CreateChildContext( +SvXMLImportContextRef SvXMLNumFmtElementContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { @@ -1529,7 +1529,7 @@ SvXMLNumFormatContext::~SvXMLNumFormatContext() { } -SvXMLImportContext* SvXMLNumFormatContext::CreateChildContext( +SvXMLImportContextRef SvXMLNumFormatContext::CreateChildContext( sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) { diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index eef7317cd281..aad99be527c1 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -79,7 +79,7 @@ public: const Reference< xml::sax::XAttributeList >& xAttrList, SvxXMLListLevelStyleContext_Impl& rLLevel ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; }; @@ -214,7 +214,7 @@ public: const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -358,7 +358,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl( } } -SvXMLImportContext *SvxXMLListLevelStyleContext_Impl::CreateChildContext( +SvXMLImportContextRef SvxXMLListLevelStyleContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -887,7 +887,7 @@ SvxXMLListLevelStyleAttrContext_Impl::SvxXMLListLevelStyleAttrContext_Impl( rListLevel.SetImageVertOrient( eVertOrient ); } -SvXMLImportContext* SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext( +SvXMLImportContextRef SvxXMLListLevelStyleAttrContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -1014,12 +1014,12 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( SvXMLImport& rImport, SvxXMLListStyleContext::~SvxXMLListStyleContext() {} -SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext( +SvXMLImportContextRef SvxXMLListStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_TEXT == nPrefix && ( bOutline @@ -1035,14 +1035,14 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext( pLevelStyles = o3tl::make_unique<SvxXMLListStyle_Impl>(); pLevelStyles->push_back( xLevelStyle ); - pContext = xLevelStyle.get(); + xContext = xLevelStyle.get(); } else { - pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); + xContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } - return pContext; + return xContext; } void SvxXMLListStyleContext::FillUnoNumRule( diff --git a/xmloff/source/style/xmlprcon.cxx b/xmloff/source/style/xmlprcon.cxx index b96bec798b6c..a3e347da1292 100644 --- a/xmloff/source/style/xmlprcon.cxx +++ b/xmloff/source/style/xmlprcon.cxx @@ -50,7 +50,7 @@ SvXMLPropertySetContext::~SvXMLPropertySetContext() { } -SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( +SvXMLImportContextRef SvXMLPropertySetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) @@ -78,7 +78,7 @@ SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( CreateChildContext if the element matches an entry in the SvXMLImportItemMapper with the mid flag MID_FLAG_ELEMENT */ -SvXMLImportContext *SvXMLPropertySetContext::CreateChildContext( +SvXMLImportContextRef SvXMLPropertySetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >&, diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index d51efb52b36f..cf782521ebed 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -148,7 +148,7 @@ SvXMLStyleContext::~SvXMLStyleContext() { } -SvXMLImportContext *SvXMLStyleContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SvXMLStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & ) { @@ -755,7 +755,7 @@ SvXMLStylesContext::~SvXMLStylesContext() { } -SvXMLImportContext *SvXMLStylesContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef SvXMLStylesContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index b7efacba6027..5efaf5eb6b03 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -65,7 +65,7 @@ public: const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -152,7 +152,7 @@ SvxXMLTabStopContext_Impl::SvxXMLTabStopContext_Impl( aTabStop.FillChar = cTextFillChar; } -SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext( +SvXMLImportContextRef SvxXMLTabStopContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & ) @@ -170,7 +170,7 @@ SvxXMLTabStopImportContext::SvxXMLTabStopImportContext( { } -SvXMLImportContext *SvxXMLTabStopImportContext::CreateChildContext( +SvXMLImportContextRef SvxXMLTabStopImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index 9042de6b1450..031af1e40188 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -70,7 +70,7 @@ class XMLProxyContext : public SvXMLImportContext public: XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContextRef& xParent, sal_uInt16 nPrfx, const OUString& rLName ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; private: SvXMLImportContextRef mxParent; @@ -94,7 +94,7 @@ class XMLTableImportContext : public SvXMLImportContext public: XMLTableImportContext( const rtl::Reference< XMLTableImport >& xThis, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange > const & xColumnRowRange ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; virtual void StartElement( const Reference< XAttributeList >& xAttrList ) override; @@ -102,9 +102,9 @@ public: void InitColumns(); - SvXMLImportContext * ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); + SvXMLImportContextRef ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); SvXMLImportContext * ImportRow( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); - SvXMLImportContext * ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); + SvXMLImportContextRef ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ); OUString GetDefaultCellStyleName() const; @@ -131,7 +131,7 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; virtual void EndElement() override; @@ -152,7 +152,7 @@ class XMLTableTemplateContext : public SvXMLStyleContext public: XMLTableTemplateContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList ); - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) override; virtual void StartElement( const Reference< XAttributeList >& xAttrList ) override; @@ -172,7 +172,7 @@ XMLProxyContext::XMLProxyContext( SvXMLImport& rImport, const SvXMLImportContext { } -SvXMLImportContext * XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) +SvXMLImportContextRef XMLProxyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) { if( mxParent.is() ) return mxParent->CreateChildContext( nPrefix, rLocalName, xAttrList ); @@ -372,7 +372,7 @@ XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImpo { } -SvXMLImportContext * XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) +SvXMLImportContextRef XMLTableImportContext::ImportColumn( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) { if( mxColumns.is() && (mnCurrentRow == -1) ) try { @@ -534,7 +534,7 @@ SvXMLImportContext * XMLTableImportContext::ImportRow( sal_uInt16 nPrefix, const return new XMLProxyContext( GetImport(), xThis, nPrefix, rLocalName ); } -SvXMLImportContext * XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) +SvXMLImportContextRef XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) { mnCurrentColumn++; if( mxColumns.is() ) try @@ -567,7 +567,7 @@ SvXMLImportContext * XMLTableImportContext::ImportCell( sal_uInt16 nPrefix, cons return SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); } -SvXMLImportContext *XMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) +SvXMLImportContextRef XMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) { if( nPrefix == XML_NAMESPACE_TABLE ) { @@ -696,7 +696,7 @@ XMLCellImportContext::XMLCellImportContext( SvXMLImport& rImport, const Referenc } } -SvXMLImportContext * XMLCellImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) +SvXMLImportContextRef XMLCellImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) { // create text cursor on demand if( !mxCursor.is() ) @@ -791,7 +791,7 @@ void XMLTableTemplateContext::CreateAndInsert(bool bOverwrite) xTableImport->insertTabletemplate(msTemplateStyleName, bOverwrite); } -SvXMLImportContext * XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) +SvXMLImportContextRef XMLTableTemplateContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) { if( nPrefix == XML_NAMESPACE_TABLE ) { diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx index dd2feab983a0..bcef9836f61b 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.cxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.cxx @@ -51,7 +51,7 @@ XMLAutoTextContainerEventImport::~XMLAutoTextContainerEventImport() { } -SvXMLImportContext* XMLAutoTextContainerEventImport::CreateChildContext( +SvXMLImportContextRef XMLAutoTextContainerEventImport::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & ) diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx index 18374a85483f..4ddfecd301ff 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx @@ -53,7 +53,7 @@ public: protected: - 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/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx index 93bba391b0a9..c0cd5affc6f5 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.cxx +++ b/xmloff/source/text/XMLChangeElementImportContext.cxx @@ -44,17 +44,17 @@ XMLChangeElementImportContext::XMLChangeElementImportContext( { } -SvXMLImportContext* XMLChangeElementImportContext::CreateChildContext( +SvXMLImportContextRef XMLChangeElementImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if ( (XML_NAMESPACE_OFFICE == nPrefix) && IsXMLToken( rLocalName, XML_CHANGE_INFO) ) { - pContext = new XMLChangeInfoContext(GetImport(), nPrefix, rLocalName, + xContext = new XMLChangeInfoContext(GetImport(), nPrefix, rLocalName, rChangedRegion, GetLocalName()); } else @@ -62,21 +62,21 @@ SvXMLImportContext* XMLChangeElementImportContext::CreateChildContext( // import into redline -> create XText rChangedRegion.UseRedlineText(); - pContext = GetImport().GetTextImport()->CreateTextChildContext( + xContext = GetImport().GetTextImport()->CreateTextChildContext( GetImport(), nPrefix, rLocalName, xAttrList, XMLTextType::ChangedRegion); - if (nullptr == pContext) + if (!xContext) { // no text element // illegal element content! TODO: discard this redline! // for the moment -> use default - pContext = SvXMLImportContext::CreateChildContext( + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); } } - return pContext; + return xContext; } void XMLChangeElementImportContext::StartElement( const Reference< XAttributeList >& ) diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 3713a2dbfd3c..f1fe47ef2e99 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -68,7 +68,7 @@ public: /// context of enclosing <text:changed-region> element XMLChangedRegionImportContext& rParent); - 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/xmloff/source/text/XMLChangeInfoContext.cxx b/xmloff/source/text/XMLChangeInfoContext.cxx index 48ec70531c21..f413cbc2f3aa 100644 --- a/xmloff/source/text/XMLChangeInfoContext.cxx +++ b/xmloff/source/text/XMLChangeInfoContext.cxx @@ -54,37 +54,37 @@ void XMLChangeInfoContext::StartElement(const Reference<XAttributeList> &) // no attributes } -SvXMLImportContext* XMLChangeInfoContext::CreateChildContext( +SvXMLImportContextRef XMLChangeInfoContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_DC == nPrefix ) { if( IsXMLToken( rLocalName, XML_CREATOR ) ) - pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, + xContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, sAuthorBuffer); else if( IsXMLToken( rLocalName, XML_DATE ) ) - pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, + xContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, sDateTimeBuffer); } else if ( ( XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) && IsXMLToken( rLocalName, XML_P ) ) { - pContext = new XMLStringBufferImportContext(GetImport(), nPrefix, + xContext = new XMLStringBufferImportContext(GetImport(), nPrefix, rLocalName, sCommentBuffer); } - if( !pContext ) + if (!xContext) { - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); } - return pContext; + return xContext; } void XMLChangeInfoContext::EndElement() diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index ef8864e99c03..1e0cf5b9daa3 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -63,7 +63,7 @@ public: virtual void StartElement( const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) 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/xmloff/source/text/XMLChangedRegionImportContext.cxx b/xmloff/source/text/XMLChangedRegionImportContext.cxx index a8b54740a5dd..29b118fcb08a 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.cxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.cxx @@ -92,12 +92,12 @@ void XMLChangedRegionImportContext::StartElement( } } -SvXMLImportContext* XMLChangedRegionImportContext::CreateChildContext( +SvXMLImportContextRef XMLChangedRegionImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if (XML_NAMESPACE_TEXT == nPrefix) { @@ -109,7 +109,7 @@ SvXMLImportContext* XMLChangedRegionImportContext::CreateChildContext( IsXMLToken( rLocalName, XML_FORMAT_CHANGE ) ) { // create XMLChangeElementImportContext for all kinds of changes - pContext = new XMLChangeElementImportContext( + xContext = new XMLChangeElementImportContext( GetImport(), nPrefix, rLocalName, IsXMLToken( rLocalName, XML_DELETION ), *this); @@ -117,23 +117,23 @@ SvXMLImportContext* XMLChangedRegionImportContext::CreateChildContext( // else: it may be a text element, see below } - if (nullptr == pContext) + if (!xContext) { // illegal element content! TODO: discard the redlines // for the moment -> use text - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); // or default if text fail - if (nullptr == pContext) + if (!xContext) { - pContext = SvXMLImportContext::CreateChildContext( + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); } } - return pContext; + return xContext; } void XMLChangedRegionImportContext::EndElement() diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index c82b6670e7c8..c82712c5b6f6 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -63,7 +63,7 @@ public: virtual void StartElement( const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) 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/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx index 192bbe85d53e..dea1526f3b90 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx @@ -38,7 +38,7 @@ XMLFootnoteBodyImportContext::XMLFootnoteBodyImportContext( { } -SvXMLImportContext* XMLFootnoteBodyImportContext::CreateChildContext( +SvXMLImportContextRef XMLFootnoteBodyImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx index 0d800b61f1ef..56fb359bb244 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx @@ -45,7 +45,7 @@ public: protected: - 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/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index 667660a92df2..d4b885853e3e 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -277,12 +277,12 @@ void XMLFootnoteConfigurationImportContext::StartElement( } } -SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext( +SvXMLImportContextRef XMLFootnoteConfigurationImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if (!bIsEndnote) { @@ -291,14 +291,14 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext( if ( IsXMLToken( rLocalName, XML_FOOTNOTE_CONTINUATION_NOTICE_FORWARD ) ) { - pContext = new XMLFootnoteConfigHelper(GetImport(), + xContext = new XMLFootnoteConfigHelper(GetImport(), nPrefix, rLocalName, *this, false); } else if ( IsXMLToken( rLocalName, XML_FOOTNOTE_CONTINUATION_NOTICE_BACKWARD ) ) { - pContext = new XMLFootnoteConfigHelper(GetImport(), + xContext = new XMLFootnoteConfigHelper(GetImport(), nPrefix, rLocalName, *this, true); } @@ -308,15 +308,15 @@ SvXMLImportContext *XMLFootnoteConfigurationImportContext::CreateChildContext( } // else: endnote -> default context - if (pContext == nullptr) + if (!xContext) { // default: delegate to super class - pContext = SvXMLStyleContext::CreateChildContext(nPrefix, + xContext = SvXMLStyleContext::CreateChildContext(nPrefix, rLocalName, xAttrList); } - return pContext; + return xContext; } // Rename method <CreateAndInsertLate(..)> to <Finish(..)> (#i40597#) diff --git a/xmloff/source/text/XMLFootnoteImportContext.cxx b/xmloff/source/text/XMLFootnoteImportContext.cxx index 78721b62f3b4..0da84c109b34 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteImportContext.cxx @@ -167,13 +167,12 @@ void XMLFootnoteImportContext::EndElement() } } - -SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext( +SvXMLImportContextRef XMLFootnoteImportContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; SvXMLTokenMap aTokenMap(aFootnoteChildTokenMap); @@ -200,25 +199,25 @@ SvXMLImportContext *XMLFootnoteImportContext::CreateChildContext( } // ignore content: return default context - pContext = new SvXMLImportContext(GetImport(), + xContext = new SvXMLImportContext(GetImport(), p_nPrefix, rLocalName); break; } case XML_TOK_FTN_NOTE_BODY: // return footnote body - pContext = new XMLFootnoteBodyImportContext(GetImport(), + xContext = new XMLFootnoteBodyImportContext(GetImport(), p_nPrefix, rLocalName); break; default: // default: - pContext = SvXMLImportContext::CreateChildContext(p_nPrefix, + xContext = SvXMLImportContext::CreateChildContext(p_nPrefix, rLocalName, xAttrList); break; } - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index ff4f718ce395..0a6d8ce40b82 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -69,7 +69,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/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx index 584c67627288..63055aef9d5a 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx @@ -200,7 +200,7 @@ void XMLIndexAlphabeticalSourceContext::EndElement() XMLIndexSourceBaseContext::EndElement(); } -SvXMLImportContext* XMLIndexAlphabeticalSourceContext::CreateChildContext( +SvXMLImportContextRef XMLIndexAlphabeticalSourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index 062b0ba31bc8..f1b380acc619 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -71,7 +71,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/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx index 7bd55721731d..497a3b6e7052 100644 --- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx @@ -147,7 +147,7 @@ void XMLIndexBibliographyConfigurationContext::ProcessAttribute( } } -SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext( +SvXMLImportContextRef XMLIndexBibliographyConfigurationContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx index bc726f42218a..bdd3d0ddde6e 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.cxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.cxx @@ -68,7 +68,7 @@ void XMLIndexBibliographySourceContext::EndElement() } -SvXMLImportContext* XMLIndexBibliographySourceContext::CreateChildContext( +SvXMLImportContextRef XMLIndexBibliographySourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx index 748bab2e6142..c2e6ff61ef1f 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx @@ -55,7 +55,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/xmloff/source/text/XMLIndexBodyContext.cxx b/xmloff/source/text/XMLIndexBodyContext.cxx index 53b3e52f6545..df805eddbcc1 100644 --- a/xmloff/source/text/XMLIndexBodyContext.cxx +++ b/xmloff/source/text/XMLIndexBodyContext.cxx @@ -40,7 +40,7 @@ XMLIndexBodyContext::~XMLIndexBodyContext() { } -SvXMLImportContext* XMLIndexBodyContext::CreateChildContext( +SvXMLImportContextRef XMLIndexBodyContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList) diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index 6b4212a50713..d7b00c59ae41 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -54,7 +54,7 @@ public: protected: - 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/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx index b8e6a2f5dcd1..87fa6219b570 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx @@ -50,7 +50,7 @@ XMLIndexIllustrationSourceContext::~XMLIndexIllustrationSourceContext() { } -SvXMLImportContext* XMLIndexIllustrationSourceContext::CreateChildContext( +SvXMLImportContextRef XMLIndexIllustrationSourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx index b924efedad09..8e7d4d38bb01 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx @@ -51,7 +51,7 @@ public: protected: - 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/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx index 1b9ff89a47e0..fbde8e4eed1e 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx @@ -126,7 +126,7 @@ void XMLIndexObjectSourceContext::EndElement() XMLIndexSourceBaseContext::EndElement(); } -SvXMLImportContext* XMLIndexObjectSourceContext::CreateChildContext( +SvXMLImportContextRef XMLIndexObjectSourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index f37e66f74a4c..8c5139840eba 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -60,7 +60,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/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx index 3aa829e4d69d..b9f98671d256 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx @@ -215,25 +215,25 @@ void XMLIndexSourceBaseContext::EndElement() rIndexPropertySet->setPropertyValue("CreateFromChapter", css::uno::Any(bChapterIndex)); } -SvXMLImportContext* XMLIndexSourceBaseContext::CreateChildContext( +SvXMLImportContextRef XMLIndexSourceBaseContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if (XML_NAMESPACE_TEXT == nPrefix) { if ( IsXMLToken( rLocalName, XML_INDEX_TITLE_TEMPLATE ) ) { - pContext = new XMLIndexTitleTemplateContext(GetImport(), + xContext = new XMLIndexTitleTemplateContext(GetImport(), rIndexPropertySet, nPrefix, rLocalName); } else if ( bUseLevelFormats && IsXMLToken( rLocalName, XML_INDEX_SOURCE_STYLES ) ) { - pContext = new XMLIndexTOCStylesContext(GetImport(), + xContext = new XMLIndexTOCStylesContext(GetImport(), rIndexPropertySet, nPrefix, rLocalName); } @@ -242,13 +242,13 @@ SvXMLImportContext* XMLIndexSourceBaseContext::CreateChildContext( // else: unknown namespace -> ignore // use default context - if (pContext == nullptr) + if (!xContext) { - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); } - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index bbd827f00cc5..09973439c805 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -107,7 +107,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/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx index 26621f72aaa1..afdb6158c6d3 100644 --- a/xmloff/source/text/XMLIndexTOCContext.cxx +++ b/xmloff/source/text/XMLIndexTOCContext.cxx @@ -273,12 +273,12 @@ void XMLIndexTOCContext::EndElement() } } -SvXMLImportContext* XMLIndexTOCContext::CreateChildContext( +SvXMLImportContextRef XMLIndexTOCContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if (bValid) { @@ -286,12 +286,12 @@ SvXMLImportContext* XMLIndexTOCContext::CreateChildContext( { if ( IsXMLToken( rLocalName, XML_INDEX_BODY ) ) { - pContext = new XMLIndexBodyContext(GetImport(), nPrefix, + xContext = new XMLIndexBodyContext(GetImport(), nPrefix, rLocalName); if ( !xBodyContextRef.is() || !static_cast<XMLIndexBodyContext*>(xBodyContextRef.get())->HasContent() ) { - xBodyContextRef = pContext; + xBodyContextRef = xContext; } } else if (IsXMLToken(rLocalName, aIndexSourceElementMap[eIndexType])) @@ -300,37 +300,37 @@ SvXMLImportContext* XMLIndexTOCContext::CreateChildContext( switch (eIndexType) { case TEXT_INDEX_TOC: - pContext = new XMLIndexTOCSourceContext( + xContext = new XMLIndexTOCSourceContext( GetImport(), nPrefix, rLocalName, xTOCPropertySet); break; case TEXT_INDEX_OBJECT: - pContext = new XMLIndexObjectSourceContext( + xContext = new XMLIndexObjectSourceContext( GetImport(), nPrefix, rLocalName, xTOCPropertySet); break; case TEXT_INDEX_ALPHABETICAL: - pContext = new XMLIndexAlphabeticalSourceContext( + xContext = new XMLIndexAlphabeticalSourceContext( GetImport(), nPrefix, rLocalName, xTOCPropertySet); break; case TEXT_INDEX_USER: - pContext = new XMLIndexUserSourceContext( + xContext = new XMLIndexUserSourceContext( GetImport(), nPrefix, rLocalName, xTOCPropertySet); break; case TEXT_INDEX_BIBLIOGRAPHY: - pContext = new XMLIndexBibliographySourceContext( + xContext = new XMLIndexBibliographySourceContext( GetImport(), nPrefix, rLocalName, xTOCPropertySet); break; case TEXT_INDEX_TABLE: - pContext = new XMLIndexTableSourceContext( + xContext = new XMLIndexTableSourceContext( GetImport(), nPrefix, rLocalName, xTOCPropertySet); break; case TEXT_INDEX_ILLUSTRATION: - pContext = new XMLIndexIllustrationSourceContext( + xContext = new XMLIndexIllustrationSourceContext( GetImport(), nPrefix, rLocalName, xTOCPropertySet); break; @@ -346,13 +346,13 @@ SvXMLImportContext* XMLIndexTOCContext::CreateChildContext( // else: not valid -> ignore // default: ignore - if (pContext == nullptr) + if (!xContext) { - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); } - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index beaf17bba10d..2238f8455d06 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -80,7 +80,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/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx index c95ff0dfbdf3..4bbff39e76d5 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx @@ -135,8 +135,7 @@ void XMLIndexTOCSourceContext::EndElement() XMLIndexSourceBaseContext::EndElement(); } - -SvXMLImportContext* XMLIndexTOCSourceContext::CreateChildContext( +SvXMLImportContextRef XMLIndexTOCSourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index c6268af8a7a7..a36b4ce88345 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -59,7 +59,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/xmloff/source/text/XMLIndexTOCStylesContext.cxx b/xmloff/source/text/XMLIndexTOCStylesContext.cxx index eaee15cd753c..4139ce7606c3 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.cxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.cxx @@ -107,7 +107,7 @@ void XMLIndexTOCStylesContext::EndElement() } } -SvXMLImportContext *XMLIndexTOCStylesContext::CreateChildContext( +SvXMLImportContextRef XMLIndexTOCStylesContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx index 347875d97d64..ecd002872471 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx @@ -69,7 +69,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/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index cb44feb858e8..af68096dea66 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -115,7 +115,6 @@ void XMLIndexTableSourceContext::ProcessAttribute( } } - void XMLIndexTableSourceContext::EndElement() { rIndexPropertySet->setPropertyValue("CreateFromLabels", css::uno::Any(bUseCaption)); @@ -133,8 +132,7 @@ void XMLIndexTableSourceContext::EndElement() XMLIndexSourceBaseContext::EndElement(); } - -SvXMLImportContext* XMLIndexTableSourceContext::CreateChildContext( +SvXMLImportContextRef XMLIndexTableSourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index a61dc4d4ab7b..b80d29220b3a 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -61,7 +61,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/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 1498c5be39ba..16f62f89a121 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -210,7 +210,7 @@ SvXMLEnumMapEntry<TemplateTokenType> const aTemplateTokenTypeMap[] = { XML_TOKEN_INVALID, (TemplateTokenType)0 } }; -SvXMLImportContext *XMLIndexTemplateContext::CreateChildContext( +SvXMLImportContextRef XMLIndexTemplateContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 09e141105b41..03562ee91541 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -121,7 +121,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/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx index c81dfeb1b605..62f23631b5db 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.cxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx @@ -129,7 +129,6 @@ void XMLIndexUserSourceContext::ProcessAttribute( } } - void XMLIndexUserSourceContext::EndElement() { rIndexPropertySet->setPropertyValue("CreateFromEmbeddedObjects", css::uno::Any(bUseObjects)); @@ -148,8 +147,7 @@ void XMLIndexUserSourceContext::EndElement() XMLIndexSourceBaseContext::EndElement(); } - -SvXMLImportContext* XMLIndexUserSourceContext::CreateChildContext( +SvXMLImportContextRef XMLIndexUserSourceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 1016ceef8f5a..9a39dae86ba2 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -63,7 +63,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/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index e70cd6db2bd1..ace06330bebe 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -257,7 +257,7 @@ void XMLLineNumberingImportContext::CreateAndInsert(bool) } } -SvXMLImportContext* XMLLineNumberingImportContext::CreateChildContext( +SvXMLImportContextRef XMLLineNumberingImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx index 1b9ae2358cfa..50021e9159f3 100644 --- a/xmloff/source/text/XMLSectionImportContext.cxx +++ b/xmloff/source/text/XMLSectionImportContext.cxx @@ -324,7 +324,7 @@ void XMLSectionImportContext::EndElement() rHelper->RedlineAdjustStartNodeCursor(false); } -SvXMLImportContext* XMLSectionImportContext::CreateChildContext( +SvXMLImportContextRef XMLSectionImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index ea7a5c2d09ad..f4e558036d76 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -74,7 +74,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/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx index 753cb43b73a8..b9ceba3b47e1 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx @@ -153,7 +153,7 @@ void XMLSectionSourceDDEImportContext::EndElement() // nothing to be done! } -SvXMLImportContext* XMLSectionSourceDDEImportContext::CreateChildContext( +SvXMLImportContextRef XMLSectionSourceDDEImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & ) diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx index 756ff9fe8a63..e1b9b0e9565a 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx @@ -50,7 +50,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/xmloff/source/text/XMLSectionSourceImportContext.cxx b/xmloff/source/text/XMLSectionSourceImportContext.cxx index 78d4847a3dbb..7a3048bb846f 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.cxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx @@ -130,7 +130,7 @@ void XMLSectionSourceImportContext::EndElement() // this space intentionally left blank. } -SvXMLImportContext* XMLSectionSourceImportContext::CreateChildContext( +SvXMLImportContextRef XMLSectionSourceImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & ) diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx index 7c577899dffe..f47e36235705 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx @@ -50,7 +50,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/xmloff/source/text/XMLStringBufferImportContext.cxx b/xmloff/source/text/XMLStringBufferImportContext.cxx index add109644693..09290ba125b7 100644 --- a/xmloff/source/text/XMLStringBufferImportContext.cxx +++ b/xmloff/source/text/XMLStringBufferImportContext.cxx @@ -42,7 +42,7 @@ XMLStringBufferImportContext::~XMLStringBufferImportContext() { } -SvXMLImportContext *XMLStringBufferImportContext::CreateChildContext( +SvXMLImportContextRef XMLStringBufferImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> &) diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 84821260e717..10544955ee30 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -283,7 +283,7 @@ XMLTextColumnsContext::XMLTextColumnsContext( } } -SvXMLImportContext *XMLTextColumnsContext::CreateChildContext( +SvXMLImportContextRef XMLTextColumnsContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 2c896bd12a87..9a843675371d 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -391,7 +391,7 @@ public: virtual void Characters( const OUString& rChars ) override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; @@ -1052,7 +1052,7 @@ void XMLTextFrameContext_Impl::EndElement() GetImport().GetTextImport()->endAppletOrPlugin( xPropSet, aParamMap); } -SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLTextFrameContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) @@ -1377,12 +1377,12 @@ void XMLTextFrameContext::EndElement() } } -SvXMLImportContext *XMLTextFrameContext::CreateChildContext( +SvXMLImportContextRef XMLTextFrameContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( !m_xImplContext.is() ) { @@ -1413,7 +1413,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( m_HasAutomaticStyleWithoutParentStyle ) { Reference < XShapes > xShapes; - pContext = GetImport().GetShapeImport()->CreateFrameChildContext( + xContext = GetImport().GetShapeImport()->CreateFrameChildContext( GetImport(), p_nPrefix, rLocalName, xAttrList, xShapes, m_xAttrList ); } else if( XML_TEXT_FRAME_PLUGIN == nFrameType ) @@ -1439,7 +1439,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( if( bMedia ) { Reference < XShapes > xShapes; - pContext = GetImport().GetShapeImport()->CreateFrameChildContext( + xContext = GetImport().GetShapeImport()->CreateFrameChildContext( GetImport(), p_nPrefix, rLocalName, xAttrList, xShapes, m_xAttrList ); } } @@ -1453,17 +1453,16 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( setSupportsMultipleContents(IsXMLToken(rLocalName, XML_IMAGE)); } - if( !pContext ) + if (!xContext) { - - pContext = new XMLTextFrameContext_Impl( GetImport(), p_nPrefix, + xContext = new XMLTextFrameContext_Impl( GetImport(), p_nPrefix, rLocalName, xAttrList, m_eDefaultAnchorType, nFrameType, m_xAttrList ); } - m_xImplContext = pContext; + m_xImplContext = xContext; if(getSupportsMultipleContents() && XML_TEXT_FRAME_GRAPHIC == nFrameType) { @@ -1475,11 +1474,11 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( else if(getSupportsMultipleContents() && XML_NAMESPACE_DRAW == p_nPrefix && IsXMLToken(rLocalName, XML_IMAGE)) { // read another image - pContext = new XMLTextFrameContext_Impl( + xContext = new XMLTextFrameContext_Impl( GetImport(), p_nPrefix, rLocalName, xAttrList, m_eDefaultAnchorType, XML_TEXT_FRAME_GRAPHIC, m_xAttrList, true); - m_xImplContext = pContext; + m_xImplContext = xContext; addContent(*m_xImplContext.get()); } else if( m_bSupportsReplacement && !m_xReplImplContext.is() && @@ -1490,9 +1489,9 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( Reference < XPropertySet > xPropSet; if( CreateIfNotThere( xPropSet ) ) { - pContext = new XMLReplacementImageContext( GetImport(), + xContext = new XMLReplacementImageContext( GetImport(), p_nPrefix, rLocalName, xAttrList, xPropSet ); - m_xReplImplContext = pContext; + m_xReplImplContext = xContext; } } else if( nullptr != dynamic_cast< const XMLTextFrameContext_Impl*>( m_xImplContext.get() )) @@ -1506,7 +1505,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( { if ( IsXMLToken( rLocalName, XML_DESC ) ) { - pContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(), + xContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(), p_nPrefix, rLocalName, m_sTitle ); @@ -1520,7 +1519,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( { // tdf#103567 ensure props are set on surviving shape m_xImplContext = solveMultipleImages(); } - pContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(), + xContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(), p_nPrefix, rLocalName, m_sTitle ); @@ -1531,7 +1530,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( { // tdf#103567 ensure props are set on surviving shape m_xImplContext = solveMultipleImages(); } - pContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(), + xContext = new XMLTextFrameTitleOrDescContext_Impl( GetImport(), p_nPrefix, rLocalName, m_sDesc ); @@ -1548,7 +1547,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( m_xImplContext = solveMultipleImages(); } if( CreateIfNotThere( xPropSet ) ) - pContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName, + xContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName, xAttrList, xPropSet, false ); } else if( IsXMLToken( rLocalName, XML_CONTOUR_PATH ) ) @@ -1558,7 +1557,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( m_xImplContext = solveMultipleImages(); } if( CreateIfNotThere( xPropSet ) ) - pContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName, + xContext = new XMLTextFrameContourContext_Impl( GetImport(), p_nPrefix, rLocalName, xAttrList, xPropSet, true ); } else if( IsXMLToken( rLocalName, XML_IMAGE_MAP ) ) @@ -1568,7 +1567,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( m_xImplContext = solveMultipleImages(); } if( CreateIfNotThere( xPropSet ) ) - pContext = new XMLImageMapContext( GetImport(), p_nPrefix, rLocalName, xPropSet ); + xContext = new XMLImageMapContext( GetImport(), p_nPrefix, rLocalName, xPropSet ); } } else if( (XML_NAMESPACE_OFFICE == p_nPrefix) && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) @@ -1586,7 +1585,7 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( if (xEventsSupplier.is()) { // OK, we have the events, so create the context - pContext = new XMLEventsImportContext(GetImport(), p_nPrefix, + xContext = new XMLEventsImportContext(GetImport(), p_nPrefix, rLocalName, xEventsSupplier); } } @@ -1600,19 +1599,19 @@ SvXMLImportContext *XMLTextFrameContext::CreateChildContext( // note: no more draw:image can be added once we get here m_xImplContext = solveMultipleImages(); } - pContext = m_xImplContext->CreateChildContext( p_nPrefix, rLocalName, xAttrList ); + xContext = m_xImplContext->CreateChildContext( p_nPrefix, rLocalName, xAttrList ); } else { // the child is a drawing shape - pContext = XMLShapeImportHelper::CreateFrameChildContext( + xContext = XMLShapeImportHelper::CreateFrameChildContext( m_xImplContext.get(), p_nPrefix, rLocalName, xAttrList ); } - if( !pContext ) - pContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName ); + if (!xContext) + xContext = new SvXMLImportContext( GetImport(), p_nPrefix, rLocalName ); - return pContext; + return xContext; } void XMLTextFrameContext::SetHyperlink( const OUString& rHRef, diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index 22587c16dd4f..98c85de61592 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -74,7 +74,7 @@ public: virtual void EndElement() override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx index 469d1b58776b..08f684d7f7cd 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.cxx @@ -103,7 +103,7 @@ void XMLTextFrameHyperlinkContext::EndElement() { } -SvXMLImportContext *XMLTextFrameHyperlinkContext::CreateChildContext( +SvXMLImportContextRef XMLTextFrameHyperlinkContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index c876c499f175..4efa170f8653 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -50,7 +50,7 @@ public: virtual void EndElement() override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx index dd63772e4374..498814bffc7b 100644 --- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx +++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx @@ -101,7 +101,7 @@ XMLTextHeaderFooterContext::~XMLTextHeaderFooterContext() { } -SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext( +SvXMLImportContextRef XMLTextHeaderFooterContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index 190840a3b7e9..6f90dee9a2ac 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -252,7 +252,7 @@ void XMLTextListBlockContext::EndElement() mrTxtImport.GetTextListHelper().SetListItem( nullptr ); } -SvXMLImportContext *XMLTextListBlockContext::CreateChildContext( +SvXMLImportContextRef XMLTextListBlockContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index eb4655489f49..8af3b8d73f69 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -61,7 +61,7 @@ public: virtual void EndElement() override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index a7c2ad0418c8..e568348c6ded 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -128,7 +128,7 @@ void XMLTextListItemContext::EndElement() rTxtImport.GetTextListHelper().SetListItem( nullptr ); } -SvXMLImportContext *XMLTextListItemContext::CreateChildContext( +SvXMLImportContextRef XMLTextListItemContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index dcf49f226c3a..5a88db902a3e 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -49,7 +49,7 @@ public: virtual void EndElement() override; - SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index 30a2a78ad6de..4bb7c0232e60 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -386,7 +386,7 @@ void XMLTextMarkImportContext::EndElement() } } -SvXMLImportContext *XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix, +SvXMLImportContextRef XMLTextMarkImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList >& ) { diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index cc9bdf992330..8f68bb055d74 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -90,7 +90,7 @@ protected: const css::uno::Reference<css::xml::sax::XAttributeList> & xAttrList) override; virtual void EndElement() 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/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index b2feaccdeec1..97ae81d15a93 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -167,12 +167,12 @@ XMLTextMasterPageContext::~XMLTextMasterPageContext() { } -SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( +SvXMLImportContextRef XMLTextMasterPageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; const SvXMLTokenMap& rTokenMap = GetImport().GetTextImport()->GetTextMasterPageElemTokenMap(); @@ -214,17 +214,17 @@ SvXMLImportContext *XMLTextMasterPageContext::CreateChildContext( if( bInsert && xStyle.is() ) { - pContext = CreateHeaderFooterContext( nPrefix, rLocalName, + xContext = CreateHeaderFooterContext( nPrefix, rLocalName, xAttrList, bFooter, bLeft, bFirst ); } else { - pContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName, + xContext = SvXMLStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); } - return pContext; + return xContext; } SvXMLImportContext *XMLTextMasterPageContext::CreateHeaderFooterContext( diff --git a/xmloff/source/text/XMLTextPropertySetContext.cxx b/xmloff/source/text/XMLTextPropertySetContext.cxx index 1dbe2f79c5f1..f25929e9dfaa 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.cxx +++ b/xmloff/source/text/XMLTextPropertySetContext.cxx @@ -49,25 +49,25 @@ XMLTextPropertySetContext::~XMLTextPropertySetContext() { } -SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext( +SvXMLImportContextRef XMLTextPropertySetContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; switch( mxMapper->getPropertySetMapper() ->GetEntryContextId( rProp.mnIndex ) ) { case CTF_TABSTOP: - pContext = new SvxXMLTabStopImportContext( GetImport(), nPrefix, + xContext = new SvxXMLTabStopImportContext( GetImport(), nPrefix, rLocalName, rProp, rProperties ); break; case CTF_TEXTCOLUMNS: - pContext = new XMLTextColumnsContext( GetImport(), nPrefix, + xContext = new XMLTextColumnsContext( GetImport(), nPrefix, rLocalName, xAttrList, rProp, rProperties ); break; @@ -85,7 +85,7 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext( rProp.mnIndex-2, rProperties ); rDropCapTextStyleName = pDCContext->GetStyleName(); - pContext = pDCContext; + xContext = pDCContext; } break; @@ -107,7 +107,7 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext( rProp.mnIndex-3 ) ) ) nTranspIndex = rProp.mnIndex-3; - pContext = + xContext = new XMLBackgroundImageContext( GetImport(), nPrefix, rLocalName, xAttrList, rProp, @@ -120,19 +120,18 @@ SvXMLImportContext *XMLTextPropertySetContext::CreateChildContext( break; case CTF_SECTION_FOOTNOTE_END: case CTF_SECTION_ENDNOTE_END: - pContext = new XMLSectionFootnoteConfigImport( + xContext = new XMLSectionFootnoteConfigImport( GetImport(), nPrefix, rLocalName, rProperties, mxMapper->getPropertySetMapper()); break; } - if( !pContext ) - pContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = SvXMLPropertySetContext::CreateChildContext( nPrefix, rLocalName, xAttrList, rProperties, rProp ); - return pContext; + return xContext; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTextPropertySetContext.hxx b/xmloff/source/text/XMLTextPropertySetContext.hxx index 8a1ef702413a..a35b4b389a67 100644 --- a/xmloff/source/text/XMLTextPropertySetContext.hxx +++ b/xmloff/source/text/XMLTextPropertySetContext.hxx @@ -42,7 +42,7 @@ public: virtual ~XMLTextPropertySetContext() override; using SvXMLPropertySetContext::CreateChildContext; - 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/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx index 10c3add0ad9e..cd4392b4ad57 100644 --- a/xmloff/source/text/XMLTextShapeStyleContext.cxx +++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx @@ -51,7 +51,7 @@ public: const rtl::Reference < SvXMLImportPropertyMapper > &rMap ); using SvXMLPropertySetContext::CreateChildContext; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, @@ -70,20 +70,20 @@ XMLTextShapePropertySetContext_Impl::XMLTextShapePropertySetContext_Impl( { } -SvXMLImportContext *XMLTextShapePropertySetContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLTextShapePropertySetContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList, ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; switch( mxMapper->getPropertySetMapper() ->GetEntryContextId( rProp.mnIndex ) ) { case CTF_TEXTCOLUMNS: - pContext = new XMLTextColumnsContext( GetImport(), nPrefix, + xContext = new XMLTextColumnsContext( GetImport(), nPrefix, rLocalName, xAttrList, rProp, rProperties ); break; @@ -98,7 +98,7 @@ SvXMLImportContext *XMLTextShapePropertySetContext_Impl::CreateChildContext( CTF_BACKGROUND_FILTER == mxMapper->getPropertySetMapper() ->GetEntryContextId( rProp.mnIndex-1 ), "invalid property map!"); - pContext = + xContext = new XMLBackgroundImageContext( GetImport(), nPrefix, rLocalName, xAttrList, rProp, @@ -110,11 +110,11 @@ SvXMLImportContext *XMLTextShapePropertySetContext_Impl::CreateChildContext( break; } - if( !pContext ) - pContext = XMLShapePropertySetContext::CreateChildContext( + if (!xContext) + xContext = XMLShapePropertySetContext::CreateChildContext( nPrefix, rLocalName, xAttrList, rProperties, rProp ); - return pContext; + return xContext; } void XMLTextShapeStyleContext::SetAttribute( sal_uInt16 nPrefixKey, @@ -149,12 +149,12 @@ XMLTextShapeStyleContext::~XMLTextShapeStyleContext() { } -SvXMLImportContext *XMLTextShapeStyleContext::CreateChildContext( +SvXMLImportContextRef XMLTextShapeStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) { @@ -171,7 +171,7 @@ SvXMLImportContext *XMLTextShapeStyleContext::CreateChildContext( GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) { - pContext = new XMLTextShapePropertySetContext_Impl( + xContext = new XMLTextShapePropertySetContext_Impl( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, GetProperties(), xImpPrMap ); } @@ -182,16 +182,16 @@ SvXMLImportContext *XMLTextShapeStyleContext::CreateChildContext( { // create and remember events import context // (for delayed processing of events) - pContext = new XMLEventsImportContext( GetImport(), nPrefix, + xContext = new XMLEventsImportContext( GetImport(), nPrefix, rLocalName); - xEventContext = pContext; + xEventContext = xContext; } - if( !pContext ) - pContext = XMLShapeStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = XMLShapeStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void XMLTextShapeStyleContext::CreateAndInsert( bool bOverwrite ) diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.cxx b/xmloff/source/text/XMLTrackedChangesImportContext.cxx index 6ff0c4f78ca8..f554b9e9b5b3 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.cxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.cxx @@ -76,27 +76,27 @@ void XMLTrackedChangesImportContext::StartElement( } -SvXMLImportContext* XMLTrackedChangesImportContext::CreateChildContext( +SvXMLImportContextRef XMLTrackedChangesImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if ( (XML_NAMESPACE_TEXT == nPrefix) && IsXMLToken( rLocalName, XML_CHANGED_REGION ) ) { - pContext = new XMLChangedRegionImportContext(GetImport(), + xContext = new XMLChangedRegionImportContext(GetImport(), nPrefix, rLocalName); } - if (nullptr == pContext) + if (!xContext) { - pContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, + xContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); } - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx index eb0562c6be76..3abaa438b2e8 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx @@ -46,7 +46,7 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) 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/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index c105ee7b49a4..fe8855d70cb1 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -1204,7 +1204,7 @@ void XMLDatabaseFieldImportContext::ProcessAttribute( } } -SvXMLImportContext* XMLDatabaseFieldImportContext::CreateChildContext( +SvXMLImportContextRef XMLDatabaseFieldImportContext::CreateChildContext( sal_uInt16 p_nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList ) @@ -2423,30 +2423,29 @@ XMLMacroFieldImportContext::XMLMacroFieldImportContext( { } -SvXMLImportContext* XMLMacroFieldImportContext::CreateChildContext( +SvXMLImportContextRef XMLMacroFieldImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) { - SvXMLImportContext* pContext = nullptr; + SvXMLImportContextRef xContext; if ( (nPrefix == XML_NAMESPACE_OFFICE) && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) ) { // create events context and remember it! - pContext = new XMLEventsImportContext( + xContext = new XMLEventsImportContext( GetImport(), nPrefix, rLocalName ); - xEventContext = pContext; + xEventContext = xContext; bValid = true; } else - pContext = SvXMLImportContext::CreateChildContext( + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList); - return pContext; + return xContext; } - void XMLMacroFieldImportContext::ProcessAttribute( sal_uInt16 nAttrToken, const OUString& sAttrValue ) @@ -2691,7 +2690,7 @@ XMLDdeFieldDeclsImportContext::XMLDdeFieldDeclsImportContext( { } -SvXMLImportContext * XMLDdeFieldDeclsImportContext::CreateChildContext( +SvXMLImportContextRef XMLDdeFieldDeclsImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList> & xAttrList ) @@ -3301,7 +3300,7 @@ void XMLAnnotationImportContext::ProcessAttribute( aName = rValue; } -SvXMLImportContext* XMLAnnotationImportContext::CreateChildContext( +SvXMLImportContextRef XMLAnnotationImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList >& xAttrList ) @@ -3639,7 +3638,7 @@ static bool lcl_ProcessLabel( const SvXMLImport& rImport, return bValid; } -SvXMLImportContext* XMLDropDownFieldImportContext::CreateChildContext( +SvXMLImportContextRef XMLDropDownFieldImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList ) diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 5b32166d0963..3115788f66cd 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -314,7 +314,7 @@ public: virtual ~XMLImpSpanContext_Impl() override; - static SvXMLImportContext *CreateChildContext( + static SvXMLImportContextRef CreateChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList, @@ -322,7 +322,7 @@ public: bool& rIgnLeadSpace, sal_uInt8 nStarFontsConvFlags = 0 ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -349,7 +349,7 @@ public: virtual ~XMLImpHyperlinkContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -432,7 +432,7 @@ XMLImpHyperlinkContext_Impl::~XMLImpHyperlinkContext_Impl() ->GetCursorAsRange()->getStart() ); } -SvXMLImportContext *XMLImpHyperlinkContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLImpHyperlinkContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -479,7 +479,7 @@ public: XMLHints_Impl& rHints, bool& rIgnLeadSpace ); - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -500,7 +500,7 @@ XMLImpRubyBaseContext_Impl::XMLImpRubyBaseContext_Impl( { } -SvXMLImportContext *XMLImpRubyBaseContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLImpRubyBaseContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -542,7 +542,7 @@ public: virtual void EndElement() override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -645,33 +645,33 @@ void XMLImpRubyContext_Impl::EndElement() m_sStyleName, m_sTextStyleName, m_sText ); } -SvXMLImportContext *XMLImpRubyContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLImpRubyContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_TEXT == nPrefix ) { if( IsXMLToken( rLocalName, XML_RUBY_BASE ) ) - pContext = new XMLImpRubyBaseContext_Impl( GetImport(), nPrefix, + xContext = new XMLImpRubyBaseContext_Impl( GetImport(), nPrefix, rLocalName, xAttrList, m_rHints, rIgnoreLeadingSpace ); else if( IsXMLToken( rLocalName, XML_RUBY_TEXT ) ) - pContext = new XMLImpRubyTextContext_Impl( GetImport(), nPrefix, + xContext = new XMLImpRubyTextContext_Impl( GetImport(), nPrefix, rLocalName, xAttrList, *this ); else - pContext = new SvXMLImportContext( + xContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } else - pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, + xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } /** for text:meta and text:meta-field @@ -702,7 +702,7 @@ public: virtual void EndElement() override; - virtual SvXMLImportContext *CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const Reference< xml::sax::XAttributeList > & i_xAttrList) override; @@ -763,7 +763,7 @@ void XMLMetaImportContextBase::EndElement() InsertMeta(xInsertionCursor); } -SvXMLImportContext * XMLMetaImportContextBase::CreateChildContext( +SvXMLImportContextRef XMLMetaImportContextBase::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const Reference< xml::sax::XAttributeList > & i_xAttrList ) { @@ -1489,7 +1489,7 @@ XMLImpSpanContext_Impl::~XMLImpSpanContext_Impl() ->GetCursorAsRange()->getStart() ); } -SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLImpSpanContext_Impl::CreateChildContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList, @@ -1736,7 +1736,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext( return pContext; } -SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext( +SvXMLImportContextRef XMLImpSpanContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -2155,7 +2155,7 @@ void XMLParaContext::EndElement() m_xHints.reset(); } -SvXMLImportContext *XMLParaContext::CreateChildContext( +SvXMLImportContextRef XMLParaContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) { @@ -2269,11 +2269,11 @@ void XMLNumberedParaContext::EndElement() } } -SvXMLImportContext *XMLNumberedParaContext::CreateChildContext( +SvXMLImportContextRef XMLNumberedParaContext::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const Reference< xml::sax::XAttributeList > & i_xAttrList ) { - SvXMLImportContext *pContext( nullptr ); + SvXMLImportContextRef xContext; if ( XML_NAMESPACE_TEXT == i_nPrefix || XML_NAMESPACE_LO_EXT == i_nPrefix ) @@ -2281,18 +2281,17 @@ SvXMLImportContext *XMLNumberedParaContext::CreateChildContext( bool bIsHeader( IsXMLToken( i_rLocalName, XML_H ) ); if ( bIsHeader || IsXMLToken( i_rLocalName, XML_P ) ) { - pContext = new XMLParaContext( GetImport(), + xContext = new XMLParaContext( GetImport(), i_nPrefix, i_rLocalName, i_xAttrList, bIsHeader ); -// ignore text:number } else if (IsXMLToken( i_rLocalName, XML_NUMBER )) { } } - if (!pContext) { - pContext = SvXMLImportContext::CreateChildContext( + if (!xContext) { + xContext = SvXMLImportContext::CreateChildContext( i_nPrefix, i_rLocalName, i_xAttrList ); } - return pContext; + return xContext; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index e6d8f1b0c18a..163236c8e71c 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -65,7 +65,7 @@ public: virtual void EndElement() 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; @@ -96,7 +96,7 @@ public: virtual void EndElement() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & i_xAttrList ) override; diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx index b03e0382c73f..5f0a9fb2231d 100644 --- a/xmloff/source/text/txtstyli.cxx +++ b/xmloff/source/text/txtstyli.cxx @@ -145,12 +145,12 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport, XMLTextStyleContext::~XMLTextStyleContext() {} -SvXMLImportContext *XMLTextStyleContext::CreateChildContext( +SvXMLImportContextRef XMLTextStyleContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< XAttributeList > & xAttrList ) { - SvXMLImportContext *pContext = nullptr; + SvXMLImportContextRef xContext; if( XML_NAMESPACE_STYLE == nPrefix ) { @@ -170,7 +170,7 @@ SvXMLImportContext *XMLTextStyleContext::CreateChildContext( rtl::Reference < SvXMLImportPropertyMapper > xImpPrMap = GetStyles()->GetImportPropertyMapper( GetFamily() ); if( xImpPrMap.is() ) - pContext = new XMLTextPropertySetContext( GetImport(), nPrefix, + xContext = new XMLTextPropertySetContext( GetImport(), nPrefix, rLocalName, xAttrList, nFamily, GetProperties(), @@ -185,14 +185,14 @@ SvXMLImportContext *XMLTextStyleContext::CreateChildContext( // (for delayed processing of events) m_xEventContext.set(new XMLEventsImportContext( GetImport(), nPrefix, rLocalName)); - pContext = m_xEventContext.get(); + xContext = m_xEventContext.get(); } - if( !pContext ) - pContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, + if (!xContext) + xContext = XMLPropStyleContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); - return pContext; + return xContext; } void XMLTextStyleContext::CreateAndInsert( bool bOverwrite ) diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index c150ad5857a6..98abf8df4bf7 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -656,12 +656,12 @@ XMLVariableDeclsImportContext::XMLVariableDeclsImportContext( { } -SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext( +SvXMLImportContextRef XMLVariableDeclsImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<xml::sax::XAttributeList> & xAttrList ) { enum XMLTokenEnum eElementName; - SvXMLImportContext* pImportContext = nullptr; + SvXMLImportContextRef xImportContext; if( XML_NAMESPACE_TEXT == nPrefix ) { @@ -684,20 +684,20 @@ SvXMLImportContext* XMLVariableDeclsImportContext::CreateChildContext( if( IsXMLToken( rLocalName, eElementName ) ) { - pImportContext = new XMLVariableDeclImportContext( + xImportContext = new XMLVariableDeclImportContext( GetImport(), rImportHelper, nPrefix, rLocalName, xAttrList, eVarDeclsContextType); } } // if no context was created, use default context - if (nullptr == pImportContext) { - pImportContext = SvXMLImportContext::CreateChildContext(nPrefix, + if (!xImportContext) { + xImportContext = SvXMLImportContext::CreateChildContext(nPrefix, rLocalName, xAttrList); } - return pImportContext; + return xImportContext; } diff --git a/xmloff/source/xforms/TokenContext.cxx b/xmloff/source/xforms/TokenContext.cxx index 22dd5747c895..3af25dc965e7 100644 --- a/xmloff/source/xforms/TokenContext.cxx +++ b/xmloff/source/xforms/TokenContext.cxx @@ -84,7 +84,7 @@ void TokenContext::StartElement( } } -SvXMLImportContext* TokenContext::CreateChildContext( +SvXMLImportContextRef TokenContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& xAttrList ) diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index fe26c740488a..97b595232726 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -60,7 +60,7 @@ public: * create a warning for all others. Classes that wish to override * CreateChildContext may want to call the parent method for * handling of defaults. */ - 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/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index 62792c1926f6..8ba624b2cb5f 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -65,7 +65,7 @@ XFormsInstanceContext::XFormsInstanceContext( SAL_WARN_IF( !mxModel.is(), "xmloff", "need model" ); } -SvXMLImportContext* XFormsInstanceContext::CreateChildContext( +SvXMLImportContextRef XFormsInstanceContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference<XAttributeList>& ) diff --git a/xmloff/source/xforms/XFormsInstanceContext.hxx b/xmloff/source/xforms/XFormsInstanceContext.hxx index 1bcdd16883d7..df77d00a7e18 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.hxx +++ b/xmloff/source/xforms/XFormsInstanceContext.hxx @@ -52,7 +52,7 @@ public: // arbitrary DOM elements. For the attributes, we use the // TokenContext mechanism. - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference<css::xml::sax::XAttributeList >& xAttrList ) override; |