emfio/qa/cppunit/emf/EmfImportTest.cxx | 8 ++++----
emfio/qa/cppunit/wmf/data/TestPalette.wmf |binary
svtools/source/control/valueset.cxx | 8 ++++++++
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 676ba2babff95da3ac41205bc96d1bf252496d6f
Author: Bartosz Kosiorek <gan...@poczta.onet.pl>
AuthorDate: Thu May 27 19:38:50 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri May 28 11:21:43 2021 +0200
tdf#117957 WMF Replace ellipses with rects to fix tests on arm64
The issue is caused by floating numbers,
On x86_64 it is:
338.499728160392-445.269903703769
on arm it is:
338.499728160392-445.26990370377
As in test files, we have two ellipses (which are made from small lines),
which points rounds differently on different architectures
Change-Id: I44dd5c7b3b13f3b1680d5a3a8348d6f467cb2f7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116270
Tested-by: Jenkins
Tested-by: René Engelhard <r...@debian.org>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116314
Reviewed-by: Bartosz Kosiorek <gan...@poczta.onet.pl>
(cherry picked from commit a1168e2c58daf2efde944970472c67c46c2e8c03)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116161
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 53be54f34c02..2e8523e5d999 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -474,25 +474,25 @@ void Test::TestPalette()
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polypolygoncolor", 2);
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polypolygoncolor[1]/polypolygon",
- "path", "m2433 1216.5c0 213.540351086756-56.2099207528522
423.318631225821-162.98009629623 608.25s-260.338534929591
338.499728160392-445.269903703769 445.26990370377-394.709648913244
162.98009629623-608.25
162.98009629623-423.318631225821-56.2099207528518-608.25-162.98009629623-338.499728160392-260.338534929591-445.26990370377-445.26990370377-162.980096296231-394.709648913244-162.980096296231-608.25c-2.70117261891301E-013-213.540351086756
56.2099207528519-423.318631225821 162.98009629623-608.25
106.770175543378-184.931368774179 260.338534929591-338.499728160392
445.269903703769-445.26990370377s394.709648913244-162.980096296231
608.25-162.980096296231c213.540351086756-5.40234523782601E-013 423.318631225821
56.2099207528518 608.25 162.98009629623s338.499728160392 260.338534929591
445.26990370377 445.269903703769c106.770175543379 184.931368774179
162.980096296231 394.709648913244 162.980096296231 608.25z");
+ "path", "m0 0h3015v3015h-3015z");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polypolygoncolor[1]",
"color", "#ffff00");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polypolygoncolor[2]/polypolygon",
- "path", "m5079 3862.5c0 213.540351086756-56.2099207528527
423.318631225821-162.980096296231 608.25s-260.33853492959
338.499728160391-445.269903703769 445.269903703769-394.709648913244
162.980096296231-608.25
162.980096296231-423.318631225821-56.2099207528518-608.25-162.98009629623-338.499728160391-260.33853492959-445.26990370377-445.269903703769-162.980096296231-394.709648913245-162.980096296231-608.250000000001c-4.54747350886464E-013-213.540351086756
56.2099207528518-423.318631225821 162.98009629623-608.25
106.770175543378-184.931368774179 260.33853492959-338.499728160392
445.269903703769-445.26990370377s394.709648913244-162.980096296231
608.25-162.980096296231c213.540351086756-4.54747350886464E-013 423.318631225821
56.2099207528522 608.25 162.98009629623s338.499728160392 260.33853492959
445.26990370377 445.269903703769c106.770175543378 184.931368774178
162.980096296231 394.709648913244 162.980096296231 608.25z");
+ "path", "m2222 2222h2698v2698h-2698z");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polypolygoncolor[2]",
"color", "#0080ff");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke", 2);
assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/polygon",
- "2408,1191 2406,1129 2402,1068 2394,1007 2383,946
2369,886 2352,827 2332,768 2309,711 2284,655 2255,600 2224,547 2190,496
2153,446 2114,398 2073,353 2029,309 1984,268 1936,229 1886,192 1835,158
1782,127 1727,98 1671,73 1614,50 1555,30 1496,13 1436,-1 1375,-12 1314,-20
1253,-24 1191,-26 1191,-26 1129,-24 1068,-20 1007,-12 946,-1 886,13 827,30
768,50 711,73 655,98 600,127 547,158 496,192 446,229 398,268 353,309 309,353
268,398 229,446 192,496 158,547 127,600 98,655 73,711 50,768 30,827 13,886
-1,946 -12,1007 -20,1068 -24,1129 -26,1191 -26,1191 -24,1253 -20,1314 -12,1375
-1,1436 13,1496 30,1555 50,1614 73,1671 98,1727 127,1782 158,1835 192,1886
229,1936 268,1984 309,2029 353,2073 398,2114 446,2153 496,2190 547,2224
600,2255 655,2284 711,2309 768,2332 827,2352 886,2369 946,2383 1007,2394
1068,2402 1129,2406 1191,2408 1191,2408 1253,2406 1314,2402 1375,2394 1436,2383
1496,2369 1555,2352 1614,2332 1671,2309 1727,2284 1782,2255 1835,2224 1886,2190
1936,2153 1984,2114
2029,2073 2073,2029 2114,1984 2153,1936 2190,1886 2224,1835 2255,1782
2284,1727 2309,1671 2332,1614 2352,1555 2369,1496 2383,1436 2394,1375 2402,1314
2406,1253");
+ "0,0 3015,0 3015,3015 0,3015");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/line",
"color", "#ff0000");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[1]/line",
"width", "132");
assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/polygon",
- "5053,3836 5051,3774 5047,3713 5039,3652 5028,3591
5014,3531 4997,3472 4977,3413 4954,3356 4929,3300 4900,3245 4869,3192 4835,3141
4798,3091 4759,3043 4718,2998 4674,2954 4629,2913 4581,2874 4531,2837 4480,2803
4427,2772 4372,2743 4316,2718 4259,2695 4200,2675 4141,2658 4081,2644 4020,2633
3959,2625 3898,2621 3836,2619 3836,2619 3774,2621 3713,2625 3652,2633 3591,2644
3531,2658 3472,2675 3413,2695 3356,2718 3300,2743 3245,2772 3192,2803 3141,2837
3091,2874 3043,2913 2998,2954 2954,2998 2913,3043 2874,3091 2837,3141 2803,3192
2772,3245 2743,3300 2718,3356 2695,3413 2675,3472 2658,3531 2644,3591 2633,3652
2625,3713 2621,3774 2619,3836 2619,3836 2621,3898 2625,3959 2633,4020 2644,4081
2658,4141 2675,4200 2695,4259 2718,4316 2743,4372 2772,4427 2803,4480 2837,4531
2874,4581 2913,4629 2954,4674 2998,4718 3043,4759 3091,4798 3141,4835 3192,4869
3245,4900 3300,4929 3356,4954 3413,4977 3472,4997 3531,5014 3591,5028 3652,5039
3713,5047 3774,5051 3836,5053 3836,5053 389
8,5051 3959,5047 4020,5039 4081,5028 4141,5014 4200,4997 4259,4977 4316,4954
4372,4929 4427,4900 4480,4869 4531,4835 4581,4798 4629,4759 4674,4718 4718,4674
4759,4629 4798,4581 4835,4531 4869,4480 4900,4427 4929,4372 4954,4316 4977,4259
4997,4200 5014,4141 5028,4081 5039,4020 5047,3959 5051,3898");
+ "2222,2222 4920,2222 4920,4920 2222,4920");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/line",
"color", "#ff0000");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/polygonstroke[2]/line",
diff --git a/emfio/qa/cppunit/wmf/data/TestPalette.wmf
b/emfio/qa/cppunit/wmf/data/TestPalette.wmf
index 222809df5ff9..079a7f64f496 100644
Binary files a/emfio/qa/cppunit/wmf/data/TestPalette.wmf and
b/emfio/qa/cppunit/wmf/data/TestPalette.wmf differ
commit 3b7c4b60121ccbe8bd0890651c2c4dc5b425d61c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 25 13:24:29 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 28 11:21:33 2021 +0200
tdf#142479 on 'return' select the entry the cursor is in before calling
Select
Change-Id: Ic11f8a12c93d1999dd6fbe555b9823660eb703d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115968
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
(cherry picked from commit eb5b345172516b31ec43e226c242e536e93a3413)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115971
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index c9a94de237a1..1d961ad4ad32 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -425,6 +425,14 @@ bool ValueSet::KeyInput( const KeyEvent& rKeyEvent )
case KEY_RETURN:
if (GetStyle() & WB_NO_DIRECTSELECT)
{
+ // tdf#142479 on return select the entry the cursor is in
+ // before calling Select
+ if (nCurPos != VALUESET_ITEM_NONEITEM)
+ {
+ const sal_uInt16 nItemId = GetItemId(nCurPos);
+ if (nItemId != mnSelItemId)
+ SelectItem(nItemId);
+ }
Select();
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
