diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
| commit | d030c4a2a54418b17e87f837092a33eae21f0588 (patch) | |
| tree | dd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sd/source/ui/unoidl/facreg.cxx | |
| parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) | |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/source/ui/unoidl/facreg.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/facreg.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 8a7d894b60d0..0a553f9222d8 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -28,7 +28,7 @@ #include "sal/types.h" #include <string.h> -#include <memory> +#include <boost/shared_ptr.hpp> #include <unordered_map> using namespace com::sun::star; @@ -46,8 +46,8 @@ enum FactoryId typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap; namespace { -static std::shared_ptr<FactoryMap> spFactoryMap; -std::shared_ptr<FactoryMap> GetFactoryMap() +static ::boost::shared_ptr<FactoryMap> spFactoryMap; +::boost::shared_ptr<FactoryMap> GetFactoryMap() { if (spFactoryMap.get() == NULL) { @@ -76,7 +76,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sd_component_getFactory( uno::Reference<lang::XSingleServiceFactory> xFactory; uno::Reference<lang::XSingleComponentFactory> xComponentFactory; - std::shared_ptr<FactoryMap> pFactoryMap (GetFactoryMap()); + ::boost::shared_ptr<FactoryMap> pFactoryMap (GetFactoryMap()); OUString sImplementationName (OUString::createFromAscii(pImplName)); FactoryMap::const_iterator iFactory (pFactoryMap->find(sImplementationName)); if (iFactory != pFactoryMap->end()) |