diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-09 13:32:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-09 21:32:33 +0100 |
| commit | ff89d2216a26a57e0682f6a80e5eade6dabd499a (patch) | |
| tree | bdad67241b3972d533f988089451f9f0e8809661 /include | |
| parent | 6dc1087b37a9ce5bc9b728d6a23fef69a66bb3d2 (diff) | |
Resolves: tdf#113695 crash in color picker after parent is closed
Change-Id: If2217abed784bf24e37e3403fa33cd2663dc51a4
Reviewed-on: https://gerrit.libreoffice.org/44545
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/colorbox.hxx | 2 | ||||
| -rw-r--r-- | include/svx/colorwindow.hxx | 4 | ||||
| -rw-r--r-- | include/svx/tbcontrl.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index 7b0f8905249c..f9655b28bc27 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -39,7 +39,7 @@ private: NamedColor m_aSelectedColor; sal_uInt16 m_nSlotId; bool m_bShowNoneButton; - std::unique_ptr<PaletteManager> m_xPaletteManager; + std::shared_ptr<PaletteManager> m_xPaletteManager; BorderColorStatus m_aBorderColorStatus; DECL_LINK(MenuActivateHdl, MenuButton *, void); diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index a782307df9fa..467acf31aaae 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -64,7 +64,7 @@ private: OUString maCommand; Link<const NamedColor&, void> maSelectedLink; - PaletteManager& mrPaletteManager; + std::shared_ptr<PaletteManager> mxPaletteManager; BorderColorStatus& mrBorderColorStatus; ColorSelectFunction maColorSelectFunction; @@ -80,7 +80,7 @@ private: public: SvxColorWindow(const OUString& rCommand, - PaletteManager& rPaletteManager, + std::shared_ptr<PaletteManager>& rPaletteManager, BorderColorStatus& rBorderColorStatus, sal_uInt16 nSlotId, const css::uno::Reference< css::frame::XFrame >& rFrame, diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index b9b8eb0db7b1..c5784bba03bc 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -209,7 +209,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public cppu::ImplInheritanceHelper< css::frame::XSubToolbarController > { std::unique_ptr<svx::ToolboxButtonColorUpdater> m_xBtnUpdater; - std::unique_ptr<PaletteManager> m_xPaletteManager; + std::shared_ptr<PaletteManager> m_xPaletteManager; BorderColorStatus m_aBorderColorStatus; bool m_bSplitButton; sal_uInt16 m_nSlotId; |