[Libreoffice-commits] core.git: include/oox oox/source

Noel (via logerrit) logerrit at kemper.freedesktop.org
Sun Feb 21 15:13:22 UTC 2021


 include/oox/ppt/timenodelistcontext.hxx |    2 +-
 oox/source/drawingml/shape.cxx          |    2 +-
 oox/source/ppt/timenodelistcontext.cxx  |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 98173f6222cec22170b53c7d9c94c6ce5b08b4d9
Author:     Noel <noel.grandin at collabora.co.uk>
AuthorDate: Sun Feb 21 13:30:45 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Feb 21 16:12:44 2021 +0100

    loplugin:refcounting in oox..i18npool
    
    Change-Id: Iff904a7ac887fa9b77bea87dbb1012281848a540
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111278
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 8bc76b3c185d..cd98d06b15fd 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -40,7 +40,7 @@ namespace oox::ppt {
     public:
         virtual ~TimeNodeContext() throw() override;
 
-        static TimeNodeContext * makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
+        static rtl::Reference<TimeNodeContext> makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
 
     protected:
         TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32  aElement, const TimeNodePtr & pNode ) throw();
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 22cacec6eaa6..469dc7c30c17 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1840,7 +1840,7 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >&
                 // load the chart data from the XML fragment
                 bool bMSO2007Doc = rFilter.isMSO2007Document();
                 chart::ChartSpaceModel aModel(bMSO2007Doc);
-                chart::ChartSpaceFragment *pChartSpaceFragment = new chart::ChartSpaceFragment(
+                rtl::Reference<chart::ChartSpaceFragment> pChartSpaceFragment = new chart::ChartSpaceFragment(
                         rFilter, mxChartShapeInfo->maFragmentPath, aModel );
                 const OUString aThemeOverrideFragmentPath( pChartSpaceFragment->
                         getFragmentPathFromFirstTypeFromOfficeDoc(u"themeOverride") );
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 6ecd0985cd0a..93525ae4879a 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -909,12 +909,12 @@ namespace oox::ppt {
 
     }
 
-    TimeNodeContext * TimeNodeContext::makeContext(
+    rtl::Reference<TimeNodeContext> TimeNodeContext::makeContext(
             FragmentHandler2 const & rParent, sal_Int32  aElement,
             const Reference< XFastAttributeList >& xAttribs,
             const TimeNodePtr & pNode )
     {
-        TimeNodeContext *pCtx = nullptr;
+        rtl::Reference<TimeNodeContext> pCtx;
         switch( aElement )
         {
         case PPT_TOKEN( animClr ):
@@ -1039,7 +1039,7 @@ namespace oox::ppt {
 
         TimeNodePtr pNode = std::make_shared<TimeNode>(nNodeType);
         maList.push_back( pNode );
-        FragmentHandler2 * pContext = TimeNodeContext::makeContext( *this, aElementToken, rAttribs.getFastAttributeList(), pNode );
+        rtl::Reference<FragmentHandler2> pContext = TimeNodeContext::makeContext( *this, aElementToken, rAttribs.getFastAttributeList(), pNode );
 
         return pContext ? pContext : this;
     }


More information about the Libreoffice-commits mailing list