diff options
| author | Noel <noel.grandin@collabora.co.uk> | 2021-02-19 15:53:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-02-20 11:38:55 +0100 |
| commit | d8ed3bda462b351d2b98ec57cfdb879e0eec0010 (patch) | |
| tree | 10d3696813b853e6b90cf045d89b9203206004b9 /include/svx | |
| parent | a87fa0206bbcbcf9aa13ee17f6f41d34e176775e (diff) | |
loplugin:refcounting in svx
Change-Id: I79afd219a29ad176ce72020579d2b29a0b3ec09d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111220
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/fmgridif.hxx | 2 | ||||
| -rw-r--r-- | include/svx/tbcontrl.hxx | 3 | ||||
| -rw-r--r-- | include/svx/unoapi.hxx | 3 | ||||
| -rw-r--r-- | include/svx/unopage.hxx | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 2703b6a016d7..8db610a77414 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -310,7 +310,7 @@ public: virtual void SAL_CALL setFocus() override; protected: - virtual FmXGridPeer* imp_CreatePeer(vcl::Window* pParent); + virtual rtl::Reference<FmXGridPeer> imp_CreatePeer(vcl::Window* pParent); // ImplCreatePeer would be better, but doesn't work because it's not exported }; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index c020ccd52a8d..995bbb05a1cb 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -186,8 +186,7 @@ private: #define MAX_FAMILIES 5 SfxStyleSheetBasePool* pStyleSheetPool; - SfxStyleControllerItem_Impl* pBoundItems[MAX_FAMILIES]; - css::uno::Reference<css::lang::XComponent> m_xBoundItems[MAX_FAMILIES]; + rtl::Reference<SfxStyleControllerItem_Impl> m_xBoundItems[MAX_FAMILIES]; std::unique_ptr<SfxTemplateItem> pFamilyState[MAX_FAMILIES]; sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 693a15646497..3297eeaf6bba 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> +#include <rtl/ref.hxx> #include <sal/types.h> #include <svx/svxdllapi.h> #include <tools/fldunit.hxx> @@ -40,7 +41,7 @@ enum class SdrInventor : sal_uInt32; * * @throws css::uno::RuntimeException */ -SVXCORE_DLLPUBLIC SvxShape* CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer); +SVXCORE_DLLPUBLIC rtl::Reference<SvxShape> CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrInventor nInventor, OUString const & referer); /** Returns a StarOffice API wrapper for the given SdrObject */ SVXCORE_DLLPUBLIC css::uno::Reference< css::drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw (); diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index b3bf6bfe47d3..2308eb93ad06 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -30,6 +30,7 @@ #include <cppuhelper/basemutex.hxx> #include <svx/svxdllapi.h> #include <svx/svdobjkind.hxx> +#include <rtl/ref.hxx> #include <cppuhelper/implbase7.hxx> #include <comphelper/servicehelper.hxx> @@ -87,7 +88,7 @@ class SVXCORE_DLLPUBLIC SvxDrawPage : protected cppu::BaseMutex, virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ); /// @throws css::uno::RuntimeException - static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ); + static rtl::Reference<SvxShape> CreateShapeByTypeAndInventor( sal_uInt16 nType, SdrInventor nInventor, SdrObject *pObj, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ); // The following method is called if a SvxShape object is to be created. // Derived classes can create a derivation or an SvxShape aggregating object. |