diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-26 16:02:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-31 06:25:45 +0000 |
| commit | 0b23eec200c8c12db5778405df44f4bf8e38e4ad (patch) | |
| tree | ee45856fe1781195c51f63835024865f283cdab8 /sd | |
| parent | 88c03cd07a171e05c7fb4dcade8baa28e7c5a770 (diff) | |
teach refcounting clang plugin about uno::Reference
uno::Reference is only allowed to used with classes that have a
::static_type member.
So convert all those places to rtl::Reference.
Maybe we need some LIBO_INTERNAL_ONLY constructors on rtl::Reference and
uno::Reference to make this a little smoother?
Change-Id: Icdcb35d71ca40a87b1dc474096776412adbfc7e3
Reviewed-on: https://gerrit.libreoffice.org/25516
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/RemoteDialogClientBox.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/inc/EventMultiplexer.hxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews5.cxx | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index a4b072efb151..b2d5718285ca 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -105,7 +105,7 @@ class ClientBox : public Control VclPtr<ScrollBar> m_aScrollBar; - css::uno::Reference< ClientRemovedListener > m_xRemoveListener; + rtl::Reference< ClientRemovedListener > m_xRemoveListener; //This mutex is used for synchronizing access to m_vEntries. //Currently it is used to synchronize adding, removing entries and diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index 541f7e5aa721..f6f38ce0bffd 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -20,9 +20,11 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_EVENTMULTIPLEXER_HXX #define INCLUDED_SD_SOURCE_UI_INC_EVENTMULTIPLEXER_HXX +#include <sal/config.h> + +#include <rtl/ref.hxx> #include <svl/lstner.hxx> #include <tools/link.hxx> -#include <com/sun/star/uno/Reference.hxx> #include <set> #include <memory> @@ -203,7 +205,7 @@ public: private: class Implementation; - css::uno::Reference<Implementation> mpImpl; + rtl::Reference<Implementation> mpImpl; }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index d8dc8a28466e..de08b44f84a6 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -575,7 +575,7 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) // Tell the draw view and the tab control of the new active layer. mpDrawView->SetActiveLayer (pBar->GetPageText (pBar->GetPageId ((sal_uInt16)nIndex))); pBar->SetCurPageId (pBar->GetPageId ((sal_uInt16)nIndex)); - css::uno::Reference<SdUnoDrawView> pUnoDrawView(new SdUnoDrawView ( + rtl::Reference<SdUnoDrawView> pUnoDrawView(new SdUnoDrawView ( *this, *GetView())); css::uno::Reference< css::drawing::XLayer> rLayer = pUnoDrawView->getActiveLayer(); |