cui/source/dialogs/QrCodeGenDialog.cxx | 4 ++--
download.lst | 4 ++--
external/zxing/StaticLibrary_zxing.mk | 23 +++++++----------------
3 files changed, 11 insertions(+), 20 deletions(-)
New commits:
commit d53340b2253537104abe6f95c8c63cc74487c3ec
Author: homeboy445 <akshitsa...@gmail.com>
AuthorDate: Tue Sep 28 13:14:35 2021 +0530
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sat Oct 30 18:56:48 2021 +0200
Switch to a newer version of ZXing library
Change-Id: Ib2b919bb7545f05631aed2e6176a97aeb866ee84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122772
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 271d14999cbf..fad04c944ee0 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -105,9 +105,9 @@ std::string GetBarCodeType(const int& type)
switch (type)
{
case 1:
- return "CODE_128";
+ return "Code128";
default:
- return "QR_CODE";
+ return "QRCode";
}
}
diff --git a/download.lst b/download.lst
index 46184db628ee..561d4e5f5908 100644
--- a/download.lst
+++ b/download.lst
@@ -265,8 +265,8 @@ export ZLIB_SHA256SUM :=
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a211
export ZLIB_TARBALL := zlib-1.2.11.tar.xz
export ZMF_SHA256SUM :=
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
export ZMF_TARBALL := libzmf-0.0.2.tar.xz
-export ZXING_SHA256SUM :=
e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86
-export ZXING_TARBALL := zxing-cpp-1.1.1.tar.gz
+export ZXING_SHA256SUM :=
653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a
+export ZXING_TARBALL := zxing-cpp-1.2.0.tar.gz
NUMBERTEXT_EXTENSION_SHA256SUM :=
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
OPENSYMBOL_SHA256SUM :=
f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140
export CUCKOO_SHA256SUM :=
471dd83a813ed2816c2246c373004470ad0f6612c7ce72038929dc5161cdd58e
diff --git a/external/zxing/StaticLibrary_zxing.mk
b/external/zxing/StaticLibrary_zxing.mk
index 9a5ca26cc398..c80f37dc21b5 100644
--- a/external/zxing/StaticLibrary_zxing.mk
+++ b/external/zxing/StaticLibrary_zxing.mk
@@ -33,26 +33,28 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/BarcodeFormat \
UnpackedTarball/zxing/core/src/BitArray \
UnpackedTarball/zxing/core/src/BitMatrixIO \
+ UnpackedTarball/zxing/core/src/BinaryBitmap \
UnpackedTarball/zxing/core/src/BitMatrix \
UnpackedTarball/zxing/core/src/BitSource \
UnpackedTarball/zxing/core/src/textcodec/Big5TextDecoder \
UnpackedTarball/zxing/core/src/textcodec/Big5TextEncoder \
UnpackedTarball/zxing/core/src/textcodec/Big5MapTable \
UnpackedTarball/zxing/core/src/CharacterSetECI \
+ UnpackedTarball/zxing/core/src/ConcentricFinder \
UnpackedTarball/zxing/core/src/DecodeHints \
UnpackedTarball/zxing/core/src/DecodeStatus \
UnpackedTarball/zxing/core/src/datamatrix/DMWriter \
- UnpackedTarball/zxing/core/src/datamatrix/DMDefaultPlacement \
UnpackedTarball/zxing/core/src/datamatrix/DMDetector \
UnpackedTarball/zxing/core/src/datamatrix/DMVersion \
UnpackedTarball/zxing/core/src/datamatrix/DMSymbolInfo \
UnpackedTarball/zxing/core/src/datamatrix/DMDecoder \
- UnpackedTarball/zxing/core/src/datamatrix/DMBitMatrixParser \
UnpackedTarball/zxing/core/src/datamatrix/DMReader \
+ UnpackedTarball/zxing/core/src/datamatrix/DMBitLayout \
UnpackedTarball/zxing/core/src/datamatrix/DMDataBlock \
UnpackedTarball/zxing/core/src/datamatrix/DMECEncoder \
UnpackedTarball/zxing/core/src/datamatrix/DMHighLevelEncoder \
UnpackedTarball/zxing/core/src/GlobalHistogramBinarizer \
+ UnpackedTarball/zxing/core/src/GTIN \
UnpackedTarball/zxing/core/src/GenericGF \
UnpackedTarball/zxing/core/src/GridSampler \
UnpackedTarball/zxing/core/src/GenericLuminanceSource \
@@ -71,35 +73,29 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/maxicode/MCDecoder \
UnpackedTarball/zxing/core/src/maxicode/MCBitMatrixParser \
UnpackedTarball/zxing/core/src/maxicode/MCReader \
- UnpackedTarball/zxing/core/src/oned/ODUPCEANExtensionSupport \
UnpackedTarball/zxing/core/src/oned/ODUPCEWriter \
UnpackedTarball/zxing/core/src/oned/ODEAN8Writer \
UnpackedTarball/zxing/core/src/oned/ODWriterHelper \
UnpackedTarball/zxing/core/src/oned/ODITFWriter \
UnpackedTarball/zxing/core/src/oned/ODITFReader \
UnpackedTarball/zxing/core/src/oned/ODCode39Reader \
- UnpackedTarball/zxing/core/src/oned/ODRSSExpandedReader \
+ UnpackedTarball/zxing/core/src/oned/ODDataBarExpandedReader \
UnpackedTarball/zxing/core/src/oned/ODCode128Reader \
UnpackedTarball/zxing/core/src/oned/ODEAN13Writer \
- UnpackedTarball/zxing/core/src/oned/ODEANManufacturerOrgSupport \
UnpackedTarball/zxing/core/src/oned/ODMultiUPCEANReader \
- UnpackedTarball/zxing/core/src/oned/ODUPCEANReader \
UnpackedTarball/zxing/core/src/oned/ODCodabarWriter \
UnpackedTarball/zxing/core/src/oned/ODCode128Writer \
UnpackedTarball/zxing/core/src/oned/ODCode93Reader \
UnpackedTarball/zxing/core/src/oned/ODCodabarReader \
UnpackedTarball/zxing/core/src/oned/ODCode39Writer \
+ UnpackedTarball/zxing/core/src/oned/ODDataBarReader \
UnpackedTarball/zxing/core/src/oned/ODUPCEANCommon \
UnpackedTarball/zxing/core/src/oned/ODRowReader \
UnpackedTarball/zxing/core/src/oned/ODReader \
UnpackedTarball/zxing/core/src/oned/ODCode93Writer \
- UnpackedTarball/zxing/core/src/oned/ODUPCEReader \
UnpackedTarball/zxing/core/src/oned/ODCode128Patterns \
- UnpackedTarball/zxing/core/src/oned/ODEAN13Reader \
+ UnpackedTarball/zxing/core/src/oned/ODDataBarCommon \
UnpackedTarball/zxing/core/src/oned/ODUPCAWriter \
- UnpackedTarball/zxing/core/src/oned/ODRSS14Reader \
- UnpackedTarball/zxing/core/src/oned/ODUPCAReader \
- UnpackedTarball/zxing/core/src/oned/ODEAN8Reader \
UnpackedTarball/zxing/core/src/PerspectiveTransform \
UnpackedTarball/zxing/core/src/pdf417/PDFCodewordDecoder \
UnpackedTarball/zxing/core/src/pdf417/PDFHighLevelEncoder \
@@ -115,22 +111,17 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,zxing,\
UnpackedTarball/zxing/core/src/pdf417/PDFModulusPoly \
UnpackedTarball/zxing/core/src/pdf417/PDFDetector \
UnpackedTarball/zxing/core/src/pdf417/PDFBarcodeValue \
- UnpackedTarball/zxing/core/src/qrcode/QRFinderPatternFinder \
UnpackedTarball/zxing/core/src/qrcode/QRDecoder \
UnpackedTarball/zxing/core/src/qrcode/QRReader \
UnpackedTarball/zxing/core/src/qrcode/QRErrorCorrectionLevel \
- UnpackedTarball/zxing/core/src/qrcode/QRAlignmentPattern \
UnpackedTarball/zxing/core/src/qrcode/QRFormatInformation \
UnpackedTarball/zxing/core/src/qrcode/QREncoder \
- UnpackedTarball/zxing/core/src/qrcode/QRFinderPattern \
UnpackedTarball/zxing/core/src/qrcode/QRMaskUtil \
UnpackedTarball/zxing/core/src/qrcode/QRWriter \
- UnpackedTarball/zxing/core/src/qrcode/QRDataMask \
UnpackedTarball/zxing/core/src/qrcode/QRMatrixUtil \
UnpackedTarball/zxing/core/src/qrcode/QRDetector \
UnpackedTarball/zxing/core/src/qrcode/QRVersion \
UnpackedTarball/zxing/core/src/qrcode/QRCodecMode \
- UnpackedTarball/zxing/core/src/qrcode/QRAlignmentPatternFinder \
UnpackedTarball/zxing/core/src/qrcode/QRDataBlock \
UnpackedTarball/zxing/core/src/qrcode/QRBitMatrixParser \
UnpackedTarball/zxing/core/src/Result \
