basctl/source/basicide/baside2.hxx | 3 +
basctl/source/basicide/baside2b.cxx | 19 ++++++-
icon-themes/colibre/cmd/32/grafblue.png |binary
icon-themes/colibre/cmd/32/grafgreen.png |binary
icon-themes/colibre/cmd/32/grafred.png |binary
icon-themes/colibre/cmd/lc_circlepie.png |binary
icon-themes/colibre/cmd/lc_grafblue.png |binary
icon-themes/colibre/cmd/lc_grafgreen.png |binary
icon-themes/colibre/cmd/lc_grafred.png |binary
icon-themes/colibre_svg/cmd/32/grafblue.svg | 2
icon-themes/colibre_svg/cmd/32/grafgreen.svg | 2
icon-themes/colibre_svg/cmd/32/grafred.svg | 2
icon-themes/colibre_svg/cmd/lc_circlepie.png |binary
icon-themes/colibre_svg/cmd/lc_grafblue.svg | 2
icon-themes/colibre_svg/cmd/lc_grafgreen.svg | 2
icon-themes/colibre_svg/cmd/lc_grafred.svg | 2
include/xmloff/xmltoken.hxx | 3 -
sc/qa/uitest/autofilter/data/tdf130770.ods |binary
sc/qa/uitest/autofilter/tdf130070.py | 73 +++++++++++++++++++++++++++
sc/source/ui/view/gridwin.cxx | 37 +++++--------
xmloff/source/core/xmltoken.cxx | 3 -
xmloff/source/token/tokens.txt | 3 -
22 files changed, 121 insertions(+), 32 deletions(-)
New commits:
commit d7d352e1692f4819742e419ea8b9577eb8b8c0ec
Author: himajin100000 <himajin100...@gmail.com>
AuthorDate: Tue May 19 14:32:52 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat May 23 09:54:55 2020 +0200
meta:non-whitespace-character-count attribute is known
also, fixed a typo and re-positioned the item to the correct index.
Change-Id: Ibac232a9e6851a0c59884bc82ead5de36ac2e391
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94454
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit acfd959f0b4069b74e76213e4118af9827005fff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94460
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index dfc9ad5ced3d..2a385278a072 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1315,8 +1315,8 @@ namespace xmloff { namespace token {
XML_NOEMPTY,
XML_NOHREF,
XML_NOMATCH,
+ XML_NON_WHITESPACE_CHARACTER_COUNT,
XML_NONE,
- XML_NOPRTSUBSET,
XML_NORMAL,
XML_NORMALS_DIRECTION,
XML_NORMALS_KIND,
@@ -1326,6 +1326,7 @@ namespace xmloff { namespace token {
XML_NOTE,
XML_NOTES,
XML_NOTIN,
+ XML_NOTPRSUBSET,
XML_NOTSUBSET,
XML_NULL_DATE,
XML_NULL_YEAR,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index b37e90f0b568..9ef0203dedf8 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1317,8 +1317,8 @@ namespace xmloff { namespace token {
TOKEN( "!empty", XML_NOEMPTY ),
TOKEN( "nohref", XML_NOHREF ),
TOKEN( "!match", XML_NOMATCH ),
+ TOKEN( "non-whitespace-character-count",
XML_NON_WHITESPACE_CHARACTER_COUNT ),
TOKEN( "none", XML_NONE ),
- TOKEN( "notprsubset", XML_NOPRTSUBSET ),
TOKEN( "normal", XML_NORMAL ),
TOKEN( "normals-direction", XML_NORMALS_DIRECTION ),
TOKEN( "normals-kind", XML_NORMALS_KIND ),
@@ -1328,6 +1328,7 @@ namespace xmloff { namespace token {
TOKEN( "note", XML_NOTE ),
TOKEN( "notes", XML_NOTES ),
TOKEN( "notin", XML_NOTIN ),
+ TOKEN( "notprsubset", XML_NOTPRSUBSET ),
TOKEN( "notsubset", XML_NOTSUBSET ),
TOKEN( "null-date", XML_NULL_DATE ),
TOKEN( "null-year", XML_NULL_YEAR ),
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index ef2aaca8ea77..e0244941123a 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1235,8 +1235,8 @@ no-wrap
NOEMPTY_DUMMY
nohref
NOMATCH_DUMMY
+non-whitespace-character-count
none
-notprsubset
normal
normals-direction
normals-kind
@@ -1246,6 +1246,7 @@ notation
note
notes
notin
+notprsubset
notsubset
null-date
null-year
commit dde26793d8c8a30801542508743f05aeebe2568f
Author: Rizal Muttaqin <riz_17_...@yahoo.co.id>
AuthorDate: Fri May 22 05:59:00 2020 +0700
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat May 23 09:54:47 2020 +0200
Colibre: tdf#133250 inconsisten colors icons
Change-Id: I2f362e0f0463d7201f0168f7d9a8bdd0c408ac61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94653
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
(cherry picked from commit defdbb87a67e2a48ecebf28d71e9b9576ef67c1e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94670
Reviewed-by: Rizal Muttaqin <riz_17_...@yahoo.co.id>
diff --git a/icon-themes/colibre/cmd/32/grafblue.png
b/icon-themes/colibre/cmd/32/grafblue.png
index 243b782c8d74..7ba2ae46464c 100644
Binary files a/icon-themes/colibre/cmd/32/grafblue.png and
b/icon-themes/colibre/cmd/32/grafblue.png differ
diff --git a/icon-themes/colibre/cmd/32/grafgreen.png
b/icon-themes/colibre/cmd/32/grafgreen.png
index fe204eea1d46..2b57ea7aca70 100644
Binary files a/icon-themes/colibre/cmd/32/grafgreen.png and
b/icon-themes/colibre/cmd/32/grafgreen.png differ
diff --git a/icon-themes/colibre/cmd/32/grafred.png
b/icon-themes/colibre/cmd/32/grafred.png
index 741003b8a09d..5ad3ed799728 100644
Binary files a/icon-themes/colibre/cmd/32/grafred.png and
b/icon-themes/colibre/cmd/32/grafred.png differ
diff --git a/icon-themes/colibre/cmd/lc_circlepie.png
b/icon-themes/colibre/cmd/lc_circlepie.png
index 2d0dc590f367..2cb0d63033d0 100644
Binary files a/icon-themes/colibre/cmd/lc_circlepie.png and
b/icon-themes/colibre/cmd/lc_circlepie.png differ
diff --git a/icon-themes/colibre/cmd/lc_grafblue.png
b/icon-themes/colibre/cmd/lc_grafblue.png
index 280c784e7f46..9efa8a00e976 100644
Binary files a/icon-themes/colibre/cmd/lc_grafblue.png and
b/icon-themes/colibre/cmd/lc_grafblue.png differ
diff --git a/icon-themes/colibre/cmd/lc_grafgreen.png
b/icon-themes/colibre/cmd/lc_grafgreen.png
index 4ac5394b42ca..2e43d29831a6 100644
Binary files a/icon-themes/colibre/cmd/lc_grafgreen.png and
b/icon-themes/colibre/cmd/lc_grafgreen.png differ
diff --git a/icon-themes/colibre/cmd/lc_grafred.png
b/icon-themes/colibre/cmd/lc_grafred.png
index 97bbcceeb704..d1c5a1093f5b 100644
Binary files a/icon-themes/colibre/cmd/lc_grafred.png and
b/icon-themes/colibre/cmd/lc_grafred.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/grafblue.svg
b/icon-themes/colibre_svg/cmd/32/grafblue.svg
index 6be19fb9b932..7424f880c9f2 100644
--- a/icon-themes/colibre_svg/cmd/32/grafblue.svg
+++ b/icon-themes/colibre_svg/cmd/32/grafblue.svg
@@ -1 +1 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path
d="m16.100847 4c-6.511858 0-12.100847 5.5382681-12.100847 12 0 6.461732
5.588989 12 12.100847 12 1.231991 0 2.515061-.34598
3.989106-.782422.826771-.404562 1.215512-.957021
1.287056-2.033789.05298-.797354-.242786-1.740401-.583398-2.833593-.340611-1.093192-.711495-2.3373-.639689-3.750196.05225-1.027932.75379-1.759862
1.896041-2.035173 1.142251-.27531 2.934713-.07863
4.797303.937623.636907.366047.993273.515541
1.125854-1.167969.03554-1.183637.07119-2.586502-.28914-3.810457-1.491839-4.76436-6.291059-8.524024-11.583133-8.524024z"
fill="#fff"/><path d="m16.100847 3c-7.2353979 0-13.1008469
5.8202976-13.1008469 13 0 7.179701 5.865449 13 13.1008469 13 1.537525 0
3.307034-.02374 4.569944-.616992 1.178498-.576672 1.919096-1.688306
2.013744-3.112891.07656-1.15242-.304213-2.226606-.639691-3.30332-.335477-1.076713-.641696-2.153586-.583396-3.300782.02895-.56964.249408-.917666.898124-1.074023.648715-.156356
1.839743-.0065 3.536205.9
19141.420529.229445.829195.355641 1.240998.335156.411803-.02049.796938-.214327
1.056768-.482422.519661-.536188.674382-1.261043.759952-2.016016.145803-1.355871.046505-2.894974-.299369-4.075198-1.614917-5.3629615-6.623534-9.272653-12.553279-9.272653zm0
1c5.292074 0 10.091294 3.759664 11.583133 8.524024.360324 1.223955.324639
2.62682.289095 3.810457-.0711.627325-.264203 1.11748-.401724
1.259375-.06877.07094-.08948.08199-.176555.08633 0
0-.258935-.04542-.547575-.177733-1.625301-.745066-3.655052-1.212934-4.797303-.937624-1.142251.275312-1.843801
1.007241-1.896041 2.035173-.07181 1.412896.299078 2.657004.63969
3.750196.340611 1.093192.636372 2.036239.583397 2.833593-.07154
1.076768-.301738 1.682077-1.128509
2.086638-1.222031.597449-2.915617.729571-4.147608.729571-6.511858
0-12.100847-5.538268-12.100847-12 0-6.4617319 5.588989-12 12.100847-12z"
fill="#808080"/><g fill="#4d82b8"><circle cx="11" cy="10" r="2"/><circle
cx="18" cy="9" r="2"/><circle cx="23" cy="13" r="2"/><circle cx="9" cy="17
" r="2"/></g><path d="m16 21a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0
0 0 -2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1-1 1 1 0 0 1 1-1z"
fill="#808080"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><g fill="#4d82b8"
stroke-width="1.737178"><path d="m15.131411
2.9864326c-6.8426141.4571906-12.1594299 6.1404276-12.1602464 12.9982994.00133
2.474759.7074614 4.897956 2.0357555 6.986034l10.1244909-7.427114z"/><path
d="m16.868589 3v12.543647l10.114313 7.42033c1.33064-2.085046 2.04027-4.505788
2.045933-6.979245-.007991-6.8526411-5.322845-12.5278889-12.160246-12.984732z"/><path
d="m16 17.063683-9.9582377 7.301576c2.4715736 2.942068 6.1157887 4.643116
9.9582377 4.648308 3.84609.000495 7.495889-1.698355
9.971809-4.641522z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/grafgreen.svg
b/icon-themes/colibre_svg/cmd/32/grafgreen.svg
index f867f85da760..f37d17bdfe76 100644
--- a/icon-themes/colibre_svg/cmd/32/grafgreen.svg
+++ b/icon-themes/colibre_svg/cmd/32/grafgreen.svg
@@ -1 +1 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path
d="m16.100847 4c-6.511858 0-12.100847 5.5382681-12.100847 12 0 6.461732
5.588989 12 12.100847 12 1.231991 0 2.515061-.34598
3.989106-.782422.826771-.404562 1.215512-.957021
1.287056-2.033789.05298-.797354-.242786-1.740401-.583398-2.833593-.340611-1.093192-.711495-2.3373-.639689-3.750196.05225-1.027932.75379-1.759862
1.896041-2.035173 1.142251-.27531 2.934713-.07863
4.797303.937623.636907.366047.993273.515541
1.125854-1.167969.03554-1.183637.07119-2.586502-.28914-3.810457-1.491839-4.76436-6.291059-8.524024-11.583133-8.524024z"
fill="#fff"/><path d="m16.100847 3c-7.2353979 0-13.1008469
5.8202976-13.1008469 13 0 7.179701 5.865449 13 13.1008469 13 1.537525 0
3.307034-.02374 4.569944-.616992 1.178498-.576672 1.919096-1.688306
2.013744-3.112891.07656-1.15242-.304213-2.226606-.639691-3.30332-.335477-1.076713-.641696-2.153586-.583396-3.300782.02895-.56964.249408-.917666.898124-1.074023.648715-.156356
1.839743-.0065 3.536205.9
19141.420529.229445.829195.355641 1.240998.335156.411803-.02049.796938-.214327
1.056768-.482422.519661-.536188.674382-1.261043.759952-2.016016.145803-1.355871.046505-2.894974-.299369-4.075198-1.614917-5.3629615-6.623534-9.272653-12.553279-9.272653zm0
1c5.292074 0 10.091294 3.759664 11.583133 8.524024.360324 1.223955.324639
2.62682.289095 3.810457-.0711.627325-.264203 1.11748-.401724
1.259375-.06877.07094-.08948.08199-.176555.08633 0
0-.258935-.04542-.547575-.177733-1.625301-.745066-3.655052-1.212934-4.797303-.937624-1.142251.275312-1.843801
1.007241-1.896041 2.035173-.07181 1.412896.299078 2.657004.63969
3.750196.340611 1.093192.636372 2.036239.583397 2.833593-.07154
1.076768-.301738 1.682077-1.128509
2.086638-1.222031.597449-2.915617.729571-4.147608.729571-6.511858
0-12.100847-5.538268-12.100847-12 0-6.4617319 5.588989-12 12.100847-12z"
fill="#808080"/><g fill="#76a797"><circle cx="11" cy="10" r="2"/><circle
cx="18" cy="9" r="2"/><circle cx="23" cy="13" r="2"/><circle cx="9" cy="17
" r="2"/></g><path d="m16 21a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0
0 0 -2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1-1 1 1 0 0 1 1-1z"
fill="#808080"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><g fill="#76a797"
stroke-width="1.737178"><path d="m15.131411
2.9864326c-6.8426141.4571906-12.1594299 6.1404276-12.1602464 12.9982994.00133
2.474759.7074614 4.897956 2.0357555 6.986034l10.1244909-7.427114z"/><path
d="m16.868589 3v12.543647l10.114313 7.42033c1.33064-2.085046 2.04027-4.505788
2.045933-6.979245-.007991-6.8526411-5.322845-12.5278889-12.160246-12.984732z"/><path
d="m16 17.063683-9.9582377 7.301576c2.4715736 2.942068 6.1157887 4.643116
9.9582377 4.648308 3.84609.000495 7.495889-1.698355
9.971809-4.641522z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/grafred.svg
b/icon-themes/colibre_svg/cmd/32/grafred.svg
index ed163b33b782..368b60045f94 100644
--- a/icon-themes/colibre_svg/cmd/32/grafred.svg
+++ b/icon-themes/colibre_svg/cmd/32/grafred.svg
@@ -1 +1 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path
d="m16.100847 4c-6.511858 0-12.100847 5.5382681-12.100847 12 0 6.461732
5.588989 12 12.100847 12 1.231991 0 2.515061-.34598
3.989106-.782422.826771-.404562 1.215512-.957021
1.287056-2.033789.05298-.797354-.242786-1.740401-.583398-2.833593-.340611-1.093192-.711495-2.3373-.639689-3.750196.05225-1.027932.75379-1.759862
1.896041-2.035173 1.142251-.27531 2.934713-.07863
4.797303.937623.636907.366047.993273.515541
1.125854-1.167969.03554-1.183637.07119-2.586502-.28914-3.810457-1.491839-4.76436-6.291059-8.524024-11.583133-8.524024z"
fill="#fff"/><path d="m16.100847 3c-7.2353979 0-13.1008469
5.8202976-13.1008469 13 0 7.179701 5.865449 13 13.1008469 13 1.537525 0
3.307034-.02374 4.569944-.616992 1.178498-.576672 1.919096-1.688306
2.013744-3.112891.07656-1.15242-.304213-2.226606-.639691-3.30332-.335477-1.076713-.641696-2.153586-.583396-3.300782.02895-.56964.249408-.917666.898124-1.074023.648715-.156356
1.839743-.0065 3.536205.9
19141.420529.229445.829195.355641 1.240998.335156.411803-.02049.796938-.214327
1.056768-.482422.519661-.536188.674382-1.261043.759952-2.016016.145803-1.355871.0574-2.810892-.299369-4.075198-1.614917-5.3629615-6.623534-9.272653-12.553279-9.272653zm0
1c5.292074 0 10.091294 3.759664 11.583133 8.524024.360324 1.223955.324639
2.62682.289095 3.810457-.0711.627325-.264203 1.11748-.401724
1.259375-.06877.07094-.08948.08199-.176555.08633 0
0-.258935-.04542-.547575-.177733-1.625301-.745066-3.655052-1.212934-4.797303-.937624-1.142251.275312-1.843801
1.007241-1.896041 2.035173-.07181 1.412896.299078 2.657004.63969
3.750196.340611 1.093192.636372 2.036239.583397 2.833593-.07154
1.076768-.460285 1.629228-1.287056
2.033789-1.474044.436438-2.75707.78242-3.989061.78242-6.511858
0-12.100847-5.538268-12.100847-12 0-6.4617319 5.588989-12 12.100847-12z"
fill="#808080"/><g fill="#e68497"><circle cx="11" cy="10" r="2"/><circle
cx="18" cy="9" r="2"/><circle cx="23" cy="13" r="2"/><circle cx="9" cy="17" r="
2"/></g><path d="m16 21a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0 0
-2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1-1 1 1 0 0 1 1-1z"
fill="#808080"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><g fill="#e68497"
stroke-width="1.737178"><path d="m15.131411
2.9864326c-6.8426141.4571906-12.1594299 6.1404276-12.1602464 12.9982994.00133
2.474759.7074614 4.897956 2.0357555 6.986034l10.1244909-7.427114z"/><path
d="m16.868589 3v12.543647l10.114313 7.42033c1.33064-2.085046 2.04027-4.505788
2.045933-6.979245-.007991-6.8526411-5.322845-12.5278889-12.160246-12.984732z"/><path
d="m16 17.063683-9.9582377 7.301576c2.4715736 2.942068 6.1157887 4.643116
9.9582377 4.648308 3.84609.000495 7.495889-1.698355
9.971809-4.641522z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_circlepie.png
b/icon-themes/colibre_svg/cmd/lc_circlepie.png
new file mode 100644
index 000000000000..2cb0d63033d0
Binary files /dev/null and b/icon-themes/colibre_svg/cmd/lc_circlepie.png differ
diff --git a/icon-themes/colibre_svg/cmd/lc_grafblue.svg
b/icon-themes/colibre_svg/cmd/lc_grafblue.svg
index 5591dd813470..1d6d77a4da52 100644
--- a/icon-themes/colibre_svg/cmd/lc_grafblue.svg
+++ b/icon-themes/colibre_svg/cmd/lc_grafblue.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m12
3c-4.9705627 0-9 4.0294373-9 9 0 4.970563 4.0294373 9 9 9 .94039 0
1.91977-.03537
3.044922-.371094.631082-.311201.927812-.73617.982422-1.564453.04044-.613349-.185321-1.33877-.445313-2.179687s-.543091-1.797923-.488281-2.884766c.03988-.790717.575375-1.536269
1.447266-1.748047.871891-.211777 1.994283.021
3.416015.802735.486157.281574.758175.39657.859375-.898438.02713-.91049.05434-1.888574-.220703-2.8300781-1.138735-3.6648919-4.556213-6.3261719-8.595703-6.3261719zm0
13c1.104569 0 2 .895431 2 2s-.895431 2-2 2-2-.895431-2-2 .895431-2 2-2z"
fill="#fff"/><path d="m12 16a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0
0 -2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1-1 1 1 0 0 1 1-1z"
fill="#808080"/><path d="m12 2c-5.5228475 0-10 4.4771525-10 10 0 5.522847
4.4771525 10 10 10 1.173607 0 2.52429-.01826 3.488281-.474609.899559-.443594
1.464864-1.298697
1.53711-2.394532.05844-.886477-.232209-1.712774-.488282-2.54101
5s-.489813-1.656605-.445312-2.539063c.0221-.438185.190376-.705897.685547-.826172.49517-.120274
1.404293-.005
2.699218.707032.320994.176496.632933.27357.947266.257812.314333-.01576.60831-.164867.806641-.371094.396662-.412452.514762-.970033.580078-1.550781.111293-1.042978-.059685-2.162225-.228511-3.1347681-1.232681-4.1253554-5.055806-7.1328099-9.582036-7.1328099zm0
1c4.03949 0 7.456968 2.66128 8.595703 6.3261719.275039.9415041.2478
1.9195881.220669
2.8300781-.05427.482558-.201669.8596-.30664.96875-.05249.05457-.0683.06307-.134766.06641-.06646.0033-.20521-.01973-.417969-.136718-1.421732-.781732-2.544124-1.014512-3.416015-.802735-.871891.211778-1.407391.95733-1.447266
1.748047-.05481 1.086843.228289 2.043849.488281 2.884766s.485749
1.566338.445313 2.179687c-.05461.828283-.35134 1.253252-.982422
1.564453-1.125152.335719-2.104498.37109-3.044888.37109-4.9705627
0-9-4.029437-9-9 0-4.9705627 4.0294373-9 9-9z" fill="#808080"/><g
fill="#4d82b8"><circle cx="8.5" cy="7.5" r="1.5"/><circle cx="13
.5" cy="6.5" r="1.5"/><circle cx="17.5" cy="9.5" r="1.5"/><circle cx="6.5"
cy="12.5" r="1.5"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><g
fill="#4d82b8"><path d="m12 2v9.744141l8.306641 5.816406c1.102579-1.644961
1.691934-3.58025 1.693359-5.560547 0-5.5228475-4.477153-10-10-10z"/><path
d="m11.492188 12
.0078.01172c.01972-.01695-.0045-.0068-.0078-.01172zm.007812.615234-7.5566406
5.289063c1.8802174 2.570174 4.8721485 4.091163 8.0566406 4.095703 2.98383-.002
5.810872-1.336409 7.708984-3.638672z"/><path d="m11
2.0605469c-5.1058961.513159-8.9946519 4.8078375-9 9.9394531.00453
1.783585.4860115 3.533501 1.3945312 5.068359l7.6054688-5.324218z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_grafgreen.svg
b/icon-themes/colibre_svg/cmd/lc_grafgreen.svg
index bf8d5c358a85..1df5ee4d0fe6 100644
--- a/icon-themes/colibre_svg/cmd/lc_grafgreen.svg
+++ b/icon-themes/colibre_svg/cmd/lc_grafgreen.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m12
3c-4.9705627 0-9 4.02944-9 9s4.0294373 9 9 9c.94039 0 1.91977-.0354
3.044922-.37109.631082-.3112.927812-.73617.982422-1.56446.04044-.61335-.185321-1.33877-.445313-2.17968-.259992-.84092-.543091-1.79793-.488281-2.88477.03988-.79072.575375-1.53627
1.447266-1.74805.871891-.21177 1.994283.021
3.416015.80274.486157.28157.758175.39657.859375-.89844.02713-.91049.05434-1.88857-.220703-2.83008-1.138735-3.66489-4.556213-6.32617-8.595703-6.32617zm0
13c1.104569 0 2 .89543 2 2s-.895431 2-2 2-2-.89543-2-2 .895431-2 2-2z"
fill="#fff"/><path d="m12 16a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0
0 -2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1-1 1 1 0 0 1 1-1z"
fill="#808080"/><path d="m12 2c-5.5228475 0-10 4.47715-10 10s4.4771525 10 10
10c1.173607 0 2.52429-.0183 3.488281-.47461.899559-.44359 1.464864-1.2987
1.53711-2.39453.05844-.88648-.232209-1.71277-.488282-2.54102-.256073-.82824-.489813-1.6566-.445312-2.53906.0
221-.43818.190376-.7059.685547-.82617.49517-.12028 1.404293-.005
2.699218.70703.320994.1765.632933.27357.947266.25781.314333-.0158.60831-.16486.806641-.37109.396662-.41245.514762-.97003.580078-1.55078.111293-1.04298-.05968-2.16223-.228511-3.13477-1.232681-4.12536-5.055806-7.13281-9.582036-7.13281zm0
1c4.03949 0 7.456968 2.66128 8.595703 6.32617.275039.94151.2478 1.91959.220669
2.83008-.05427.48256-.201669.8596-.30664.96875-.05249.0546-.0683.0631-.134766.0664-.06646.003-.20521-.0197-.417969-.13672-1.421732-.78173-2.544124-1.01451-3.416015-.80273s-1.407391.95733-1.447266
1.74804c-.05481 1.08685.228289 2.04385.488281 2.88477s.485749 1.56634.445313
2.17969c-.05461.82828-.35134 1.25325-.982422
1.56445-1.125152.33573-2.104498.3711-3.044888.3711-4.9705627
0-9-4.02944-9-9s4.0294373-9 9-9z" fill="#808080"/><g fill="#76a797"><circle
cx="8.5" cy="7.5" r="1.5"/><circle cx="13.5" cy="6.5" r="1.5"/><circle
cx="17.5" cy="9.5" r="1.5"/><circle cx="6.5" cy="12.5" r="1.5"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><g
fill="#76a797"><path d="m12 2v9.744141l8.306641 5.816406c1.102579-1.644961
1.691934-3.58025 1.693359-5.560547 0-5.5228475-4.477153-10-10-10z"/><path
d="m11.492188 12
.0078.01172c.01972-.01695-.0045-.0068-.0078-.01172zm.007812.615234-7.5566406
5.289063c1.8802174 2.570174 4.8721485 4.091163 8.0566406 4.095703 2.98383-.002
5.810872-1.336409 7.708984-3.638672z"/><path d="m11
2.0605469c-5.1058961.513159-8.9946519 4.8078375-9 9.9394531.00453
1.783585.4860115 3.533501 1.3945312 5.068359l7.6054688-5.324218z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_grafred.svg
b/icon-themes/colibre_svg/cmd/lc_grafred.svg
index 28d9b05c7239..469a6e85cfc6 100644
--- a/icon-themes/colibre_svg/cmd/lc_grafred.svg
+++ b/icon-themes/colibre_svg/cmd/lc_grafred.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m12
3c-4.9705627 0-9 4.02944-9 9s4.0294373 9 9 9c.94039 0 1.91977-.0354
3.044922-.37109.631082-.3112.927812-.73617.982422-1.56446.04044-.61335-.185321-1.33877-.445313-2.17968-.259992-.84092-.543091-1.79793-.488281-2.88477.03988-.79072.575375-1.53627
1.447266-1.74805.871891-.21177 1.994283.021
3.416015.80274.486157.28157.758175.39657.859375-.89844.02713-.91049.05434-1.88857-.220703-2.83008-1.138735-3.66489-4.556213-6.32617-8.595703-6.32617zm0
13c1.104569 0 2 .89543 2 2s-.895431 2-2 2-2-.89543-2-2 .895431-2 2-2z"
fill="#fff"/><path d="m12 16a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2-2 2 2 0 0
0 -2-2zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1-1 1 1 0 0 1 1-1z"
fill="#808080"/><path d="m12 2c-5.5228475 0-10 4.47715-10 10s4.4771525 10 10
10c1.173607 0 2.52429-.0183 3.488281-.47461.899559-.44359 1.464864-1.2987
1.53711-2.39453.05844-.88648-.232209-1.71277-.488282-2.54102-.256073-.82824-.489813-1.6566-.445312-2.53906.0
221-.43818.190376-.7059.685547-.82617.49517-.12028 1.404293-.005
2.699218.70703.320994.1765.632933.27357.947266.25781.314333-.0158.60831-.16486.806641-.37109.396662-.41245.514762-.97003.580078-1.55078.111293-1.04298-.05968-2.16223-.228511-3.13477-1.232681-4.12536-5.055806-7.13281-9.582036-7.13281zm0
1c4.03949 0 7.456968 2.66128 8.595703 6.32617.275039.94151.2478 1.91959.220669
2.83008-.05427.48256-.201669.8596-.30664.96875-.05249.0546-.0683.0631-.134766.0664-.06646.003-.20521-.0197-.417969-.13672-1.421732-.78173-2.544124-1.01451-3.416015-.80273s-1.407391.95733-1.447266
1.74804c-.05481 1.08685.228289 2.04385.488281 2.88477s.485749 1.56634.445313
2.17969c-.05461.82828-.35134 1.25325-.982422
1.56445-1.125152.33573-2.104498.3711-3.044888.3711-4.9705627
0-9-4.02944-9-9s4.0294373-9 9-9z" fill="#808080"/><g fill="#e68497"><circle
cx="8.5" cy="7.5" r="1.5"/><circle cx="13.5" cy="6.5" r="1.5"/><circle
cx="17.5" cy="9.5" r="1.5"/><circle cx="6.5" cy="12.5" r="1.5"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><g
fill="#e68497"><path d="m12 2v9.744141l8.306641 5.816406c1.102579-1.644961
1.691934-3.58025 1.693359-5.560547 0-5.5228475-4.477153-10-10-10z"/><path
d="m11.492188 12
.0078.01172c.01972-.01695-.0045-.0068-.0078-.01172zm.007812.615234-7.5566406
5.289063c1.8802174 2.570174 4.8721485 4.091163 8.0566406 4.095703 2.98383-.002
5.810872-1.336409 7.708984-3.638672z"/><path d="m11
2.0605469c-5.1058961.513159-8.9946519 4.8078375-9 9.9394531.00453
1.783585.4860115 3.533501 1.3945312 5.068359l7.6054688-5.324218z"/></g></svg>
\ No newline at end of file
commit ab53e0ab01e4d3fce9ddc0ef91d11ffc4b203c69
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 19 11:20:52 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat May 23 09:54:39 2020 +0200
Resolves: tdf#114258 defer LoseFocus treeview update
until the next event cycle in cas the LoseFocus is happening due to an
in-progress selection event from a mouse down in the treeview that would be
updated
Change-Id: Ia4448aa798a8af7cd35bc17215891f6c5ca8678a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94494
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 1f209723cb294559f6f6bbb42d9db7b78a3b5a61)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94455
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 81401763c9ae..ba9f5b43f0fb 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -85,10 +85,13 @@ private:
long nCurTextWidth;
+ ImplSVEvent* m_nSetSourceInBasicId;
+
SyntaxHighlighter aHighlighter;
Idle aSyntaxIdle;
std::set<sal_uInt16> aSyntaxLineTable;
DECL_LINK(SyntaxTimerHdl, Timer *, void);
+ DECL_LINK(SetSourceInBasicHdl, void*, void);
// progress bar
class ProgressInfo;
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 6bf425a65c8b..d07222a44d27 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -229,6 +229,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent,
ModulWindow* pModulWindow) :
Window(pParent, WB_BORDER),
rModulWindow(*pModulWindow),
nCurTextWidth(0),
+ m_nSetSourceInBasicId(nullptr),
aHighlighter(HighlighterLanguage::Basic),
bHighlighting(false),
bDoSyntaxHighlight(true),
@@ -259,6 +260,12 @@ EditorWindow::~EditorWindow()
void EditorWindow::dispose()
{
+ if (m_nSetSourceInBasicId)
+ {
+ Application::RemoveUserEvent(m_nSetSourceInBasicId);
+ m_nSetSourceInBasicId = nullptr;
+ }
+
Reference< beans::XMultiPropertySet > n;
{
osl::MutexGuard g(mutex_);
@@ -926,10 +933,20 @@ void EditorWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::Rectan
void EditorWindow::LoseFocus()
{
- SetSourceInBasic();
+ // tdf#114258 wait until the next event loop cycle to do this so it doesn't
+ // happen during a mouse down/up selection in the treeview whose contents
+ // this may update
+ if (!m_nSetSourceInBasicId)
+ m_nSetSourceInBasicId = Application::PostUserEvent(LINK(this,
EditorWindow, SetSourceInBasicHdl));
Window::LoseFocus();
}
+IMPL_LINK_NOARG(EditorWindow, SetSourceInBasicHdl, void*, void)
+{
+ m_nSetSourceInBasicId = nullptr;
+ SetSourceInBasic();
+}
+
void EditorWindow::SetSourceInBasic()
{
if ( pEditEngine && pEditEngine->IsModified()
commit b3d0f6ebdfe2c61b79a4f624da24ba8a5a7883fa
Author: scito <i...@scito.ch>
AuthorDate: Fri Apr 3 16:13:42 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat May 23 09:54:32 2020 +0200
tdf#130770 apply autofilter to data regardless of autofilter changes
Add a unit test
Apply autofilter to data if there are no changes from the user for
AutoFilterMode::Normal mode
The condition
eMode == AutoFilterMode::Normal
at that position is equivalent to
eMode != AutoFilterMode::Top10
&& eMode != AutoFilterMode::Empty
&& eMode != AutoFilterMode::NonEmpty
because
- Top10: Excluded in if()
- Custom: Already handled before
- Empty: Excluded in if()
- NonEmpty: Excluded in if()
- SortAscending: Already handled before
- SortDescending: Already handled before
- Normal: The remaining condition
Delete dead code:
The condition
if (mpAutoFilterPopup->isAllSelected())
will never be true since
eMode == AutoFilterMode::Normal && mpAutoFilterPopup->isAllSelected()
is excluded in the "outer if condition"
!(eMode == AutoFilterMode::Normal && mpAutoFilterPopup->isAllSelected())
Moreover aParam.RemoveAllEntriesByField(rPos.Col()); has already been called
before.
Change-Id: I1a5362f6edf6d28b3e049977d761cef83897e63e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91645
Tested-by: Jenkins
Tested-by: Serge Krot (CIB) <serge.k...@cib.de>
Reviewed-by: Serge Krot (CIB) <serge.k...@cib.de>
(cherry picked from commit e9c04fdc6d91a152c9197bda3b07316bed1dc4f3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94457
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/qa/uitest/autofilter/data/tdf130770.ods
b/sc/qa/uitest/autofilter/data/tdf130770.ods
new file mode 100644
index 000000000000..952cf3866b8f
Binary files /dev/null and b/sc/qa/uitest/autofilter/data/tdf130770.ods differ
diff --git a/sc/qa/uitest/autofilter/tdf130070.py
b/sc/qa/uitest/autofilter/tdf130070.py
new file mode 100644
index 000000000000..77c554849635
--- /dev/null
+++ b/sc/qa/uitest/autofilter/tdf130070.py
@@ -0,0 +1,73 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_sheet_from_doc
+from libreoffice.calc.conditional_format import
get_conditional_format_from_sheet
+from uitest.debug import sleep
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from libreoffice.calc.document import get_row
+# import org.libreoffice.unotest
+# import pathlib
+from uitest.path import get_srcdir_url
+
+def get_url_for_data_file(file_name):
+# return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+ return get_srcdir_url() + "/sc/qa/uitest/autofilter/data/" + file_name
+
+def is_row_hidden(doc, index):
+ row = get_row(doc, index)
+ val = row.getPropertyValue("IsVisible")
+ return not val
+
+#Bug 130770 - Autofilter not updated on data change (automatically or manually)
+
+class tdf130770(UITestCase):
+ def test_tdf130770_autofilter(self):
+ calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf130770.ods"))
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+ document = self.ui_test.get_component()
+
+ # 1. open attached file and check initial state
+ self.assertFalse(is_row_hidden(calc_doc, 0))
+ self.assertFalse(is_row_hidden(calc_doc, 1))
+ self.assertTrue(is_row_hidden(calc_doc, 2))
+ self.assertFalse(is_row_hidden(calc_doc, 3))
+ self.assertFalse(is_row_hidden(calc_doc, 4))
+
+ # 2. open filter of column A and cancel
+ gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "0", "ROW": "0"}))
+ xFloatWindow = self.xUITest.getFloatWindow()
+
+ xOkBtn = xFloatWindow.getChild("cancel")
+ xOkBtn.executeAction("CLICK", tuple())
+
+ self.assertFalse(is_row_hidden(calc_doc, 0))
+ self.assertFalse(is_row_hidden(calc_doc, 1))
+ self.assertTrue(is_row_hidden(calc_doc, 2))
+ self.assertFalse(is_row_hidden(calc_doc, 3))
+ self.assertFalse(is_row_hidden(calc_doc, 4))
+
+ # 3. open filter of column A and just click OK
+ gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "0", "ROW": "0"}))
+ xFloatWindow = self.xUITest.getFloatWindow()
+
+ xOkBtn = xFloatWindow.getChild("ok")
+ xOkBtn.executeAction("CLICK", tuple())
+
+ self.assertFalse(is_row_hidden(calc_doc, 0))
+ self.assertFalse(is_row_hidden(calc_doc, 1))
+ self.assertTrue(is_row_hidden(calc_doc, 2))
+ self.assertFalse(is_row_hidden(calc_doc, 3))
+ self.assertTrue(is_row_hidden(calc_doc, 4)) # filtered out
+
+ self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 78371c7eb53d..37eb8853902c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -791,25 +791,31 @@ void
ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
pViewData->GetDispatcher().Execute(SID_FILTER,
SfxCallMode::SLOT|SfxCallMode::RECORD);
return;
}
- if (eMode != AutoFilterMode::Top10
- && eMode != AutoFilterMode::Empty
- && eMode != AutoFilterMode::NonEmpty)
+
+ ScQueryParam aParam;
+ pDBData->GetQueryParam(aParam);
+
+ if (eMode == AutoFilterMode::Normal)
{
- // do not recreate auto-filter rules if there is no any changes from
the user
+ // Do not recreate autofilter rules if there are no changes from the
user
ScCheckListMenuWindow::ResultType aResult;
mpAutoFilterPopup->getResult(aResult);
if (aResult == aSaveAutoFilterResult)
{
- SAL_INFO("sc.ui", "nothing to do when autofilter entries are the
same");
+ SAL_INFO("sc.ui", "Apply autofilter to data when entries are the
same");
+ // Apply autofilter to data
+ ScQueryEntry* pEntry = aParam.FindEntryByField(rPos.Col(), true);
+ pEntry->bDoQuery = true;
+ pEntry->nField = rPos.Col();
+ pEntry->eConnect = SC_AND;
+ pEntry->eOp = SC_EQUAL;
+ pViewData->GetView()->Query(aParam, nullptr, true);
return;
}
}
- ScQueryParam aParam;
- pDBData->GetQueryParam(aParam);
-
- // Remove old entries.
+ // Remove old entries in auto-filter rules
aParam.RemoveAllEntriesByField(rPos.Col());
if( !(eMode == AutoFilterMode::Normal &&
mpAutoFilterPopup->isAllSelected() ) )
@@ -840,19 +846,6 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode
eMode)
ScQueryEntry::QueryItemsType& rItems = pEntry->GetQueryItems();
rItems.clear();
std::for_each(aResult.begin(), aResult.end(),
AddItemToEntry(rItems, rPool));
-
- if (mpAutoFilterPopup->isAllSelected())
- {
- // get all strings from the column
- std::vector<ScTypedStrData> aAllStrings; // case sensitive
- pDoc->GetDataEntries(rPos.Col(), rPos.Row(), rPos.Tab(),
aAllStrings, true);
-
- if (rItems.size() == aAllStrings.size() ||
aAllStrings.empty())
- {
- // all selected => Remove filter entries
- aParam.RemoveAllEntriesByField(rPos.Col());
- }
- }
}
break;
case AutoFilterMode::Top10:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
