[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svx svx/source

[Caolán McNamara]

 include/svx/sidebar/Popup.hxx                 |    2 ++
 svx/source/sidebar/line/LinePropertyPanel.cxx |    1 +
 svx/source/sidebar/tools/Popup.cxx            |    7 ++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit de2d7448736384dfdab667a86330fcec37116c94
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue May 26 17:33:52 2015 +0100

    Resolves: tdf#91542 crash on pressing return in sidebar line popup
    
    Change-Id: I661a51f84827326dfc33a11a02f8065d68e8333a
    (cherry picked from commit 2a6aa95a7af11eb091dfa9494cd810998b2e324d)

diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
index 4fd74d1..ebd91bb 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -75,6 +75,8 @@ public :
     */
     void SetPopupModeEndHandler (const ::boost::function<void()>& rCallback);
 
+    void dispose();
+
 protected:
     VclPtr<PopupControl> mxControl;
 
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 589247e..e7348a9 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 71911a5..3bd6246 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);