cui/source/dialogs/QrCodeGenDialog.cxx | 5 +---- include/editeng/editids.hrc | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-)
New commits: commit 49e5a9d4c49a290eb64399e983ca7810ef4ed8f3 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Dec 29 19:30:32 2022 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Dec 30 13:07:39 2022 +0000 SID_ATTR_CHAR_COLOR is a SvxColorItem Change-Id: I24daf6ce37a09ef2b8fa33f1d28e43e1470d5014 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144867 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc index a418a3f889b5..b4e717620acf 100644 --- a/include/editeng/editids.hrc +++ b/include/editeng/editids.hrc @@ -24,6 +24,7 @@ class SfxGrabBagItem; class SfxUInt16Item; class SvxBrushItem; +class SvxColorItem; class SvxFontItem; class SvxKerningItem; class SvxLanguageItem; @@ -56,7 +57,7 @@ class SvxWeightItem; #define SID_ATTR_CHAR_UNDERLINE TypedWhichId<SvxUnderlineItem>( SID_SVX_START + 14 ) #define SID_ATTR_CHAR_FONTHEIGHT ( SID_SVX_START + 15 ) // free -#define SID_ATTR_CHAR_COLOR ( SID_SVX_START + 17 ) +#define SID_ATTR_CHAR_COLOR TypedWhichId<SvxColorItem>( SID_SVX_START + 17 ) #define SID_ATTR_CHAR_KERNING TypedWhichId<SvxKerningItem>( SID_SVX_START + 18 ) #define SID_ATTR_CHAR_CASEMAP ( SID_SVX_START + 19 ) #define SID_ATTR_CHAR_LANGUAGE ( SID_SVX_START + 20 ) commit 15e5d86cc55ad94ac946e04d5e25b84be5810970 Author: Brett T. Warden <brett.t.war...@intel.com> AuthorDate: Fri Dec 30 08:43:25 2022 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Dec 30 13:07:24 2022 +0000 Remove dependency on BitArray.h from zxing-1.2.0 In zxing-1.4.0, numerous headers are no longer public. Rework the ConvertToSVGFormat method so it uses bitmatrix.get instead of bitmatrix.getRow, similar to the ToSVG method in zxing itself. See https://github.com/zxing-cpp/zxing-cpp/issues/361 Change-Id: Ie25eb8f782e8799fbd57c24ef79bba92acf0f9ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144874 Tested-by: René Engelhard <r...@debian.org> Reviewed-by: René Engelhard <r...@debian.org> Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx index f8cbac1d758d..817be7f21ede 100644 --- a/cui/source/dialogs/QrCodeGenDialog.cxx +++ b/cui/source/dialogs/QrCodeGenDialog.cxx @@ -27,7 +27,6 @@ #endif #include <BarcodeFormat.h> -#include <BitArray.h> #include <BitMatrix.h> #include <MultiFormatWriter.h> #include <TextUtfEncoding.h> @@ -79,7 +78,6 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix) OStringBuffer sb; const int width = bitmatrix.width(); const int height = bitmatrix.height(); - ZXing::BitArray row(width); sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" "<svg xmlns=\"http://www.w3.org/2000/svg\"; version=\"1.1\" viewBox=\"0 0 " + OString::number(width) + " " + OString::number(height) @@ -87,10 +85,9 @@ OString ConvertToSVGFormat(const ZXing::BitMatrix& bitmatrix) "<path d=\""); for (int i = 0; i < height; ++i) { - bitmatrix.getRow(i, row); for (int j = 0; j < width; ++j) { - if (row.get(j)) + if (bitmatrix.get(j, i)) { sb.append("M" + OString::number(j) + "," + OString::number(i) + "h1v1h-1z"); }