diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-04 09:28:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-04 11:11:02 +0000 |
| commit | e537d227d3a801076aff98c113650942fb6b3699 (patch) | |
| tree | 6bd828b1cfd46b3f21fa58162ec77b421669c52a /sd/inc | |
| parent | 8af6c125226b55af21efd60edc6ed59a9214fa8c (diff) | |
hard to find accidental leaks with all the deliberate ones
so make these globals belong to the SfxModule which gets
torn down before exit
Change-Id: Iad655f8726ba6784a5d606ef469522950906360a
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/sdmod.hxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index d339c09ce2f5..d2a64acb4118 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -26,11 +26,13 @@ #include <sot/storage.hxx> #include <tools/shl.hxx> #include "sddllapi.h" +#include <svl/itemprop.hxx> #include <svl/lstner.hxx> #include <com/sun/star/text/WritingMode.hpp> #include <sfx2/module.hxx> #include <vcl/vclevent.hxx> #include <sal/types.h> +#include <boost/ptr_container/ptr_map.hpp> #include <memory> class SdOptions; @@ -58,6 +60,9 @@ 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; + /* This subclass of <SfxModule> (which is a subclass of <SfxShell>) is @@ -122,6 +127,10 @@ public: virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE; virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE; + SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; + SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache; + SdTypesCache gImplTypesCache; + protected: SdOptions* pImpressOptions; |