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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 9545b26cbb16..72f86a5d7ddf 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -105,6 +105,7 @@ void ConditionColorWrapper::operator()(const OUString& /*rCommand*/, const Named Condition::Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController ) : VclHBox(_pParent) + , m_xPaletteManager(new PaletteManager) , m_aColorWrapper(this) , m_rController(_rController) , m_rAction(_rAction) @@ -231,7 +232,7 @@ IMPL_LINK(Condition, DropdownClick, ToolBox*, pToolBox, void) m_aColorWrapper.SetSlotId(nSlotId); m_pColorFloat = VclPtr<SvxColorWindow>::Create( OUString() /*m_aCommandURL*/, - m_aPaletteManager, + m_xPaletteManager, m_aBorderColorStatus, nSlotId, nullptr, diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 6abd8aa07435..f770928ee7e5 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -87,7 +87,7 @@ namespace rptui sal_uInt16 m_nBackgroundColorId; sal_uInt16 m_nFontColorId; sal_uInt16 m_nFontDialogId; - PaletteManager m_aPaletteManager; + std::shared_ptr<PaletteManager> m_xPaletteManager; BorderColorStatus m_aBorderColorStatus; ConditionColorWrapper m_aColorWrapper; |