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

Derrick Rocha drocha616 at gmail.com
Sat Sep 12 23:22:15 PDT 2015


 sc/inc/cellsuno.hxx               |    3 +--
 sc/source/ui/unoobj/cellsuno.cxx  |    4 +---
 sc/source/ui/unoobj/chart2uno.cxx |    4 +---
 sc/source/ui/unoobj/dapiuno.cxx   |    3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit d8707b06e4b5a1dc6934ba4c15774d370eed6535
Author: Derrick Rocha <drocha616 at gmail.com>
Date:   Fri Sep 11 11:27:46 2015 -0600

    replace boost::ptr_vector with std::vector<std::unique_ptr>
    
    Change-Id: Id9419f23dde4d93dde78398207dcf5c38e87f450
    Reviewed-on: https://gerrit.libreoffice.org/18046
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 7496a47f..d721b29 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -89,7 +89,6 @@
 #include <com/sun/star/sheet/XExternalSheetName.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/scoped_ptr.hpp>
 
 #include <vector>
@@ -119,7 +118,7 @@ public:
 
 typedef ::com::sun::star::uno::Reference<
             ::com::sun::star::util::XModifyListener > XModifyListenerRef;
-typedef boost::ptr_vector<XModifyListenerRef> XModifyListenerArr_Impl;
+typedef std::vector<XModifyListenerRef> XModifyListenerArr_Impl;
 
 //  ScCellRangesBase - base class for ScCellRangesObj (with access by index)
 //                                and ScCellRangeObj  (without access by index)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a2c83b4..0263843 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3413,9 +3413,7 @@ void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XMo
     if ( aRanges.empty() )
         throw uno::RuntimeException();
 
-    uno::Reference<util::XModifyListener> *pObj =
-            new uno::Reference<util::XModifyListener>( aListener );
-    aValueListeners.push_back( pObj );
+    aValueListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) );
 
     if ( aValueListeners.size() == 1 )
     {
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index e0efaaf..a2b870c3 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3347,9 +3347,7 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
 
     ScRangeList aRanges;
     ScRefTokenHelper::getRangeListFromTokens(aRanges, *m_pTokens, ScAddress());
-    uno::Reference<util::XModifyListener> *pObj =
-            new uno::Reference<util::XModifyListener>( aListener );
-    m_aValueListeners.push_back( pObj );
+    m_aValueListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) );
 
     if ( m_aValueListeners.size() == 1 )
     {
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index fa9d99d..bad5abf 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1302,8 +1302,7 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util:
 {
     SolarMutexGuard aGuard;
 
-    uno::Reference<util::XModifyListener> *pObj = new uno::Reference<util::XModifyListener>( aListener );
-    aModifyListeners.push_back( pObj );
+    aModifyListeners.push_back( uno::Reference<util::XModifyListener>( aListener ) );
 
     if ( aModifyListeners.size() == 1 )
     {


More information about the Libreoffice-commits mailing list