cui/source/dialogs/QrCodeGenDialog.cxx | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
New commits: commit 246490068cac44cf1544623e2183403a09a6d7b0 Author: Xisco Fauli <[email protected]> AuthorDate: Thu Feb 12 09:52:05 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Thu Feb 12 11:45:22 2026 +0100 zxing-cpp: use SAL_WNODEPRECATED_DECLARATIONS instead after commit 77306dfdb89553860d5d93a3050f2003cf27b6e0 Author: Xisco Fauli <[email protected]> Date: Wed Feb 11 17:22:47 2026 +0100 zxing-cpp: drop patch and use diagnostic pragmas instead Thanks to Stephan Bergmann for the suggestion Change-Id: Ib12d174e284bb0e32069133109cf369ae2f3803a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199239 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index 92a49a27216f..b06dbb45de3b 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -156,19 +156,9 @@ 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 + SAL_WNODEPRECATED_DECLARATIONS_PUSH auto writer = ZXing::MultiFormatWriter(format).setMargin(aQRBorder).setEccLevel(bqrEcc); -#ifdef __GNUC__ -#pragma GCC diagnostic pop -#else -#pragma warning(pop) -#endif + SAL_WNODEPRECATED_DECLARATIONS_POP writer.setEncoding(ZXing::CharacterSet::UTF8); #if ZXING_VERSION_MAJOR >= 2 ZXing::BitMatrix bitmatrix = writer.encode(QRText, 0, 0);
