[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtkinst.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 76507ce885893dff1d39945a204cffa4ab5fd3cb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 28 11:11:07 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri May 28 14:57:28 2021 +0200

    gtk4: 'events' property is redundant now
    
    Change-Id: I1819dcaec3835a6e1ca2c54f7ac14804b407c613
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116323
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 4980eee59062..58041169e175 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -20511,6 +20511,9 @@ ConvertResult Convert3To4(const Reference<css::xml::dom::XNode>& xNode)
             if (sName == "icon-name")
                 bHasIconName = true;
 
+            if (sName == "events")
+                xRemoveList.push_back(xChild);
+
             if (sName == "activates-default")
             {
                 if (GetParentObjectType(xChild) == "GtkSpinButton")
@@ -21878,6 +21881,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString&
         rUIFile != "modules/scalc/ui/solverdlg.ui" &&
         rUIFile != "modules/scalc/ui/xmlsourcedialog.ui" &&
         rUIFile != "modules/smath/ui/alignmentdialog.ui" &&
+        rUIFile != "modules/smath/ui/catalogdialog.ui" &&
         rUIFile != "modules/smath/ui/fontsizedialog.ui" &&
         rUIFile != "modules/smath/ui/savedefaultsdialog.ui" &&
         rUIFile != "modules/swriter/ui/gotopagedialog.ui" &&