diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-05 12:40:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-05 12:47:23 +0100 |
| commit | 7078f667a3e39601c6d135e311de67fbab289a2b (patch) | |
| tree | 2cfdaf2d8c95f5d82d09a33f92c4d52fdd85250c /sd/inc | |
| parent | 0f86834bd5e2f8d8c7c7880c6f97273d45c599de (diff) | |
Don't hold refcounted objects by naked pointer
(and no need to hold css::uno::Sequence objects by pointer either). Regression
from e537d227d3a801076aff98c113650942fb6b3699 "hard to find accidental leaks
with all the deliberate ones" caused JunitTest_svx_unoapi to sometimes crash.
Change-Id: I3579c4bbac58d7e341c8acb52dd3f0f06f7b2245
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/sdmod.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index d2a64acb4118..d3ae1b2882e1 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -23,6 +23,7 @@ #include "glob.hxx" #include "pres.hxx" +#include <rtl/ref.hxx> #include <sot/storage.hxx> #include <tools/shl.hxx> #include "sddllapi.h" @@ -32,7 +33,7 @@ #include <sfx2/module.hxx> #include <vcl/vclevent.hxx> #include <sal/types.h> -#include <boost/ptr_container/ptr_map.hpp> +#include <map> #include <memory> class SdOptions; @@ -60,8 +61,8 @@ enum SdOptionStreamMode SD_OPTION_STORE = 1 }; -typedef boost::ptr_map< sal_uIntPtr, SfxExtItemPropertySetInfo > SdExtPropertySetInfoCache; -typedef boost::ptr_map< sal_uInt32, css::uno::Sequence< css::uno::Type> > SdTypesCache; +typedef std::map< sal_uIntPtr, rtl::Reference<SfxExtItemPropertySetInfo> > SdExtPropertySetInfoCache; +typedef std::map< sal_uInt32, css::uno::Sequence< css::uno::Type> > SdTypesCache; /* |