[Libreoffice-commits] core.git: Branch 'private/jmux/qt5_fixes' - vcl/qa

Jan-Marek Glogowski glogow at fbihome.de
Fri Jul 6 09:01:59 UTC 2018


Rebased ref, commits from common ancestor:
commit 8ca8f8df8080debd21f138d5f549c5e4668ad3e7
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Jul 6 09:44:21 2018 +0200

    loplugin:externandnotdefined + loplugin:unreffun
    
    Change-Id: I364cfdb3b26096d986b651bd3e0673fa3dbf5f83

diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 97d156d4f8e8..cf1027f0810c 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -7,10 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_test.h>
+
 #include <ostream>
 #include <vector>
-#if !defined(_WIN32)
-std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
+#if !defined(_WIN32) && !TEST_FONTS_MISSING
+static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
 #endif
 
 #include <unotest/filters-test.hxx>
@@ -23,10 +25,8 @@ std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
 #include <osl/file.hxx>
 #include <osl/process.h>
 
-#include <config_test.h>
-
-#if !defined(_WIN32)
-std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
+#if !defined(_WIN32) && !TEST_FONTS_MISSING
+static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
 {
     rStream << "{ ";
     for (size_t i = 0; i < rVec.size() - 1; i++)
@@ -42,8 +42,10 @@ class VclComplexTextTest : public test::BootstrapFixture
 public:
     VclComplexTextTest() : BootstrapFixture(true, false) {}
 
+#if !TEST_FONTS_MISSING
     /// Play with font measuring etc.
     void testArabic();
+#endif
 #if defined(_WIN32)
     void testTdf95650(); // Windows-only issue
 #endif


More information about the Libreoffice-commits mailing list