summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-12-17 14:47:56 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-12-17 16:51:16 +0100
commit21e72c5f1d315068b0aa6afd3b9750c2ad878dcb (patch)
treef93a352182acf4890f0469425526894029323d62 /xmloff
parentb902432b431d01634c1f56e4758ec236a999650d (diff)
Hold XMLTransformerContext by rtl::Reference
Change-Id: I60b8d422d53d47537996756aa1b7fb3c26f8383a
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/transform/ChartPlotAreaOASISTContext.cxx12
-rw-r--r--xmloff/source/transform/ChartPlotAreaOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/ChartPlotAreaOOoTContext.cxx17
-rw-r--r--xmloff/source/transform/ChartPlotAreaOOoTContext.hxx4
-rw-r--r--xmloff/source/transform/ControlOOoTContext.cxx12
-rw-r--r--xmloff/source/transform/ControlOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/CreateElemTContext.cxx8
-rw-r--r--xmloff/source/transform/DeepTContext.cxx51
-rw-r--r--xmloff/source/transform/DeepTContext.hxx4
-rw-r--r--xmloff/source/transform/EventOOoTContext.cxx2
-rw-r--r--xmloff/source/transform/EventOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/FormPropOOoTContext.cxx16
-rw-r--r--xmloff/source/transform/FormPropOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/FrameOASISTContext.cxx18
-rw-r--r--xmloff/source/transform/FrameOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/FrameOOoTContext.cxx6
-rw-r--r--xmloff/source/transform/FrameOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/IgnoreTContext.cxx12
-rw-r--r--xmloff/source/transform/IgnoreTContext.hxx2
-rw-r--r--xmloff/source/transform/MergeElemTContext.cxx44
-rw-r--r--xmloff/source/transform/MergeElemTContext.hxx2
-rw-r--r--xmloff/source/transform/MetaTContext.cxx8
-rw-r--r--xmloff/source/transform/MetaTContext.hxx2
-rw-r--r--xmloff/source/transform/NotesTContext.cxx14
-rw-r--r--xmloff/source/transform/NotesTContext.hxx2
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx4
-rw-r--r--xmloff/source/transform/PersAttrListTContext.cxx2
-rw-r--r--xmloff/source/transform/PersAttrListTContext.hxx2
-rw-r--r--xmloff/source/transform/PersMixedContentTContext.cxx6
-rw-r--r--xmloff/source/transform/StyleOASISTContext.cxx8
-rw-r--r--xmloff/source/transform/StyleOASISTContext.hxx2
-rw-r--r--xmloff/source/transform/StyleOOoTContext.cxx24
-rw-r--r--xmloff/source/transform/StyleOOoTContext.hxx2
-rw-r--r--xmloff/source/transform/TransformerContext.cxx2
-rw-r--r--xmloff/source/transform/TransformerContext.hxx3
35 files changed, 145 insertions, 158 deletions
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
index 95dc0763a234..c0b8c1068fd7 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
@@ -40,7 +40,7 @@ public:
::rtl::Reference< XMLPersAttrListTContext > & rOutCategoriesContext );
virtual ~XMLAxisOASISContext();
- virtual XMLTransformerContext *CreateChildContext(
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
@@ -68,13 +68,13 @@ XMLAxisOASISContext::XMLAxisOASISContext(
XMLAxisOASISContext::~XMLAxisOASISContext()
{}
-XMLTransformerContext * XMLAxisOASISContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLAxisOASISContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< xml::sax::XAttributeList >& xAttrList )
{
- XMLTransformerContext * pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( XML_NAMESPACE_CHART == nPrefix &&
IsXMLToken( rLocalName, XML_CATEGORIES ) )
@@ -194,18 +194,18 @@ XMLChartPlotAreaOASISTContext::XMLChartPlotAreaOASISTContext(
XMLChartPlotAreaOASISTContext::~XMLChartPlotAreaOASISTContext()
{}
-XMLTransformerContext * XMLChartPlotAreaOASISTContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLChartPlotAreaOASISTContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( XML_NAMESPACE_CHART == nPrefix &&
IsXMLToken( rLocalName, XML_AXIS ) )
{
- pContext = new XMLAxisOASISContext( GetTransformer(), rQName, m_rCategoriesContext );
+ pContext.set(new XMLAxisOASISContext( GetTransformer(), rQName, m_rCategoriesContext ));
}
else
{
diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
index e42f10f79129..fc1bc7b80c9b 100644
--- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx
@@ -30,7 +30,7 @@ public:
XMLTransformerBase & rTransformer, const OUString & rQName );
virtual ~XMLChartPlotAreaOASISTContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
index 5df97537a1aa..16aeecceba00 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx
@@ -126,25 +126,25 @@ XMLChartPlotAreaOOoTContext::XMLChartPlotAreaOOoTContext(
XMLChartPlotAreaOOoTContext::~XMLChartPlotAreaOOoTContext()
{}
-XMLTransformerContext * XMLChartPlotAreaOOoTContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLChartPlotAreaOOoTContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const uno::Reference< xml::sax::XAttributeList >& xAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( XML_NAMESPACE_CHART == nPrefix &&
IsXMLToken( rLocalName, XML_AXIS ) )
{
- XMLAxisOOoContext * pAxisContext( new XMLAxisOOoContext( GetTransformer(), rQName ));
+ rtl::Reference<XMLAxisOOoContext> pAxisContext( new XMLAxisOOoContext( GetTransformer(), rQName ));
AddContent( pAxisContext );
- pContext = pAxisContext;
+ pContext.set(pAxisContext.get());
}
else if( XML_NAMESPACE_CHART == nPrefix &&
IsXMLToken( rLocalName, XML_CATEGORIES ) )
{
- pContext = new XMLPersAttrListTContext( GetTransformer(), rQName );
+ pContext.set(new XMLPersAttrListTContext( GetTransformer(), rQName ));
// put categories at correct axis
XMLAxisContextVector::iterator aIter = m_aChildContexts.begin();
@@ -197,12 +197,11 @@ void XMLChartPlotAreaOOoTContext::EndElement()
XMLProcAttrTransformerContext::EndElement();
}
-void XMLChartPlotAreaOOoTContext::AddContent( XMLAxisOOoContext *pContext )
+void XMLChartPlotAreaOOoTContext::AddContent(rtl::Reference<XMLAxisOOoContext> const & pContext)
{
- OSL_ENSURE( pContext && pContext->IsPersistent(),
+ OSL_ENSURE( pContext.is() && pContext->IsPersistent(),
"non-persistent context" );
- XMLAxisContextVector::value_type aVal( pContext );
- m_aChildContexts.push_back( aVal );
+ m_aChildContexts.push_back(pContext);
}
diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
index e2ddd635458a..75a14f59c1ec 100644
--- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
+++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx
@@ -36,7 +36,7 @@ public:
XMLTransformerBase & rTransformer, const OUString & rQName );
virtual ~XMLChartPlotAreaOOoTContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -44,7 +44,7 @@ public:
virtual void ExportContent() override;
protected:
- void AddContent( XMLAxisOOoContext *pContent );
+ void AddContent( rtl::Reference<XMLAxisOOoContext> const & pContent );
private:
XMLAxisContextVector m_aChildContexts;
diff --git a/xmloff/source/transform/ControlOOoTContext.cxx b/xmloff/source/transform/ControlOOoTContext.cxx
index bff9ace673d3..1961da430869 100644
--- a/xmloff/source/transform/ControlOOoTContext.cxx
+++ b/xmloff/source/transform/ControlOOoTContext.cxx
@@ -48,19 +48,19 @@ void XMLControlOOoTransformerContext::StartElement(
m_xAttrList = new XMLMutableAttributeList( rAttrList, true );
}
-XMLTransformerContext *XMLControlOOoTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLControlOOoTransformerContext::CreateChildContext(
sal_uInt16 /*nPrefix*/,
const OUString& /*rLocalName*/,
const OUString& rQName,
const Reference< XAttributeList >& rAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( m_aElemQName.isEmpty() )
{
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(),
rQName,
- false, false );
+ false, false ));
m_aElemQName = rQName;
static_cast< XMLMutableAttributeList * >( m_xAttrList.get() )
->AppendAttributeList( rAttrList );
@@ -72,9 +72,9 @@ XMLTransformerContext *XMLControlOOoTransformerContext::CreateChildContext(
}
else
{
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(),
rQName,
- true, true );
+ true, true ));
}
return pContext;
}
diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx
index 350e2946a846..7e345ea2d42f 100644
--- a/xmloff/source/transform/ControlOOoTContext.hxx
+++ b/xmloff/source/transform/ControlOOoTContext.hxx
@@ -34,7 +34,7 @@ public:
virtual ~XMLControlOOoTransformerContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx
index e39864636bde..2a39c9a69bc3 100644
--- a/xmloff/source/transform/CreateElemTContext.cxx
+++ b/xmloff/source/transform/CreateElemTContext.cxx
@@ -87,13 +87,11 @@ void XMLCreateElemTransformerContext::StartElement(
(*aIter).second.GetQNamePrefixFromParam1(),
::xmloff::token::GetXMLToken(
(*aIter).second.GetQNameTokenFromParam1()) ) );
- XMLTransformerContext *pContext =
+ rtl::Reference<XMLTransformerContext> pContext(
new XMLPersTextContentTContext( GetTransformer(),
- aElemQName );
+ aElemQName ));
pContext->Characters( rAttrValue );
- XMLTransformerContextVector::value_type aVal(
- pContext );
- aChildContexts.push_back( aVal );
+ aChildContexts.push_back(pContext);
pMutableAttrList->RemoveAttributeByIndex( i );
--i;
--nAttrCount;
diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx
index 50bf401d5d43..d078cff27c31 100644
--- a/xmloff/source/transform/DeepTContext.cxx
+++ b/xmloff/source/transform/DeepTContext.cxx
@@ -29,12 +29,11 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-void XMLPersElemContentTContext::AddContent( XMLTransformerContext *pContext )
+void XMLPersElemContentTContext::AddContent( rtl::Reference<XMLTransformerContext> const & pContext )
{
- OSL_ENSURE( pContext && pContext->IsPersistent(),
+ OSL_ENSURE( pContext.is() && pContext->IsPersistent(),
"non-persistent context" );
- XMLTransformerContextVector::value_type aVal( pContext );
- m_aChildContexts.push_back( aVal );
+ m_aChildContexts.push_back(pContext);
}
XMLPersElemContentTContext::XMLPersElemContentTContext(
@@ -75,13 +74,13 @@ XMLPersElemContentTContext::~XMLPersElemContentTContext()
{
}
-XMLTransformerContext *XMLPersElemContentTContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLPersElemContentTContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
XMLTransformerActions::key_type aKey( nPrefix, rLocalName );
XMLTransformerActions::const_iterator aIter =
@@ -92,63 +91,61 @@ XMLTransformerContext *XMLPersElemContentTContext::CreateChildContext(
switch( (*aIter).second.m_nActionType )
{
case XML_ETACTION_COPY:
- pContext = new XMLPersMixedContentTContext( GetTransformer(),
- rQName );
+ pContext.set(new XMLPersMixedContentTContext( GetTransformer(),
+ rQName ));
break;
case XML_ETACTION_COPY_TEXT:
- pContext = new XMLPersMixedContentTContext( GetTransformer(),
- rQName );
+ pContext.set(new XMLPersMixedContentTContext( GetTransformer(),
+ rQName ));
break;
case XML_ETACTION_RENAME_ELEM:
- pContext = new XMLPersMixedContentTContext( GetTransformer(), rQName,
+ pContext.set(new XMLPersMixedContentTContext( GetTransformer(), rQName,
(*aIter).second.GetQNamePrefixFromParam1(),
- (*aIter).second.GetQNameTokenFromParam1() );
+ (*aIter).second.GetQNameTokenFromParam1() ));
break;
case XML_ETACTION_RENAME_ELEM_PROC_ATTRS:
- pContext = new XMLPersMixedContentTContext( GetTransformer(), rQName,
+ pContext.set(new XMLPersMixedContentTContext( GetTransformer(), rQName,
(*aIter).second.GetQNamePrefixFromParam1(),
(*aIter).second.GetQNameTokenFromParam1(),
- static_cast< sal_uInt16 >( (*aIter).second.m_nParam2 ) );
+ static_cast< sal_uInt16 >( (*aIter).second.m_nParam2 ) ));
break;
case XML_ETACTION_RENAME_ELEM_ADD_PROC_ATTR:
{
- XMLPersMixedContentTContext *pMC =
+ rtl::Reference<XMLPersMixedContentTContext> pMC(
new XMLPersMixedContentTContext( GetTransformer(), rQName,
(*aIter).second.GetQNamePrefixFromParam1(),
(*aIter).second.GetQNameTokenFromParam1(),
static_cast< sal_uInt16 >(
- (*aIter).second.m_nParam3 >> 16 ) );
+ (*aIter).second.m_nParam3 >> 16 ) ));
pMC->AddAttribute(
(*aIter).second.GetQNamePrefixFromParam2(),
(*aIter).second.GetQNameTokenFromParam2(),
static_cast< ::xmloff::token::XMLTokenEnum >(
(*aIter).second.m_nParam3 & 0xffff ) );
- pContext = pMC;
+ pContext.set(pMC.get());
}
break;
case XML_ETACTION_PROC_ATTRS:
- pContext = new XMLPersMixedContentTContext( GetTransformer(), rQName,
- static_cast< sal_uInt16 >( (*aIter).second.m_nParam1 ) );
+ pContext.set(new XMLPersMixedContentTContext( GetTransformer(), rQName,
+ static_cast< sal_uInt16 >( (*aIter).second.m_nParam1 ) ));
break;
default:
pContext = GetTransformer().CreateUserDefinedContext(
(*aIter).second, rQName, true );
- OSL_ENSURE( pContext && pContext->IsPersistent(),
+ OSL_ENSURE( pContext.is() && pContext->IsPersistent(),
"unknown or not persistent action" );
- if( pContext && !pContext->IsPersistent() )
+ if( pContext.is() && !pContext->IsPersistent() )
{
- delete pContext;
- pContext = nullptr;
+ pContext.clear();
}
break;
}
}
// default is copying
- if( !pContext )
- pContext = new XMLPersMixedContentTContext( GetTransformer(), rQName );
- XMLTransformerContextVector::value_type aVal( pContext );
- m_aChildContexts.push_back( aVal );
+ if( !pContext.is() )
+ pContext.set(new XMLPersMixedContentTContext( GetTransformer(), rQName ));
+ m_aChildContexts.push_back(pContext);
return pContext;
}
diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx
index 39660381b4f7..8031b15f7251 100644
--- a/xmloff/source/transform/DeepTContext.hxx
+++ b/xmloff/source/transform/DeepTContext.hxx
@@ -55,12 +55,12 @@ public:
virtual ~XMLPersElemContentTContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
- void AddContent( XMLTransformerContext *pContent );
+ void AddContent( rtl::Reference<XMLTransformerContext> const & pContent );
bool HasElementContent() const
{
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index d3b97b456c7b..7abb9977a369 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -226,7 +226,7 @@ void XMLEventOOoTransformerContext::EndElement()
GetTransformer().GetDocHandler()->endElement( GetExportQName() );
}
-XMLTransformerContext * XMLEventOOoTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLEventOOoTransformerContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx
index fa7a7e210cbd..b3d879fce446 100644
--- a/xmloff/source/transform/EventOOoTContext.hxx
+++ b/xmloff/source/transform/EventOOoTContext.hxx
@@ -42,7 +42,7 @@ public:
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
virtual void EndElement() override;
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx
index 0aea00928cd8..fe7653f40639 100644
--- a/xmloff/source/transform/FormPropOOoTContext.cxx
+++ b/xmloff/source/transform/FormPropOOoTContext.cxx
@@ -150,36 +150,36 @@ XMLFormPropOOoTransformerContext::~XMLFormPropOOoTransformerContext()
{
}
-XMLTransformerContext *XMLFormPropOOoTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLFormPropOOoTransformerContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( XML_NAMESPACE_FORM == nPrefix &&
IsXMLToken( rLocalName, XML_PROPERTY_VALUE ) )
{
if( m_bIsList )
{
- pContext = new XMLFormPropValueTContext_Impl( GetTransformer(),
+ pContext.set(new XMLFormPropValueTContext_Impl( GetTransformer(),
rQName,
XML_NAMESPACE_OFFICE,
- m_eValueToken );
+ m_eValueToken ));
}
else if( !m_xValueContext.is() )
{
m_xValueContext=
new XMLFormPropValueTContext_Impl( GetTransformer(), rQName );
- pContext = m_xValueContext.get();
+ pContext.set(m_xValueContext.get());
}
}
// default is ignore
- if( !pContext )
- pContext = new XMLIgnoreTransformerContext( GetTransformer(), rQName,
- true, true );
+ if( !pContext.is() )
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(), rQName,
+ true, true ));
return pContext;
}
diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx
index 54111ef581bb..6630cc5516f4 100644
--- a/xmloff/source/transform/FormPropOOoTContext.hxx
+++ b/xmloff/source/transform/FormPropOOoTContext.hxx
@@ -46,7 +46,7 @@ public:
virtual ~XMLFormPropOOoTransformerContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx
index 061a60b38948..ca5b1e9c2b94 100644
--- a/xmloff/source/transform/FrameOASISTContext.cxx
+++ b/xmloff/source/transform/FrameOASISTContext.cxx
@@ -105,20 +105,20 @@ void XMLFrameOASISTransformerContext::StartElement(
}
}
-XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLFrameOASISTransformerContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& rAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( m_bIgnoreElement )
{
// do not export the frame element and all of its children
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(),
rQName,
- true, true );
+ true, true ));
}
else
{
@@ -136,9 +136,9 @@ XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext(
if( m_aElemQName.isEmpty() &&
!IsLinkedEmbeddedObject( rLocalName, rAttrList ) )
{
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(),
rQName,
- false, false );
+ false, false ));
m_aElemQName = rQName;
static_cast< XMLMutableAttributeList * >( m_xAttrList.get() )
->AppendAttributeList( rAttrList );
@@ -150,9 +150,9 @@ XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext(
}
else
{
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(),
rQName,
- true, true );
+ true, true ));
}
break;
default:
@@ -163,7 +163,7 @@ XMLTransformerContext *XMLFrameOASISTransformerContext::CreateChildContext(
}
// default is copying
- if( !pContext )
+ if( !pContext.is() )
pContext = XMLTransformerContext::CreateChildContext( nPrefix,
rLocalName,
rQName,
diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx
index 26b641f2663e..55f0d549a0b9 100644
--- a/xmloff/source/transform/FrameOASISTContext.hxx
+++ b/xmloff/source/transform/FrameOASISTContext.hxx
@@ -40,7 +40,7 @@ public:
virtual ~XMLFrameOASISTransformerContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx
index f181f058bdc2..74385d604e03 100644
--- a/xmloff/source/transform/FrameOOoTContext.cxx
+++ b/xmloff/source/transform/FrameOOoTContext.cxx
@@ -100,13 +100,13 @@ void XMLFrameOOoTransformerContext::StartElement(
XMLTransformerContext::StartElement( xAttrList );
}
-XMLTransformerContext *XMLFrameOOoTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLFrameOOoTransformerContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& rAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
XMLTransformerActions *pActions =
GetTransformer().GetUserDefinedActions( OOO_FRAME_ELEM_ACTIONS );
@@ -133,7 +133,7 @@ XMLTransformerContext *XMLFrameOOoTransformerContext::CreateChildContext(
}
// default is copying
- if( !pContext )
+ if( !pContext.is() )
pContext = XMLTransformerContext::CreateChildContext(
nPrefix, rLocalName, rQName, rAttrList );
diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx
index 9c8f753132f1..c49b42d70442 100644
--- a/xmloff/source/transform/FrameOOoTContext.hxx
+++ b/xmloff/source/transform/FrameOOoTContext.hxx
@@ -32,7 +32,7 @@ public:
virtual ~XMLFrameOOoTransformerContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/IgnoreTContext.cxx b/xmloff/source/transform/IgnoreTContext.cxx
index 5174399b7d9b..1dde4f753306 100644
--- a/xmloff/source/transform/IgnoreTContext.cxx
+++ b/xmloff/source/transform/IgnoreTContext.cxx
@@ -53,20 +53,20 @@ XMLIgnoreTransformerContext::~XMLIgnoreTransformerContext()
{
}
-XMLTransformerContext *XMLIgnoreTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLIgnoreTransformerContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& xAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( m_bIgnoreElements )
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(),
rQName, true,
- true );
+ true ));
else if (m_bRecursiveUse)
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
- rQName, m_bAllowCharactersRecursive );
+ pContext.set(new XMLIgnoreTransformerContext( GetTransformer(),
+ rQName, m_bAllowCharactersRecursive ));
else
pContext = XMLTransformerContext::CreateChildContext(
nPrefix, rLocalName, rQName, xAttrList );
diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx
index aae5bf2c2c09..024692774755 100644
--- a/xmloff/source/transform/IgnoreTContext.hxx
+++ b/xmloff/source/transform/IgnoreTContext.hxx
@@ -55,7 +55,7 @@ public:
// Create a children element context. By default, the import's
// CreateContext method is called to create a new default context.
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx
index 3e1a79da7376..f35fde9c4dfe 100644
--- a/xmloff/source/transform/MergeElemTContext.cxx
+++ b/xmloff/source/transform/MergeElemTContext.cxx
@@ -41,7 +41,7 @@ public:
// Create a children element context. By default, the import's
// CreateContext method is called to create a new default context.
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -72,18 +72,14 @@ XMLParagraphTransformerContext::~XMLParagraphTransformerContext()
{
}
-XMLTransformerContext *XMLParagraphTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLParagraphTransformerContext::CreateChildContext(
sal_uInt16 /*nPrefix*/,
const OUString& /*rLocalName*/,
const OUString& rQName,
const Reference< XAttributeList >& )
{
- XMLTransformerContext *pContext = nullptr;
-
- pContext = new XMLIgnoreTransformerContext( GetTransformer(),
+ return new XMLIgnoreTransformerContext( GetTransformer(),
rQName, true );
-
- return pContext;
}
void XMLParagraphTransformerContext::StartElement( const Reference< XAttributeList >& rAttrList )
@@ -200,13 +196,13 @@ void XMLMergeElemTransformerContext::StartElement(
}
}
-XMLTransformerContext *XMLMergeElemTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLMergeElemTransformerContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& rAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( !m_bStartElementExported )
{
@@ -225,36 +221,33 @@ XMLTransformerContext *XMLMergeElemTransformerContext::CreateChildContext(
{
case XML_ETACTION_MOVE_TO_ATTR_RNG2ISO_DATETIME:
{
- XMLPersTextContentTContext *pTC =
+ rtl::Reference<XMLPersTextContentTContext> pTC(
new XMLPersTextContentRNGTransformTContext(
GetTransformer(), rQName,
(*aIter).second.GetQNamePrefixFromParam1(),
- (*aIter).second.GetQNameTokenFromParam1() );
- XMLPersTextContentTContextVector::value_type aVal(pTC);
- m_aChildContexts.push_back( aVal );
- pContext = pTC;
+ (*aIter).second.GetQNameTokenFromParam1() ));
+ m_aChildContexts.push_back(pTC);
+ pContext.set(pTC.get());
}
break;
case XML_ETACTION_MOVE_TO_ATTR:
{
- XMLPersTextContentTContext *pTC =
+ rtl::Reference<XMLPersTextContentTContext> pTC(
new XMLPersTextContentTContext(
GetTransformer(), rQName,
(*aIter).second.GetQNamePrefixFromParam1(),
- (*aIter).second.GetQNameTokenFromParam1() );
- XMLPersTextContentTContextVector::value_type aVal(pTC);
- m_aChildContexts.push_back( aVal );
- pContext = pTC;
+ (*aIter).second.GetQNameTokenFromParam1() ));
+ m_aChildContexts.push_back(pTC);
+ pContext.set(pTC.get());
}
break;
case XML_ETACTION_EXTRACT_CHARACTERS:
{
if( !m_bStartElementExported )
ExportStartElement();
- XMLParagraphTransformerContext* pPTC =
+ pContext.set(
new XMLParagraphTransformerContext( GetTransformer(),
- rQName);
- pContext = pPTC;
+ rQName));
}
break;
default:
@@ -283,10 +276,9 @@ XMLTransformerContext *XMLMergeElemTransformerContext::CreateChildContext(
{
if( !m_bStartElementExported )
ExportStartElement();
- XMLParagraphTransformerContext* pPTC =
+ pContext.set(
new XMLParagraphTransformerContext( GetTransformer(),
- rQName);
- pContext = pPTC;
+ rQName));
}
break;
default:
@@ -298,7 +290,7 @@ XMLTransformerContext *XMLMergeElemTransformerContext::CreateChildContext(
}
// default is copying
- if( !pContext )
+ if( !pContext.is() )
{
if( !m_bStartElementExported )
ExportStartElement();
diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx
index 39cc3b174e0e..07602f681c02 100644
--- a/xmloff/source/transform/MergeElemTContext.hxx
+++ b/xmloff/source/transform/MergeElemTContext.hxx
@@ -43,7 +43,7 @@ public:
virtual ~XMLMergeElemTransformerContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/MetaTContext.cxx b/xmloff/source/transform/MetaTContext.cxx
index f029cdfaee2a..8dea091fd10d 100644
--- a/xmloff/source/transform/MetaTContext.cxx
+++ b/xmloff/source/transform/MetaTContext.cxx
@@ -67,18 +67,18 @@ XMLMetaTransformerContext::~XMLMetaTransformerContext()
{
}
-XMLTransformerContext *XMLMetaTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLMetaTransformerContext::CreateChildContext(
sal_uInt16 /*nPrefix*/,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& )
{
- XMLPersTextContentTContext *pContext =
- new XMLPersTextContentTContext( GetTransformer(), rQName );
+ rtl::Reference<XMLPersTextContentTContext> pContext(
+ new XMLPersTextContentTContext( GetTransformer(), rQName ));
XMLMetaContexts_Impl::value_type aVal( rLocalName, pContext );
m_aContexts.insert( aVal );
- return pContext;
+ return pContext.get();
}
void XMLMetaTransformerContext::EndElement()
diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx
index a8788fa8c4d3..f6ed27136dbf 100644
--- a/xmloff/source/transform/MetaTContext.hxx
+++ b/xmloff/source/transform/MetaTContext.hxx
@@ -49,7 +49,7 @@ public:
// Create a children element context. By default, the import's
// CreateContext method is called to create a new default context.
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx
index 9fbdf1f1b53b..bef8abcd8e40 100644
--- a/xmloff/source/transform/NotesTContext.cxx
+++ b/xmloff/source/transform/NotesTContext.cxx
@@ -153,13 +153,13 @@ void XMLNotesTransformerContext::EndElement()
}
}
-XMLTransformerContext *XMLNotesTransformerContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLNotesTransformerContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& rAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( XML_NOTE == m_eTypeToken )
{
if( XML_NAMESPACE_TEXT == nPrefix )
@@ -180,25 +180,25 @@ XMLTransformerContext *XMLNotesTransformerContext::CreateChildContext(
{
if( m_bPersistent )
{
- pContext = new XMLPersTextContentTContext(
+ pContext.set(new XMLPersTextContentTContext(
GetTransformer(), rQName,
XML_NAMESPACE_TEXT,
- eToken );
+ eToken ));
AddContent( pContext );
}
else
{
- pContext = new XMLRenameElemTransformerContext(
+ pContext.set(new XMLRenameElemTransformerContext(
GetTransformer(), rQName,
XML_NAMESPACE_TEXT,
- eToken );
+ eToken ));
}
}
}
}
- if( !pContext )
+ if( !pContext.is() )
{
pContext = m_bPersistent
? XMLPersElemContentTContext::CreateChildContext(
diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx
index 1a49c4a94c47..b7f9a6eb5823 100644
--- a/xmloff/source/transform/NotesTContext.hxx
+++ b/xmloff/source/transform/NotesTContext.hxx
@@ -36,7 +36,7 @@ public:
virtual ~XMLNotesTransformerContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 9ab36090f3a6..e23b5e128228 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1252,7 +1252,7 @@ public:
virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -1276,7 +1276,7 @@ void XMLBodyOASISTransformerContext_Impl::StartElement(
{
}
-XMLTransformerContext* XMLBodyOASISTransformerContext_Impl::CreateChildContext( sal_uInt16 nPrefix,
+rtl::Reference<XMLTransformerContext> XMLBodyOASISTransformerContext_Impl::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList )
diff --git a/xmloff/source/transform/PersAttrListTContext.cxx b/xmloff/source/transform/PersAttrListTContext.cxx
index 82985eb85699..3f708fd482ae 100644
--- a/xmloff/source/transform/PersAttrListTContext.cxx
+++ b/xmloff/source/transform/PersAttrListTContext.cxx
@@ -110,7 +110,7 @@ XMLPersAttrListTContext::~XMLPersAttrListTContext()
{
}
-XMLTransformerContext *XMLPersAttrListTContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLPersAttrListTContext::CreateChildContext(
sal_uInt16 /*nPrefix*/,
const OUString& /*rLocalName*/,
const OUString& rQName,
diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx
index 5f4942c204d1..e47fb3377491 100644
--- a/xmloff/source/transform/PersAttrListTContext.hxx
+++ b/xmloff/source/transform/PersAttrListTContext.hxx
@@ -69,7 +69,7 @@ public:
// Create a children element context. By default, the import's
// CreateContext method is called to create a new default context.
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx
index 3a4696a9e9c6..43f49af454b9 100644
--- a/xmloff/source/transform/PersMixedContentTContext.cxx
+++ b/xmloff/source/transform/PersMixedContentTContext.cxx
@@ -34,7 +34,7 @@ public:
const OUString& rChars );
virtual ~XMLPersTextTContext_Impl();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
@@ -58,14 +58,14 @@ XMLPersTextTContext_Impl::~XMLPersTextTContext_Impl()
{
}
-XMLTransformerContext *XMLPersTextTContext_Impl::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLPersTextTContext_Impl::CreateChildContext(
sal_uInt16,
const OUString&,
const OUString&,
const Reference< XAttributeList >& )
{
OSL_ENSURE( false, "illegal call to CreateChildContext" );
- return nullptr;
+ return {};
}
void XMLPersTextTContext_Impl::StartElement(
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx
index 6a4163ce74fa..060336798936 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -759,13 +759,13 @@ XMLStyleOASISTContext::~XMLStyleOASISTContext()
{
}
-XMLTransformerContext *XMLStyleOASISTContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLStyleOASISTContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& rAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
@@ -779,10 +779,10 @@ XMLTransformerContext *XMLStyleOASISTContext::CreateChildContext(
GetTransformer(), rQName, ePropType, m_aStyleFamily, m_bControlStyle );
else
m_xPropContext->SetQNameAndPropType( rQName, ePropType );
- pContext = m_xPropContext.get();
+ pContext.set(m_xPropContext.get());
}
}
- if( !pContext )
+ if( !pContext.is() )
{
// if a properties context exist close it
if( m_xPropContext.is() && !m_bPersistent )
diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx
index ae46ba624f5f..8b1149ccf596 100644
--- a/xmloff/source/transform/StyleOASISTContext.hxx
+++ b/xmloff/source/transform/StyleOASISTContext.hxx
@@ -46,7 +46,7 @@ public:
virtual ~XMLStyleOASISTContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx
index 24d0234a3b27..4f30727767d6 100644
--- a/xmloff/source/transform/StyleOOoTContext.cxx
+++ b/xmloff/source/transform/StyleOOoTContext.cxx
@@ -237,7 +237,7 @@ public:
virtual ~XMLPropertiesOOoTContext_Impl();
- XMLTransformerContext *CreateChildContext(
+ rtl::Reference<XMLTransformerContext> CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
@@ -378,7 +378,7 @@ XMLPropertiesOOoTContext_Impl::~XMLPropertiesOOoTContext_Impl()
{
}
-XMLTransformerContext *XMLPropertiesOOoTContext_Impl::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLPropertiesOOoTContext_Impl::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
@@ -1067,13 +1067,13 @@ XMLStyleOOoTContext::~XMLStyleOOoTContext()
{
}
-XMLTransformerContext *XMLStyleOOoTContext::CreateChildContext(
+rtl::Reference<XMLTransformerContext> XMLStyleOOoTContext::CreateChildContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& rAttrList )
{
- XMLTransformerContext *pContext = nullptr;
+ rtl::Reference<XMLTransformerContext> pContext;
if( XML_NAMESPACE_STYLE == nPrefix &&
IsXMLToken( rLocalName, XML_PROPERTIES ) )
@@ -1093,29 +1093,29 @@ XMLTransformerContext *XMLStyleOOoTContext::CreateChildContext(
aAttrActionMaps[aPropTypes[m_eFamily][0]];
if( nActionMap < MAX_OOO_PROP_ACTIONS )
{
- pContext = new XMLPropertiesOOoTContext_Impl(
+ pContext.set(new XMLPropertiesOOoTContext_Impl(
GetTransformer(), rQName,
- aPropTypes[m_eFamily], m_bPersistent );
+ aPropTypes[m_eFamily], m_bPersistent ));
}
else
{
if( m_bPersistent )
- pContext = new XMLPersElemContentTContext(
+ pContext.set(new XMLPersElemContentTContext(
GetTransformer(), rQName,
XML_NAMESPACE_STYLE,
- aPropTokens[aPropTypes[m_eFamily][0]] );
+ aPropTokens[aPropTypes[m_eFamily][0]] ));
else
- pContext = new XMLRenameElemTransformerContext(
+ pContext.set(new XMLRenameElemTransformerContext(
GetTransformer(), rQName,
XML_NAMESPACE_STYLE,
- aPropTokens[aPropTypes[m_eFamily][0]] );
+ aPropTokens[aPropTypes[m_eFamily][0]] ));
}
}
else
{
- pContext = new XMLPropertiesOOoTContext_Impl(
+ pContext.set(new XMLPropertiesOOoTContext_Impl(
GetTransformer(), rQName,
- aPropTypes[m_eFamily], m_bPersistent);
+ aPropTypes[m_eFamily], m_bPersistent));
}
if( m_bPersistent )
diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx
index 5a716a5387d7..12cb4192f2b3 100644
--- a/xmloff/source/transform/StyleOOoTContext.hxx
+++ b/xmloff/source/transform/StyleOOoTContext.hxx
@@ -47,7 +47,7 @@ public:
virtual ~XMLStyleOOoTContext();
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override;
diff --git a/xmloff/source/transform/TransformerContext.cxx b/xmloff/source/transform/TransformerContext.cxx
index 61e3df984876..d245314774f6 100644
--- a/xmloff/source/transform/TransformerContext.cxx
+++ b/xmloff/source/transform/TransformerContext.cxx
@@ -58,7 +58,7 @@ XMLTransformerContext::~XMLTransformerContext()
{
}
-XMLTransformerContext *XMLTransformerContext::CreateChildContext( sal_uInt16 nPrefix,
+rtl::Reference<XMLTransformerContext> XMLTransformerContext::CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const Reference< XAttributeList >& )
diff --git a/xmloff/source/transform/TransformerContext.hxx b/xmloff/source/transform/TransformerContext.hxx
index 449c3e144f98..a42e982a4dec 100644
--- a/xmloff/source/transform/TransformerContext.hxx
+++ b/xmloff/source/transform/TransformerContext.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <salhelper/simplereferenceobject.hxx>
+#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <xmloff/xmltoken.hxx>
@@ -69,7 +70,7 @@ public:
// Create a children element context. By default, the import's
// CreateContext method is called to create a new default context.
- virtual XMLTransformerContext *CreateChildContext( sal_uInt16 nPrefix,
+ virtual rtl::Reference<XMLTransformerContext> CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString& rQName,
const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList );