[Libreoffice-commits] core.git: 2 commits - sc/uiconfig vcl/qa

[Stephan Bergmann (via logerrit)]

 sc/uiconfig/scalc/ui/cellprotectionpage.ui |    1 -
 vcl/qa/cppunit/svm/svmtest.cxx             |    4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c1abdd5ad801a48e104fe8596cfbde5b3d4aa453
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jun 25 10:21:01 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jun 25 21:10:04 2021 +0200

    loplugin:unreffun (clang-cl)
    
    Change-Id: Iee87fb5b62a5489f001890dc97a44dfe447080e5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117838
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index a95c249c96bf..c260a974282d 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -166,7 +166,9 @@ class SvmTest : public test::BootstrapFixture, public XmlTestTools
     void checkMapMode(const GDIMetaFile& rMetaFile);
     void testMapMode();
 
+#if HAVE_MORE_FONTS && !defined(_WIN32)
     void checkFont(const GDIMetaFile& rMetaFile);
+#endif
     void testFont();
 
     void checkPushPop(const GDIMetaFile& rMetaFile);
@@ -1890,6 +1892,7 @@ void SvmTest::testMapMode()
     checkMapMode(readFile(u"mapmode.svm"));
 }
 
+#if HAVE_MORE_FONTS && !defined(_WIN32)
 void SvmTest::checkFont(const GDIMetaFile& rMetafile)
 {
     xmlDocUniquePtr pDoc = dumpMeta(rMetafile);
@@ -1905,6 +1908,7 @@ void SvmTest::checkFont(const GDIMetaFile& rMetafile)
         {"vertical", "true"},
     });
 }
+#endif
 
 void SvmTest::testFont()
 {
commit 9b2dca857efea82722f82b20de68b7dc9c439fb6
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jun 25 16:35:58 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jun 25 21:09:52 2021 +0200

    unused always-show-image in GtkCheckButton
    
    Change-Id: I876072cf5b4fe276959467efe9e9ee2cd66eafb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117906
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/uiconfig/scalc/ui/cellprotectionpage.ui b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
index 22662a55d721..17581b7deb14 100644
--- a/sc/uiconfig/scalc/ui/cellprotectionpage.ui
+++ b/sc/uiconfig/scalc/ui/cellprotectionpage.ui
@@ -77,7 +77,6 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
-                <property name="always_show_image">True</property>
                 <property name="inconsistent">True</property>
                 <property name="draw_indicator">True</property>
                 <child internal-child="accessible">