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

[Stephan Bergmann]

 sw/inc/doc.hxx                  |    5 +----
 sw/source/core/doc/docchart.cxx |    5 ++---
 sw/source/core/doc/docnew.cxx   |    2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 3f4ea7a6477c9314fd4b407035b56e7669527bf4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 16 14:40:02 2014 +0200

    rtl::Reference fits just fine here
    
    Change-Id: If06465ebad4083b8cdcd102ed0bbc6f61e78410f

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ee48178..7554ebf 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -60,7 +60,6 @@ class SwList;
 #include <sfx2/objsh.hxx>
 #include <svl/style.hxx>
 #include <editeng/numitem.hxx>
-#include <comphelper/implementationreference.hxx>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
@@ -365,9 +364,7 @@ class SW_DLLPUBLIC SwDoc :
     SwModify *mpUnoCallBack;
     IGrammarContact *mpGrammarContact;   //< for grammar checking in paragraphs during editing
 
-    mutable  comphelper::ImplementationReference< SwChartDataProvider
-        , ::com::sun::star::chart2::data::XDataProvider >
-                                maChartDataProviderImplRef;
+    mutable rtl::Reference<SwChartDataProvider> maChartDataProviderImplRef;
     SwChartLockController_Helper  *mpChartControllerHelper;
 
     // table of forbidden characters of this document
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 2f25fdb..9902337 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -204,10 +204,9 @@ SwChartDataProvider * SwDoc::GetChartDataProvider( bool bCreate ) const
     // we need a mutex here
     SolarMutexGuard aGuard;
 
-    if (bCreate && !maChartDataProviderImplRef.get())
+    if (bCreate && !maChartDataProviderImplRef.is())
     {
-        maChartDataProviderImplRef = comphelper::ImplementationReference< SwChartDataProvider
-            , chart2::data::XDataProvider >( new SwChartDataProvider( this ) );
+        maChartDataProviderImplRef = new SwChartDataProvider( this );
     }
     return maChartDataProviderImplRef.get();
 }
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 5266765..182d3af 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -431,7 +431,7 @@ SwDoc::~SwDoc()
     // Note: the chart data provider gets already disposed in ~SwDocShell
     // since all UNO API related functionality requires an existing SwDocShell
     // this assures that dipose gets called if there is need for it.
-    maChartDataProviderImplRef.reset();
+    maChartDataProviderImplRef.clear();
     delete mpChartControllerHelper;
 
     delete mpGrammarContact;