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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 764b4e7b42791f82237c334ab123d1ae68cec898
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Aug 22 20:06:58 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 23 10:00:19 2021 +0200

    gtk4: fix build
    
    since...
    
    commit 0f6457b1e867c49bc82f2b18e2e462fb7100051f
    Date:   Sat Aug 21 17:04:39 2021 +0200
    
        don't store vcl::Font with unique_ptr
    
    Change-Id: Ib7db1a59ec328d0a387d836d813c05910a30ebc8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120854
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index fc56dfaecda0..618772dc1921 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9832,7 +9832,7 @@ public:
 
     virtual void set_font(const vcl::Font& rFont) override
     {
-        m_xFont.reset(new vcl::Font(rFont));
+        m_xFont = rFont;
         GtkWidget* pChild = ::get_label_widget(GTK_WIDGET(m_pMenuButton));
         ::set_font(GTK_LABEL(pChild), rFont);
     }
@@ -18832,7 +18832,7 @@ public:
 
     virtual void set_entry_font(const vcl::Font& rFont) override
     {
-        m_xFont.reset(new vcl::Font(rFont));
+        m_xFont = rFont;
         assert(m_pEntry);
         PangoAttrList* pOrigList = 
gtk_entry_get_attributes(GTK_ENTRY(m_pEntry));
         PangoAttrList* pAttrList = pOrigList ? pango_attr_list_copy(pOrigList) 
: pango_attr_list_new();