[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 10 commits - connectivity/source icon-themes/karasa_jaga icon-themes/karasa_jaga_svg oox/source sc/source sd/qa sd/source sw/source vcl/source vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Mar 31 08:46:17 UTC 2021
connectivity/source/drivers/file/FStatement.cxx | 7 +
connectivity/source/parse/sqliterator.cxx | 27 +++++-
icon-themes/karasa_jaga/cmd/ar/sc_defaultnumbering.png |binary
icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png |binary
icon-themes/karasa_jaga/cmd/sc_defaultnumbering.png |binary
icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png |binary
icon-themes/karasa_jaga_svg/cmd/ar/sc_defaultnumbering.svg | 2
icon-themes/karasa_jaga_svg/cmd/ar/sc_linenumberingdialog.svg | 2
icon-themes/karasa_jaga_svg/cmd/sc_defaultnumbering.svg | 2
icon-themes/karasa_jaga_svg/cmd/sc_linenumberingdialog.svg | 2
oox/source/drawingml/hyperlinkcontext.cxx | 3
oox/source/drawingml/textrun.cxx | 4
sc/source/ui/condformat/condformatdlg.cxx | 9 ++
sc/source/ui/inc/condformatdlgentry.hxx | 1
sd/qa/unit/data/pptx/tdf137367.pptx |binary
sd/qa/unit/import-tests.cxx | 41 ++++++++++
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 12 ++
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 2
sw/source/core/edit/autofmt.cxx | 2
sw/source/uibase/utlui/glbltree.cxx | 2
vcl/source/window/menu.cxx | 2
vcl/unx/gtk3/gtk3gtkinst.cxx | 3
22 files changed, 104 insertions(+), 19 deletions(-)
New commits:
commit ad9f58e419044f30f368bd9413bc918d70e7a74e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 30 12:11:42 2021 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:52 2021 +0200
fix the endif placement for GTK_CHECK_VERSION
Change-Id: I1ff3f3c32990947a353c5908665b156d87d8ff58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113291
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f29c0c018ad3..773b20ac5b07 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7783,8 +7783,8 @@ private:
gdk_event_free(pKeyEvent);
}
-#else
else
+#endif
{
guint nButton;
guint32 nTime;
@@ -7806,7 +7806,6 @@ private:
gtk_menu_popup(m_pMenu, nullptr, nullptr, nullptr, nullptr, nButton, nTime);
}
-#endif
if (g_main_loop_is_running(pLoop))
{
commit 3f0ba06495e5808ab1bd58de6abe79afffe59d7c
Author: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
AuthorDate: Tue Mar 30 11:49:16 2021 +0700
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:47 2021 +0200
KJ: Improve small numbering icons
Change-Id: I5e6aff983875c8144450b8c484cbc25e5eb465fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113333
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin <rizmut at libreoffice.org>
(cherry picked from commit a247d2f896d7fcb30f35cf95f69e32534a475fba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113287
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/icon-themes/karasa_jaga/cmd/ar/sc_defaultnumbering.png b/icon-themes/karasa_jaga/cmd/ar/sc_defaultnumbering.png
index 7247281c3ad1..6255d5be3a46 100644
Binary files a/icon-themes/karasa_jaga/cmd/ar/sc_defaultnumbering.png and b/icon-themes/karasa_jaga/cmd/ar/sc_defaultnumbering.png differ
diff --git a/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png
index bca545c56639..094ef7c30507 100644
Binary files a/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/ar/sc_linenumberingdialog.png differ
diff --git a/icon-themes/karasa_jaga/cmd/sc_defaultnumbering.png b/icon-themes/karasa_jaga/cmd/sc_defaultnumbering.png
index ca437a82c63e..6aed602d256b 100644
Binary files a/icon-themes/karasa_jaga/cmd/sc_defaultnumbering.png and b/icon-themes/karasa_jaga/cmd/sc_defaultnumbering.png differ
diff --git a/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png b/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png
index 49bdb065819c..e06aff69b007 100644
Binary files a/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png and b/icon-themes/karasa_jaga/cmd/sc_linenumberingdialog.png differ
diff --git a/icon-themes/karasa_jaga_svg/cmd/ar/sc_defaultnumbering.svg b/icon-themes/karasa_jaga_svg/cmd/ar/sc_defaultnumbering.svg
index aee94eb670f0..52386857dad5 100644
--- a/icon-themes/karasa_jaga_svg/cmd/ar/sc_defaultnumbering.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/ar/sc_defaultnumbering.svg
@@ -1 +1 @@
-<svg height="16" viewBox="0 0 4.2333333 4.2333335" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(2.9758551 0 0 2.9758549 -2309.4946 -578.87404)" gradientUnits="userSpaceOnUse" x1="778.88196" x2="778.88196" xlink:href="#b" y1="289.57986" y2="284.53162"/><linearGradient id="b"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="5.882862" x2="5.621286" xlink:href="#b" y1="294.754239" y2="278.863507"/><g fill="#fff" fill-opacity=".392157" transform="matrix(-1 0 0 1 4.233333 -293.03123)"><path d="m3.96875 293.5604-2.1166668-.00001v.26459l2.1166668.00001z" stroke-width=".125"/><path d="m3.4395832 294.08956h-1.5874999v.26458h1.5874999z" stroke-width=".125"/><g transform="matrix(-.125 0 0 .125 0 259.87498)"><path d="m-31.749998 284.30007 16.933334-.00008v2.1167h-16.933336z"/><path d="m-27.516665 288.5333
3h12.699999v2.11669h-12.699999z"/></g></g><g transform="matrix(.125 0 0 .125 2.517307 -32.89167)"><path d="m3.610746 298.44107v-1.22882q.3465908-.7625.9830574-1.48719.6427683-.72469 1.6132224-1.5124.9326441-.75619 1.3044415-1.24772.378099-.49153.378099-.96416 0-1.1595-1.1658053-1.1595-.5671484 0-.8696276.30878-.2961776.30248-.3844007.91374l-1.7833669-.10083q.1512396-1.23512.9200409-1.88419.7751029-.64907 2.104751-.64907 1.4367762 0 2.2055775.65537.7688013.65537.7688013 1.84008 0 .62387-.2457644 1.128-.2457643.50413-.630165.93264-.3844006.42221-.8570243.79401-.4663221.3718-.9074376.72469-.4411155.35289-.8066112.71209-.359194.35919-.5356402.7688h4.121279v1.45568z" fill="none" stroke="url(#c)" stroke-linejoin="round" stroke-width="4.360674" transform="scale(1.0218307 .9786357)"/><path d="m3.8917163 292.06509v-1.20256q.3391861-.74621.9620551-1.45542.629036-.70921 1.578757-1.48009.9127189-.74004 1.2765731-1.22107.3700212-.48102.3700212-.94355 0-1.13473-1.1408987-1.13473-.5550317 0-.85104
87.30218-.2898499.29602-.3761882.89422l-1.7452666-.0987q.1480085-1.20874.9003849-1.84394.7585434-.6352 2.0597846-.6352 1.4060805 0 2.1584569.64137.7523764.64137.7523764 1.80077 0 .61053-.2405138 1.10389-.2405137.49336-.6167019.91272-.3761882.41319-.8387147.77705-.4563595.36385-.8880509.7092-.4316913.34536-.7893785.69688-.3515201.35152-.5241967.75237h4.0332309v1.42458z" fill="#bfd9ff" stroke-width="2.180337"/></g><g transform="matrix(.125 0 0 .125 2.521097 -32.89167)"><path d="m3.6715918 284.12396v-1.32424h2.2112989v-6.08899l-2.1416018 1.33691v-1.40028l2.2366433-1.45096h1.6854026v7.60332h2.0465603v1.32424z" stroke="url(#a)" stroke-linejoin="round" stroke-width="4.360674" transform="scale(1.0236449 .97690126)"/><path d="m3.960415 277.56085v-1.29365h2.1602208v-5.94835l-2.0921336 1.30604v-1.36794l2.1849798-1.41745h1.646472v7.4277h1.9992875v1.29365z" fill="#bfd9ff" stroke-width="2.180337"/></g><g fill="#404040" fill-opacity=".839216" stroke-width=".125"><path d="m.25124238.79374375h2.130
00752v.26458755h-2.13000752z"/><path d="m.79374988 1.32291h1.58749992v.2645863h-1.58749992z"/><path d="m.25124263 2.6458287h2.13000747v.2645875h-2.13000747z"/><path d="m.79375 3.1749962h1.5874999v.2645863h-1.5874999z"/></g></svg>
\ No newline at end of file
+<svg height="16" viewBox="0 0 4.2333333 4.2333335" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="6.7862" x2="6.7862" xlink:href="#c" y1="275.1897" y2="266.72305"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="3.307292" x2="3.307292" xlink:href="#c" y1="3.249675" y2="2.116667"/><linearGradient id="c"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><g stroke-width="2.180337" transform="matrix(.125 0 0 .125 2.459017 -33.075797)"><path d="m6.2128906 266.72266a2.1170101 2.1170101 0 0 0 -1.0273437.26562l-2.5546875 1.41797a2.1170101 2.1170101 0 0 0 -1.0898438 1.86133l.00977 1.92773a2.1170101 2.1170101 0 0 0 .6015626 1.46289 2.1170101 2.1170101 0 0 0 -.6582032 1.53125v2.11719a2.1170101 2.1170101 0 0 0 2.1171875 2.11719h6.3496094a2.1170101 2.1170101 0 0 0 2.1171875-2.11719v-2.11719a2.1170101 2.1170101 0 0 0 -2.1171875-2.11718h.029297l-.0
13672-4.24024a2.1170101 2.1170101 0 0 0 -2.1171919-2.10937zm-.8847656 10.54101a2.1170101 2.1170101 0 0 0 .019531.004c-.0026-.00034-.019531-.002-.019531-.002s-.0000001-.002 0-.002z" fill="url(#a)"/><path d="m3.6112001 277.30638v-2.11666c.5847778 0 2.1910135.00078 2.125264-.00021l-.0086-4.23313-2.0600039 1.22994-.010292-1.92916 2.5559108-1.41766h1.646472l.021716 6.35001 2.0795306.0002v2.11667z" fill="#bfd9ff"/></g><g fill="#fff" fill-opacity=".392157" transform="matrix(-1 0 0 1 4.233333 -293.03123)"><path d="m3.96875 293.29582-2.1166668-.00001v.26459l2.1166668.00001z" stroke-width=".125"/><path d="m3.4395832 293.82498h-1.5874999v.26458h1.5874999z" stroke-width=".125"/><g transform="matrix(-.125 0 0 .125 0 259.87498)"><path d="m-31.749998 284.30007 16.933334-.00008v2.1167h-16.933336z"/><path d="m-27.516665 288.53333h12.699999v2.11669h-12.699999z"/></g></g><path d="m3.3671875 2.1171875c-.1737915 0-.3428195.047526-.4726563.15625a.26421909.26421909 0 0 0 0 .00195c-.1289799.1088955-.202423
5.2722656-.2226562.4375031a.26421909.26421909 0 0 0 .2480469.2949219l.072266.00391c-.046591.04399-.1008834.088255-.1386719.1308593a.26421909.26421909 0 0 0 -.00195.00195c-.0737312.0839473-.1357264.174371-.1816441.2753901a.26421909.26421909 0 0 0 -.023437.109375v.1757812a.26421909.26421909 0 0 0 .2636713.2636719h.7949219a.26421909.26421909 0 0 0 .2636719-.2636719v-.265625a.26421909.26421909 0 0 0 -.109375-.2128906c.072941-.088558.108149-.1663051.1308594-.2128906.041651-.08544.060547-.1809754.060547-.2753907 0-.1694871-.068557-.3498422-.2011718-.4628906-.1291463-.110091-.3027896-.1582031-.4824221-.1582031z" fill="url(#b)" stroke-width=".317094"/><path d="m2.9104167 3.7041663v-.1748925c.032886-.0723492.0795243-.1429047.1399149-.2116666.0609886-.0687619.1375233-.1405134.229604-.2152545.0884932-.071751.1630627-.1689977.1983404-.2156363.035875-.046637.053813-.092379.053813-.1372236 0-.1100185-.055308-.1650277-.1659247-.1650277-.053813 0-.09507.014649-.1237709.043946-.028102.028701-.046339
.072051-.054709.1300501l-.253821-.0143537c.01435-.1171941.057999-.2065843.1309461-.2681705.073545-.061586.1764994-.094687.3026619-.094687.1363274 0 .237864.0334.3108111.095584.072947.062184.1094206.1494814.1094206.2618921 0 .059194-.01166.1127081-.034979.1605424-.023319.047834-.065899.1301329-.102373.1707919-.036473.040061-.077132.077731-.1219771.1130087-.044247.035277-.087297.069658-.1291523.1031413-.041855.033485-.080122.067268-.1148016.1013496-.034082.034082-.023618.013158-.04036.052023l.4601069.0000003v.2645837z" fill="#bfd9ff" stroke-width=".317094"/><g fill="#404040" fill-opacity=".839216" stroke-width=".125"><path d="m.25124238.52916041h2.13000752v.26458755h-2.13000752z"/><path d="m.79374988 1.0583267h1.58749992v.2645863h-1.58749992z"/><path d="m.25124263 2.6458287h2.13000747v.2645875h-2.13000747z"/><path d="m.79375 3.1749962h1.5874999v.2645863h-1.5874999z"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/karasa_jaga_svg/cmd/ar/sc_linenumberingdialog.svg b/icon-themes/karasa_jaga_svg/cmd/ar/sc_linenumberingdialog.svg
index 9fca94d77f30..81176347fd67 100644
--- a/icon-themes/karasa_jaga_svg/cmd/ar/sc_linenumberingdialog.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/ar/sc_linenumberingdialog.svg
@@ -1 +1 @@
-<svg height="16" viewBox="0 0 4.2333333 4.2333334" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><filter id="a"><feGaussianBlur stdDeviation="1.0394514"/></filter><filter id="b"><feGaussianBlur stdDeviation=".50063244"/></filter><radialGradient id="c" cx="2.55723984" cy="3.71424435872" gradientUnits="userSpaceOnUse" r="4.61560710582"><stop offset="0" stop-color="#00537d"/><stop offset=".0151" stop-color="#186389"/><stop offset=".0558" stop-color="#558ca8"/><stop offset=".0964" stop-color="#89afc3"/><stop offset=".1357" stop-color="#b3ccd8"/><stop offset=".1737" stop-color="#d4e2e9"/><stop offset=".2099" stop-color="#ecf2f5"/><stop offset=".2435" stop-color="#fafcfd"/><stop offset=".2722" stop-color="#fff"/></radialGradient><radialGradient id="d" cx="102" cy="112.3047" gradientTransform="matrix(.03236924 0 0 .03247159 -.771162 .038485)" gradientUnits="userSpaceOnUse" r="139.55859"><stop offset="0" stop-color="#535557"/><stop offset=".1136614
5" stop-color="#898a8c"/><stop offset=".20296688" stop-color="#ececec"/><stop offset=".2363" stop-color="#fafafa"/><stop offset=".2722" stop-color="#fff"/><stop offset=".5313" stop-color="#fafafa"/><stop offset=".8449" stop-color="#ebecec"/><stop offset="1" stop-color="#e1e2e3"/></radialGradient><filter id="e" height="1.247155" width="1.247155" x="-.123577" y="-.123577"><feGaussianBlur stdDeviation="1.7720846"/></filter><filter id="f"><feGaussianBlur stdDeviation=".90565481"/></filter><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="85.219681" x2="61.336319" y1="93.219681" y2="69.336319"><stop offset="0"/><stop offset="1" stop-color="#393b38"/></linearGradient><filter id="h"><feGaussianBlur stdDeviation=".4901192"/></filter><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="96" x2="88.000198" y1="104" y2="96.000198"><stop offset="0" stop-color="#888a85"/><stop offset=".0072" stop-color="#8c8e89"/><stop offset=".0673" stop-color="#abaca9"/><stop offset=".1347" stop-co
lor="#c5c6c4"/><stop offset=".2115" stop-color="#dbdbda"/><stop offset=".3012" stop-color="#ebebeb"/><stop offset=".4122" stop-color="#f7f7f6"/><stop offset=".5679" stop-color="#fdfdfd"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="j" gradientTransform="matrix(.36111918 0 0 .36111917 -280.44128 196.31872)" gradientUnits="userSpaceOnUse" x1="778.88196" x2="778.88196" xlink:href="#k" y1="289.57986" y2="284.53162"/><linearGradient id="k"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><linearGradient id="l" gradientTransform="matrix(.35915571 0 0 .35915572 -278.87823 195.9106)" gradientUnits="userSpaceOnUse" x1="778" x2="778" xlink:href="#k" y1="295" y2="290"/><path d="m39.011563 16.724135.040833 104.275865h45.771182c.53 0 1.039-.211 1.414-.586l32.828002-32.828002c.375-.375.586-.884.586-1.414l-.00002-69.447863z" filter="url(#a)" opacity=".715069" transform="matrix(.03445096 0 0 .0342541 -1.145549 -.109853)"/><path
d="m40.931562 18.655271.000013 100.413799 43.316003-.0001c.53 0 1.039-.211 1.414-.586l31.484002-31.765938c.375-.375.586-.884.586-1.414l-.00002-66.647761z" filter="url(#b)" opacity=".89589" transform="matrix(.03445096 0 0 .0342541 -1.145549 -.109853)"/><path d="m39.011563 17.689652.040829 103.310348h45.771186c.53 0 1.039-.211 1.414-.586 13.296921-8.21061 24.140862-19.26784 32.828002-32.828002.375-.375.586-.884.586-1.414l-.00002-68.482346z" filter="url(#a)" opacity=".835616" transform="matrix(.03445096 0 0 .0342541 -1.145549 -.109853)"/><path d="m.26458296.52916668.0000004 3.43958382h1.49396994c.017529 0 .034363-.00698.046765-.019381l1.085718-1.0857177c.012402-.012402.019415-.029236.019381-.046765l-.0000006-2.28772002z" fill="url(#c)" stroke-width=".033073"/><path d="m.55161363.79375004c-.017835 0-.032369.0145797-.032369.0324716l.00992 2.84547376c0 .017925.014534.032472.032369.032472h1.18774857c.00851 0 .016864-.00344.022885-.00951l.8641821-.8675445c.00605-.00607.00948-.014417.00948-.
022957l-.0000007-1.97793387c0-.0178919-.014502-.0324716-.032369-.0324716z" fill="url(#d)" stroke-width=".033073"/><g fill="#fff" fill-opacity=".392157" transform="translate(-1.058333 -293.29581)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g fill="#404040" fill-opacity=".839216" transform="translate(-1.058333 -293.03124)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g transform="matrix(.03307292 0 0 .03307292 -.816197 0)"><path d="m111.414 86.586c.25-.25-26.379-1.586-31.414-1.586-1.654 0-3 1.346-3 3 0 5.035 1.336 31.664 1.586 31.414z" filter="url(#e)" opacity=".906849"/><path d="m111.414 86.586c.375-.375-21.97-.586-31.414-.586-1.103 0-2
.897-2 2 0 9.444.211 31.789.586 31.414z" filter="url(#f)" opacity=".2"/><path d="m111.414 86.586c.239-.239-21.607.414-31.414.414-.553 0-1 .447-1 1 0 9.807-.653 31.653-.414 31.414z" fill="url(#g)" filter="url(#h)" opacity=".1"/><path d="m78.586 119.414s11.914-9.914 17.414-15.414 15.414-17.414 15.414-17.414-21.164 1.414-31.414 1.414c0 10.25-1.414 31.414-1.414 31.414z" fill="url(#i)"/></g><g transform="translate(2.910417 -291.70832)"><path d="m.25329595 301.86154v-.14912q.0420587-.0925.11929377-.18047.0779998-.0879.19576412-.18352.11317614-.0918.15829365-.15142.0458822-.0596.0458822-.117 0-.1407-.14147017-.1407-.0688233 0-.1055291.0375-.0359411.0367-.0466469.11088l-.21641112-.0122q.0183529-.14989.11164672-.22865.0940585-.0788.25541101-.0788.17435242 0 .26764626.0795.0932938.0795.0932938.2233 0 .0757-.0298234.13688-.0298234.0612-.0764704.11318-.0466469.0512-.10399969.0964-.0565881.0451-.11011732.0879-.0535292.0428-.0978821.0864-.0435881.0436-.0649998.0933h.50011622v.17664z" fill="none"
stroke="url(#l)" stroke-linejoin="round" stroke-width=".529167" transform="scale(1.0218307 .9786357)"/><path d="m.28335501 295.41248v-.14594q.0411601-.0906.11674513-.17661.0763334-.0861.19158175-.17961.11075821-.0898.15491181-.14817.044902-.0584.044902-.1145 0-.1377-.13844775-.1377-.067353 0-.10327454.0367-.0351732.0359-.0456504.10851l-.21178764-.012q.0179608-.14668.10926147-.22377.0920491-.0771.24995432-.0771.1706275 0 .26192818.0778.0913007.0778.0913007.21852 0 .0741-.0291863.13396-.0291863.0599-.0748366.11076-.0456503.0501-.10177781.0943-.0553791.0442-.10776474.0861-.0523856.0419-.0957909.0846-.0426569.0427-.0636111.0913h.48943151v.17288z" fill="#bfd9ff" stroke-width=".264583"/></g><g transform="translate(2.910417 -292.23748)"><path d="m.26081901 301.0433v-.16069h.26834044v-.7389l-.25988272.16223v-.16992l.27141598-.17607h.20452309v.92266h.24834946v.16069z" stroke="url(#j)" stroke-linejoin="round" stroke-width=".529167" transform="scale(1.0236449 .97690126)"/><path d="m.29150194
294.08957v-.15699h.26214211v-.72183l-.25387975.15849v-.166l.26514661-.172h.19979885v.90134h.24261294v.15699z" fill="#bfd9ff" stroke-width=".264583"/></g></svg>
\ No newline at end of file
+<svg height="16" viewBox="0 0 4.2333333 4.2333334" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="6.7862" x2="6.7862" xlink:href="#a" y1="275.1897" y2="266.72305"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="3.307292" x2="3.307292" xlink:href="#a" y1="3.249675" y2="2.116667"/><filter id="d"><feGaussianBlur stdDeviation="1.0394514"/></filter><filter id="e"><feGaussianBlur stdDeviation=".50063244"/></filter><radialGradient id="f" cx="2.55724" cy="3.714244" gradientUnits="userSpaceOnUse" r="4.615607"><stop offset="0" stop-color="#00537d"/><stop offset=".0151" stop-color="#186389"/><stop offset=".0558" stop-color="#558ca8"/><stop offset=".0964" stop-color="#89afc3"/><stop offset=".1357" stop-color="#b3ccd8"/><stop offset=".1737" stop-color="#d4e2e9"/><stop offse
t=".2099" stop-color="#ecf2f5"/><stop offset=".2435" stop-color="#fafcfd"/><stop offset=".2722" stop-color="#fff"/></radialGradient><radialGradient id="g" cx="102" cy="112.3047" gradientTransform="matrix(.03236924 0 0 .03247159 -.771162 .038485)" gradientUnits="userSpaceOnUse" r="139.55859"><stop offset="0" stop-color="#535557"/><stop offset=".11366145" stop-color="#898a8c"/><stop offset=".20296688" stop-color="#ececec"/><stop offset=".2363" stop-color="#fafafa"/><stop offset=".2722" stop-color="#fff"/><stop offset=".5313" stop-color="#fafafa"/><stop offset=".8449" stop-color="#ebecec"/><stop offset="1" stop-color="#e1e2e3"/></radialGradient><filter id="h" height="1.247155" width="1.247155" x="-.123577" y="-.123577"><feGaussianBlur stdDeviation="1.7720846"/></filter><filter id="i"><feGaussianBlur stdDeviation=".90565481"/></filter><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="85.219681" x2="61.336319" y1="93.219681" y2="69.336319"><stop offset="0"/><stop offset="1" stop-
color="#393b38"/></linearGradient><filter id="k"><feGaussianBlur stdDeviation=".4901192"/></filter><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="96" x2="88.000198" y1="104" y2="96.000198"><stop offset="0" stop-color="#888a85"/><stop offset=".0072" stop-color="#8c8e89"/><stop offset=".0673" stop-color="#abaca9"/><stop offset=".1347" stop-color="#c5c6c4"/><stop offset=".2115" stop-color="#dbdbda"/><stop offset=".3012" stop-color="#ebebeb"/><stop offset=".4122" stop-color="#f7f7f6"/><stop offset=".5679" stop-color="#fdfdfd"/><stop offset="1" stop-color="#fff"/></linearGradient><path d="m39.011563 16.724135.040833 104.275865h45.771182c.53 0 1.039-.211 1.414-.586l32.828002-32.828002c.375-.375.586-.884.586-1.414l-.00002-69.447863z" filter="url(#d)" opacity=".715069" transform="matrix(.03445096 0 0 .0342541 -1.145549 -.109853)"/><path d="m40.931562 18.655271.000013 100.413799 43.316003-.0001c.53 0 1.039-.211 1.414-.586l31.484002-31.765938c.375-.375.586-.884.586-1.414l-.00002-66
.647761z" filter="url(#e)" opacity=".89589" transform="matrix(.03445096 0 0 .0342541 -1.145549 -.109853)"/><path d="m39.011563 17.689652.040829 103.310348h45.771186c.53 0 1.039-.211 1.414-.586 13.296921-8.21061 24.140862-19.26784 32.828002-32.828002.375-.375.586-.884.586-1.414l-.00002-68.482346z" filter="url(#d)" opacity=".835616" transform="matrix(.03445096 0 0 .0342541 -1.145549 -.109853)"/><path d="m.26458296.52916668.0000004 3.43958382h1.49396994c.017529 0 .034363-.00698.046765-.019381l1.085718-1.0857177c.012402-.012402.019415-.029236.019381-.046765l-.0000006-2.28772002z" fill="url(#f)" stroke-width=".033073"/><path d="m.55161363.79375004c-.017835 0-.032369.0145797-.032369.0324716l.00992 2.84547376c0 .017925.014534.032472.032369.032472h1.18774857c.00851 0 .016864-.00344.022885-.00951l.8641821-.8675445c.00605-.00607.00948-.014417.00948-.022957l-.0000007-1.97793387c0-.0178919-.014502-.0324716-.032369-.0324716z" fill="url(#g)" stroke-width=".033073"/><g fill="#fff" fill-opacity=".3
92157" transform="translate(-1.058333 -293.29581)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g fill="#404040" fill-opacity=".839216" transform="translate(-1.058333 -293.03124)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g transform="matrix(.03307292 0 0 .03307292 -.816197 0)"><path d="m111.414 86.586c.25-.25-26.379-1.586-31.414-1.586-1.654 0-3 1.346-3 3 0 5.035 1.336 31.664 1.586 31.414z" filter="url(#h)" opacity=".906849"/><path d="m111.414 86.586c.375-.375-21.97-.586-31.414-.586-1.103 0-2 .897-2 2 0 9.444.211 31.789.586 31.414z" filter="url(#i)" opacity=".2"/><path d="m111.414 86.586c.239-.239-21.607.414-31.414.414-.553 0-1 .447-1
1 0 9.807-.653 31.653-.414 31.414z" fill="url(#j)" filter="url(#k)" opacity=".1"/><path d="m78.586 119.414s11.914-9.914 17.414-15.414 15.414-17.414 15.414-17.414-21.164 1.414-31.414 1.414c0 10.25-1.414 31.414-1.414 31.414z" fill="url(#l)"/></g><g stroke-width="2.180337" transform="matrix(.125 0 0 .125 2.7236 -32.811214)"><path d="m6.2128906 266.72266a2.1170101 2.1170101 0 0 0 -1.0273437.26562l-2.5546875 1.41797a2.1170101 2.1170101 0 0 0 -1.0898438 1.86133l.00977 1.92773a2.1170101 2.1170101 0 0 0 .6015626 1.46289 2.1170101 2.1170101 0 0 0 -.6582032 1.53125v2.11719a2.1170101 2.1170101 0 0 0 2.1171875 2.11719h6.3496094a2.1170101 2.1170101 0 0 0 2.1171871-2.11719v-2.11719a2.1170101 2.1170101 0 0 0 -2.1171871-2.11718h.029297l-.013672-4.24024a2.1170101 2.1170101 0 0 0 -2.1171919-2.10937zm-.8847656 10.54101a2.1170101 2.1170101 0 0 0 .019531.004c-.0026-.00034-.019531-.002-.019531-.002s-.0000001-.002 0-.002z" fill="url(#b)"/><path d="m3.6112001 277.30638v-2.11666c.5847778 0 2.1910135.00078
2.125264-.00021l-.0086-4.23313-2.0600039 1.22994-.010292-1.92916 2.5559108-1.41766h1.646472l.021716 6.35001 2.0795306.0002v2.11667z" fill="#bfd9ff"/></g><g stroke-width=".317094" transform="translate(.264584 .26458)"><path d="m3.3671875 2.1171875c-.1737915 0-.3428195.047526-.4726563.15625a.26421909.26421909 0 0 0 0 .00195c-.1289799.1088955-.2024235.2722656-.2226562.4375031a.26421909.26421909 0 0 0 .2480469.2949219l.072266.00391c-.046591.04399-.1008834.088255-.1386719.1308593a.26421909.26421909 0 0 0 -.00195.00195c-.073731.083947-.1357264.174371-.1816441.2753901a.26421909.26421909 0 0 0 -.023437.109375v.1757812a.26421909.26421909 0 0 0 .2636713.2636719h.7949219a.26421909.26421909 0 0 0 .2636719-.2636719v-.265625a.26421909.26421909 0 0 0 -.109375-.2128906c.072941-.088558.108149-.1663051.1308594-.2128906.041651-.08544.060547-.1809754.060547-.2753907 0-.1694871-.068557-.3498422-.2011718-.4628906-.1291463-.110091-.3027896-.1582031-.4824221-.1582031z" fill="url(#c)"/><path d="m2.9104167 3
.7041663v-.1748925c.032886-.0723492.0795243-.1429047.1399149-.2116666.0609886-.0687619.1375233-.1405134.229604-.2152545.0884932-.071751.1630627-.1689977.1983404-.2156363.035875-.046637.053813-.092379.053813-.1372236 0-.1100185-.055308-.1650277-.1659247-.1650277-.053813 0-.09507.014649-.1237709.043946-.028102.028701-.046339.072051-.054709.1300501l-.253821-.0143537c.01435-.1171941.057999-.2065843.1309461-.2681705.073545-.061586.1764994-.094687.3026619-.094687.1363274 0 .237864.0334.3108111.095584.072947.062184.1094206.1494814.1094206.2618921 0 .059194-.01166.1127081-.034979.1605424-.023319.047834-.065899.1301329-.102373.1707919-.036473.040061-.077132.077731-.1219771.1130087-.044247.035277-.087297.069658-.1291523.1031413-.041855.033485-.080122.067268-.1148016.1013496-.034082.034082-.023618.013158-.04036.052023l.4601069.0000003v.2645837z" fill="#bfd9ff"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/karasa_jaga_svg/cmd/sc_defaultnumbering.svg b/icon-themes/karasa_jaga_svg/cmd/sc_defaultnumbering.svg
index 9fe105b81da5..b0115eded738 100644
--- a/icon-themes/karasa_jaga_svg/cmd/sc_defaultnumbering.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/sc_defaultnumbering.svg
@@ -1 +1 @@
-<svg height="16" viewBox="0 0 4.2333333 4.2333334" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.36111918 0 0 .36111917 -280.44128 196.31872)" gradientUnits="userSpaceOnUse" x1="778.88196" x2="778.88196" xlink:href="#b" y1="289.57986" y2="284.53162"/><linearGradient id="b"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><linearGradient id="c" gradientTransform="matrix(.35915571 0 0 .35915572 -278.87823 195.9106)" gradientUnits="userSpaceOnUse" x1="778" x2="778" xlink:href="#b" y1="295" y2="290"/><g transform="translate(0 -291.708317)"><path d="m.25329595 301.86154v-.14912q.0420587-.0925.11929377-.18047.0779998-.0879.19576412-.18352.11317614-.0918.15829365-.15142.0458822-.0596.0458822-.117 0-.1407-.14147017-.1407-.0688233 0-.1055291.0375-.0359411.0367-.0466469.11088l-.21641112-.0122q.0183529-.14989.11164672-.22865.0940585-.0788.25541101-.0788.174352
42 0 .26764626.0795.0932938.0795.0932938.2233 0 .0757-.0298234.13688-.0298234.0612-.0764704.11318-.0466469.0512-.10399969.0964-.0565881.0451-.11011732.0879-.0535292.0428-.0978821.0864-.0435881.0436-.0649998.0933h.50011622v.17664z" fill="none" stroke="url(#c)" stroke-linejoin="round" stroke-width=".529167" transform="scale(1.0218307 .9786357)"/><path d="m.28335501 295.41248v-.14594q.0411601-.0906.11674513-.17661.0763334-.0861.19158175-.17961.11075821-.0898.15491181-.14817.044902-.0584.044902-.1145 0-.1377-.13844775-.1377-.067353 0-.10327454.0367-.0351732.0359-.0456504.10851l-.21178764-.012q.0179608-.14668.10926147-.22377.0920491-.0771.24995432-.0771.1706275 0 .26192818.0778.0913007.0778.0913007.21852 0 .0741-.0291863.13396-.0291863.0599-.0748366.11076-.0456503.0501-.10177781.0943-.0553791.0442-.10776474.0861-.0523856.0419-.0957909.0846-.0426569.0427-.0636111.0913h.4894315v.17288z" fill="#bfd9ff" stroke-width=".264583"/></g><g transform="translate(0 -292.237483)"><path d="m.26081901 3
01.0433v-.16069h.26834044v-.7389l-.25988272.16223v-.16992l.27141598-.17607h.20452309v.92266h.24834946v.16069z" stroke="url(#a)" stroke-linejoin="round" stroke-width=".529167" transform="scale(1.0236449 .97690126)"/><path d="m.29150194 294.08957v-.15699h.26214211v-.72183l-.25387975.15849v-.166l.26514661-.172h.19979885v.90134h.24261294v.15699z" fill="#bfd9ff" stroke-width=".264583"/></g><g fill="#404040" fill-opacity=".839216" transform="translate(0 -292.76665)"><path d="m3.96875 293.5604-2.1166668-.00001v.26459l2.1166668.00001z" stroke-width=".125"/><path d="m3.4395832 294.08956h-1.5874999v.26458h1.5874999z" stroke-width=".125"/><g transform="matrix(-.125 0 0 .125 0 259.87498)"><path d="m-31.749998 284.30007 16.933334-.00008v2.1167h-16.933336z"/><path d="m-27.516665 288.53333h12.699999v2.11669h-12.699999z"/></g></g><g fill="#fff" fill-opacity=".392157" transform="translate(0 -293.03122)"><path d="m3.96875 293.5604-2.1166668-.00001v.26459l2.1166668.00001z" stroke-width=".125"/><path d
="m3.4395832 294.08956h-1.5874999v.26458h1.5874999z" stroke-width=".125"/><g transform="matrix(-.125 0 0 .125 0 259.87498)"><path d="m-31.749998 284.30007 16.933334-.00008v2.1167h-16.933336z"/><path d="m-27.516665 288.53333h12.699999v2.11669h-12.699999z"/></g></g></svg>
\ No newline at end of file
+<svg height="16" viewBox="0 0 4.2333333 4.2333334" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="6.7862" x2="6.7862" xlink:href="#a" y1="275.1897" y2="266.72305"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="3.307292" x2="3.307292" xlink:href="#a" y1="3.249675" y2="2.116667"/><g fill="#404040" fill-opacity=".839216" transform="translate(0 -292.76665)"><path d="m3.96875 293.29582-2.1166668-.00001v.26459l2.1166668.00001z" stroke-width=".125"/><path d="m3.4395832 293.82498h-1.5874999v.26458h1.5874999z" stroke-width=".125"/><g transform="matrix(-.125 0 0 .125 0 259.87498)"><path d="m-31.749998 284.30007 16.933334-.00008v2.1167h-16.933336z"/><path d="m-27.516665 288.53333h12.699999v2.11669h-12.699999z"/></g></g><g fill="#fff" fill-opacity=".392157" transform="tra
nslate(0 -293.03122)"><path d="m3.96875 293.29582-2.1166668-.00001v.26459l2.1166668.00001z" stroke-width=".125"/><path d="m3.4395832 293.82498h-1.5874999v.26458h1.5874999z" stroke-width=".125"/><g transform="matrix(-.125 0 0 .125 0 259.87498)"><path d="m-31.749998 284.30007 16.933334-.00008v2.1167h-16.933336z"/><path d="m-27.516665 288.53333h12.699999v2.11669h-12.699999z"/></g></g><g stroke-width="2.180337" transform="matrix(.125 0 0 .125 -.186817 -33.075797)"><path d="m6.2128906 266.72266a2.1170101 2.1170101 0 0 0 -1.0273437.26562l-2.5546875 1.41797a2.1170101 2.1170101 0 0 0 -1.0898438 1.86133l.00977 1.92773a2.1170101 2.1170101 0 0 0 .6015626 1.46289 2.1170101 2.1170101 0 0 0 -.6582032 1.53125v2.11719a2.1170101 2.1170101 0 0 0 2.1171875 2.11719h6.3496094a2.1170101 2.1170101 0 0 0 2.1171871-2.11719v-2.11719a2.1170101 2.1170101 0 0 0 -2.1171871-2.11718h.029297l-.013672-4.24024a2.1170101 2.1170101 0 0 0 -2.1171919-2.10937zm-.8847656 10.54101a2.1170101 2.1170101 0 0 0 .019531.004c-.002
6-.00034-.019531-.002-.019531-.002s-.0000001-.002 0-.002z" fill="url(#b)"/><path d="m3.6112001 277.30638v-2.11666c.5847778 0 2.1910135.00078 2.125264-.00021l-.0086-4.23313-2.0600039 1.22994-.010292-1.92916 2.5559108-1.41766h1.646472l.021716 6.35001 2.0795306.0002v2.11667z" fill="#bfd9ff"/></g><g stroke-width=".317094" transform="translate(-2.645833 -.000004)"><path d="m3.3671875 2.1171875c-.1737915 0-.3428195.047526-.4726563.15625a.26421909.26421909 0 0 0 0 .00195c-.1289799.1088955-.2024235.2722656-.2226562.4375031a.26421909.26421909 0 0 0 .2480469.2949219l.072266.00391c-.046591.04399-.1008834.088255-.1386719.1308593a.26421909.26421909 0 0 0 -.00195.00195c-.073731.083947-.1357264.174371-.1816441.2753901a.26421909.26421909 0 0 0 -.023437.109375v.1757812a.26421909.26421909 0 0 0 .2636713.2636719h.7949219a.26421909.26421909 0 0 0 .2636719-.2636719v-.265625a.26421909.26421909 0 0 0 -.109375-.2128906c.072941-.088558.108149-.1663051.1308594-.2128906.041651-.08544.060547-.1809754.060547-.2
753907 0-.1694871-.068557-.3498422-.2011718-.4628906-.1291463-.110091-.3027896-.1582031-.4824221-.1582031z" fill="url(#c)"/><path d="m2.9104167 3.7041663v-.1748925c.032886-.0723492.0795243-.1429047.1399149-.2116666.0609886-.0687619.1375233-.1405134.229604-.2152545.0884932-.071751.1630627-.1689977.1983404-.2156363.035875-.046637.053813-.092379.053813-.1372236 0-.1100185-.055308-.1650277-.1659247-.1650277-.053813 0-.09507.014649-.1237709.043946-.028102.028701-.046339.072051-.054709.1300501l-.253821-.0143537c.01435-.1171941.057999-.2065843.1309461-.2681705.073545-.061586.1764994-.094687.3026619-.094687.1363274 0 .237864.0334.3108111.095584.072947.062184.1094206.1494814.1094206.2618921 0 .059194-.01166.1127081-.034979.1605424-.023319.047834-.065899.1301329-.102373.1707919-.036473.040061-.077132.077731-.1219771.1130087-.044247.035277-.087297.069658-.1291523.1031413-.041855.033485-.080122.067268-.1148016.1013496-.034082.034082-.023618.013158-.04036.052023l.4601069.0000003v.2645837z" fill=
"#bfd9ff"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/karasa_jaga_svg/cmd/sc_linenumberingdialog.svg b/icon-themes/karasa_jaga_svg/cmd/sc_linenumberingdialog.svg
index 2f3e9878cfc5..98c4b00bdd36 100644
--- a/icon-themes/karasa_jaga_svg/cmd/sc_linenumberingdialog.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/sc_linenumberingdialog.svg
@@ -1 +1 @@
-<svg height="16" viewBox="0 0 4.2333333 4.2333334" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><filter id="a"><feGaussianBlur stdDeviation="1.0394514"/></filter><filter id="b"><feGaussianBlur stdDeviation=".50063244"/></filter><radialGradient id="c" cx="3.61557384" cy="3.71424435872" gradientUnits="userSpaceOnUse" r="4.61560710582"><stop offset="0" stop-color="#00537d"/><stop offset=".0151" stop-color="#186389"/><stop offset=".0558" stop-color="#558ca8"/><stop offset=".0964" stop-color="#89afc3"/><stop offset=".1357" stop-color="#b3ccd8"/><stop offset=".1737" stop-color="#d4e2e9"/><stop offset=".2099" stop-color="#ecf2f5"/><stop offset=".2435" stop-color="#fafcfd"/><stop offset=".2722" stop-color="#fff"/></radialGradient><radialGradient id="d" cx="102" cy="112.3047" gradientTransform="matrix(.03236924 0 0 .03247159 .287171 .038485)" gradientUnits="userSpaceOnUse" r="139.55859"><stop offset="0" stop-color="#535557"/><stop offset=".11366145
" stop-color="#898a8c"/><stop offset=".20296688" stop-color="#ececec"/><stop offset=".2363" stop-color="#fafafa"/><stop offset=".2722" stop-color="#fff"/><stop offset=".5313" stop-color="#fafafa"/><stop offset=".8449" stop-color="#ebecec"/><stop offset="1" stop-color="#e1e2e3"/></radialGradient><filter id="e" height="1.247155" width="1.247155" x="-.123577" y="-.123577"><feGaussianBlur stdDeviation="1.7720846"/></filter><filter id="f"><feGaussianBlur stdDeviation=".90565481"/></filter><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="85.219681" x2="61.336319" y1="93.219681" y2="69.336319"><stop offset="0"/><stop offset="1" stop-color="#393b38"/></linearGradient><filter id="h"><feGaussianBlur stdDeviation=".4901192"/></filter><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="96" x2="88.000198" y1="104" y2="96.000198"><stop offset="0" stop-color="#888a85"/><stop offset=".0072" stop-color="#8c8e89"/><stop offset=".0673" stop-color="#abaca9"/><stop offset=".1347" stop-col
or="#c5c6c4"/><stop offset=".2115" stop-color="#dbdbda"/><stop offset=".3012" stop-color="#ebebeb"/><stop offset=".4122" stop-color="#f7f7f6"/><stop offset=".5679" stop-color="#fdfdfd"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="j" gradientTransform="matrix(.36111918 0 0 .36111917 -280.44128 196.31872)" gradientUnits="userSpaceOnUse" x1="778.88196" x2="778.88196" xlink:href="#k" y1="289.57986" y2="284.53162"/><linearGradient id="k"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><linearGradient id="l" gradientTransform="matrix(.35915571 0 0 .35915572 -278.87823 195.9106)" gradientUnits="userSpaceOnUse" x1="778" x2="778" xlink:href="#k" y1="295" y2="290"/><path d="m39.011563 16.724135.040833 104.275865h45.771182c.53 0 1.039-.211 1.414-.586l32.828002-32.828002c.375-.375.586-.884.586-1.414l-.00002-69.447863z" filter="url(#a)" opacity=".715069" transform="matrix(.03445096 0 0 .0342541 -.087215 -.109853)"/><path d=
"m40.931562 18.655271.000013 100.413799 43.316003-.0001c.53 0 1.039-.211 1.414-.586l31.484002-31.765938c.375-.375.586-.884.586-1.414l-.00002-66.647761z" filter="url(#b)" opacity=".89589" transform="matrix(.03445096 0 0 .0342541 -.087215 -.109853)"/><path d="m39.011563 17.689652.040829 103.310348h45.771186c.53 0 1.039-.211 1.414-.586 13.296921-8.21061 24.140862-19.26784 32.828002-32.828002.375-.375.586-.884.586-1.414l-.00002-68.482346z" filter="url(#a)" opacity=".835616" transform="matrix(.03445096 0 0 .0342541 -.087215 -.109853)"/><path d="m1.3229163.52916668.0000004 3.43958382h1.49397c.017529 0 .034363-.00698.046765-.019381l1.085718-1.0857177c.012402-.012402.019415-.029236.019381-.046765l-.0000006-2.28772002z" fill="url(#c)" stroke-width=".033073"/><path d="m1.609947.79375004c-.017835 0-.032369.0145797-.032369.0324716l.00992 2.84547376c0 .017925.014534.032472.032369.032472h1.1877486c.00851 0 .016864-.00344.022885-.00951l.8641821-.8675445c.00605-.00607.00948-.014417.00948-.022957l-.
0000007-1.97793387c0-.0178919-.014502-.0324716-.032369-.0324716z" fill="url(#d)" stroke-width=".033073"/><g fill="#fff" fill-opacity=".392157" transform="translate(0 -293.29581)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g fill="#404040" fill-opacity=".839216" transform="translate(0 -293.03124)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g transform="matrix(.03307292 0 0 .03307292 .242136 0)"><path d="m111.414 86.586c.25-.25-26.379-1.586-31.414-1.586-1.654 0-3 1.346-3 3 0 5.035 1.336 31.664 1.586 31.414z" filter="url(#e)" opacity=".906849"/><path d="m111.414 86.586c.375-.375-21.97-.586-31.414-.586-1.103 0-2 .897-2 2 0 9.444.211 31.7
89.586 31.414z" filter="url(#f)" opacity=".2"/><path d="m111.414 86.586c.239-.239-21.607.414-31.414.414-.553 0-1 .447-1 1 0 9.807-.653 31.653-.414 31.414z" fill="url(#g)" filter="url(#h)" opacity=".1"/><path d="m78.586 119.414s11.914-9.914 17.414-15.414 15.414-17.414 15.414-17.414-21.164 1.414-31.414 1.414c0 10.25-1.414 31.414-1.414 31.414z" fill="url(#i)"/></g><g transform="translate(0 -291.708317)"><path d="m.25329595 301.86154v-.14912q.0420587-.0925.11929377-.18047.0779998-.0879.19576412-.18352.11317614-.0918.15829365-.15142.0458822-.0596.0458822-.117 0-.1407-.14147017-.1407-.0688233 0-.1055291.0375-.0359411.0367-.0466469.11088l-.21641112-.0122q.0183529-.14989.11164672-.22865.0940585-.0788.25541101-.0788.17435242 0 .26764626.0795.0932938.0795.0932938.2233 0 .0757-.0298234.13688-.0298234.0612-.0764704.11318-.0466469.0512-.10399969.0964-.0565881.0451-.11011732.0879-.0535292.0428-.0978821.0864-.0435881.0436-.0649998.0933h.50011622v.17664z" fill="none" stroke="url(#l)" stroke-linejoi
n="round" stroke-width=".529167" transform="scale(1.0218307 .9786357)"/><path d="m.28335501 295.41248v-.14594q.0411601-.0906.11674513-.17661.0763334-.0861.19158175-.17961.11075821-.0898.15491181-.14817.044902-.0584.044902-.1145 0-.1377-.13844775-.1377-.067353 0-.10327454.0367-.0351732.0359-.0456504.10851l-.21178764-.012q.0179608-.14668.10926147-.22377.0920491-.0771.24995432-.0771.1706275 0 .26192818.0778.0913007.0778.0913007.21852 0 .0741-.0291863.13396-.0291863.0599-.0748366.11076-.0456503.0501-.10177781.0943-.0553791.0442-.10776474.0861-.0523856.0419-.0957909.0846-.0426569.0427-.0636111.0913h.4894315v.17288z" fill="#bfd9ff" stroke-width=".264583"/></g><g transform="translate(0 -292.237483)"><path d="m.26081901 301.0433v-.16069h.26834044v-.7389l-.25988272.16223v-.16992l.27141598-.17607h.20452309v.92266h.24834946v.16069z" stroke="url(#j)" stroke-linejoin="round" stroke-width=".529167" transform="scale(1.0236449 .97690126)"/><path d="m.29150194 294.08957v-.15699h.26214211v-.72183l-.2
5387975.15849v-.166l.26514661-.172h.19979885v.90134h.24261294v.15699z" fill="#bfd9ff" stroke-width=".264583"/></g></svg>
\ No newline at end of file
+<svg height="16" viewBox="0 0 4.2333333 4.2333334" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset="0" stop-color="#06f"/><stop offset="1" stop-color="#80b3ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="6.7862" x2="6.7862" xlink:href="#a" y1="275.1897" y2="266.72305"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="3.307292" x2="3.307292" xlink:href="#a" y1="3.249675" y2="2.116667"/><filter id="d"><feGaussianBlur stdDeviation="1.0394514"/></filter><filter id="e"><feGaussianBlur stdDeviation=".50063244"/></filter><radialGradient id="f" cx="3.615574" cy="3.714244" gradientUnits="userSpaceOnUse" r="4.615607"><stop offset="0" stop-color="#00537d"/><stop offset=".0151" stop-color="#186389"/><stop offset=".0558" stop-color="#558ca8"/><stop offset=".0964" stop-color="#89afc3"/><stop offset=".1357" stop-color="#b3ccd8"/><stop offset=".1737" stop-color="#d4e2e9"/><stop offs
et=".2099" stop-color="#ecf2f5"/><stop offset=".2435" stop-color="#fafcfd"/><stop offset=".2722" stop-color="#fff"/></radialGradient><radialGradient id="g" cx="102" cy="112.3047" gradientTransform="matrix(.03236924 0 0 .03247159 .287171 .038485)" gradientUnits="userSpaceOnUse" r="139.55859"><stop offset="0" stop-color="#535557"/><stop offset=".11366145" stop-color="#898a8c"/><stop offset=".20296688" stop-color="#ececec"/><stop offset=".2363" stop-color="#fafafa"/><stop offset=".2722" stop-color="#fff"/><stop offset=".5313" stop-color="#fafafa"/><stop offset=".8449" stop-color="#ebecec"/><stop offset="1" stop-color="#e1e2e3"/></radialGradient><filter id="h" height="1.247155" width="1.247155" x="-.123577" y="-.123577"><feGaussianBlur stdDeviation="1.7720846"/></filter><filter id="i"><feGaussianBlur stdDeviation=".90565481"/></filter><linearGradient id="j" gradientUnits="userSpaceOnUse" x1="85.219681" x2="61.336319" y1="93.219681" y2="69.336319"><stop offset="0"/><stop offset="1" stop-
color="#393b38"/></linearGradient><filter id="k"><feGaussianBlur stdDeviation=".4901192"/></filter><linearGradient id="l" gradientUnits="userSpaceOnUse" x1="96" x2="88.000198" y1="104" y2="96.000198"><stop offset="0" stop-color="#888a85"/><stop offset=".0072" stop-color="#8c8e89"/><stop offset=".0673" stop-color="#abaca9"/><stop offset=".1347" stop-color="#c5c6c4"/><stop offset=".2115" stop-color="#dbdbda"/><stop offset=".3012" stop-color="#ebebeb"/><stop offset=".4122" stop-color="#f7f7f6"/><stop offset=".5679" stop-color="#fdfdfd"/><stop offset="1" stop-color="#fff"/></linearGradient><path d="m39.011563 16.724135.040833 104.275865h45.771182c.53 0 1.039-.211 1.414-.586l32.828002-32.828002c.375-.375.586-.884.586-1.414l-.00002-69.447863z" filter="url(#d)" opacity=".715069" transform="matrix(.03445096 0 0 .0342541 -.087215 -.109853)"/><path d="m40.931562 18.655271.000013 100.413799 43.316003-.0001c.53 0 1.039-.211 1.414-.586l31.484002-31.765938c.375-.375.586-.884.586-1.414l-.00002-66.
647761z" filter="url(#e)" opacity=".89589" transform="matrix(.03445096 0 0 .0342541 -.087215 -.109853)"/><path d="m39.011563 17.689652.040829 103.310348h45.771186c.53 0 1.039-.211 1.414-.586 13.296921-8.21061 24.140862-19.26784 32.828002-32.828002.375-.375.586-.884.586-1.414l-.00002-68.482346z" filter="url(#d)" opacity=".835616" transform="matrix(.03445096 0 0 .0342541 -.087215 -.109853)"/><path d="m1.3229163.52916668.0000004 3.43958382h1.49397c.017529 0 .034363-.00698.046765-.019381l1.085718-1.0857177c.012402-.012402.019415-.029236.019381-.046765l-.0000006-2.28772002z" fill="url(#f)" stroke-width=".033073"/><path d="m1.609947.79375004c-.017835 0-.032369.0145797-.032369.0324716l.00992 2.84547376c0 .017925.014534.032472.032369.032472h1.1877486c.00851 0 .016864-.00344.022885-.00951l.8641821-.8675445c.00605-.00607.00948-.014417.00948-.022957l-.0000007-1.97793387c0-.0178919-.014502-.0324716-.032369-.0324716z" fill="url(#g)" stroke-width=".033073"/><g fill="#fff" fill-opacity=".392157" t
ransform="translate(0 -293.29581)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g fill="#404040" fill-opacity=".839216" transform="translate(0 -293.03124)"><path d="m3.7041666 294.08958-2.1166666-.00001v.26458l2.1166666.00001z" stroke-width=".125"/><path d="m-29.633333 288.53346 16.933334-.00002v2.11669l-16.933334.00002z" transform="matrix(-.125 0 0 .125 0 259.87498)"/></g><g transform="matrix(.03307292 0 0 .03307292 .242136 0)"><path d="m111.414 86.586c.25-.25-26.379-1.586-31.414-1.586-1.654 0-3 1.346-3 3 0 5.035 1.336 31.664 1.586 31.414z" filter="url(#h)" opacity=".906849"/><path d="m111.414 86.586c.375-.375-21.97-.586-31.414-.586-1.103 0-2 .897-2 2 0 9.444.211 31.789.586 31.414z" filter="url(#i)" opacity=".2"/><path d="m111.414 86.586c.239-.239-21.607.414-31.414.414-.553 0-1 .447-1 1 0 9.807-.653 31.653-.4
14 31.414z" fill="url(#j)" filter="url(#k)" opacity=".1"/><path d="m78.586 119.414s11.914-9.914 17.414-15.414 15.414-17.414 15.414-17.414-21.164 1.414-31.414 1.414c0 10.25-1.414 31.414-1.414 31.414z" fill="url(#l)"/></g><g stroke-width="2.180337" transform="matrix(.125 0 0 .125 -.186816 -32.811214)"><path d="m6.2128906 266.72266a2.1170101 2.1170101 0 0 0 -1.0273437.26562l-2.5546875 1.41797a2.1170101 2.1170101 0 0 0 -1.0898438 1.86133l.00977 1.92773a2.1170101 2.1170101 0 0 0 .6015626 1.46289 2.1170101 2.1170101 0 0 0 -.6582032 1.53125v2.11719a2.1170101 2.1170101 0 0 0 2.1171875 2.11719h6.3496094a2.1170101 2.1170101 0 0 0 2.1171871-2.11719v-2.11719a2.1170101 2.1170101 0 0 0 -2.1171871-2.11718h.029297l-.013672-4.24024a2.1170101 2.1170101 0 0 0 -2.1171919-2.10937zm-.8847656 10.54101a2.1170101 2.1170101 0 0 0 .019531.004c-.0026-.00034-.019531-.002-.019531-.002s-.0000001-.002 0-.002z" fill="url(#b)"/><path d="m3.6112001 277.30638v-2.11666c.5847778 0 2.1910135.00078 2.125264-.00021l-.0086-
4.23313-2.0600039 1.22994-.010292-1.92916 2.5559108-1.41766h1.646472l.021716 6.35001 2.0795306.0002v2.11667z" fill="#bfd9ff"/></g><g stroke-width=".317094" transform="translate(-2.645833 .264579)"><path d="m3.3671875 2.1171875c-.1737915 0-.3428195.047526-.4726563.15625a.26421909.26421909 0 0 0 0 .00195c-.1289799.1088955-.2024235.2722656-.2226562.4375031a.26421909.26421909 0 0 0 .2480469.2949219l.072266.00391c-.046591.04399-.1008834.088255-.1386719.1308593a.26421909.26421909 0 0 0 -.00195.00195c-.073731.083947-.1357264.174371-.1816441.2753901a.26421909.26421909 0 0 0 -.023437.109375v.1757812a.26421909.26421909 0 0 0 .2636713.2636719h.7949219a.26421909.26421909 0 0 0 .2636719-.2636719v-.265625a.26421909.26421909 0 0 0 -.109375-.2128906c.072941-.088558.108149-.1663051.1308594-.2128906.041651-.08544.060547-.1809754.060547-.2753907 0-.1694871-.068557-.3498422-.2011718-.4628906-.1291463-.110091-.3027896-.1582031-.4824221-.1582031z" fill="url(#c)"/><path d="m2.9104167 3.7041663v-.1748925c.
032886-.0723492.0795243-.1429047.1399149-.2116666.0609886-.0687619.1375233-.1405134.229604-.2152545.0884932-.071751.1630627-.1689977.1983404-.2156363.035875-.046637.053813-.092379.053813-.1372236 0-.1100185-.055308-.1650277-.1659247-.1650277-.053813 0-.09507.014649-.1237709.043946-.028102.028701-.046339.072051-.054709.1300501l-.253821-.0143537c.01435-.1171941.057999-.2065843.1309461-.2681705.073545-.061586.1764994-.094687.3026619-.094687.1363274 0 .237864.0334.3108111.095584.072947.062184.1094206.1494814.1094206.2618921 0 .059194-.01166.1127081-.034979.1605424-.023319.047834-.065899.1301329-.102373.1707919-.036473.040061-.077132.077731-.1219771.1130087-.044247.035277-.087297.069658-.1291523.1031413-.041855.033485-.080122.067268-.1148016.1013496-.034082.034082-.023618.013158-.04036.052023l.4601069.0000003v.2645837z" fill="#bfd9ff"/></g></svg>
\ No newline at end of file
commit 3f358583f87be5b2d6b238ed30cca61c3601e0ef
Author: Tibor Nagy <nagy.tibor2 at nisz.hu>
AuthorDate: Fri Mar 12 11:35:53 2021 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:42 2021 +0200
tdf#137367 PPTX import: fix lost direct hyperlink colors
Regression from commit 92f74f6ccb5a55807724db85815f7ea0c49370e0
(bnc#887230: always use theme color for hyperlinks in Impress)
Testing: direct color of the first text line is theme based
(a:rPr/a:solidFill/a:schemeClr), the second line contains
a direct color (a:rPr/a:solidFill/a:srgbClr), the third one
contains a theme based direct color darkened by 25.000%
(val=75000 of a:rPr/a:solidFill/a:schemeClr/a:lumMod).
Note: overwriting default theme based hyperlink colors is
also supported by Google Docs, Office 365 and MS Office 2019.
Change-Id: I1e3e78fac729a97f42c8dddcffd877a16383adbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112377
Tested-by: László Németh <nemeth at numbertext.org>
Reviewed-by: László Németh <nemeth at numbertext.org>
(cherry picked from commit f35e0b2cbfd6e7150aeb5699e1db1d7c13fdb935)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113290
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx
index d0a09b140dcf..267216ff7500 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -150,7 +150,8 @@ ContextHandlerRef HyperLinkContext::onCreateContext(
switch( aElement )
{
case A_TOKEN( extLst ):
- return nullptr;
+ maProperties.setProperty(PROP_CharColor, XML_fillcolor);
+ break;
case A_TOKEN( snd ):
// TODO use getEmbeddedWAVAudioFile() here
break;
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index 8b34fd99082e..ab87fb732141 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -148,7 +148,9 @@ sal_Int32 TextRun::insertAt(
xTextFieldCursor->gotoEnd( true );
- aTextCharacterProps.maFillProperties.maFillColor.setSchemeClr( XML_hlink );
+ if (!maTextCharacterProperties.maHyperlinkPropertyMap.hasProperty(PROP_CharColor))
+ aTextCharacterProps.maFillProperties.maFillColor.setSchemeClr(XML_hlink);
+
aTextCharacterProps.maFillProperties.moFillType.set(XML_solidFill);
if ( !maTextCharacterProperties.moUnderline.has() )
aTextCharacterProps.moUnderline.set( XML_sng );
diff --git a/sd/qa/unit/data/pptx/tdf137367.pptx b/sd/qa/unit/data/pptx/tdf137367.pptx
new file mode 100644
index 000000000000..cf6aa086d9a8
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf137367.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index a60d6f601bfc..e140c41c126d 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -122,6 +122,7 @@ public:
virtual void setUp() override;
void testDocumentLayout();
+ void testHyperlinkColor();
void testSmoketest();
void testN759180();
void testN778859();
@@ -239,6 +240,7 @@ public:
CPPUNIT_TEST_SUITE(SdImportTest);
CPPUNIT_TEST(testDocumentLayout);
+ CPPUNIT_TEST(testHyperlinkColor);
CPPUNIT_TEST(testSmoketest);
CPPUNIT_TEST(testN759180);
CPPUNIT_TEST(testN778859);
@@ -432,6 +434,45 @@ void SdImportTest::testDocumentLayout()
}
}
+void SdImportTest::testHyperlinkColor()
+{
+ ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf137367.pptx"), PPTX);
+
+ uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) );
+
+ // Get first paragraph of the text
+ uno::Reference<text::XTextRange> const xParagraph1( getParagraphFromShape( 0, xShape ) );
+ // Get second paragraph of the text
+ uno::Reference<text::XTextRange> const xParagraph2( getParagraphFromShape( 1, xShape ) );
+ // Get third paragraph of the text
+ uno::Reference<text::XTextRange> const xParagraph3( getParagraphFromShape( 2, xShape ) );
+
+ // Get run of the first paragraph
+ uno::Reference<text::XTextRange> xRun1( getRunFromParagraph (0, xParagraph1 ) );
+ uno::Reference< beans::XPropertySet > xPropSet1( xRun1, uno::UNO_QUERY_THROW );
+ sal_Int32 nCharColorBlue;
+ xPropSet1->getPropertyValue( "CharColor" ) >>= nCharColorBlue;
+
+ // Get run of the second paragraph
+ uno::Reference<text::XTextRange> xRun2( getRunFromParagraph (1, xParagraph2 ) );
+ uno::Reference< beans::XPropertySet > xPropSet2( xRun2, uno::UNO_QUERY_THROW );
+ sal_Int32 nCharColorRed;
+ xPropSet2->getPropertyValue( "CharColor" ) >>= nCharColorRed;
+
+ // Get run of the third paragraph
+ uno::Reference<text::XTextRange> xRun3( getRunFromParagraph (2, xParagraph3 ) );
+ uno::Reference< beans::XPropertySet > xPropSet3( xRun3, uno::UNO_QUERY_THROW );
+ sal_Int32 nCharColorGreen;
+ xPropSet3->getPropertyValue( "CharColor" ) >>= nCharColorGreen;
+
+ // Hyperlink colors should be blue, red, green.
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(4485828), nCharColorBlue );
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(16711680), nCharColorRed );
+ CPPUNIT_ASSERT_EQUAL( sal_Int32(5538357), nCharColorGreen );
+
+ xDocShRef->DoClose();
+}
+
void SdImportTest::testSmoketest()
{
sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/smoketest.pptx"), PPTX);
commit 292c17071a10424646da8fc0a7de7eccba314a1d
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 23 13:05:26 2021 +0000
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:36 2021 +0200
Resolves: tdf#135364 ensure the window is released by a11y dispose
the window dtor wasn't called with a11y enabled, with the side
effect that the pen color wasn't stored by the dtor
Change-Id: I5f482f53d4d93f1e2632cacf7c0a7407f0df1450
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112955
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 67238cb3154c..66bef0694c28 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -88,13 +88,17 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase (
mpViewShell = pViewShell;
}
+void AccessibleDocumentViewBase::ReleaseWindow()
+{
+ SolarMutexGuard g;
+ mpWindow.reset();
+}
+
AccessibleDocumentViewBase::~AccessibleDocumentViewBase()
{
// At this place we should be disposed. You may want to add a
// corresponding assertion into the destructor of a derived class.
-
- SolarMutexGuard g;
- mpWindow.reset();
+ ReleaseWindow(); // this should already be done by impl_dispose
}
void AccessibleDocumentViewBase::Init()
@@ -484,6 +488,8 @@ void AccessibleDocumentViewBase::impl_dispose()
mxController = nullptr;
maShapeTreeInfo.SetDocumentWindow (nullptr);
+
+ ReleaseWindow(); // tdf#135363 - ensure the window is released by dispose
}
//===== XEventListener ======================================================
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index 2194dee2f290..44079e305560 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -238,6 +238,8 @@ private:
virtual void
implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override;
+ void ReleaseWindow();
+
protected:
/// The core window that is made accessible.
VclPtr< ::sd::Window> mpWindow;
commit 1f602903fd2f59aec3d17aaa0b872c641d9f90be
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Mar 18 14:21:22 2021 +0000
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:32 2021 +0200
tdf#118482 set a scroll step of the height of a collapsed entry
Change-Id: I09ea056f6c2284afda5b387b6fdff3160bb7adc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112625
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 09432d8f6454..4744b99e1125 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -177,6 +177,8 @@ void ScCondFormatList::RecalcAll()
if (mbFrozen)
return;
+ int nWheelScroll = SAL_MAX_INT32;
+
sal_Int32 nIndex = 1;
for (const auto& item : maEntries)
{
@@ -184,8 +186,15 @@ void ScCondFormatList::RecalcAll()
continue;
item->SetIndex(nIndex);
item->set_grid_top_attach(nIndex - 1);
+ nWheelScroll = std::min(nWheelScroll, item->get_preferred_height());
++nIndex;
}
+
+ if (nWheelScroll != SAL_MAX_INT32)
+ {
+ // tdf#118482 set a scroll step of the height of a collapsed entry
+ mxScrollWindow->vadjustment_set_step_increment(nWheelScroll);
+ }
}
IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, weld::ComboBox&, rBox, void)
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index bf2d80fba2e0..aed63be47729 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -77,6 +77,7 @@ public:
void Show() { mxGrid->show(); }
void set_grid_top_attach(int nAttach) { mxBorder->set_grid_top_attach(nAttach); }
+ int get_preferred_height() const { return mxBorder->get_preferred_size().Height(); }
void SetPos(const ScAddress& rPos) { maPos = rPos; };
bool IsSelected() const { return mbActive;}
commit 0de9652bb58080a3cbd3f9833ee4611bc7700e47
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Mar 7 10:40:42 2021 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:27 2021 +0200
sw fr_FR AutoCorrect: fix crash using "Apply and Edit changes"
Bad calling of SvxAutoCorrect::FnAddNonBrkSpace() in French
documents, see tdf#140849 for a similar problem.
Change-Id: I19b964fb8fe437c7f98342a873a456ffded75d82
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112120
(cherry picked from commit df41967a29c4f8243d1df2d9b23d7c41d4a13819)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112731
Tested-by: Michael Stahl <michael.stahl at allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2a40b90d448f..060e8b2889b4 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2184,7 +2184,7 @@ void SwAutoFormat::AutoCorrect(TextFrameIndex nPos)
continue; // do not check further
}
- if ( m_aFlags.bAddNonBrkSpace )
+ if ( m_aFlags.bAddNonBrkSpace && nPos < TextFrameIndex(pText->getLength()) )
{
SetRedlineText( STR_AUTOFMTREDL_NON_BREAK_SPACE );
pATst->FnAddNonBrkSpace(aACorrDoc, *pText, sal_Int32(nPos), eLang, bNbspRunNext);
commit 3baaa2ef817543f5f0e83d3c7f48bc3c0eca63d3
Author: Lionel Elie Mamane <lionel at mamane.lu>
AuthorDate: Sat Mar 27 10:57:50 2021 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:23 2021 +0200
tdf#141115: correctly find the ORDER BY clause of a UNION
instead of blindly assuming a SELECT is not a UNION, leading to an
out-of-bounds array access when it is.
Change-Id: I8f904ae65acba8d8ee23b95299058207af68c0ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113189
(cherry picked from commit f4367cfd6978ae2fa896652175956bdbedd3c4bf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113128
Tested-by: Jenkins
Reviewed-by: Lionel Mamane <lionel at mamane.lu>
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index a91390eca2b8..4d8634d07eb5 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1831,12 +1831,29 @@ const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
// Analyse parse tree (depending on statement type)
// and set pointer to ORDER clause:
+
+ assert(SQL_ISRULE(m_pParseTree, select_statement) || SQL_ISRULE(m_pParseTree, union_statement));
+
+ auto pParseTree = m_pParseTree;
+ if(SQL_ISRULE(m_pParseTree, union_statement))
+ {
+ assert(m_pParseTree->count() == 4);
+ pParseTree = pParseTree->getChild(3);
+ // since UNION is left-associative (at least in our grammar),
+ // possibly the left-hand (m_pParseTree->getChild(0)) is a union_statement,
+ // but the right hand cannot.
+ assert(SQL_ISRULE(pParseTree, select_statement));
+ }
+
OSQLParseNode * pOrderClause = nullptr;
- OSL_ENSURE(m_pParseTree->count() >= 4,"ParseTreeIterator: error in parse tree!");
- OSQLParseNode * pTableExp = m_pParseTree->getChild(3);
- OSL_ENSURE(pTableExp != nullptr,"OSQLParseTreeIterator: error in parse tree!");
- OSL_ENSURE(SQL_ISRULE(pTableExp,table_exp),"OSQLParseTreeIterator: error in parse tree!");
- OSL_ENSURE(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT,"OSQLParseTreeIterator: error in parse tree!");
+ OSL_ENSURE(pParseTree->count() == 4, "OSQLParseTreeIterator::getOrderTree: expected a SELECT, and a SELECT must have exactly four children");
+ OSQLParseNode * pTableExp = pParseTree->getChild(3);
+ OSL_ENSURE(pTableExp != nullptr, "OSQLParseTreeIterator::getOrderTree: got NULL table_exp");
+ OSL_ENSURE(SQL_ISRULE(pTableExp, table_exp), "OSQLParseTreeIterator::getOrderTree: expected table_exp but got something else");
+ OSL_ENSURE(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT,"OSQLParseTreeIterator::getOrderTree: table_exp doesn't have the expected number of children");
+ // tdf#141115 upgrade the above to an assert;
+ // this cannot go well if there are too few children
+ assert(pTableExp->count() == TABLE_EXPRESSION_CHILD_COUNT);
pOrderClause = pTableExp->getChild(ORDER_BY_CHILD_POS);
// If it is an order_by, it must not be empty
commit abe3d1acaa788a56377c63de340d8a12609f43d1
Author: Lionel Elie Mamane <lionel at mamane.lu>
AuthorDate: Sat Mar 27 15:44:08 2021 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:18 2021 +0200
tdf#141115 semi-userfriendly message on UNION query on file driver
Rather than silently returning only the first (left) part of the
UNION, error out.
Change-Id: I6ed1eba55ad33f149d9010933a3c7a835fce0451
(cherry picked from commit d0efd1e280c2b9759dce120dff64e8bac1ab19c1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113216
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 08c4f7fdd844..31d435b62aab 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -394,6 +394,13 @@ void OStatement_Base::construct(const OUString& sql)
case OSQLStatementType::Unknown:
m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX,*this);
break;
+ case OSQLStatementType::Select:
+ if(SQL_ISRULE(m_aSQLIterator.getParseTree(), union_statement))
+ {
+ m_pConnection->throwGenericSQLException(STR_QUERY_TOO_COMPLEX, *this);
+ }
+ assert(SQL_ISRULE(m_aSQLIterator.getParseTree(), select_statement));
+ break;
default:
break;
}
commit f04fe56b7143ae05345e33012270ed3057c2ee4e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 29 14:17:31 2021 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:13 2021 +0200
tdf#140556 master document view not launching subdocument from context menu
Change-Id: I0ae61e51266ae050e340c1af99e0dd6a481e6ff9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113281
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 925753c35345..f17faed8c960 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -610,7 +610,7 @@ void SwGlobalTree::ExecuteContextMenuAction(const OString& rSelectedPopupEntry)
pCont = nullptr;
bUpdateHard = true;
}
- else if (rSelectedPopupEntry == "edit")
+ else if (rSelectedPopupEntry == "editcontent")
{
OSL_ENSURE(pCont, "edit without entry ? " );
if (pCont)
commit 59e43cb2d9e6f546070423413d4edbed0d312f09
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 23 14:55:09 2021 +0000
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Mar 31 10:45:08 2021 +0200
Related: tdf#141197 critical a11y warning
** (soffice:19098): CRITICAL **: 13:44:40.365:
AtkObject* atk_object_wrapper_ref(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>&, bool):
assertion 'bool(rxAccessible)' failed
probably since...
commit cbc18cc904c652a936c4b68fba4d975bd89b5abd
Date: Mon Nov 23 21:03:28 2020 +0100
tdf#138425 vcl/gtk activate main menu in UpdateFull
Change-Id: Ieb181e02bb0d2a907aec8534349ec2a80fd9c7e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112957
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 7d4a34678ada..792f3aed5ff5 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1302,7 +1302,7 @@ css::uno::Reference<css::accessibility::XAccessible> Menu::GetAccessible()
// Since PopupMenu are sometimes shared by different instances of MenuBar, the mxAccessible member gets
// overwritten and may contain a disposed object when the initial menubar gets set again. So use the
// mxAccessible member only for sub menus.
- if ( pStartedFrom )
+ if (pStartedFrom && pStartedFrom != this)
{
for ( sal_uInt16 i = 0, nCount = pStartedFrom->GetItemCount(); i < nCount; ++i )
{
More information about the Libreoffice-commits
mailing list