diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 17:33:52 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 17:34:51 +0100 |
commit | de2d7448736384dfdab667a86330fcec37116c94 (patch) | |
tree | 176373c12a415c51cc8889ad065bb15cf9d4e975 /svx | |
parent | 0d4d89b6687fe7c735b22e56175abd2de2133798 (diff) |
Resolves: tdf#91542 crash on pressing return in sidebar line popup
Change-Id: I661a51f84827326dfc33a11a02f8065d68e8333a
(cherry picked from commit 2a6aa95a7af11eb091dfa9494cd810998b2e324d)
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 1 | ||||
-rw-r--r-- | svx/source/sidebar/tools/Popup.cxx | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 589247e35ee4..e7348a9c19c0 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -213,6 +213,7 @@ void LinePropertyPanel::dispose() mpFTCapStyle.clear(); mpLBCapStyle.clear(); + maLineWidthPopup.dispose(); maStyleControl.dispose(); maDashControl.dispose(); maWidthControl.dispose(); diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 71911a51ae72..3bd6246a5fcf 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -40,12 +40,17 @@ Popup::Popup ( OSL_ASSERT(maControlCreator); } -Popup::~Popup() +void Popup::dispose() { mxControl.disposeAndClear(); mxContainer.disposeAndClear(); } +Popup::~Popup() +{ + dispose(); +} + void Popup::Show (ToolBox& rToolBox) { rToolBox.SetItemDown(rToolBox.GetCurItemId(), true); |