diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-02 14:53:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-06 07:01:51 +0000 |
| commit | 7d1b01070c330d45212cd69ea692b2263c23c2a6 (patch) | |
| tree | 7ae6ecdd69cd3d8b6ce4431a39034186695497c0 /include/xmloff | |
| parent | 9f138ffe9da2f448a455f4b51facab82e5e243d7 (diff) | |
remove some manual ref counting in svx and xmloff
Change-Id: Ica0b6ff8ff7fa9e65cd758160d6e3ea7110ebb46
Reviewed-on: https://gerrit.libreoffice.org/25824
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/xmloff')
| -rw-r--r-- | include/xmloff/shapeimport.hxx | 12 | ||||
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index aa4a7b4765f6..db54f5cb1ebd 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -270,9 +270,9 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public salhelper::SimpleReferenceO XMLShapeImportPageContextImpl* mpPageContext; // PropertySetMappers and factory - XMLSdPropHdlFactory* mpSdPropHdlFactory; - SvXMLImportPropertyMapper* mpPropertySetMapper; - SvXMLImportPropertyMapper* mpPresPagePropsMapper; + rtl::Reference<XMLSdPropHdlFactory> mpSdPropHdlFactory; + rtl::Reference<SvXMLImportPropertyMapper> mpPropertySetMapper; + rtl::Reference<SvXMLImportPropertyMapper> mpPresPagePropsMapper; // contexts for Style and AutoStyle import SvXMLStylesContext* mpStylesContext; @@ -341,8 +341,8 @@ public: void SetAutoStylesContext(SvXMLStylesContext* pNew); // get factories and mappers - SvXMLImportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper; } - SvXMLImportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper; } + SvXMLImportPropertyMapper* GetPropertySetMapper() const { return mpPropertySetMapper.get(); } + SvXMLImportPropertyMapper* GetPresPagePropsMapper() const { return mpPresPagePropsMapper.get(); } // this function is called whenever the implementation classes like to add this new // shape to the given XShapes. @@ -409,7 +409,7 @@ public: /** queries the capability of the current model to create presentation shapes */ bool IsPresentationShapesSupported(); - XMLSdPropHdlFactory* GetSdPropHdlFactory() const { return mpSdPropHdlFactory; } + XMLSdPropHdlFactory* GetSdPropHdlFactory() const { return mpSdPropHdlFactory.get(); } const rtl::Reference< XMLTableImport >& GetShapeTableImport(); }; diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 2261e4759d67..7827177518fc 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -151,7 +151,7 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper7< ProgressBarHelper *mpProgressBarHelper; XMLEventImportHelper *mpEventImportHelper; XMLErrors *mpXMLErrors; - StyleMap *mpStyleMap; + rtl::Reference<StyleMap> mpStyleMap; OUString msPackageProtocol; SAL_DLLPRIVATE void InitCtor_(); |