sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 1 +
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 1 +
sw/qa/extras/uiwriter/uiwriter4.cxx | 1 +
3 files changed, 3 insertions(+)
New commits:
commit 38358c6b1630d1d003e3a6e8289ab36bf4d40546
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Jan 28 18:51:49 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 28 20:32:27 2022 +0100
Fix --with-latest-c++ build
...after e53ad7928fc1cbe9950efebe41f1aa5a1a289439 "CppunitTest_sw_uiwriter*:
remove unused includes" and ba593f5fdfecd1b8b2036f99618b39e18facca55
"CppunitTest_sw_ooxmlexport*: remove unused includes" caused
> In file included from
workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:8,
> from include/test/bootstrapfixture.hxx:20,
> from sw/qa/inc/swmodeltestbase.hxx:26,
> from sw/qa/extras/ooxmlexport/ooxmlexport.cxx:10:
> workdir/UnpackedTarball/cppunit/include/cppunit/tools/StringHelper.h: In
instantiation of ‘typename std::enable_if<(! std::is_enum<_Tp>::value),
std::__cxx11::basic_string<char> >::type CppUnit::StringHelper::toString(const
T&) [with T = char16_t; typename std::enable_if<(! std::is_enum<_Tp>::value),
std::__cxx11::basic_string<char> >::type = std::__cxx11::basic_string<char>]’:
> workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:74:50:
required from ‘static std::string CppUnit::assertion_traits<T>::toString(const
T&) [with T = char16_t; std::string = std::__cxx11::basic_string<char>]’
> workdir/UnpackedTarball/cppunit/include/cppunit/TestAssert.h:168:58:
required from ‘void CppUnit::assertEquals(const T&, const T&, SourceLine, const
std::string&) [with T = char16_t; std::string =
std::__cxx11::basic_string<char>]’
> sw/qa/extras/ooxmlexport/ooxmlexport.cxx:967:5: required from here
>
workdir/UnpackedTarball/cppunit/include/cppunit/tools/StringHelper.h:25:9:
error: use of deleted function ‘std::basic_ostream<char, _Traits>&
std::operator<<(basic_ostream<char, _Traits>&, char16_t) [with _Traits =
char_traits<char>]’
> 25 | ost << x;
> | ~~~~^~~~
> In file included from
~/gcc/trunk/inst/include/c++/12.0.1/bits/unique_ptr.h:41,
> from ~/gcc/trunk/inst/include/c++/12.0.1/memory:76,
> from sw/qa/inc/swmodeltestbase.hxx:13:
> ~/gcc/trunk/inst/include/c++/12.0.1/ostream:558:5: note: declared here
> 558 | operator<<(basic_ostream<char, _Traits>&, char16_t) = delete;
> | ^~~~~~~~
etc.
Change-Id: I85087a8472eab923065ceb7ca6a1585f7ade75e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129118
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f6642444a105..3e44a2f869aa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/text/XTextFieldsSupplier.hpp>
#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
+#include <o3tl/cppunittraitshelper.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 4d4a4f60f383..9d3bed3d6b44 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/rdf/Statement.hpp>
#include <comphelper/processfactory.hxx>
+#include <o3tl/cppunittraitshelper.hxx>
#include <pam.hxx>
#include <unotxdoc.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter4.cxx
b/sw/qa/extras/uiwriter/uiwriter4.cxx
index 8f6c31f8ab45..5e916b6a43a6 100644
--- a/sw/qa/extras/uiwriter/uiwriter4.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter4.cxx
@@ -42,6 +42,7 @@
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/text/XPageCursor.hpp>
+#include <o3tl/cppunittraitshelper.hxx>
#include <osl/thread.hxx>
#include <txtfrm.hxx>
#include <hyp.hxx>
