[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Feb 11 15:10:35 UTC 2019


 cui/source/inc/cuitabline.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 04a6277f40727bf814c67a75e55ce3a6dcbc6bec
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 11 10:31:43 2019 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Feb 11 16:10:14 2019 +0100

    Resolves: tdf#123309 destroy menu before menubutton
    
    Change-Id: Ib6b179c460bed4ffdcc2678294633004bbae816a
    Reviewed-on: https://gerrit.libreoffice.org/67678
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 284a0e656a55..bd26683b7963 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -148,8 +148,6 @@ private:
     std::unique_ptr<weld::MetricSpinButton> m_xMtrEndWidth;
     std::unique_ptr<weld::CheckButton> m_xTsbCenterEnd;
     std::unique_ptr<weld::CheckButton> m_xCbxSynchronize;
-    std::unique_ptr<weld::Menu> m_xGalleryMenu;
-    std::unique_ptr<weld::Menu> m_xSymbolsMenu;
     std::unique_ptr<weld::CustomWeld> m_xCtlPreview;
 
     std::unique_ptr<weld::Widget> m_xFLEdgeStyle;
@@ -162,6 +160,8 @@ private:
     std::unique_ptr<weld::Widget> m_xFlSymbol;
     std::unique_ptr<weld::Widget> m_xGridIconSize;
     std::unique_ptr<weld::MenuButton> m_xSymbolMB;
+    std::unique_ptr<weld::Menu> m_xSymbolsMenu;
+    std::unique_ptr<weld::Menu> m_xGalleryMenu;
     std::unique_ptr<weld::MetricSpinButton> m_xSymbolWidthMF;
     std::unique_ptr<weld::MetricSpinButton> m_xSymbolHeightMF;
     std::unique_ptr<weld::CheckButton> m_xSymbolRatioCB;


More information about the Libreoffice-commits mailing list