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

Caolán McNamara caolanm at redhat.com
Sat Sep 26 05:35:43 PDT 2015


 sd/source/ui/inc/framework/ResourceId.hxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 82630bda21200ad32e13b2e5a0d24de00fd1c8c2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 26 12:14:13 2015 +0100

    boost->std
    
    Change-Id: I2c919e8bd17d16d1924524a18d2056daae8ef750
    Reviewed-on: https://gerrit.libreoffice.org/18882
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx
index e9ab84c..4dd11c4 100644
--- a/sd/source/ui/inc/framework/ResourceId.hxx
+++ b/sd/source/ui/inc/framework/ResourceId.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace {
 
@@ -171,9 +170,9 @@ private:
     /** The set of URLs that consist of the resource URL at index 0 and the
         anchor URLs and indices 1 and above.
     */
-    ::std::vector<OUString> maResourceURLs;
+    std::vector<OUString> maResourceURLs;
 
-    ::boost::scoped_ptr<css::util::URL> mpURL;
+    std::unique_ptr<css::util::URL> mpURL;
 
     static css::uno::WeakReference<css::util::XURLTransformer> mxURLTransformerWeak;
 


More information about the Libreoffice-commits mailing list