[Libreoffice-commits] core.git: sw/source

Noel Grandin noel.grandin at collabora.co.uk
Wed Oct 18 08:41:36 UTC 2017


 sw/source/core/unocore/unochart.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit cdd4b528a4d200aa322891373c80e2bc8e6cd16c
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Oct 18 09:22:56 2017 +0200

    use rtl::Reference in SwChartDataSequence
    
    instead of manual acquire/release
    
    Change-Id: I2d827b2f785b34b77adb95ac62afb885bb423879
    Reviewed-on: https://gerrit.libreoffice.org/43478
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 1d06634c6950..79439553fb34 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -1860,7 +1860,7 @@ SwChartDataSequence::SwChartDataSequence(
 {
     m_bDisposed = false;
 
-    acquire();
+    rtl::Reference<SwChartDataSequence> aSelfHold(this);
     try
     {
         const SwTable* pTable = SwTable::FindTable( &rTableFormat );
@@ -1876,13 +1876,11 @@ SwChartDataSequence::SwChartDataSequence(
     }
     catch (uno::RuntimeException &)
     {
-        // TODO: shouldn't there be a call to release() here?
         throw;
     }
     catch (uno::Exception &)
     {
     }
-    release();
 
 #if OSL_DEBUG_LEVEL > 0
     // check if it can properly convert into a SwUnoTableCursor
@@ -1906,7 +1904,7 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
 {
     m_bDisposed = false;
 
-    acquire();
+    rtl::Reference<SwChartDataSequence> aSelfHold(this);
     try
     {
         const SwTable* pTable = SwTable::FindTable( GetFrameFormat() );
@@ -1922,13 +1920,11 @@ SwChartDataSequence::SwChartDataSequence( const SwChartDataSequence &rObj ) :
     }
     catch (uno::RuntimeException &)
     {
-        // TODO: shouldn't there be a call to release() here?
         throw;
     }
     catch (uno::Exception &)
     {
     }
-    release();
 
 #if OSL_DEBUG_LEVEL > 0
     // check if it can properly convert into a SwUnoTableCursor


More information about the Libreoffice-commits mailing list