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

[Noel Grandin (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit f11195aa32035ceeb1271667f5ad5e35847acd0e
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 17 15:48:38 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jun 18 13:33:18 2021 +0200

    avoid maybe-uninitialised in FontConfig
    
    triggers inside the std::optional<PrintFont> with gcc 10.2.0
    
    Change-Id: Id34e46ddfff447cb48b886003f04203979c30732
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117399
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 66f09ffc9102..184f000c0a43 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -17,6 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#if defined __GNUC__ && !defined __clang_ && __GNUC__ >= 10
+// gcc 10.2.0 gets unhappy about one of the OString inside PrintFont at line 656
+// I have to turn it off here because the warning actually occurs inside rtl::OString
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
 #include <memory>
 #include <string_view>