cui/source/dialogs/QrCodeGenDialog.cxx | 12 ++++++++++++ external/zxing/UnpackedTarball_zxing.mk | 1 - external/zxing/deprecatedMultiFormatWriter.patch | 11 ----------- 3 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 77306dfdb89553860d5d93a3050f2003cf27b6e0 Author: Xisco Fauli <[email protected]> AuthorDate: Wed Feb 11 17:22:47 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Feb 12 09:24:59 2026 +0100 zxing-cpp: drop patch and use diagnostic pragmas instead Change-Id: I17ab5688288ec6371c20084e4a1d5f16fcacceef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199191 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index 155b95394f01..92a49a27216f 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -156,7 +156,19 @@ OString GenerateQRCode(std::u16string_view aQRText, tools::Long aQRECC, int aQRB OString o = OUStringToOString(aQRText, RTL_TEXTENCODING_UTF8); std::string QRText(o); ZXing::BarcodeFormat format = ZXing::BarcodeFormatFromString(GetBarCodeType(aQRType)); +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#else +#pragma warning(push) +#pragma warning(disable : 4996) +#endif auto writer = ZXing::MultiFormatWriter(format).setMargin(aQRBorder).setEccLevel(bqrEcc); +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#else +#pragma warning(pop) +#endif writer.setEncoding(ZXing::CharacterSet::UTF8); #if ZXING_VERSION_MAJOR >= 2 ZXing::BitMatrix bitmatrix = writer.encode(QRText, 0, 0); diff --git a/external/zxing/UnpackedTarball_zxing.mk b/external/zxing/UnpackedTarball_zxing.mk index 4f1863536e08..ca81d70c03c3 100644 --- a/external/zxing/UnpackedTarball_zxing.mk +++ b/external/zxing/UnpackedTarball_zxing.mk @@ -22,7 +22,6 @@ endif $(eval $(call gb_UnpackedTarball_add_patches,zxing, \ external/zxing/0001-add-ZXVersion-h.patch \ external/zxing/gcc12-format.patch \ - external/zxing/deprecatedMultiFormatWriter.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/zxing/deprecatedMultiFormatWriter.patch b/external/zxing/deprecatedMultiFormatWriter.patch deleted file mode 100644 index a9750068bff3..000000000000 --- a/external/zxing/deprecatedMultiFormatWriter.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zxing/core/src/MultiFormatWriter.h 2026-02-11 13:06:00.665958666 +0100 -+++ zxing/core/src/MultiFormatWriter.h 2026-02-11 13:06:08.693923744 +0100 -@@ -23,7 +23,7 @@ - class MultiFormatWriter - { - public: -- [[deprecated("use CreateBarcode()")]] explicit MultiFormatWriter(BarcodeFormat format) : _format(format) {} -+ explicit MultiFormatWriter(BarcodeFormat format) : _format(format) {} - - /** - * Used for Aztec, PDF417, and QRCode only.
