summaryrefslogtreecommitdiff
path: root/extensions/source/resource
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-18 11:51:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-09-18 14:27:53 +0000
commit1de1b63c2243c8b89789a180bfeed3bbb2ff01ae (patch)
tree7071cc0e77e2813db8cab0a7806008b5ae690a9d /extensions/source/resource
parent335704695d15f53518a614060e60821c8e1cf279 (diff)
boost->std
Change-Id: Id55e334156628a916ce15fca8ec618eed0ae9366 Reviewed-on: https://gerrit.libreoffice.org/18683 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions/source/resource')
-rw-r--r--extensions/source/resource/ResourceIndexAccess.cxx14
-rw-r--r--extensions/source/resource/ResourceIndexAccess.hxx4
-rw-r--r--extensions/source/resource/oooresourceloader.cxx4
3 files changed, 11 insertions, 11 deletions
diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx
index 9b47ae23fb30..403aaf4b9c99 100644
--- a/extensions/source/resource/ResourceIndexAccess.cxx
+++ b/extensions/source/resource/ResourceIndexAccess.cxx
@@ -26,21 +26,21 @@ using namespace ::com::sun::star::container;
namespace
{
- static ::boost::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
+ static std::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs)
{
if(rArgs.getLength()!=1)
- return ::boost::shared_ptr<ResMgr>();
+ return std::shared_ptr<ResMgr>();
OUString sFilename;
rArgs[0] >>= sFilename;
SolarMutexGuard aGuard;
const OString sEncName(OUStringToOString(sFilename, osl_getThreadTextEncoding()));
- return ::boost::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr()));
+ return std::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr()));
}
class ResourceIndexAccessBase : public cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess>
{
public:
- ResourceIndexAccessBase( ::boost::shared_ptr<ResMgr> pResMgr)
+ ResourceIndexAccessBase( std::shared_ptr<ResMgr> pResMgr)
: m_pResMgr(pResMgr)
{
OSL_ENSURE(m_pResMgr, "no resource manager given");
@@ -55,13 +55,13 @@ namespace
protected:
// m_pResMgr should never be NULL
- const ::boost::shared_ptr<ResMgr> m_pResMgr;
+ const std::shared_ptr<ResMgr> m_pResMgr;
};
class ResourceStringIndexAccess : public ResourceIndexAccessBase
{
public:
- ResourceStringIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr)
+ ResourceStringIndexAccess( std::shared_ptr<ResMgr> pResMgr)
: ResourceIndexAccessBase(pResMgr) {}
// XIndexAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -73,7 +73,7 @@ namespace
class ResourceStringListIndexAccess : public ResourceIndexAccessBase
{
public:
- ResourceStringListIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr)
+ ResourceStringListIndexAccess( std::shared_ptr<ResMgr> pResMgr)
: ResourceIndexAccessBase(pResMgr) {}
// XIndexAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx
index 596c0afd390d..97a6a49c361f 100644
--- a/extensions/source/resource/ResourceIndexAccess.hxx
+++ b/extensions/source/resource/ResourceIndexAccess.hxx
@@ -11,12 +11,12 @@
#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX
-#include <boost/shared_ptr.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <cppuhelper/implbase.hxx>
+#include <memory>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
@@ -46,7 +46,7 @@ namespace extensions { namespace resource
private:
// m_pResMgr should never be NULL
- const ::boost::shared_ptr<ResMgr> m_pResMgr;
+ const std::shared_ptr<ResMgr> m_pResMgr;
};
}}
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index edba15919be8..08158fd0f062 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -26,8 +26,8 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
-#include <boost/shared_ptr.hpp>
#include <map>
+#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::resource;
@@ -94,7 +94,7 @@ namespace extensions { namespace resource
class OpenOfficeResourceBundle : public OpenOfficeResourceBundle_Base
{
private:
- typedef ::boost::shared_ptr< IResourceType > ResourceTypePtr;
+ typedef std::shared_ptr< IResourceType > ResourceTypePtr;
typedef ::std::map< OUString, ResourceTypePtr > ResourceTypes;
::osl::Mutex m_aMutex;