Makefile.in | 2
basegfx/source/polygon/b2dpolygontools.cxx | 15
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 36
chart2/qa/extras/chart2export.cxx | 23
chart2/qa/extras/data/xlsx/tdf130986.xlsx |binary
dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 4
dbaccess/source/ui/dlg/generalpage.cxx | 6
dictionaries | 2
embeddedobj/source/commonembedding/embedobj.cxx | 6
i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx | 4
icon-themes/colibre/cmd/32/signature.png |binary
icon-themes/colibre/cmd/32/signaturelinedialog.png |binary
icon-themes/colibre/cmd/lc_signature.png |binary
icon-themes/colibre/cmd/lc_signaturelinedialog.png |binary
icon-themes/colibre/cmd/sc_signature.png |binary
icon-themes/colibre/cmd/sc_signaturelinedialog.png |binary
icon-themes/colibre/links.txt | 2
icon-themes/colibre_svg/cmd/32/signature.svg | 2
icon-themes/colibre_svg/cmd/32/signaturelinedialog.svg | 2
icon-themes/colibre_svg/cmd/lc_signature.svg | 2
icon-themes/colibre_svg/cmd/lc_signaturelinedialog.svg | 2
icon-themes/colibre_svg/cmd/sc_signature.svg | 2
icon-themes/colibre_svg/cmd/sc_signaturelinedialog.svg | 2
include/o3tl/span.hxx | 7
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 4
o3tl/qa/test-span.cxx | 6
oox/qa/unit/data/shape-non-autosize-with-text.docx |binary
oox/qa/unit/vml.cxx | 18
oox/source/export/chartexport.cxx | 3
oox/source/vml/vmlshape.cxx | 6
readlicense_oo/license/CREDITS.fodt | 2760
+++++-----
sc/qa/uitest/calc_tests/data/tdf131291.ods |binary
sc/qa/uitest/chart/chartDataLabels.py | 75
sc/source/filter/oox/numberformatsbuffer.cxx | 2
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/navipi/content.cxx | 14
sd/source/ui/unoidl/unomodel.cxx | 8
sd/source/ui/view/drtxtob1.cxx | 2
svx/source/form/fmvwimp.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 12
svx/uiconfig/ui/docking3deffects.ui | 4
sw/CppunitTest_sw_accessible_relation_set.mk | 3
sw/CppunitTest_sw_apitests.mk | 4
sw/CppunitTest_sw_xhtmlexport.mk | 9
sw/inc/ndgrf.hxx | 3
sw/qa/extras/layout/data/btlr-table-row-span.odt |binary
sw/qa/extras/layout/layout.cxx | 18
sw/qa/python/testdocuments/xtextrange.odt |binary
sw/qa/python/xtextrange.py | 21
sw/source/core/graphic/ndgrf.cxx | 9
sw/source/core/layout/ssfrm.cxx | 14
sw/source/core/text/atrhndl.hxx | 3
sw/source/core/text/atrstck.cxx | 6
sw/source/core/text/redlnitr.cxx | 9
sw/source/core/unocore/unotext.cxx | 12
sw/source/uibase/app/apphdl.cxx | 21
sw/uiconfig/swriter/ui/notebookbar.ui | 2
sw/uiconfig/swriter/ui/notebookbar_compact.ui | 2
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui | 4
sw/uiconfig/swriter/ui/notebookbar_single.ui | 2
translations | 2
unotools/source/i18n/resmgr.cxx | 3
vcl/inc/osx/salframe.h | 2
vcl/osx/salframe.cxx | 18
vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 62
vcl/source/edit/vclmedit.cxx | 3
vcl/source/gdi/pdfwriter_impl.cxx | 54
vcl/unx/gtk3/gtk3gtkinst.cxx | 59
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 5
70 files changed, 1908 insertions(+), 1479 deletions(-)
New commits:
commit d1580c8212589812b76e7e792d574dee98805693
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Mar 22 14:48:39 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:54 2020 +0100
tdf#131464: fix create an index of Writer in Japanese locale
in i18npool/source/collator/collator_unicode.cxx, we got:
177 // replace algorithm name to implementation
name.
178 if (rAlgorithm == "phonetic (alphanumeric
first)")
179 aBuf.append("phonetic_alphanumeric_first");
180 else if (rAlgorithm == "phonetic (alphanumeric
last)")
181 aBuf.append("phonetic_alphanumeric_last");
182 else
183 aBuf.append(rAlgorithm);
So don't add extra ja_ before "phonetic..."
Also we already add "ja" in buffer with line:
158
aBuf.append("get_").append(rLocale.Language).append("_");
so right functions from ICU will be retrieved
Change-Id: I163c3ca4bb4dcfa1e5d29313190c5ba3e6396c4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90877
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90889
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
index 012dbf3b65cb..30758b103cf3 100644
--- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
@@ -63,7 +63,7 @@ sal_Int16 SAL_CALL
IndexEntrySupplier_ja_phonetic::compareIndexEntry(
return result;
}
-static const sal_Char first[] = "ja_phonetic (alphanumeric first)";
+static const sal_Char first[] = "phonetic (alphanumeric first)";
sal_Bool SAL_CALL
IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm(
const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
sal_Int32 collatorOptions )
@@ -77,7 +77,7 @@ sal_Bool SAL_CALL
IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant
return collator->loadCollatorAlgorithm(first, rLocale, collatorOptions) ==
0;
}
-static const sal_Char last[] = "ja_phonetic (alphanumeric last)";
+static const sal_Char last[] = "phonetic (alphanumeric last)";
sal_Bool SAL_CALL
IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm(
const css::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/,
sal_Int32 collatorOptions )
commit 7c4c26ac97ccf9043e3902d9c4a13da9e721f6a8
Author: Rizal Muttaqin <riz_17_...@yahoo.co.id>
AuthorDate: Sun Mar 22 12:54:52 2020 +0700
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:54 2020 +0100
Colibre: fix for tdf#131454, Wrong icons for Valid Signature
Change-Id: I16790b6f668823be346a6d8b51de4a98ac3eb5d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90874
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin <riz_17_...@yahoo.co.id>
(cherry picked from commit 8fe403c536234ff84ac2301e67e0f5483ba99b5b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90819
diff --git a/icon-themes/colibre/cmd/32/signature.png
b/icon-themes/colibre/cmd/32/signature.png
index 2b30b8dc4b45..c17b4d69c319 100644
Binary files a/icon-themes/colibre/cmd/32/signature.png and
b/icon-themes/colibre/cmd/32/signature.png differ
diff --git a/icon-themes/colibre/cmd/32/signaturelinedialog.png
b/icon-themes/colibre/cmd/32/signaturelinedialog.png
index 95a119714fbe..0f845793cb5f 100644
Binary files a/icon-themes/colibre/cmd/32/signaturelinedialog.png and
b/icon-themes/colibre/cmd/32/signaturelinedialog.png differ
diff --git a/icon-themes/colibre/cmd/lc_signature.png
b/icon-themes/colibre/cmd/lc_signature.png
index 7cc88bc830cd..54dd06960ba3 100644
Binary files a/icon-themes/colibre/cmd/lc_signature.png and
b/icon-themes/colibre/cmd/lc_signature.png differ
diff --git a/icon-themes/colibre/cmd/lc_signaturelinedialog.png
b/icon-themes/colibre/cmd/lc_signaturelinedialog.png
index 28af02718db1..cf07980d465e 100644
Binary files a/icon-themes/colibre/cmd/lc_signaturelinedialog.png and
b/icon-themes/colibre/cmd/lc_signaturelinedialog.png differ
diff --git a/icon-themes/colibre/cmd/sc_signature.png
b/icon-themes/colibre/cmd/sc_signature.png
index 6205a3c58693..ac2db0c661f2 100644
Binary files a/icon-themes/colibre/cmd/sc_signature.png and
b/icon-themes/colibre/cmd/sc_signature.png differ
diff --git a/icon-themes/colibre/cmd/sc_signaturelinedialog.png
b/icon-themes/colibre/cmd/sc_signaturelinedialog.png
index 42a6aea4e512..a49b9ecbea07 100644
Binary files a/icon-themes/colibre/cmd/sc_signaturelinedialog.png and
b/icon-themes/colibre/cmd/sc_signaturelinedialog.png differ
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 07d0124d77ab..c0fe87e0bc76 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2342,7 +2342,7 @@ cmd/sc_wrapmenu.png cmd/sc_wrapon.png
# xmlsecurity
# ==============================================
xmlsecurity/res/key_12.png dbaccess/res/pkey.png
-xmlsecurity/res/signet_11x16.png xmlsecurity/res/notcertificate_16.png
+xmlsecurity/res/signet_11x16.png xmlsecurity/res/certificate_16.png
cmd/32/columnoperations.png cmd/32/entirecolumn.png
cmd/32/rowoperations.png cmd/32/entirerow.png
diff --git a/icon-themes/colibre_svg/cmd/32/signature.svg
b/icon-themes/colibre_svg/cmd/32/signature.svg
index 3681e2c159f8..a87db5097cb8 100644
--- a/icon-themes/colibre_svg/cmd/32/signature.svg
+++ b/icon-themes/colibre_svg/cmd/32/signature.svg
@@ -1 +1 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m6
3v26h10v-6c0-1.090703.909297-2 2-2h1v-2.5c0-2.473437 2.026563-4.5
4.5-4.5.922893 0 1.783593.283408 2.5.765625v-4.765625l-7-7zm17.5 14c-.840272
0-1.5.659728-1.5 1.5v2.5h3v-2.5c0-.840272-.659728-1.5-1.5-1.5z"
fill="#fff"/><path d="m5.9980469 2c-.554 0-1 .446-1 1v26c0 .554.446 1 1
1h10.2851561c-.175464-.296519-.283203-.636031-.283203-1h-10.0019531v-26h13.0000001v6c0
.6726441.491378 1 1 1h6v4.763672c.383945.258111.711431.584929 1
.945312v-7.3242184l-6.507813-6.3847656z" fill="#808080"/><path d="m20
9h6l-6-6z" fill="#fff" fill-rule="evenodd"/><path d="m16.792969
17.996094c-.440308.0077-.791251.370213-.785157.810547v3.011718c-.03398.13134-.03398.271004
0 .402344v.703125c.042014-1.055771.927549-1.923828
1.992188-1.923828h1v-1.419922l-1.392578.927734v-1.701171c.0062-.451364-.363116-.818536-.814453-.810547zm-4.767578.0098c-.309911-.0079-.597499.164217-.736329.441407l-3.2011714
6.388672c-.477975.953382.9520955 1.67037 1.4
296875.716796l.9804689-1.957031h1.882812l.447266 1.791016c.258581 1.034771
1.811526.646047
1.552734-.388672l-1.601562-6.386719c-.08637-.348821-.394688-.595604-.753906-.605469zm-.273438
3.083985.228516.908203h-.681641z" fill="#d65532" fill-rule="evenodd"/><path
d="m23.5 15a3.5 3.5 0 0 0 -3.5 3.5v3.5h-2c-.554 0-1 .446-1 1v6c0 .554.446 1 1
1h11c.554 0 1-.446 1-1v-6c0-.554-.446-1-1-1h-2v-3.5a3.5 3.5 0 0 0 -3.5-3.5zm0
1a2.5 2.5 0 0 1 2.5 2.5v3.5h-5v-3.5a2.5 2.5 0 0 1 2.5-2.5z"
fill="#eac282"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m6
3v26h19.998047v-8.716797l-3.228516
5.908203c-.131092.226141-.312962.41871-.53125.5625l-1.865234
1.232422c-1.159597.766812-2.696791-.120119-2.613281-1.507812l.134765-2.232422c.015599-.261325.091831-.51543.222657-.742188l5.5-10.0625
1.5-2.597656c.200468-.346786.519096-.590631.882812-.724609v-.119141l-7-7z"
fill="#fff"/><path d="m5.9980469 2c-.554 0-1 .446-1 1v26c0 .554.446 1 1
1h20.0000001c.554 0 .892483-.456533 1-1v-10.109375-.435547l-1
1.830078v8.714844h-20.0000001v-26h13.0000001v6c0 .6726441.491378 1 1
1h6v.119141c.197169-.072871.403925-.1226106.621094-.117188.128566.00323.255347.026674.378906.058594v-1.6757814l-6.507813-6.3847656z"
fill="#808080"/><path d="m20 9h6l-6-6z" fill="#fff" fill-rule="evenodd"/><path
d="m16.440678 22.940678c-.0057.119919.0045.24168-.01724.359757-1.48276
2.140243-3.174194 2.413727-4.733998
2.037374-1.08594-.278714-2.330522-.545396-3.355744-.719062
0-.01997.0458.01412.05992 0s-.0089-.04
206 0-.05992c.01263-.02527.04729-.03466.05992-.05992.0089-.01787-.0089-.04206
0-.05992.457105-.462145 1.140881-.688255
1.67787-.898839.179773-.05992.359546-.119849.539319-.179773 1.241581-.402159
2.445893-.492944 3.715307-.599217h.239697c.488932-.000101 1.030634 0 1.498108 0
.114145.04124.195859.189602.316841.17952.155503-.01296.263683-.167693.402227-.239486.02341-.01213.278159
0 .299622 0l1.195432-.01695" fill="none" stroke="#4d82b8"
stroke-width=".5"/><path d="m17.008475
21.754237c.005.0072.255373.243013.220562.382255-.01532.06128-.04954.117466-.05992.179773-.11713
1.033768-.239689 1.946212-.239689 3.056139 0 .01424-.0067.226267 0
.239697.888459 1.257965.646134.942924.119835.599231-.05911-.0099-.119848
0-.179773
0-.591709.06282-1.361015.0429-1.737791-.11984-.02527-.01263-.03995-.03995-.05992-.05992s-.04729-.03466-.05992-.05992c-.0016-.0031-.0016-.176638
0-.179773.01263-.02527.03466-.04729.05992-.05992.338285-.236911.436696-.254998.898856-.239689.420371.03049.607917.205084.898826.3
5952.01412.01412-.0089.04206 0 .05992" fill="none" stroke="#4d82b8"
stroke-width=".5"/><g fill="#808080"><path d="m25.077088 14.286323 1.732051
1-5.5 10.062178-1.732051-1z" stroke="#808080" stroke-linecap="round"
stroke-linejoin="round"/><path d="m26.577088 11.688247 1.732051 1-1.5
2.598076-1.732051-1z" stroke="#808080" stroke-linecap="round"/><path
d="m28.480047 13.365635-.5.866025.360402.142839-2 3.464103.866025.5
2.500001-4.330128-.866026-.5z"/><path d="m19.577088 24.348501-.133975 2.232051
1.866025-1.232051z" stroke="#808080" stroke-linecap="round"
stroke-linejoin="round"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/32/signaturelinedialog.svg
b/icon-themes/colibre_svg/cmd/32/signaturelinedialog.svg
index bfce0c0be75e..da3c8d6b569b 100644
--- a/icon-themes/colibre_svg/cmd/32/signaturelinedialog.svg
+++ b/icon-themes/colibre_svg/cmd/32/signaturelinedialog.svg
@@ -1 +1 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m6
3v26h9.216797l.921875-3.748047c.043441-.177395.134629-.339507.263672-.46875
3.211977-3.208087 6.250568-6.073461
9.271484-9.236328.099174-.099048.210028-.182879.326172-.255859v-5.291016l-7-7zm19.998047
21.554688c-1.470064 1.414868-2.925585 2.881009-4.355469 4.445312h4.355469z"
fill="#fff"/><path d="m5.9980469 2c-.554 0-1 .446-1 1v26c0 .554.446 1 1
1h9.0058591c.000305-.077999.005577-.157445.025391-.238281l.1875-.761719h-9.2187501v-26h13.0000001v6c0
.6726441.491378 1 1
1h6v5.292969c.301195-.189855.647735-.292969.992187-.292969.002579 0
.005234-.000011.007813 0v-6.6152344l-6.507813-6.3847656zm21.0000001
21.605469c-.333036.316596-.667835.629525-1
.949219v4.445312h-4.355469c-.163185.178525-.3298.343868-.492187.525391-.125138.125908-.281533.216238-.453125.261718l-.800782.212891h6.101563c.554
0 .892483-.456533 1-1z" fill="#808080"/><path d="m20 9h6l-6-6z" fill="#fff"
fill-rule="evenodd"/><path d="m16.792969 17.996094c-.
440308.0077-.791252.370213-.785157.810547v3.011718c-.033979.13134-.033979.271004
0
.402344v2.970703c-.00061.125725.025798.233869.064454.330078l.066406-.269531c.043441-.177395.134629-.339507.263672-.46875.411317-.410819.79912-.786577
1.205078-1.1875v-.105469l.064453.042969c.39112-.38609.775341-.765052
1.162109-1.144531l-.585937-.390625
3.025391-2.011719c.368004-.362099.732042-.726967
1.097656-1.089844.124936-.387134-.093181-.662079-.53125-.867187-.08025-.02328-.162569-.0338-.246094-.03125-.153444.0048-.303282.053503-.429688.140625l-3.55664
2.36914v-1.701171c.0062-.451364-.363116-.818536-.814453-.810547zm-4.767578.009765c-.309911-.0079-.597499.164217-.736329.441407l-3.2011714
6.388672c-.4779745.953382.9520959 1.67037
1.4296875.716796l.9804689-1.957031h1.882812l.447266 1.791016c.258581 1.034771
1.811526.646047
1.552734-.388672l-1.601562-6.386719c-.08637-.348821-.394688-.595604-.753906-.605469zm-.273438
3.083985.228516.908203h-.681641z" fill="#d65532" fill-rule="evenodd"/><g
fill="#eac2
82" transform="matrix(1.1667513 0 0 1.1666667 3.165736 3.166667)"><path
d="m17.480469 13.611328-5.529297 5.523438-.951172 3.865234 3.806641-1.011719
5.509765-5.544922z"/><path d="m20.419922 11c-.189562
0-.378184.07172-.523438.216797l-1.673828 1.669922 2.847656 2.849609
1.710938-1.638672c.290506-.290127.290506-.756747
0-1.046875l-1.835938-1.833984c-.145254-.145064-.335828-.216797-.52539-.216797z"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg";><path d="m11 3v7c0
.554-.446 1-1 1h-4v18h19.998047v-8.716797l-3.228516
5.908203c-.131092.226141-.312962.41871-.53125.5625l-1.865234
1.232422c-1.159597.766812-2.696791-.120119-2.613281-1.507812l.134765-2.232422c.015599-.261325.091831-.51543.222657-.742188l5.5-10.0625
1.5-2.597656c.200468-.346786.519096-.590631.882812-.724609v-.119141l-7-7z"
fill="#fff"/><path d="m11 2v1h7.998047v6c0 .6726441.491378 1 1
1h6v.119141c.197169-.072871.403925-.1226105.621094-.117188.128566.00323.255347.026674.378906.058594v-1.6757814l-6.507813-6.3847656zm-6.0019531
9v18c0 .554.446 1 1 1h20.0000001c.1385 0
.263681-.028786.375-.080078.333957-.153875.544362-.512322.625-.919922v-10.109375-.435547l-1
1.830078v8.714844h-20.0000001v-18z" fill="#808080"/><path d="m20 9h6l-6-6z"
fill="#fff" fill-rule="evenodd"/><path d="m16.440678
22.940678c-.0057.119919.0045.24168-.01724.359757-1.48276 2.140243-3.174194
2.413727-4.733998 2.037374-1.08594-.278714-2.330522-
.545396-3.355744-.719062 0-.01997.0458.01412.05992 0s-.0089-.04206
0-.05992c.01263-.02527.04729-.03466.05992-.05992.0089-.01787-.0089-.04206
0-.05992.457105-.462145 1.140881-.688255
1.67787-.898839.179773-.05992.359546-.119849.539319-.179773 1.241581-.402159
2.445893-.492944 3.715307-.599217h.239697c.488932-.000101 1.030634 0 1.498108 0
.114145.04124.195859.189602.316841.17952.155503-.01296.263683-.167693.402227-.239486.02341-.01213.278159
0 .299622 0l1.195432-.01695" fill="none" stroke="#4d82b8"
stroke-width=".5"/><path d="m17.008475
21.754237c.005.0072.255373.243013.220562.382255-.01532.06128-.04954.117466-.05992.179773-.11713
1.033768-.239689 1.946212-.239689 3.056139 0 .01424-.0067.226267 0
.239697.888459 1.257965.646134.942924.119835.599231-.05911-.0099-.119848
0-.179773
0-.591709.06282-1.361015.0429-1.737791-.11984-.02527-.01263-.03995-.03995-.05992-.05992s-.04729-.03466-.05992-.05992c-.0016-.0031-.0016-.176638
0-.179773.01263-.02527.03466-.04729.05992-.05992.338285-.236911.43
6696-.254998.898856-.239689.420371.03049.607917.205084.898826.35952.01412.01412-.0089.04206
0 .05992" fill="none" stroke="#4d82b8" stroke-width=".5"/><g
fill="#808080"><path d="m25.077088 14.286323 1.732051 1-5.5
10.062178-1.732051-1z" stroke="#808080" stroke-linecap="round"
stroke-linejoin="round"/><path d="m26.577088 11.688247 1.732051 1-1.5
2.598076-1.732051-1z" stroke="#808080" stroke-linecap="round"/><path
d="m28.480047 13.365635-.5.866025.360402.142839-2 3.464103.866025.5
2.500001-4.330128-.866026-.5z"/><path d="m19.577088 24.348501-.133975 2.232051
1.866025-1.232051z" stroke="#808080" stroke-linecap="round"
stroke-linejoin="round"/></g><g fill="#eac282" transform="translate(-1
-1.000012)"><path d="m4 10 6-6v6z" fill-rule="evenodd" stroke="#eac282"
stroke-linecap="round" stroke-linejoin="round" stroke-width="2.000024"/><rect
height="6" ry="1" width="2" x="2" y="2"/><rect height="2" ry=".932203"
width="6" x="2" y="2"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_signature.svg
b/icon-themes/colibre_svg/cmd/lc_signature.svg
index e71e61ecba03..f078638ca7a5 100644
--- a/icon-themes/colibre_svg/cmd/lc_signature.svg
+++ b/icon-themes/colibre_svg/cmd/lc_signature.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m5
3v18h7v-3c0-1.090703.909297-2 2-2v-1c0-2.197294 1.802706-4 4-4 .346993 0
.678233.060164 1 .144531v-4.4160154l-4-3.7285156zm13 11c-.564129 0-1 .435871-1
1v1h2v-1c0-.564129-.435871-1-1-1z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1
1v18c0 .554.446 1 1 1h7v-1h-7v-18h9v4c0 .554.446 1 1
1h4v3.144531c.355789.093288.689331.233855 1
.416016v-4.310547-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109z"
fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff"/><path d="m11.490234
13.001953a.49960701.49845209 0 0 0 -.492187.505859v1.923829a.49960701.49845209
0 0 0 0 .15039v1.91211a.5.49884417 0 0 0 1
0v-1.0625l.46875.3125c.22942-.278251.525685-.496687.869141-.621094l-.9375-.623047
1.664062-1.105469c.038629-.24896.100796-.488733.183594-.720703.000209-.000588-.00021-.001365
0-.001953.081525-.228068.18294-.443198.302734-.650391.002481-.004
29.003363-.00939.00586-.013672a.49960701.49845209 0 0 0
-.06836-.001953.49960701.49845209 0 0 0 -.267578.085938l-2.220703
1.476562v-1.060547a.49960701.49845209 0 0 0
-.507813-.505859zm-3.0253902.007813a.49960701.49845209 0 0 0
-.4101563.27539l-1.9980469 3.988282a.49960701.49845209 0 1 0
.8925782.443359l.6113281-1.21875h1.1757812l.2792969 1.117187a.49960701.49845209
0 1 0 .96875-.242187l-1-3.986328a.49960701.49845209 0 0 0
-.46875-.376953.49960701.49845209 0 0 0 -.0507812 0zm-.1191407
1.923828.140625.566406h-.4257812z" fill="#d65532"/><path d="m18 12a3 3 0 0 0 -3
3v2h-1c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h8c.554 0 1-.446
1-1v-4c0-.554-.446-1-1-1h-1v-2a3 3 0 0 0 -3-3zm0 1a2 2 0 0 1 2 2v2h-4v-2a2 2 0
0 1 2-2z" fill="#eac282"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m5
3v18h14v-3.603516l-.455078.78711a1.6862314 1.6862314 0 0 1
-.53125.5625l-1.865234 1.232422a1.6862314 1.6862314 0 0 1
-2.613282-1.507813l.134766-2.232422a1.6862314 1.6862314 0 0 1
.222656-.742187l3.5-6.0625002 1.5-2.5976563a1.6862314 1.6862314 0 0 1
.083984-.1289063l-3.976562-3.7070312z" fill="#fff"/><path d="m5 2c-.554 0-1
.446-1 1v18c0 .554.446 1 1 1h14c.554 0 1-.446 1-1v-5.335938l-1
1.732422v3.603516h-14v-18h9v4c0 .554.446 1 1
1h3.220703l.671875-1.1640625a1.6862314 1.6862314 0 0 1
.707031-.6640625c.11027.1053482.189835.18715.248047.2578125-.089232-.1087467-.215134-.2382346-.453125-.4550781l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109zm14.847656
4.4296875c.174637.2119876.152344.317835.152344.6113281
0-.2982182.022196-.3986173-.152344-.6113281z" fill="#808080"/><path d="m15
3v4h3.796875l.074219-.1289062z" fill="#fff"/><g fill="#808080"><path
d="m18.852886 10.27785 1.732
051 1-3.5 6.062178-1.732051-1z" stroke="#808080" stroke-linecap="round"
stroke-linejoin="round"/><path d="m20.352886 7.6797742 1.732051 1-1.5
2.5980758-1.732051-1z" stroke="#808080" stroke-linecap="round"/><path
d="m22.255845 9.3571623-.5.8660257.360402.142839-2 3.464102.866025.5
2.500001-4.330128-.866026-.4999998z"/><path d="m15.352886 16.340028-.133975
2.232051 1.866026-1.232051z" stroke="#808080" stroke-linecap="round"
stroke-linejoin="round"/></g><path d="m13.520908
14.676573c-.0056.11794.0045.23771-.01697.353849-1.458401 2.105099-3.122061
2.374092-4.6562511 2.003918-1.0681081-.274137-2.2922529-.536439-3.30064-.707254
0-.01964.045048.0139.058936 0 .013881-.0139-.00875-.04137
0-.05893.012419-.02485.046514-.0341.058936-.05893.00875-.01751-.00875-.04137
0-.05893.4496011-.454569 1.1221488-.676967
1.6503201-.884091.1768217-.058934.353642-.117886.530463-.17682
1.2211932-.395564 2.405729-.484856 3.654298-.589385h.235761c.480903-.000099
1.013711 0 1.473508 0 .112272.04056.192643.186489.
311639.176567.152957-.01281.259352-.164943.395621-.235553.02303-.01191.273592
0 .294702 0" fill="none" stroke="#4d82b8" stroke-width=".5"/><path
d="m12.444071
13.834734c.005.0072.255373.243013.220562.382255-.01532.06128-.04954.117466-.05992.179773-.11713
1.033768-.239689 1.946212-.239689 3.05614 0 .01424-.0067.226267 0
.239697.115419.455342.454381.707517.659141.958759.129784.04897.0365.07246 0
0-.01787-.03573.01787-.08412
0-.119848-.467113-.365628.000608.00027-.539306-.23968-.05911-.0099-.119848
0-.179773
0-.591709.06282-1.361015.0429-1.737791-.11984-.02527-.01263-.03995-.03995-.05992-.05992s-.04729-.03466-.05992-.05992c-.0016-.0031-.0016-.176638
0-.179773.01263-.02527.03466-.04729.05992-.05992.338285-.236911.436696-.254998.898856-.239689.420371.03049.607917.205084.898826.35952.01412.01412-.0089.04206
0 .05992.448441.616773.705564.948814 1.258403 1.204465" fill="none"
stroke="#4d82b8" stroke-width=".5"/></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_signaturelinedialog.svg
b/icon-themes/colibre_svg/cmd/lc_signaturelinedialog.svg
index 02a0be497418..0c6ca5547255 100644
--- a/icon-themes/colibre_svg/cmd/lc_signaturelinedialog.svg
+++ b/icon-themes/colibre_svg/cmd/lc_signaturelinedialog.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m5
3v18h5.462891l.517578-2.103516c.04344-.177395.134629-.339507.263672-.46875l5.529297-5.523437.0078-.0078.738281-.720703
1.480481-1.476575v-3.9707034l-4-3.7285156zm14 16.1875-1.802734
1.8125h1.802734z" fill="#fff"/><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1
1 1h5.216797l.246094-1h-5.462891v-18h9v4c0 .554.446 1 1
1h4v2.699219l.189453-.189453c.10637-.106241.227363-.190073.353516-.263672.022042-.012592.043911-.023576.066406-.035156.123752-.06524.251663-.116414.384766-.150391.00198-.000505.003877-.001455.005859-.001953v-2.808594-.2089844c0-.4506799.098038-.4254121-.605469-1.0664062l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109zm15
16.179688-1 1.005859v.001953 1.8125h-1.802734l-.992188 1h2.794922c.554 0
1-.446 1-1z" fill="#808080"/><path d="m15 7h4l-4-4z" fill="#fff"
fill-rule="evenodd"/><path d="m11.490234 13.001953a.49902923.49902923 0 0 0
-.490234.505859v1.88086a.49902
923.49902923 0 0 0 0 .25v1.855469a.49902923.49902923 0 0 0
.740234.4375l.197266-.195313a.49902923.49902923 0 0 0
.060547-.242187v-1.0625l.746094.498047.720703-.720704-1.066406-.708984
2.373046-1.578125a.49902923.49902923 0 0 0 -.285156-.917969.49902923.49902923 0
0 0 -.267578.087891l-2.220703 1.478515v-1.0625a.49902923.49902923 0 0 0
-.507813-.505859zm-2.9765621.005859a.49902923.49902923 0 0 0
-.4589844.275391l-1.9980469 3.988281a.49918502.49918502 0 1 0
.8925782.447266l.6113281-1.220703h1.1757812l.2792969
1.117187a.49928226.49928226 0 0 0 .96875-.242187l-1-3.986328a.49902923.49902923
0 0 0 -.4707031-.378907zm-.1699219 1.925782.1425781.566406h-.4257812zm6.650391
2.574218-.486329.486329a.49944731.49944731 0 0 0 .486329-.486329z"
fill="#d65532" fill-rule="evenodd"/><g fill="#eac282"><path d="m17.480469
13.611328-5.529297 5.523438-.951172 3.865234 3.806641-1.011719
5.509765-5.544922z"/><path d="m20.419922 11c-.189562
0-.378184.07172-.523438.216797l-1.673828 1.669922 2.847656 2.849609 1
.710938-1.638672c.290506-.290127.290506-.756747
0-1.046875l-1.835938-1.833984c-.145254-.145064-.335828-.216797-.52539-.216797z"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg";><path d="m9 3v5c0
.554-.446 1-1 1h-3v12h14v-3.603516l-.455078.78711a1.6862314 1.6862314 0 0 1
-.53125.5625l-1.865234 1.232422a1.6862314 1.6862314 0 0 1
-2.613282-1.507813l.134766-2.232422a1.6862314 1.6862314 0 0 1
.222656-.742187l3.5-6.0625002 1.5-2.5976563a1.6862314 1.6862314 0 0 1
.083984-.1289063l-3.976562-3.7070312z" fill="#fff"/><path d="m9 2v1h5v4c0
.554.446 1 1 1h3.220703l.671875-1.1640625a1.6862314 1.6862314 0 0 1
.701172-.6601563c-.067813-.0673492-.094297-.1055736-.199219-.2011718l-3.30664-3.2382813c-.709525-.7368575-.710169-.7363281-1.09375-.7363281h-.332032-.662109zm10.59375
4.1757812c.085344.0847607.202268.1915169.251953.2519532-.05809-.0702884-.136675-.1513244-.246094-.2558594a1.6862314
1.6862314 0 0 0 -.005859.0039062zm-15.59375 2.8242188v12c0 .554.446 1 1
1h14c.554 0 1-.446 1-1v-5.335938l-1 1.732422v3.603516h-14v-12z"
fill="#808080"/><path d="m15 3v4h3.796875l.074219-.1289062z" fill="#fff"/><g
fill="#808080">
<path d="m18.852886 10.27785 1.732051 1-3.5 6.062178-1.732051-1z"
stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><path
d="m20.352886 7.6797742 1.732051 1-1.5 2.5980758-1.732051-1z" stroke="#808080"
stroke-linecap="round"/><path d="m22.255845
9.3571623-.5.8660257.360402.142839-2 3.464102.866025.5
2.500001-4.330128-.866026-.4999998z"/><path d="m15.352886 16.340028-.133975
2.232051 1.866026-1.232051z" stroke="#808080" stroke-linecap="round"
stroke-linejoin="round"/></g><path d="m13.520908
14.676573c-.0056.11794.0045.23771-.01697.353849-1.458401 2.105099-3.122061
2.374092-4.6562511 2.003918-1.0681081-.274137-2.2922529-.536439-3.30064-.707254
0-.01964.045048.0139.058936 0 .013881-.0139-.00875-.04137
0-.05893.012419-.02485.046514-.0341.058936-.05893.00875-.01751-.00875-.04137
0-.05893.4496011-.454569 1.1221488-.676967
1.6503201-.884091.1768217-.058934.353642-.117886.530463-.17682
1.2211932-.395564 2.405729-.484856 3.654298-.589385h.235761c.480903-.000099
1.013711 0 1.473
508 0
.112272.04056.192643.186489.311639.176567.152957-.01281.259352-.164943.395621-.235553.02303-.01191.273592
0 .294702 0" fill="none" stroke="#4d82b8" stroke-width=".5"/><path
d="m12.444071
13.834734c.005.0072.255373.243013.220562.382255-.01532.06128-.04954.117466-.05992.179773-.11713
1.033768-.239689 1.946212-.239689 3.05614 0 .01424-.0067.226267 0
.239697.115419.455342.454381.707517.659141.958759.129784.04897.0365.07246 0
0-.01787-.03573.01787-.08412
0-.119848-.467113-.365628.000608.00027-.539306-.23968-.05911-.0099-.119848
0-.179773
0-.591709.06282-1.361015.0429-1.737791-.11984-.02527-.01263-.03995-.03995-.05992-.05992s-.04729-.03466-.05992-.05992c-.0016-.0031-.0016-.176638
0-.179773.01263-.02527.03466-.04729.05992-.05992.338285-.236911.436696-.254998.898856-.239689.420371.03049.607917.205084.898826.35952.01412.01412-.0089.04206
0 .05992.448441.616773.705564.948814 1.258403 1.204465" fill="none"
stroke="#4d82b8" stroke-width=".5"/><g fill="#eac282"><path d="m2.4999352
7.499994
1 5.0000589-5.0000589v5.0000589z" fill-rule="evenodd" stroke="#eac282"
stroke-linecap="round" stroke-linejoin="round" stroke-width="1.000012"/><rect
height="6" ry=".5" width="1" x="1" y="1"/><rect height="1" ry=".5" width="6"
x="1" y="1"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_signature.svg
b/icon-themes/colibre_svg/cmd/sc_signature.svg
index 29500a3ae93c..808f66ab1fc9 100644
--- a/icon-themes/colibre_svg/cmd/sc_signature.svg
+++ b/icon-themes/colibre_svg/cmd/sc_signature.svg
@@ -1 +1 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg";>/><path d="m3
1v14h4v-3c0-1.090703.9092972-2 2-2v-1c0-1.6450096 1.35499-3 3-3 .351851 0
.685106.0739423 1 .1875v-2.4824219l-2.695312-2.7050781z" fill="#fff"/><path
d="m3 0c-.554 0-1 .446-1 1v14c0 .554.446 1 1 1h2 1.0292969
1.2539062c-.1754644-.296519-.2832031-.636031-.2832031-1h-.7988281-1.2011719-2v-14h6v3.5c0
.277.223.5.5.5h3.5v1.1875c.372977.1345038.710808.3377285 1
.5996094v-2.2871094-.8632812l-3.636719-3.6367188h-.863281zm7 1 3 3h-3z"
fill="#808080"/><g fill="#eac282"><path d="m12 7a2 2 0 0 0 -2 2v2h-1c-.554 0-1
.446-1 1v3c0 .554.446 1 1 1h6c.554 0 1-.446 1-1v-3c0-.554-.446-1-1-1h-1v-2a2 2
0 0 0 -2-2zm0 1a1 1 0 0 1 1 1v2h-2v-2a1 1 0 0 1 1-1z"/><path d="m6.5097656
9.0117188c-.1934581-.0049598-.3723219.1023661-.4589844.2753906l-1.9980468
3.9882816c-.298191.595052.5943871
1.042317.8925781.447265l.6113281-1.220703h1.1757813l.2675781
1.070313v-1.572266c0-.413435.1318605-.799432.3535156-1.121094l-.3730468-1.488281c-.05389
69-.217754-.2464532-.3727434-.4707032-.3789062zm-.1699218
1.9257812.1425781.566406h-.4257813z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg";><path d="m3
1v14h10v-4.070312l-.054688-.03125-.61914
1.21289c-.131091.226141-.312962.41871-.53125.5625l-1.8652345
1.232422c-.2907266.192417-.6339492.289997-.9824219.279297-.9501888-.029487-1.6881884-.838194-1.6308594-1.787109l.1347657-2.232422c.0155994-.2613272.0918306-.51543.2226562-.7421879l2.2363281-4.2480469
1.4999998-2.5976562c.056363-.0969676.137422-.1728408.210938-.2558594l-1.316406-1.3222656z"
fill="#fff"/><path d="m3 0c-.554 0-1 .446-1 1v14c0 .554.446 1 1 1h10c.554 0
1-.446 1-1v-4.072266a.99343846.99343846 0 0 1
-.996094.003907l-.003906-.001953v4.070312h-10v-14h6v3.5c0
.277.223.5.5.5h.511719l.578125-1h-.589844v-3l1.486328
1.4863281c.185558-.2723481.435623-.4954448.742188-.6210937l-1.865235-1.8652344h-.863281z"
fill="#808080"/><path d="m7.3587687
11.364407c-2.4317625.532816-2.908689-.424715-3.1755738-1.4944866-.1712497-.7551355-.4135091-1.5878619-.6531895-2.2452729.017403-.012383.00516.03332.022858.032126.017702-.00
119.033285-.030875.052243-.037172.026851-.00891.048268.00385.075101-.00505.018915-.00627.033276-.030869.052243-.037172.5773339-.041638
1.035331.1846901
1.4237945.3419514.1208234.059213.2416635.1184131.3624867.1776257.8242943.4161694
1.3628725 1.0055375 1.9397914 1.6201983l.09144.128513" fill="none"
stroke="#4d82b8" stroke-width=".5"/><path d="m11.370613 6.0196211 1.73205
1-2.236638 4.2483279-1.732051-1z" fill="#7b7b7b" stroke="#808080"
stroke-linecap="round" stroke-linejoin="round"/><path d="m12.870613 3.4215449
1.73205 1-1.5 2.5980762-1.73205-1z" fill="#7b7b7b" stroke="#808080"
stroke-linecap="round"/><path d="m14.773571
5.098933-.5.8660254.360403.1428389-2 3.4641024.866025.5000003
2.5-4.3301281-.866025-.5z" fill="#808080"/><path d="m9.133974
10.267949-.1339746 2.232051 1.8660256-1.232051z" fill="#616165"
stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_signaturelinedialog.svg
b/icon-themes/colibre_svg/cmd/sc_signaturelinedialog.svg
index 011b08cd540a..6a9d59a8fd81 100644
--- a/icon-themes/colibre_svg/cmd/sc_signaturelinedialog.svg
+++ b/icon-themes/colibre_svg/cmd/sc_signaturelinedialog.svg
@@ -1 +1 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg";><path d="m3
1v14h3.2167969l.5273437-2.138672c.04377-.176696.1349364-.338094.2636719-.466797l4.1464845-4.1425779c.097425-.0969128.213778-.1727082.341797-.2226562.050153-.1196995.123123-.2284935.214844-.3203125l1.255859-1.2539063c.010316-.0103037.022635-.0173807.033203-.0273437v-2.7226563l-2.695312-2.7050781zm10
12.496094-1.494141 1.503906h1.494141z" fill="#fff"/><path d="m3 0c-.554 0-1
.446-1 1v14c0 .554.446 1 1 1h2
1.0039062c.0003004-.078705.0052092-.158659.0253907-.240234l.1875-.759766h-.015625-1.2011719-2v-14h6v3.5c0
.277.223.5.5.5h3.5v1.4277344c.279141-.2631723.642184-.4059802
1-.421875v-1.5058594-.8632812l-3.636719-3.6367188h-.863281zm7 1 3 3h-3zm4
11.488281-1
1.007813v.503906.091797.908203h-1.494141l-.941406.947266c-.020517.020642-.046233.034045-.068359.052734h.503906
2c.554 0 1-.446 1-1v-.800781-.199219z" fill="#808080"/><g fill="#eac282"><path
d="m11.861005 8.958496-4.1469731 4.142578-.713379 2.898926 2.8549808-.7587
89 4.1323233-4.158692z"/><path d="m14.065594 7c-.142171
0-.283638.05379-.392578.1625977l-1.255371 1.2524416 2.135742 2.1372067
1.283203-1.229004c.21788-.2175952.21788-.5675602
0-.7851562l-1.376953-1.3754881c-.108941-.108798-.251871-.1625977-.394043-.1625977z"/><path
d="m6.5175781
8.0117188c-.1934491-.0049598-.3723258.1023662-.4589843.2753906l-1.9980469
3.9882816c-.2991123.595363.5947128
1.043252.8925781.447265l.6113281-1.220703h1.1757813l.234375.935547c.012162-.013569.0202731-.030042.0332031-.042969l.7871094-.787109-.8066407-3.216797c-.0539103-.2177374-.2464755-.3727484-.4707031-.3789062zm-.1699219
1.9257812.1425782.566406h-.4257813z" fill-rule="evenodd"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg";><path d="m6 1v4c0
.554-.446 1-1 1h-2v9h10v-4.070312l-.054688-.03125-.61914
1.21289c-.131091.226141-.312962.41871-.53125.5625l-1.8652345
1.232422c-.2907266.192417-.6339492.289997-.9824219.279297-.9501888-.029487-1.6881884-.838195-1.6308594-1.787109l.1347657-2.232422c.0155994-.2613276.0918306-.51543.2226562-.7421879l2.2363281-4.2480469
1.4999998-2.5976562c.056363-.0969676.137422-.1728408.210938-.2558594l-1.316406-1.3222656z"
fill="#fff"/><path d="m6 0v1h3v3.5c0
.277.223.5.5.5h.511719l.578125-1h-.589844v-3l1.486328
1.4863281c.185558-.2723481.435623-.4954448.742188-.6210937l-1.865235-1.8652344h-.863281zm-4
6v9c0 .554.446 1 1 1h10c.554 0 1-.446 1-1v-4.072266a.99343846.99343846 0 0 1
-.996094.003907l-.003906-.001953v4.070312h-10v-9z" fill="#808080"/><path
d="m7.3587687
11.364407c-2.4317625.532816-2.908689-.424715-3.1755738-1.4944866-.1712497-.7551355-.4135091-1.5878619-.6531895-2.2452729.017403-.012383.00516.03332.022858.032126.0
17702-.00119.033285-.030875.052243-.037172.026851-.00891.048268.00385.075101-.00505.018915-.00627.033276-.030869.052243-.037172.5773339-.041638
1.035331.1846901
1.4237945.3419514.1208234.059213.2416635.1184131.3624867.1776257.8242943.4161694
1.3628725 1.0055375 1.9397914 1.6201983l.09144.128513" fill="none"
stroke="#4d82b8" stroke-width=".5"/><path d="m11.370613 6.0196211 1.73205
1-2.236638 4.2483279-1.732051-1z" fill="#7b7b7b" stroke="#808080"
stroke-linecap="round" stroke-linejoin="round"/><path d="m12.870613 3.4215449
1.73205 1-1.5 2.5980762-1.73205-1z" fill="#7b7b7b" stroke="#808080"
stroke-linecap="round"/><path d="m14.773571
5.098933-.5.8660254.360403.1428389-2 3.4641024.866025.5000003
2.5-4.3301281-.866025-.5z" fill="#808080"/><path d="m9.133974
10.267949-.1339746 2.232051 1.8660256-1.232051z" fill="#616165"
stroke="#808080" stroke-linecap="round" stroke-linejoin="round"/><g
fill="#eac282"><rect height="1" ry=".5" width="3"/><rect height="3" rx=".5"
width="1"/><path d="m.4999
293 4.5 4-4v4z" fill-rule="evenodd" stroke="#eac282" stroke-linecap="round"
stroke-linejoin="round"/></g></svg>
\ No newline at end of file
commit 095de7887a5e1003b6db87c5ddec7d1c9651caae
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Mar 20 09:15:05 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
Missing test dependencies
`make clean && make CppunitTest_sw_xhtmlexport` SIGABRT'ed with
[...]
> warn:vcl.builder:649768:649768:vcl/source/window/builder.cxx:462:
DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window *, const
rtl::OUString &, const rtl::OUString &, const rtl::OString &, const
css::uno::Reference<css::frame::XFrame> &, bool, const NotebookBarAddonsItem *)
> when: Unable to read .ui file exception:
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebarstylespanel.ui
>
warn:sfx.sidebar:649768:649768:sfx2/source/sidebar/SidebarController.cxx:976:
Cannot create panel
private:resource/toolpanel/SvxPanelFactory/StylesPropertyPanel
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebarstylespanel.ui
> warn:vcl.builder:649768:649768:vcl/source/window/builder.cxx:462:
DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window *, const
rtl::OUString &, const rtl::OUString &, const rtl::OString &, const
css::uno::Reference<css::frame::XFrame> &, bool, const NotebookBarAddonsItem *)
> when: Unable to read .ui file exception:
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebartextpanel.ui
>
warn:sfx.sidebar:649768:649768:sfx2/source/sidebar/SidebarController.cxx:976:
Cannot create panel
private:resource/toolpanel/SvxPanelFactory/TextPropertyPanel
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebartextpanel.ui
> warn:vcl.builder:649768:649768:vcl/source/window/builder.cxx:462:
DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window *, const
rtl::OUString &, const rtl::OUString &, const rtl::OString &, const
css::uno::Reference<css::frame::XFrame> &, bool, const NotebookBarAddonsItem *)
> when: Unable to read .ui file exception:
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebarparagraph.ui
> warn:legacy.osl:649768:649768:vcl/source/window/window.cxx:269: Window (
7Control()) with live children destroyed: 7VclVBox()
> Window ( 7Control()) with live children destroyed: 7VclVBox()
and then still failed with
[...]
> I/O warning : failed to load external entity
"file:///.../instdir/share/xslt/export/xhtml/opendoc2xhtml.xsl"
> error
> xsltParseStylesheetFile : cannot parse
file:///.../instdir/share/xslt/export/xhtml/opendoc2xhtml.xsl
>
warn:filter.xslt:662169:662186:filter/source/xsltfilter/XSLTFilter.cxx:234:
XSLTFilter::error was called: com.sun.star.uno.Exception message: failed to
load external entity
"file:///.../instdir/share/xslt/export/xhtml/opendoc2xhtml.xsl"
>
> warn:xmloff:662169:662169:xmloff/source/core/xmlerror.cxx:169: An error
or a warning has occurred during XML import/export!
> Error-Id: 0x60040004
> Flags: 6 ERROR SEVERE
> Class: 4 API
> Number: 4
> Parameters:
> Exception-Message: com.sun.star.uno.RuntimeException: ""
>
> warn:sfx.doc:662169:662169:sfx2/source/doc/sfxbasemodel.cxx:3096: Storing
has failed, no error is set!
> image-mimetype.odt:
> unknown:0:testImageEmbedding::Import_Export
> An uncaught exception of type com.sun.star.io.IOException
> - SfxBaseModel::impl_store
<file:///TMPDIR/libtest_sw_xhtmlexport.sozwb87q.tmp> failed: 0xc10(Error
Area:Io Class:Write Code:16)
and then still failed with
[...]
> I/O warning : failed to load external entity
"file:///.../instdir/share/xslt/export/common/styles/style_collector.xsl"
> compilation error: file
file:///.../instdir/share/xslt/export/xhtml/opendoc2xhtml.xsl line 55 element
include
> xsl:include : unable to load
file:///.../instdir/share/xslt/export/common/styles/style_collector.xsl
> I/O warning : failed to load external entity
"file:///.../instdir/share/xslt/export/common/styles/style_mapping_css.xsl"
> compilation error: file
file:///.../instdir/share/xslt/export/xhtml/opendoc2xhtml.xsl line 58 element
include
> xsl:include : unable to load
file:///.../instdir/share/xslt/export/common/styles/style_mapping_css.xsl
> I/O warning : failed to load external entity
"file:///.../instdir/share/xslt/common/measure_conversion.xsl"
> compilation error: file
file:///.../instdir/share/xslt/export/xhtml/body.xsl line 28 element import
> xsl:import : unable to load
file:///.../instdir/share/xslt/common/measure_conversion.xsl
> I/O warning : failed to load external entity
"file:///.../instdir/share/xslt/export/common/body.xsl"
> compilation error: file
file:///.../instdir/share/xslt/export/xhtml/body.xsl line 31 element import
> xsl:import : unable to load
file:///.../instdir/share/xslt/export/common/body.xsl
> I/O warning : failed to load external entity
"file:///.../instdir/share/xslt/export/common/table/table.xsl"
> compilation error: file
file:///.../instdir/share/xslt/export/xhtml/body.xsl line 34 element import
> xsl:import : unable to load
file:///.../instdir/share/xslt/export/common/table/table.xsl
>
warn:filter.xslt:662890:662907:filter/source/xsltfilter/XSLTFilter.cxx:234:
XSLTFilter::error was called: com.sun.star.uno.Exception message: failed to
load external entity
"file:///.../instdir/share/xslt/export/common/table/table.xsl"
>
> warn:xmloff:662890:662890:xmloff/source/core/xmlerror.cxx:169: An error
or a warning has occurred during XML import/export!
> Error-Id: 0x60040004
> Flags: 6 ERROR SEVERE
> Class: 4 API
> Number: 4
> Parameters:
> Exception-Message: com.sun.star.uno.RuntimeException: ""
>
> warn:sfx.doc:662890:662890:sfx2/source/doc/sfxbasemodel.cxx:3096: Storing
has failed, no error is set!
> image-mimetype.odt:
> unknown:0:testImageEmbedding::Import_Export
> An uncaught exception of type com.sun.star.io.IOException
> - SfxBaseModel::impl_store
<file:///TMPDIR/libtest_sw_xhtmlexport.sozwmx0q.tmp> failed: 0xc10(Error
Area:Io Class:Write Code:16)
Change-Id: I295222448be208582003c62e3d610f6fe743af3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit f7efe5a7fe8ade48fe376eb817017b26892f95b3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90812
diff --git a/sw/CppunitTest_sw_xhtmlexport.mk b/sw/CppunitTest_sw_xhtmlexport.mk
index 61f4700e08c4..70c3af41d6d8 100644
--- a/sw/CppunitTest_sw_xhtmlexport.mk
+++ b/sw/CppunitTest_sw_xhtmlexport.mk
@@ -58,4 +58,13 @@ $(eval $(call
gb_CppunitTest_use_rdb,sw_xhtmlexport,services))
$(eval $(call gb_CppunitTest_use_configuration,sw_xhtmlexport))
+$(eval $(call gb_CppunitTest_use_packages,sw_xhtmlexport, \
+ filter_xhtml \
+ filter_xslt \
+))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_xhtmlexport, \
+ svx \
+))
+
# vim: set noet sw=4 ts=4:
commit 59df8351d45e9dd85d2c5379b6c5c1e6382e491a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Mar 10 18:10:07 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
tdf#61274 sd PDF export: fix links ending up on wrong pages with hidden
slides
SdPage::IsExcluded() decides if a slide is hidden,
SdXImpressDocument::render() checks for this and returns early if
needed. In that case PDFExport::ExportSelection() detects that the
produced metafile has no actions and avoids creating a PDF page.
Then Impress links are created using the
vcl::PDFExtOutDevData::CreateLink() call in
drawinglayer::processor2d::VclMetafileProcessor2D::processTextHierarchyFieldPrimitive2D(),
not specifying the PDF page number explicitly. This means the link is
created on the "current" page number, set in
vcl::PDFExtOutDevData::SetCurrentPageNumber(), called by
PDFExport::ExportSelection(), but that filter/ code can't know about
hidden slides in sd/.
Fix the problem by setting the page number again in
SdXImpressDocument::render(), that way the link created by drawinglayer
will end on the correct page.
(cherry picked from commit 01dbb38680aa39a4d3bc7afd05d44a4b2c9bc6ab)
Conflicts:
vcl/qa/cppunit/pdfexport/pdfexport.cxx
Change-Id: Ic29e345d45bc7c944d65e6e450f1d742dd0e9f8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90551
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 6f7510488a30..8bc98bbc6693 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -1884,6 +1884,14 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32
nRenderer, const uno::Any& r
(pPDFExtOutDevData && pPDFExtOutDevData->GetIsExportHiddenSlides())) )
return;
+ if (pPDFExtOutDevData)
+ {
+ // Calculate the page number in the PDF output, which may be smaller
than the page number in
+ // case of hidden slides.
+ sal_Int32 nOutputPageNum = CalcOutputPageNum(pPDFExtOutDevData, mpDoc,
nPageNumber);
+ pPDFExtOutDevData->SetCurrentPageNumber(nOutputPageNum);
+ }
+
std::unique_ptr<::sd::ClientView> pView( new ::sd::ClientView( mpDocShell,
pOut ) );
::tools::Rectangle aVisArea( Point(), mpDoc->GetSdPage(
static_cast<sal_uInt16>(nPageNumber) - 1, ePageKind )->GetSize() );
vcl::Region aRegion( aVisArea );
diff --git a/vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp
b/vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp
new file mode 100644
index 000000000000..b6787aff6684
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/link-wrong-page.odp
differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 9b95717d4349..48f12080f74b 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -137,6 +137,7 @@ public:
void testTdf121615();
void testTocLink();
void testPdfImageResourceInlineXObjectRef();
+ void testLinkWrongPage();
CPPUNIT_TEST_SUITE(PdfExportTest);
CPPUNIT_TEST(testTdf106059);
@@ -174,6 +175,7 @@ public:
CPPUNIT_TEST(testTdf121615);
CPPUNIT_TEST(testTocLink);
CPPUNIT_TEST(testPdfImageResourceInlineXObjectRef);
+ CPPUNIT_TEST(testLinkWrongPage);
CPPUNIT_TEST_SUITE_END();
};
@@ -1861,6 +1863,38 @@ void PdfExportTest::testTocLink()
CPPUNIT_ASSERT(FPDFLink_Enumerate(pPdfPage.get(), &nStartPos,
&pLinkAnnot));
}
+bool HasLinksOnPage(PageHolder& pPdfPage)
+{
+ int nStartPos = 0;
+ FPDF_LINK pLinkAnnot = nullptr;
+ return FPDFLink_Enumerate(pPdfPage.get(), &nStartPos, &pLinkAnnot);
+}
+
+void PdfExportTest::testLinkWrongPage()
+{
+ // Import the bugdoc and export as PDF.
+ OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"link-wrong-page.odp";
+ utl::MediaDescriptor aMediaDescriptor;
+ aMediaDescriptor["FilterName"] <<= OUString("impress_pdf_Export");
+ DocumentHolder pPdfDocument = exportAndParse(aURL, aMediaDescriptor);
+
+ // The document has 2 pages.
+ CPPUNIT_ASSERT_EQUAL(2, FPDF_GetPageCount(pPdfDocument.get()));
+
+ // First page should have 1 link (2nd slide, 1st was hidden).
+ PageHolder pPdfPage(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/0));
+ CPPUNIT_ASSERT(pPdfPage.get());
+
+ // Without the accompanying fix in place, this test would have failed, as
the link of the first
+ // page went to the second page due to the hidden first slide.
+ CPPUNIT_ASSERT(HasLinksOnPage(pPdfPage));
+
+ // Second page should have no links (3rd slide).
+ PageHolder pPdfPage2(FPDF_LoadPage(pPdfDocument.get(), /*page_index=*/1));
+ CPPUNIT_ASSERT(pPdfPage2.get());
+ CPPUNIT_ASSERT(!HasLinksOnPage(pPdfPage2));
+}
+
void PdfExportTest::testPdfImageResourceInlineXObjectRef()
{
// Create an empty document.
commit 13b112d958afef5afba18ac362dcaa6f88365913
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Mar 20 23:54:54 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
tdf#100706: get blink cursor delay for MacOS
See https://bugs.documentfoundation.org/show_bug.cgi?id=100706#c1
Change-Id: I2e471f093ce18c8716108c4ba793c2124e489295
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90855
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 2fcdef3609e9..3d0f19f418a0 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -95,6 +95,8 @@ public:
bool mbGeometryDidChange;
+ int mnBlinkCursorDelay;
+
public:
/** Constructor
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 1bd88a810bc0..9065a3de2ff5 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -82,7 +82,8 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent,
SalFrameStyleFlags salFrameStyle
mePointerStyle( PointerStyle::Arrow ),
mnTrackingRectTag( 0 ),
mrClippingPath( nullptr ),
- mnICOptions( InputContextFlags::NONE )
+ mnICOptions( InputContextFlags::NONE ),
+ mnBlinkCursorDelay ( 500 )
{
mpParent = dynamic_cast<AquaSalFrame*>(pParent);
@@ -90,6 +91,19 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent,
SalFrameStyleFlags salFrameStyle
SalData* pSalData = GetSalData();
pSalData->mpInstance->insertFrame( this );
+ NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+ if (userDefaults != nil)
+ {
+ id setting = [userDefaults objectForKey:
@"NSTextInsertionPointBlinkPeriodOn"];
+ if (setting)
+ mnBlinkCursorDelay = [setting intValue];
+ else
+ {
+ setting = [userDefaults objectForKey:
@"NSTextInsertionPointBlinkPeriodOff"];
+ if (setting)
+ mnBlinkCursorDelay = [setting intValue];
+ }
+ }
}
AquaSalFrame::~AquaSalFrame()
@@ -1279,7 +1293,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
aStyleSettings.SetMenuBarRolloverTextColor( aMenuTextColor );
aStyleSettings.SetMenuBarHighlightTextColor(aStyleSettings.GetMenuHighlightTextColor());
- aStyleSettings.SetCursorBlinkTime( 500 );
+ aStyleSettings.SetCursorBlinkTime( mnBlinkCursorDelay );
// no mnemonics on macOS
aStyleSettings.SetOptions( aStyleSettings.GetOptions() |
StyleSettingsOptions::NoMnemonics );
commit 8d60d092cb4679aa7ca1c00a71480cb5ecb52f86
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Mar 19 16:00:45 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
Missing test dependency
`make clean && make CppunitTest_sw_apitests` SIGABRT'ed with
[...]
> warn:vcl.builder:2929395:2929395:vcl/source/window/builder.cxx:462:
DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window*, const
rtl::OUString&, const rtl::OUString&, const rtl::OString&, const
com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, bool, const
NotebookBarAddonsItem*)
> when: Unable to read .ui file exception:
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebarstylespanel.ui
>
warn:sfx.sidebar:2929395:2929395:sfx2/source/sidebar/SidebarController.cxx:976:
Cannot create panel
private:resource/toolpanel/SvxPanelFactory/StylesPropertyPanel
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebarstylespanel.ui
> warn:vcl.builder:2929395:2929395:vcl/source/window/builder.cxx:462:
DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window*, const
rtl::OUString&, const rtl::OUString&, const rtl::OString&, const
com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, bool, const
NotebookBarAddonsItem*)
> when: Unable to read .ui file exception:
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebartextpanel.ui
>
warn:sfx.sidebar:2929395:2929395:sfx2/source/sidebar/SidebarController.cxx:976:
Cannot create panel
private:resource/toolpanel/SvxPanelFactory/TextPropertyPanel
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebartextpanel.ui
> warn:vcl.builder:2929395:2929395:vcl/source/window/builder.cxx:462:
DBG_UNHANDLED_EXCEPTION in VclBuilder::VclBuilder(vcl::Window*, const
rtl::OUString&, const rtl::OUString&, const rtl::OString&, const
com::sun::star::uno::Reference<com::sun::star::frame::XFrame>&, bool, const
NotebookBarAddonsItem*)
> when: Unable to read .ui file exception:
com.sun.star.container.NoSuchElementException message:
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebarparagraph.ui
> warn:legacy.osl:2929395:2929395:vcl/source/window/window.cxx:269: Window
( 7Control()) with live children destroyed: 7VclVBox()
> Window ( 7Control()) with live children destroyed: 7VclVBox()
Change-Id: I89b6365bdabfea75e53a2bce7f8639061390e038
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90754
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 61d8d991a27c3bfe70e3b8d3b4ce4d8a41d18d2d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90644
diff --git a/sw/CppunitTest_sw_apitests.mk b/sw/CppunitTest_sw_apitests.mk
index dec7bc7e3de2..d65c058fc97c 100644
--- a/sw/CppunitTest_sw_apitests.mk
+++ b/sw/CppunitTest_sw_apitests.mk
@@ -74,4 +74,8 @@ $(eval $(call gb_CppunitTest_use_configuration,sw_apitests))
$(eval $(call gb_CppunitTest_use_rdb,sw_apitests,services))
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_apitests, \
+ svx \
+))
+
# vim: set noet sw=4 ts=4:
commit e9eaa0a91a418b6c073ec95f79269216605433ca
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Mar 20 13:05:18 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
fix CppunitTest_sw_accessible_relation_set dependency
warn:sal.osl:4733:4733:sal/osl/unx/module.cxx:162:
dlopen(/home/seli/build/suse/l1/instdir/program/libacclo.so, 1):
/home/seli/build/suse/l1/instdir/program/libacclo.so: cannot open shared object
file: No such file or directory
warn:legacy.osl:4733:4733:toolkit/source/helper/accessibilityclient.cxx:183:
AccessibilityClient::ensureInitialized: could not load the library, or not
retrieve the needed symbol!
Change-Id: I72ea338ae69ffabe2187f4725ec13deea9a2afd6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90789
Tested-by: Luboš Luňák <l.lu...@collabora.com>
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
(cherry picked from commit 6bc2b598d6b748a130b84d4a7e07f3b3c34fe3e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90810
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/CppunitTest_sw_accessible_relation_set.mk
b/sw/CppunitTest_sw_accessible_relation_set.mk
index 90b500f429aa..ddb1754426c5 100644
--- a/sw/CppunitTest_sw_accessible_relation_set.mk
+++ b/sw/CppunitTest_sw_accessible_relation_set.mk
@@ -58,4 +58,7 @@ $(eval $(call
gb_CppunitTest_use_rdb,sw_accessible_relation_set,services))
$(eval $(call gb_CppunitTest_use_configuration,sw_accessible_relation_set))
+# we need to explicitly depend on Library_acc because it's dynamically loaded
+$(call gb_CppunitTest_get_target,sw_accessible_relation_set) : $(call
gb_Library_get_target,acc)
+
# vim: set noet sw=4 ts=4:
commit aa44b578614ce3d2895db5e713734e004ee08bc2
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Fri Mar 20 19:15:12 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
fix test dependencies
I'm not sure if this is the right dependency, but this test is
paired in Module_dbaccess.mk with CppunitTest_dbaccess_hsqldb_test
and that one uses this too, and it makes the dependencies work.
Change-Id: Ib7d1dff99ed5e6f91f11d6a583475323a3307ad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90835
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
(cherry picked from commit 5ef77a5af1ffa8f83fa6d803494bc0afe3742375)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90817
diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index 27e47b40ce06..ac11256d6bfd 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -54,6 +54,10 @@ $(eval $(call
gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
xo \
))
+$(eval $(call gb_CppunitTest_use_jars,dbaccess_RowSetClones, \
+ sdbc_hsqldb \
+))
+
$(eval $(call gb_CppunitTest_use_api,dbaccess_RowSetClones,\
offapi \
oovbaapi \
commit 3c19b9f946aeaa3577c3474bb325d1848864bd23
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Mar 19 20:01:44 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
make: map slowcheck to gbuild's build and slowcheck
This is meant to to fix the Jenkins Windows/macOS buildbots after they
started to run 'make unitcheck slowcheck'.
(cherry picked from commit 4054a30e2b2fa254dfb20718ce757ceb2f638fd5)
Change-Id: I128448ca3a190969c0cc0f02d2c27bc0a373129b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90793
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/Makefile.in b/Makefile.in
index 50b995df7499..ce2dd29358bf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck
subsequentcheck perfcheck uic
MAKECMDGOALS?=all
build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
- $(if $(filter build-nocheck uicheck,$(MAKECMDGOALS)),build)\
+ $(if $(filter build-nocheck slowcheck uicheck,$(MAKECMDGOALS)),build)\
$(if $(filter check,$(MAKECMDGOALS)),subsequentcheck $(if $(filter Linux,
$(shell uname)), uicheck))\
$(filter all build-l10n-only build-non-l10n-only debugrun help showmodules
translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo
gbuildtojson,$(MAKECMDGOALS))
commit 9ff59f11bda4f80c44260847d5e4511ae1546122
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Thu Mar 12 15:09:02 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:53 2020 +0100
tdf#130208 use TableCellBackgroundColor instead of BackgroundColor
Change-Id: I2f1d5fdf976f9e787d64098a091022182156e401
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90408
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
(cherry picked from commit 2a5dfda892ca444eca2a0fcba2b28b9c9fd2915e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90403
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index 0cc64ef83294..335a1b7fb5df 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -10692,7 +10692,7 @@
<object class="GtkMenuToolButton"
id="Table-BackgroundColor1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:TableCellBackgroundColor</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
index 6760c607c84b..18b51e7776d1 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_compact.ui
@@ -9767,7 +9767,7 @@
<object class="GtkToolButton"
id="Table-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:TableCellBackgroundColor</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
index 206a86f0e881..259161e66950 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui
@@ -5685,7 +5685,7 @@
<object class="GtkMenuToolButton"
id="Table-LineSpacing">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:TableCellBackgroundColor</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -6213,7 +6213,7 @@
<object class="GtkMenuToolButton"
id="Table-BackgroundColor">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:TableCellBackgroundColor</property>
</object>
<packing>
<property
name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui
b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index aa1e24a11446..0f1faa7faee4 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -2678,7 +2678,7 @@
<object class="GtkMenuToolButton"
id="Table-BackgroundColor">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="action_name">.uno:BackgroundColor</property>
+ <property
name="action_name">.uno:TableCellBackgroundColor</property>
</object>
<packing>
<property name="expand">False</property>
commit ac9ce5f217ee7e951a85606703f198a5a4ca8114
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sat Feb 22 17:29:15 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:52 2020 +0100
Adapt o3tl::span to removal of std::span::cbegin et al
<https://cplusplus.github.io/LWG/issue3320> "span::cbegin/cend methods
produce
different results than std::[ranges::]cbegin/cend", as implemented now in
<https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=commit;
h=247f410b83797a1840573840cc2a539ef9d7f96b> "libstdc++: Remove
std::span::cbegin
and std::span::cend (LWG 3320)".
Turns out we only used the removed member functions in
o3tl/qa/test-span.cxx.
Change-Id: I6c73797594b4e0e753a88840033d54961e271df5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89261
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90634
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/o3tl/span.hxx b/include/o3tl/span.hxx
index b19d2d847ac7..8af8ba846b65 100644
--- a/include/o3tl/span.hxx
+++ b/include/o3tl/span.hxx
@@ -62,18 +62,11 @@ public:
constexpr iterator begin() const noexcept { return data_; }
constexpr iterator end() const noexcept { return begin() + size(); }
- constexpr const_iterator cbegin() const noexcept { return begin(); }
- constexpr const_iterator cend() const noexcept { return end(); }
-
reverse_iterator rbegin() const noexcept
{ return reverse_iterator(end()); }
reverse_iterator rend() const noexcept
{ return reverse_iterator(begin()); }
- constexpr const_reverse_iterator crbegin() const noexcept
- { return rbegin(); }
- constexpr const_reverse_iterator crend() const noexcept { return rend(); }
-
constexpr size_type size() const noexcept { return size_; }
constexpr reference operator [](size_type pos) const {
diff --git a/o3tl/qa/test-span.cxx b/o3tl/qa/test-span.cxx
index 3cb78ace1db2..26eedfc21938 100644
--- a/o3tl/qa/test-span.cxx
+++ b/o3tl/qa/test-span.cxx
@@ -34,15 +34,9 @@ private:
CPPUNIT_ASSERT_EQUAL(1, *v.begin());
CPPUNIT_ASSERT_EQUAL(
o3tl::span<int>::difference_type(3), v.end() - v.begin());
- CPPUNIT_ASSERT_EQUAL(1, *v.cbegin());
- CPPUNIT_ASSERT_EQUAL(
- o3tl::span<int>::difference_type(3), v.cend() - v.cbegin());
CPPUNIT_ASSERT_EQUAL(3, *v.rbegin());
CPPUNIT_ASSERT_EQUAL(
o3tl::span<int>::difference_type(3), v.rend() - v.rbegin());
- CPPUNIT_ASSERT_EQUAL(3, *v.crbegin());
- CPPUNIT_ASSERT_EQUAL(
- o3tl::span<int>::difference_type(3), v.crend() - v.crbegin());
CPPUNIT_ASSERT_EQUAL(std::size_t(3), v.size());
CPPUNIT_ASSERT(!v.empty());
CPPUNIT_ASSERT_EQUAL(2, v[1]);
commit adc368b9f08daa2cc23675c9661b7b772f4952a3
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Mar 16 21:18:25 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:52 2020 +0100
tdf#131118 VML import: fix size of non-autosize shapes containing text
Regression from commit b92293b3943423324064a8513c2e114d18817179
(tdf#103983 VML import: handle <v:textbox
style="mso-fit-shape-to-text:t">, 2020-01-20), the problem was that in
case we disable autosize too late, then the size will be already set
during adding text to the shape.
Do it before adding text, this way adding text won't change the shape
size, so it'll be correct at the end of the import.
(cherry picked from commit 4ee7ee1c4a515479bc174543af4dbc400035c0ba)
Change-Id: I9410fc695c3edfa5089d845864bf237e71c533c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90602
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/oox/qa/unit/data/shape-non-autosize-with-text.docx
b/oox/qa/unit/data/shape-non-autosize-with-text.docx
new file mode 100644
index 000000000000..b9ae501f4b93
Binary files /dev/null and b/oox/qa/unit/data/shape-non-autosize-with-text.docx
differ
diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx
index 01539abdfbda..b83334eeadc6 100644
--- a/oox/qa/unit/vml.cxx
+++ b/oox/qa/unit/vml.cxx
@@ -103,6 +103,24 @@ CPPUNIT_TEST_FIXTURE(OoxVmlTest, testSpt202ShapeType)
CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"),
xShape->getShapeType());
}
+CPPUNIT_TEST_FIXTURE(OoxVmlTest, testShapeNonAutosizeWithText)
+{
+ // Load a document which has a group shape, containing a single child.
+ // 17.78 cm is the full group shape width, 19431/64008 is the child
shape's relative width inside
+ // that, so 5.3975 cm should be the shape width.
+ load("shape-non-autosize-with-text.docx");
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPage>
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess> xGroup(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
+ uno::Reference<drawing::XShape> xShape(xGroup->getByIndex(0),
uno::UNO_QUERY);
+ // Without the accompanying fix in place, this test would have failed with:
+ // - Actual : 1115
+ // - Expected: 5398
+ // because the width was determined using its text size, not using the
explicit size.
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5398),
xShape->getSize().Width);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 82cacfdcaf68..45409c3f23a3 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -784,6 +784,9 @@ Reference< XShape > SimpleShape::implConvertAndInsert(
const Reference< XShapes
eTextVerticalAdjust = drawing::TextVerticalAdjust_BOTTOM;
PropertySet(xShape).setAnyProperty(PROP_TextVerticalAdjust,
makeAny(eTextVerticalAdjust));
+ PropertySet(xShape).setAnyProperty(PROP_TextAutoGrowHeight,
+ makeAny(maTypeModel.mbAutoHeight));
+
if (getTextBox())
{
getTextBox()->convert(xShape);
@@ -797,9 +800,6 @@ Reference< XShape > SimpleShape::implConvertAndInsert(
const Reference< XShapes
xShape->setSize(aSize);
}
}
-
- PropertySet(xShape).setAnyProperty(PROP_TextAutoGrowHeight,
- makeAny(maTypeModel.mbAutoHeight));
}
// Import Legacy Fragments (if any)
commit a80f5943b16d706f56af110e70244b32dd43209e
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Mar 18 14:04:52 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:52 2020 +0100
Update git submodules
* Update dictionaries from branch 'libreoffice-6-4'
to 390a74603cd452dc35b34bc956927d519953bcab
- tdf#130999 fix registration of Greek dictionary
Change-Id: I7b85d588c67c9b05f3856d92544fb0a0348594ea
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/90626
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/dictionaries b/dictionaries
index 2e25022c7405..390a74603cd4 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 2e25022c7405dc29aab47f26369bbcc21fbe6e68
+Subproject commit 390a74603cd452dc35b34bc956927d519953bcab
commit a8f400d4d5fefd3dab8ea6c9bc34b56c78175ac5
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Mar 17 20:14:17 2020 +0000
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:52 2020 +0100
tdf#131069 always produce utf-8 from gettext
Change-Id: I311e647f08b4d541825e7790d971b98b5b5bfe40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90631
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx
index 47069489aa41..786c83df2e7b 100644
--- a/unotools/source/i18n/resmgr.cxx
+++ b/unotools/source/i18n/resmgr.cxx
@@ -130,7 +130,10 @@ namespace Translate
OString sPath(OUStringToOString(path, osl_getThreadTextEncoding()));
gen.add_messages_path(sPath.getStr());
#if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID
+ // allow gettext to find these .mo files e.g. so gtk dialogs can use
them
bindtextdomain(pPrefixName, sPath.getStr());
+ // tdf#131069 gtk, and anything sane, always wants utf-8 strings as
output
+ bind_textdomain_codeset(pPrefixName, "UTF-8");
#endif
gen.add_messages_domain(pPrefixName);
commit 7f8f09cd018cc6ced6e348f2adb5e4621f4307b2
Author: Roman Kuznetsov <antilibreoff...@gmail.com>
AuthorDate: Mon Mar 16 08:58:08 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:52 2020 +0100
tdf#128281 Increase a checkbox height in Windows installer
Change-Id: Ic0bc2af1dd565dc9c24a74de8900da771f052a95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90402
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit e6d008f131c7ca532a9e8410b424b3323d581978)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90404
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 41708a651b5a..a573077997f6 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -214,8 +214,8 @@ ReadyToInstall DlgTitle Text 13 6
380 25 65538 OOO_CONTROL_170
ReadyToInstall DlgTitle2 Text 13 6 380 25 65538
OOO_CONTROL_171
ReadyToInstall DlgTitle3 Text 13 6 380 25 65538
OOO_CONTROL_172
ReadyToInstall InstallNow PushButton 330 243 66 17
3 OOO_CONTROL_173 Cancel
-ReadyToInstall DesktopLink CheckBox 21 100 300 10
3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart
-ReadyToInstall EnableQuickstart CheckBox 21 125 300
15 3 QUICKSTART OOO_CONTROL_321 Back
+ReadyToInstall DesktopLink CheckBox 21 100 300 15
3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart
+ReadyToInstall EnableQuickstart CheckBox 21 130 300
15 3 QUICKSTART OOO_CONTROL_321 Back
ReadyToRemove Back PushButton 264 243 66 17 3
OOO_CONTROL_174 RemoveNow
ReadyToRemove Banner Bitmap 0 0 474 44 1
BannerBmp
ReadyToRemove BannerLine Line 0 44 474 0 1
commit f31bf2bcf980d1600769674d4c9c50a59f2a3094
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Mar 14 17:18:52 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:52 2020 +0100
tdf#131337: fix range for "Surface angle" (tab "Shading" in "3D Effects")
Should be to 90° max instead of 1000°
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=11d0c28601dc89c48e67a7b39ba82dd52e660334
author Caolán McNamara <caol...@redhat.com> 2014-12-28 16:30:18 +0000
committer Caolán McNamara <caol...@redhat.com> 2014-12-30 15:43:39
+0000
commit 11d0c28601dc89c48e67a7b39ba82dd52e660334 (patch)
tree 75e0e9d83694637de1e3b95a25c66de911d381bc
parent 04299dba24d04b08d54f4f5945d340d7abfa73e4 (diff)
convert RID_SVXFLOAT_3D docking window to .ui
This is an epic dialog with lots of moving parts
Change-Id: I867723f65273bf46b0693910d88e11a9197384c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90397
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/svx/uiconfig/ui/docking3deffects.ui
b/svx/uiconfig/ui/docking3deffects.ui
index 32691a53a020..e51705b52a5b 100644
--- a/svx/uiconfig/ui/docking3deffects.ui
+++ b/svx/uiconfig/ui/docking3deffects.ui
@@ -30,8 +30,8 @@
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment6">
- <property name="lower">1</property>
- <property name="upper">1000</property>
+ <property name="lower">0</property>
+ <property name="upper">90</property>
<property name="step_increment">5</property>
<property name="page_increment">10</property>
</object>
commit 60dda240999ef39a0b09379455a972e5d03ec771
Author: Armin Le Grand <armin.le.gr...@me.com>
AuthorDate: Tue Mar 10 16:15:45 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:52 2020 +0100
tdf#125520 create a persist correctly for OLE
If the D&D-Start described as in the task is an
OLE object we need to create a Persist-object
to copy the included EmbeddedObjectContainer
Change-Id: Ib8b9677bbc3e6c5b3895abc55e6da5b0a96e33d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90263
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <armin.le.gr...@me.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90336
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index b3800f9505e6..9c556ecddd91 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1230,7 +1230,21 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell,
const OUString& rName, ScCo
SdrPageView* pPV = aEditView.GetSdrPageView();
aEditView.MarkObj(pObject, pPV);
+ // tdf125520 this is a D&D-start potentially with an OLE object. If
+ // so, we need to do similar as e.g. in ScDrawView::BeginDrag so
that
+ // the temporary SdrModel for transfer does have a GetPersist() so
+ // that the EmbeddedObjectContainer gets copied. We noeed no
CheckOle
+ // here, test is simpler.
+ ScDocShellRef aDragShellRef;
+ if(OBJ_OLE2 == pObject->GetObjIdentifier())
+ {
+ aDragShellRef = new ScDocShell; // DocShell needs a Ref
immediately
+ aDragShellRef->DoInitNew();
+ }
+
+ ScDrawLayer::SetGlobalDrawPersist(aDragShellRef.get());
std::unique_ptr<SdrModel>
pDragModel(aEditView.CreateMarkedObjModel());
+ ScDrawLayer::SetGlobalDrawPersist(nullptr);
TransferableObjectDescriptor aObjDesc;
pSrcShell->FillTransferableObjectDescriptor( aObjDesc );
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 8fcd742ec71f..88083f3e93e0 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -57,6 +57,7 @@
#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
#include <svx/sdr/contact/displayinfo.hxx>
#include <svx/svdotable.hxx>
+#include <sal/log.hxx>
using namespace com::sun::star;
@@ -744,7 +745,16 @@ std::unique_ptr<SdrModel>
SdrExchangeView::CreateMarkedObjModel() const
if(nullptr == pNewObj)
{
- // not cloned yet, use default way
+ // not cloned yet
+ if(pObj->GetObjIdentifier() == OBJ_OLE2 && nullptr ==
mpModel->GetPersist())
+ {
+ // tdf#125520 - former fix was wrong, the SdrModel
+ // has to have a GetPersist() already, see task.
+ // We can still warn here when this is not the case
+ SAL_WARN( "svx", "OLE gets cloned Persist,
EmbeddedObjectContainer will not be copied" );
+ }
+
+ // use default way
pNewObj = pObj->CloneSdrObject(*pNewModel);
}
commit 5646b503e684863db5b875847bca4c9a8f91dd77
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Feb 21 08:06:51 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:51 2020 +0100
Set Firebird creation option experimental
See:
http://document-foundation-mail-archive.969070.n3.nabble.com/About-putting-Firebird-creation-option-experimental-tt4274028.html
http://document-foundation-mail-archive.969070.n3.nabble.com/ESC-meeting-minutes-2020-02-20-tt4274082.html
for rationale
Change-Id: I73d1563575252ebbcfb764753294bceb29e9bf12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89167
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
(cherry picked from commit dc3c6e64650f0347648598dae0fa67c296ad36f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89132
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index cf564821fcf0..31bed5505d5c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -41,6 +41,7 @@
#include <comphelper/processfactory.hxx>
#include <unotools/confignode.hxx>
#include <osl/diagnose.h>
+#include <svtools/miscopt.hxx>
#include <sal/log.hxx>
#include <dbwizsetup.hxx>
@@ -146,6 +147,9 @@ namespace dbaui
DisplayedTypes aDisplayedTypes;
::dbaccess::ODsnTypeCollection::TypeIterator aEnd =
m_pCollection->end();
+
+ SvtMiscOptions aMiscOptions;
+
for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop
= m_pCollection->begin();
aTypeLoop != aEnd;
++aTypeLoop
@@ -158,6 +162,8 @@ namespace dbaui
if (m_xEmbeddedDBType->find_text(sDisplayName) == -1 &&
dbaccess::ODsnTypeCollection::isEmbeddedDatabase(sURLPrefix))
{
+ if( !aMiscOptions.IsExperimentalMode() &&
sURLPrefix.startsWith("sdbc:embedded:firebird") )
+ continue;
aDisplayedTypes.emplace_back( sURLPrefix,
sDisplayName );
}
}
commit 5960e20c42befea261ea6545f684317bcc7c4bbc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Mar 4 10:13:08 2020 +0000
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:51 2020 +0100
tdf#131076 allow 'return' in GtkComboBox to activate default widget
typically ok and accept the dialog. alt+down is documented as the
default menu-activate key binding, space will also work to popup
the menu from a combobox.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89950
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 7a078207fbfd71b33cb51c38b3886351fedcde8d)
Change-Id: I7bec880670cc006b288996d6f59a88fe9a9fb8cc
tdf#131223 let return deactive active popup
Change-Id: Ib116a1eb047aa9f1a5ca7a2ec9333a793addd304
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90188
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 0d81a613ef5af22253e51d9917c5d5c94d764456)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90381
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 541b3356b203..f82347713d65 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -11409,6 +11409,24 @@ private:
return pThis->signal_key_press(pEvent);
}
+ // tdf#131076 we want return in a GtkComboBox to act like return in a
+ // GtkEntry and activate the default dialog/assistant button
+ bool combobox_activate()
+ {
+ GtkWidget *pComboBox = GTK_WIDGET(m_pComboBox);
+ GtkWidget *pToplevel = gtk_widget_get_toplevel(pComboBox);
+ GtkWindow *pWindow = GTK_WINDOW(pToplevel);
+ if (!pWindow)
+ return false;
+ if (!GTK_IS_DIALOG(pWindow) && !GTK_IS_ASSISTANT(pWindow))
+ return false;
+ bool bDone = false;
+ GtkWidget *pDefaultWidget = gtk_window_get_default_widget(pWindow);
+ if (pDefaultWidget && pDefaultWidget != m_pToggleButton &&
gtk_widget_get_sensitive(pDefaultWidget))
+ bDone = gtk_widget_activate(pDefaultWidget);
+ return bDone;
+ }
+
bool signal_key_press(const GdkEventKey* pEvent)
{
KeyEvent aKEvt(GtkToVcl(*pEvent));
@@ -11417,7 +11435,8 @@ private:
bool bDone = false;
- switch (aKeyCode.GetCode())
+ auto nCode = aKeyCode.GetCode();
+ switch (nCode)
{
case KEY_DOWN:
case KEY_UP:
@@ -11429,9 +11448,16 @@ private:
case KEY_RIGHT:
case KEY_RETURN:
m_aQuickSelectionEngine.Reset();
+ // tdf#131076 don't let bare return toggle menu popup active,
but do allow deactive
+ if (nCode == KEY_RETURN && !pEvent->state && !m_bPopupActive)
+ bDone = combobox_activate();
break;
default:
- bDone = m_aQuickSelectionEngine.HandleKeyEvent(aKEvt);
+ // tdf#131076 let base space toggle menu popup when its not
already visible
+ if (nCode == KEY_SPACE && !pEvent->state && !m_bPopupActive)
+ bDone = false;
+ else
+ bDone = m_aQuickSelectionEngine.HandleKeyEvent(aKEvt);
break;
}
commit 2b4371fd99562b333ccfc28e7f2647fc50622558
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 12 10:30:21 2020 +0000
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:51 2020 +0100
Resolves: tdf#126366 revert use of SfxDispatcher::Lock
Revert "tdf#121607 defer other requests until password dialog is dismissed"
This reverts commit 205aeffda1a29865576fb865f23dfb6761ebfab1
as far as I can see the original problem doesn't reappear anyway
Change-Id: If5fd3383f3473662bc87a367fad2c1febe1c6a23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90388
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index a2a2ff35b455..0465bf430e78 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -203,27 +203,9 @@ void SwModule::StateOther(SfxItemSet &rSet)
{
SwView* pView = ::GetActiveView();
std::shared_ptr<SwMailMergeConfigItem> xConfigItem;
- bool bUnLockDispatcher = false;
- SfxDispatcher* pDispatcher = nullptr;
if (pView)
- {
xConfigItem = pView->EnsureMailMergeConfigItem();
- // tdf#121607 lock the dispatcher while processing
- // this request, and release it afterwards,
- // that means that if this request pops up a dialog
- // any other pending requests will be deferred
- // until this request is finished, i.e. they won't
- // be dispatched by the dispatcher timeout until
- // unlock is called, serializing the password dialogs
- pDispatcher = pView->GetViewFrame()->GetDispatcher();
- if (!pDispatcher->IsLocked())
- {
- pDispatcher->Lock(true);
- bUnLockDispatcher = true;
- }
- }
-
// #i51949# hide e-Mail option if e-Mail is not supported
// #i63267# printing might be disabled
if (!xConfigItem ||
@@ -237,9 +219,6 @@ void SwModule::StateOther(SfxItemSet &rSet)
{
rSet.DisableItem(nWhich);
}
-
- if (bUnLockDispatcher)
- pDispatcher->Lock(false);
}
break;
default:
commit abedc4a182acfdb111b59d1b570fff9cf88cf6f5
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Mar 11 12:42:01 2020 +0000
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:51 2020 +0100
mysterious greyed out native toggle buttons when in foreground
and flipping to normal mode when in background.
Change-Id: I100efb651515b044d56a8c3838569cf717b37d51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90279
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 5680ddf71bc2..716d5316203a 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -3057,11 +3057,14 @@ bool GtkSalGraphics::updateSettings(AllSettings&
rSettings)
pos = gtk_widget_path_append_type (pCPath, GTK_TYPE_LABEL);
gtk_widget_path_iter_add_class(pCPath, pos, GTK_STYLE_CLASS_LABEL);
GtkStyleContext *pCStyle = makeContext (pCPath, nullptr);
+ aContextState.save(pCStyle);
GdkRGBA tooltip_bg_color, tooltip_fg_color;
style_context_set_state(pCStyle, GTK_STATE_FLAG_NORMAL);
gtk_style_context_get_color(pCStyle,
gtk_style_context_get_state(pCStyle), &tooltip_fg_color);
gtk_style_context_get_background_color(pCStyle,
gtk_style_context_get_state(pCStyle), &tooltip_bg_color);
+
+ aContextState.restore();
g_object_unref( pCStyle );
aStyleSet.SetHelpColor( getColor( tooltip_bg_color ));
@@ -3074,6 +3077,7 @@ bool GtkSalGraphics::updateSettings(AllSettings&
rSettings)
gtk_widget_path_append_type( pCPath, GTK_TYPE_TEXT_VIEW );
gtk_widget_path_iter_add_class( pCPath, -1, GTK_STYLE_CLASS_VIEW );
GtkStyleContext *pCStyle = makeContext( pCPath, nullptr );
+ aContextState.save(pCStyle);
// highlighting colors
style_context_set_state(pCStyle, GTK_STATE_FLAG_SELECTED);
@@ -3113,6 +3117,7 @@ bool GtkSalGraphics::updateSettings(AllSettings&
rSettings)
aShadowColor.DecreaseLuminance(64);
aStyleSet.SetShadowColor(aShadowColor);
+ aContextState.restore();
g_object_unref( pCStyle );
// Tab colors
commit 451b8069cd4a95b73ae9d72b96c743af99ab7288
Author: Armin.Le.Grand (CIB) <armin.le.gr...@me.com>
AuthorDate: Tue Mar 3 11:34:45 2020 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Mon Mar 23 14:13:51 2020 +0100
tdf#130150 Improve clipping in PDF export
For more info and discusson please have a look
at the task. It reverts the change from tdf#99680
which did a wrong paradigm change in how clip in
Region(s) is defined and tries to fix the
underlying error in a more correct way.
This includes problems noted in tdf#44388 and
tdf#113449.
This is a decent improvement, but - due to dealing
with numerical problems - not yet the whole healing.
Still thinking about how to solve this for good.
Adapted PdfExportTest::testTdf99680() and
PdfExportTest::testTdf99680_2() as needed, empty
clip regions are allowed again. Added comments, too.
Had to change solvePolygonOperationAnd to work
on ranges if both inputs *are* ranges. The AND-case
is then completely solvable. Also increased geometry
for transformations of clip geometries - may help
later.
Change-Id: I2370447597faa6efb81d58ee31c63654e304262e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89874
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 6dff631f8f4b964b48aadde52a1e1b8b04b9ba53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89923
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx
b/basegfx/source/polygon/b2dpolygontools.cxx
index 4ac68958eaa2..cbc18ee74203 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -333,15 +333,15 @@ namespace basegfx
const B2DPoint aPreviousPoint(aCurrentPoint);
aCurrentPoint = aCandidate.getB2DPoint(a);
- // cross-over in Y?
- const bool bCompYA(fTools::more(aPreviousPoint.getY(),
rPoint.getY()));
- const bool bCompYB(fTools::more(aCurrentPoint.getY(),
rPoint.getY()));
+ // cross-over in Y? tdf#130150 use full precision, no
need for epsilon
+ const bool bCompYA(aPreviousPoint.getY() >
rPoint.getY());
+ const bool bCompYB(aCurrentPoint.getY() >
rPoint.getY());
if(bCompYA != bCompYB)
{
- // cross-over in X?
- const bool
bCompXA(fTools::more(aPreviousPoint.getX(), rPoint.getX()));
- const bool
bCompXB(fTools::more(aCurrentPoint.getX(), rPoint.getX()));
+ // cross-over in X? tdf#130150 use full precision,
no need for epsilon
+ const bool bCompXA(aPreviousPoint.getX() >
rPoint.getX());
+ const bool bCompXB(aCurrentPoint.getX() >
rPoint.getX());
if(bCompXA == bCompXB)
{
@@ -357,7 +357,8 @@ namespace basegfx
(aPreviousPoint.getX() -
aCurrentPoint.getX()) /
(aPreviousPoint.getY() -
aCurrentPoint.getY()));
- if(fTools::more(fCompare, rPoint.getX()))
+ // tdf#130150 use full precision, no need for
epsilon
+ if(fCompare > rPoint.getX())
{
bRetval = !bRetval;
}
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index 0ea1e8b9b863..9d2e574c1b2d 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -986,6 +986,42 @@ namespace basegfx
}
else
{
+ // tdf#130150 shortcut & precision: If both are simple ranges,
+ // solve based on ranges
+ if(basegfx::utils::isRectangle(rCandidateA) &&
basegfx::utils::isRectangle(rCandidateB))
+ {
+ // *if* both are ranges, AND always can be solved
+ const basegfx::B2DRange aRangeA(rCandidateA.getB2DRange());
+ const basegfx::B2DRange aRangeB(rCandidateB.getB2DRange());
+
+ if(aRangeA.isInside(aRangeB))
+ {
+ // 2nd completely inside 1st -> 2nd is result of AND
+ return rCandidateB;
+ }
+
+ if(aRangeB.isInside(aRangeA))
+ {
+ // 2nd completely inside 1st -> 2nd is result of AND
+ return rCandidateA;
+ }
+
+ // solve by intersection
+ basegfx::B2DRange aIntersect(aRangeA);
+ aIntersect.intersect(aRangeB);
+
+ if(aIntersect.isEmpty())
+ {
+ // no overlap -> empty polygon as result of AND
+ return B2DPolyPolygon();
+ }
+
+ // create polygon result
+ return B2DPolyPolygon(
+ basegfx::utils::createPolygonFromRect(
+ aIntersect));
+ }
+
// concatenate polygons, solve crossovers and throw away all
sub-polygons
// with a depth of < 1. This means to keep all polygons where
at least two
// polygons do overlap.
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 1603cc83a8e5..9b95717d4349 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -816,15 +816,17 @@ void PdfExportTest::testTdf99680()
aZCodec.Decompress(rObjectStream, aUncompressed);
CPPUNIT_ASSERT(aZCodec.EndCompression());
- // Make sure there are no empty clipping regions.
- OString aEmptyRegion("0 0 m h W* n");
- auto pStart = static_cast<const char*>(aUncompressed.GetData());
- const char* pEnd = pStart + aUncompressed.GetSize();
- auto it = std::search(pStart, pEnd, aEmptyRegion.getStr(),
aEmptyRegion.getStr() + aEmptyRegion.getLength());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Empty clipping region detected!", it, pEnd);
+ // tdf#130150 See infos in task - short: tdf#99680 was not the
+ // correct fix, so empty clip regions are valid - allow again in tests
+ // Make sure there are no empty clipping regions.
+ // OString aEmptyRegion("0 0 m h W* n");
+ // auto it = std::search(pStart, pEnd, aEmptyRegion.getStr(),
aEmptyRegion.getStr() + aEmptyRegion.getLength());
+ // CPPUNIT_ASSERT_EQUAL_MESSAGE("Empty clipping region detected!",
it, pEnd);
// Count save graphic state (q) and restore (Q) operators
// and ensure their amount is equal
+ auto pStart = static_cast<const char*>(aUncompressed.GetData());
+ const char* pEnd = pStart + aUncompressed.GetSize();
size_t nSaveCount = std::count(pStart, pEnd, 'q');
size_t nRestoreCount = std::count(pStart, pEnd, 'Q');
CPPUNIT_ASSERT_EQUAL_MESSAGE("Save/restore graphic state operators count
mismatch!", nSaveCount, nRestoreCount);
@@ -855,15 +857,17 @@ void PdfExportTest::testTdf99680_2()
aZCodec.Decompress(rObjectStream, aUncompressed);
CPPUNIT_ASSERT(aZCodec.EndCompression());
- // Make sure there are no empty clipping regions.
- OString aEmptyRegion("0 0 m h W* n");
- auto pStart = static_cast<const char*>(aUncompressed.GetData());
- const char* pEnd = pStart + aUncompressed.GetSize();
- auto it = std::search(pStart, pEnd, aEmptyRegion.getStr(),
aEmptyRegion.getStr() + aEmptyRegion.getLength());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Empty clipping region detected!", it,
pEnd);
+ // tdf#130150 See infos in task - short: tdf#99680 was not the
+ // correct fix, so empty clip regions are valid - allow again in tests
+ // Make sure there are no empty clipping regions.
+ // OString aEmptyRegion("0 0 m h W* n");
+ // auto it = std::search(pStart, pEnd, aEmptyRegion.getStr(),
aEmptyRegion.getStr() + aEmptyRegion.getLength());
+ // CPPUNIT_ASSERT_EQUAL_MESSAGE("Empty clipping region
detected!", it, pEnd);
// Count save graphic state (q) and restore (Q) operators
// and ensure their amount is equal
+ auto pStart = static_cast<const char*>(aUncompressed.GetData());
+ const char* pEnd = pStart + aUncompressed.GetSize();
size_t nSaveCount = std::count(pStart, pEnd, 'q');
size_t nRestoreCount = std::count(pStart, pEnd, 'Q');
CPPUNIT_ASSERT_EQUAL_MESSAGE("Save/restore graphic state operators
count mismatch!", nSaveCount, nRestoreCount);
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 72919042f0a2..a2a3f5ca9a5b 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9878,8 +9878,15 @@ void PDFWriterImpl::updateGraphicsState(Mode const mode)
if ( rNewState.m_aClipRegion.count() )
{
m_aPages.back().appendPolyPolygon(
rNewState.m_aClipRegion, aLine );
- aLine.append( "W* n\n" );
}
+ else
+ {
+ // tdf#130150 Need to revert tdf#99680, that breaks the
+ // rule that an set but empty clip-region clips everything
+ // aka draws nothing -> nothing is in an empty clip-region
+ aLine.append( "0 0 m h " ); // NULL clip, i.e. nothing
visible
+ }
+ aLine.append( "W* n\n" );
rNewState.m_aMapMode = aNewMapMode;
SetMapMode( rNewState.m_aMapMode );
@@ -10024,8 +10031,12 @@ void PDFWriterImpl::setMapMode( const MapMode&
rMapMode )
void PDFWriterImpl::setClipRegion( const basegfx::B2DPolyPolygon& rRegion )
{
- basegfx::B2DPolyPolygon aRegion = LogicToPixel( rRegion,
m_aGraphicsStack.front().m_aMapMode );
- aRegion = PixelToLogic( aRegion, m_aMapMode );
+ // tdf#130150 improve coordinate manipulations to double precision
transformations
+ const basegfx::B2DHomMatrix aCurrentTransform(
+ GetInverseViewTransformation(m_aMapMode) *
GetViewTransformation(m_aGraphicsStack.front().m_aMapMode));
+ basegfx::B2DPolyPolygon aRegion(rRegion);
+
+ aRegion.transform(aCurrentTransform);
m_aGraphicsStack.front().m_aClipRegion = aRegion;
m_aGraphicsStack.front().m_bClipRegion = true;
m_aGraphicsStack.front().m_nUpdateFlags |=
GraphicsStateUpdateFlags::ClipRegion;
@@ -10035,16 +10046,26 @@ void PDFWriterImpl::moveClipRegion( sal_Int32 nX,
sal_Int32 nY )
{
if( m_aGraphicsStack.front().m_bClipRegion &&
m_aGraphicsStack.front().m_aClipRegion.count() )
{
- Point aPoint( lcl_convert( m_aGraphicsStack.front().m_aMapMode,
- m_aMapMode,
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
