[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 5 commits - icon-themes/karasa_jaga icon-themes/karasa_jaga_svg sd/uiconfig sw/CppunitTest_sw_ooxmlexport4.mk sw/inc sw/qa sw/source vcl/uiconfig writerfilter/source
Rizal Muttaqin (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 17 08:19:27 UTC 2020
icon-themes/karasa_jaga/cmd/32/insertsymbol.png |binary
icon-themes/karasa_jaga/cmd/lc_insertreferencefield.png |binary
icon-themes/karasa_jaga/cmd/lc_insertsymbol.png |binary
icon-themes/karasa_jaga_svg/cmd/32/insertsymbol.svg | 2
icon-themes/karasa_jaga_svg/cmd/lc_insertreferencefield.svg | 2
icon-themes/karasa_jaga_svg/cmd/lc_insertsymbol.svg | 2
sd/uiconfig/simpress/ui/clientboxfragment.ui | 2
sw/CppunitTest_sw_ooxmlexport4.mk | 4
sw/inc/IDocumentSettingAccess.hxx | 3
sw/qa/extras/ooxmlexport/data/128197_compat14.docx |binary
sw/qa/extras/ooxmlexport/data/128197_compat15.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 15 +
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 96 ++++++++----
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 3
sw/source/core/doc/DocumentSettingManager.cxx | 7
sw/source/core/docnode/ndtbl.cxx | 9 +
sw/source/core/inc/DocumentSettingManager.hxx | 1
sw/source/core/text/itrform2.cxx | 10 +
sw/source/uibase/uno/SwXDocumentSettings.cxx | 13 +
vcl/uiconfig/ui/wizard.ui | 2
writerfilter/source/dmapper/SdtHelper.cxx | 9 +
writerfilter/source/dmapper/SettingsTable.cxx | 8 +
23 files changed, 156 insertions(+), 34 deletions(-)
New commits:
commit fcd2266d4d8c805ed4e4d1504871dda258bb7ff0
Author: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
AuthorDate: Thu Aug 13 07:57:19 2020 +0700
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 17 10:18:53 2020 +0200
Karasa Jaga: enlarge Insert Char/Symbol icons, update Ref Field icons
Change-Id: I16184cc81bda1b9608bbf52d2732e2fd3f5a8cf3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100636
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin <riz_17_oke at yahoo.co.id>
(cherry picked from commit 6d5f547f5504a5a2f18bf0b44970ccf87b12b661)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100526
diff --git a/icon-themes/karasa_jaga/cmd/32/insertsymbol.png b/icon-themes/karasa_jaga/cmd/32/insertsymbol.png
index edd533c68340..6cd5faf41694 100644
Binary files a/icon-themes/karasa_jaga/cmd/32/insertsymbol.png and b/icon-themes/karasa_jaga/cmd/32/insertsymbol.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_insertreferencefield.png b/icon-themes/karasa_jaga/cmd/lc_insertreferencefield.png
index 2dfdd8378312..5a60f228e545 100644
Binary files a/icon-themes/karasa_jaga/cmd/lc_insertreferencefield.png and b/icon-themes/karasa_jaga/cmd/lc_insertreferencefield.png differ
diff --git a/icon-themes/karasa_jaga/cmd/lc_insertsymbol.png b/icon-themes/karasa_jaga/cmd/lc_insertsymbol.png
index 83d7086b7bed..120814406014 100644
Binary files a/icon-themes/karasa_jaga/cmd/lc_insertsymbol.png and b/icon-themes/karasa_jaga/cmd/lc_insertsymbol.png differ
diff --git a/icon-themes/karasa_jaga_svg/cmd/32/insertsymbol.svg b/icon-themes/karasa_jaga_svg/cmd/32/insertsymbol.svg
index 0c134b1ccc20..550be109b0b1 100644
--- a/icon-themes/karasa_jaga_svg/cmd/32/insertsymbol.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/32/insertsymbol.svg
@@ -1 +1 @@
-<svg height="32" viewBox="0 0 8.4666665 8.466667" width="32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="16.933095" x2="16.933095" y1=".000477" y2="16.933571"><stop offset="0" stop-color="#3b3e22"/><stop offset="1" stop-color="#454545" stop-opacity="0"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="15.745811" x2="16.795531" y1="29.719465" y2="5.575883"><stop offset="0" stop-color="#555"/><stop offset="1"/></linearGradient><text style="font-size:34.913219;font-family:sans-serif;letter-spacing:0;word-spacing:0;stroke-width:.872831;fill:url(#b)" transform="matrix(.25205115 0 0 .24510525 0 -.098438)" x="3.55068" y="29.504255"><tspan fill="url(#b)" font-family="FreeSerif" font-size="36.740231" stroke-width=".872831" x="3.55068" y="29.504255">Ω</tspan></text><path d="m78.480469 23.09375c2.08133 1.131248 4.195208 2.035891 6.199219 3.697266 3.697607 2.982138 6.473749 7.2
67464 8.492187 12.628906 2.050915 5.447717 3.013672 11.737986 3.013672 18.847656 0 4.865656-.410712 9.279083-1.255859 13.261719a87.271504 31.999551 0 0 0 7.906252-1.835938c1.46197-3.945919 2.19922-8.325101 2.19922-13.220703 0-10.949528-3.63294-19.158173-11.111332-25.595703a3.5601796 3.5024711 0 0 1 -.01563-.01563c-4.344796-3.788647-9.6095-6.161368-15.427729-7.767573zm-29.345703.314453c-5.513005 1.737193-10.43138 4.297238-14.556641 8.082031-7.67505 7.04161-11.328125 15.287158-11.328125 25.539063 0 4.915564.854242 9.393211 2.539062 13.544922.0015.0035.0044.0043.0059.0078.551504 1.328274 1.150867 2.562143 1.787109 3.720703a87.271504 31.999551 0 0 0 6.955078.652344c-1.656991-5.089729-2.445312-10.970706-2.445312-17.654297 0-10.781996 2.819307-20.015792 8.603515-27.230469a3.5601796 3.5024711 0 0 1 .02148-.02148c2.374288-2.909507 5.361365-4.854926 8.417969-6.640625z" fill="url(#a)" opacity=".75" transform="matrix(.06614584 0 0 .06538284 0 -.098438)"/></svg>
\ No newline at end of file
+<svg height="32" viewBox="0 0 8.4666665 8.466667" width="32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.0716208 0 0 .07079464 -.351164 -.445073)" gradientUnits="userSpaceOnUse" x1="16.933095" x2="16.933095" y1=".000477" y2="16.933571"><stop offset="0" stop-color="#3b3e22"/><stop offset="1" stop-color="#454545" stop-opacity="0"/></linearGradient><linearGradient id="b" gradientTransform="matrix(.26912697 0 0 .26912699 -.346291 -.451335)" gradientUnits="userSpaceOnUse" x1="15.745811" x2="16.795531" y1="29.719465" y2="5.575883"><stop offset="0" stop-color="#555"/><stop offset="1"/></linearGradient><path d="m.75760932 5.9997387h.23730691c.01318367.237307.08239827.4152871.20764357.5339405.1252453.1186535.3197051.1779802.5833795.1779802h1.2953002l-.0098878-.4486895c-.2175313-.046143-.4416545-.1318371-.6723696-.2570824-.2241232-.1252453-.4416545-.2900418-.652594-.4943894-.2043476-.2109395-.37244-.4779097-.5
042772-.8009108-.1318371-.3295929-.1977557-.6855533-.1977557-1.0678811 0-.7976149.2933377-1.4699845.8800131-2.0171087.5866754-.5471243 1.351331-.82068643 2.2939668-.82068643.9096765 0 1.6545565.25708243 2.23464.77124743.5800835.5075731.8701253 1.1832386.8701253 2.0269965 0 .6657777-.1779802 1.2326776-.5339405 1.7006995-.3493685.4614301-.8338701.7811353-1.4535048.9591154l-.049439.4486895h1.3249636c.4943894 0 .748176-.2373069.7613597-.7119207h.2373069l-.0593267 1.5128315h-2.6894783l.1285412-1.4770194c.8042067-.2570825 1.2063101-1.025034 1.2063101-2.3038545 0-.4877975-.0659186-.9096765-.1977557-1.2656369-.1318372-.3559603-.3065215-.6229306-.5240528-.8009108-.2109395-.1779802-.4218789-.3065214-.6328184-.3856237s-.4251749-.1186535-.6427062-.1186535c-.606451 0-1.0975445.234011-1.4732804.702033-.3691441.4680219-.5537161 1.067881-.5537161 1.7995773 0 1.2788206.4119912 2.0698436 1.2359735 2.3730691l.098878 1.4770194h-2.68947845z" fill="url(#b)" stroke-width=".234902" transform="scale(1.01407
02 .98612501)"/><path d="m5.26967 1.1898406c.1490666.080087.3004642.1441302.443993.2617467.2648255.2111194.4636551.5144974.6082172.8940588.1468882.3856692.2158416.8309865.2158416 1.3343131 0 .3444624-.029416.6569093-.089945.9388586a6.2504546 2.2653967 0 0 0 .5662514-.1299746c.1047075-.2793498.1575099-.5893725.1575099-.9359548 0-.775168-.260194-1.356296-.7958024-1.8120387a.25498289.24795618 0 0 1 -.00112-.0011c-.3111772-.2682224-.6882395-.4361983-1.1049457-.5499091zm-2.1017626.0222616c-.3948458.122984-.7471038.3042214-1.0425583.5721645-.5496931.4985082-.8113292 1.0822489-.8113292 1.8080289 0 .3479955.061181.664989.1818496.9589078.0001075.0002478.0003152.0003045.0004226.0005522.039499.094035.082426.181386.1279941.2634059a6.2504546 2.2653967 0 0 0 .4981283.046182c-.1186751-.3603251-.1751352-.7766667-.1751352-1.2498292 0-.7633075.2019209-1.4170109.6161906-1.9277714a.25498289.24795618 0 0 1 .00154-.00152c.1700468-.2059781.3839836-.3437033.6029-.4701213z" fill="url(#a)" opacity=".75" stro
ke-width=".071207"/></svg>
\ No newline at end of file
diff --git a/icon-themes/karasa_jaga_svg/cmd/lc_insertreferencefield.svg b/icon-themes/karasa_jaga_svg/cmd/lc_insertreferencefield.svg
index 5969ae297d87..c29c4836761d 100644
--- a/icon-themes/karasa_jaga_svg/cmd/lc_insertreferencefield.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/lc_insertreferencefield.svg
@@ -1 +1 @@
-<svg height="24" viewBox="0 0 6.3499999 6.3500002" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="88.591797" x2="71.262016" y1="96.592697" y2="79.262917"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#555753"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="85.219681" x2="61.336319" y1="93.219681" y2="69.336319"><stop offset="0"/><stop offset="1" stop-color="#393b38"/></linearGradient><linearGradient id="c" 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><radialGradient id="d" cx="102" cy="112.3047" gradientTransform="matrix(.96868017 0 0 -.96868017 13.687922 129.93131)" gradientUnits="userSpaceOnUse" r="139.5585" xlink:href="#i"/><radialGradient id="e" cx="83.124592" cy="106.857862" fx="83.124592" fy="106.857862" gradientUnits="userSpaceOnUse" r="135.187546" xlink:href="#i"/><filter id="f"><feGaussianBlur stdDeviation="1.0394514"/></filter><filter id="g"><feGaussianBlur stdDeviation=".50063244"/></filter><radialGradient id="h" cx="21.993382" cy="28.27281" fx="21.993382" fy="28.27281" gradientUnits="userSpaceOnUse" r="35.768372" xlink:href="#i"/><radialGradient id="i" cx="102" cy="112.3047" gradientUnits="userSpaceOnUse" r="139.5585"><stop offset="0" stop-color="#3e3e3e"/><stop offset=".0151" stop-color="#505050"/><stop offset=".0558" stop-color="#7e7e7e"/><stop offset=".1357" stop-color="#c6c6c6"/><stop offset=".20990001" stop-color="#f1f1f1"/><stop offset=".24349999" stop-color="#fcfcfc"/><stop offse
t=".2722" stop-color="#fff"/></radialGradient><radialGradient id="j" cx="102" cy="112.3047" gradientTransform="matrix(.25084352 0 0 .25163671 -3.799874 -.21228)" gradientUnits="userSpaceOnUse" r="139.55859" xlink:href="#k"/><radialGradient id="k" cx="102" cy="112.3047" 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="l"><feGaussianBlur stdDeviation=".40750996"/></filter><filter id="m"><feGaussianBlur stdDeviation=".90565481"/></filter><filter id="n"><feGaussianBlur stdDeviation=".4901192"/></filter><linearGradient id="o" gradientTransform="matrix(.26458333 0 0 .20410714 -16.575145 7.37254)" gradientUnits="userSpaceOnUse" x1
="154.28152" x2="154.28152" y1="104.82231" y2="115.19268"><stop offset="0" stop-color="#4c78fd"/><stop offset="1" stop-color="#85a2fe"/></linearGradient><linearGradient id="p" gradientTransform="matrix(-.26458333 0 0 .26458333 47.943628 -60.267332)" gradientUnits="userSpaceOnUse" x1="182.28288" x2="182.28288" y1="238.96916" y2="344.42404"><stop offset="0" stop-color="#8e79b9"/><stop offset="1" stop-color="#462886"/></linearGradient><radialGradient id="q" cx="102" cy="112.3047" gradientTransform="matrix(.25629663 0 0 -.25629663 31.095232 292.7746)" gradientUnits="userSpaceOnUse" r="139.5585" xlink:href="#i"/><radialGradient id="r" cx="102" cy="112.3047" gradientTransform="matrix(.25084352 0 0 -.25163671 31.444232 292.47636)" gradientUnits="userSpaceOnUse" r="139.55859" xlink:href="#k"/><g transform="matrix(.171875 0 0 .171875 .264624 .264543)"><g transform="translate(-25.934242 -256.85755)"><path d="m28.946235 8.9687825.040816 102.0638675h55.184949c.53 0 1.039-.211 1.414-.586l32.828-
32.827997c.375-.375.586-.884.586-1.414v-67.2358705z" filter="url(#f)" opacity=".553425" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m28.946235 9 .04082 102.03265h55.184945c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414v-67.204653z" filter="url(#f)" opacity=".306849" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m30.866234 10.931136v97.971234l52.729766-.0001c.53 0 1.039-.211 1.414-.586l31.484-31.76593c.375-.375.586-.884.586-1.414v-64.205204z" filter="url(#g)" opacity=".89589" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m28.946235 9.9655172.040816 101.0671328h55.184949c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414v-66.2391358z" filter="url(#f)" opacity=".306849" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m36.783478 290.72423v-26.00648h14.090678c.135838 0 .266292.0541.362404.15019l8.413706 8.41371c.09611.0961.15018
8.22657.150188.3624v17.08018z" fill="url(#q)" stroke-width=".264583"/><path d="m38.520073 289.23848c-.138215 0-.250843-.11299-.250843-.25164l.08518-22.42007c0-.1389.112628-.25164.250843-.25164h12.19708c.06597 0 .130689.0267.177346.0737l7.440941 7.20239c.04691.0471.0735.11173.0735.17791v15.39708c0 .13865-.112376.25163-.250841.25163z" fill="url(#r)" stroke-width=".264583"/><g transform="matrix(.29316259 0 0 -.29316259 27.192827 299.16799)"><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" fill="url(#a)" filter="url(#l)" opacity=".750685"/><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(#m)" opacity=".564"/><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(#b)" filter="url(#n)" opacity=".1"/><path d="m79.721619 119.31106 31.505501-31.505504h-31.505501z" fill="url(#c)"/></g><g fill="
url(#d)" stroke-width=".999999"><path d="m92.810547 27.455078v13.519531l5.013672.105469a5.8296843 5.8296843 0 0 0 .126953.0078c.340728 0 .509366.0705.714844.236328v-.0078c.246248.198732.270968.225353.302734.244141l-.05859 34.052734-2.554687-.0078a5.8296843 5.8296843 0 0 0 -.01367 0c-2.46539.0031-5.437841 1.123872-6.894531 4.037109-1.451452 2.9016-1.10639 5.545404.730468 8.001953a5.8296843 5.8296843 0 0 0 .279297.347657l13.560553 15.50195-.0957-.14062a5.8296843 5.8296843 0 0 0 .20703.26562l.0508.0586a5.8296843 5.8296843 0 0 0 .21484.23047l-.16992-.16406a5.8296843 5.8296843 0 0 0 .3125.33398c1.46963 1.75966 3.12946 2.65625 5.77734 2.65626 2.60523 0 4.24302-.90629 5.69532-2.61719a5.8296843 5.8296843 0 0 0 .22461-.2168l-.16797.19922a5.8296843 5.8296843 0 0 0 .375-.41406 5.8296843 5.8296843 0 0 0 .008-.008l5.73047-6.539056v-39.511561c0-.513373-.20316-1.005928-.56641-1.369141z" transform="matrix(.26458334 0 0 .26458334 27.473636 258.39694)"/><path d="m75.619141 23.890625v11.017578a5.82968
42 5.8296842 0 0 0 5.707031 5.824219l16.498047.347656a5.8296842 5.8296842 0 0 0 .126953.0078c.340728 0 .509366.0705.714844.236328v-.0078c.246248.198732.270968.225353.302734.244141l-.05859 34.052734-2.554687-.0078a5.8296842 5.8296842 0 0 0 -.01367 0c-2.46539.0031-5.437841 1.123872-6.894531 4.037109-1.451452 2.9016-1.10639 5.545404.730468 8.001953a5.8296842 5.8296842 0 0 0 .279297.347657l13.560553 15.50195-.0957-.14062a5.8296842 5.8296842 0 0 0 .20703.26562l.0508.0586a5.8296842 5.8296842 0 0 0 .21484.23047l-.16992-.16406a5.8296842 5.8296842 0 0 0 .3125.33398c1.46963 1.75965 3.12946 2.65626 5.77734 2.65626 2.60523 0 4.24302-.90629 5.69532-2.61719a5.8296842 5.8296842 0 0 0 .22461-.2168l-.16797.19922a5.8296842 5.8296842 0 0 0 .375-.41406 5.8296842 5.8296842 0 0 0 .008-.008l5.73047-6.539056v-39.511561c0-.513373-.20316-1.005928-.56641-1.369141l-31.801-31.800781c-.363258-.363175-.855737-.566406-1.369141-.566406z" transform="matrix(.26458334 0 0 .26458334 27.473636 258.39694)"/></g></g><path
d="m28.946235 8.9687825.040816 102.0638675h55.184949c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414v-67.2358705z" filter="url(#f)" opacity=".553425" transform="matrix(.26697567 0 0 .26545011 -8.240556 -2.901214)"/><path d="m28.946235 9 .04082 102.03265h55.184945c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414v-67.204653z" filter="url(#f)" opacity=".306849" transform="matrix(.26697567 0 0 .26545011 -8.240556 -2.901214)"/><path d="m28.946235 9.9655172.040816 101.0671328h55.184949c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414v-66.2391358z" filter="url(#f)" opacity=".306849" transform="matrix(.26697567 0 0 .26545011 -8.240556 -2.901214)"/><path d="m20.011839 27.70918h10.775606v3.07875h-10.775606z" fill="url(#o)"/><g transform="translate(-1.539394 -1.539394)"><path d="m30.866234 10.931136v97.971234l52.729766-.0001c.53 0 1.039-.211 1.414-.586l31.484-31.76593c.375-.375.586-.884.586-1.414v-64.205204z" filter="
url(#g)" opacity=".89589" transform="matrix(.26697567 0 0 .26545011 -6.701162 -1.36182)"/><path d="m1.5393723 1.53985v26.00648h14.0906777c.135838 0 .266292-.0541.362404-.15019l8.413706-8.41371c.09611-.0961.150188-.22657.150188-.3624v-17.08018z" fill="url(#h)" stroke-width=".264583"/><path d="m3.2759668 3.0256c-.138215 0-.250843.11299-.250843.25164l.08518 22.42007c0 .1389.112628.25164.250843.25164h12.1970802c.06597 0 .130689-.0267.177346-.0737l7.440941-7.20239c.04691-.0471.0735-.11173.0735-.17791v-15.39708c0-.13865-.112376-.25163-.250841-.25163z" fill="url(#j)" stroke-width=".264583"/><g fill="#b3b3b3" transform="translate(.073608 -263.06488)"><path d="m4.544509 283.07718h16.933098v1.53937h-16.933098z"/><path d="m4.544509 286.15594h12.699821v1.53937h-12.699821z"/><path d="m4.544509 267.68347h16.933098v1.53937h-16.933098z"/><path d="m4.544509 270.76221h16.933098v1.53937h-16.933098z"/><path d="m4.544509 273.84094h16.933098v1.53937h-16.933098z"/><path d="m4.544509 276.91971h16.933098v1.
53937h-16.933098z"/><path d="m4.544509 279.99844h16.933098v1.53937h-16.933098z"/></g><path d="m4.6181169 6.1579656h13.8543501v3.07875h-13.8543501z" fill="#f60"/><g transform="matrix(.29316259 0 0 .29316259 -8.05128 -6.90391)"><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" fill="url(#a)" filter="url(#l)" opacity=".750685"/><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(#m)" opacity=".564"/><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(#b)" filter="url(#n)" opacity=".1"/><path d="m79.721619 119.31106 31.505501-31.505504h-31.505501z" fill="url(#c)"/></g><path d="m81.578125 17.451172a5.8296842 5.8296842 0 0 0 -5.958984 5.824219v11.632812a5.8296842 5.8296842 0 0 0 5.707031 5.824219l11.484375.242187v-23.287109z" fill="url(#e)" stroke-width=".999999" transform="scale(.26458334)"
/></g><path d="m21.551212 6.1579656v3.0783649l4.365222.091749c.42394 0 .827112.1374396 1.157551.4041097.330441.2666799.654741.6384708.654741 1.1353308l-.02003 10.684169-2.217435-.0057c-.2345.000291-.386944.0959-.446484.214974-.0781.15613-.05289.367282.04961.504362l3.629751 4.150651.0078.0078.02479.03307c.01431.0132.02814.02704.04134.04134.0882.11509.246687.198438.388607.198438.141931 0 .300437-.0833.388607-.198438.01331-.0143.02704-.02814.04134-.04134.008-.0112.0163-.02227.02479-.03307l.0083-.0078 3.638021-4.150651v-.0083c.0521-.0715.08705-.158203.09095-.264583.008-.23821-.209606-.447015-.487826-.446485l-2.103747.0062.02003-10.684629c.000706-2.5790601-2.287794-4.6178061-4.890746-4.6178061z" fill="url(#p)" stroke-width=".264583"/></g></svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 6.3499999 6.3500002" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="88.591797" x2="71.262016" y1="96.592697" y2="79.262917"><stop offset="0" stop-color="#fff"/><stop offset="1" stop-color="#555753"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="85.219681" x2="61.336319" y1="93.219681" y2="69.336319"><stop offset="0"/><stop offset="1" stop-color="#393b38"/></linearGradient><linearGradient id="c" 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><radialGradient id="d" cx="83.124592" cy="106.857862" fx="83.124592" fy="106.857862" gradientUnits="userSpaceOnUse" r="135.187546" xlink:href="#h"/><filter id="e"><feGaussianBlur stdDeviation="1.0394514"/></filter><filter id="f"><feGaussianBlur stdDeviation=".50063244"/></filter><radialGradient id="g" cx="21.993382" cy="28.27281" fx="21.993382" fy="28.27281" gradientUnits="userSpaceOnUse" r="35.768372" xlink:href="#h"/><radialGradient id="h" cx="102" cy="112.3047" gradientUnits="userSpaceOnUse" r="139.5585"><stop offset="0" stop-color="#3e3e3e"/><stop offset=".0151" stop-color="#505050"/><stop offset=".0558" stop-color="#7e7e7e"/><stop offset=".1357" stop-color="#c6c6c6"/><stop offset=".20990001" stop-color="#f1f1f1"/><stop offset=".24349999" stop-color="#fcfcfc"/><stop offset=".2722" stop-color="#fff"/></radialGradient><radialGradient id="i" cx="102" cy="112.3047" gradientTransform="matrix(.25084352 0 0 .25163671 -3.799874 -.21228)" gradientUnits="use
rSpaceOnUse" r="139.55859" xlink:href="#j"/><radialGradient id="j" cx="102" cy="112.3047" 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="k"><feGaussianBlur stdDeviation=".40750996"/></filter><filter id="l"><feGaussianBlur stdDeviation=".90565481"/></filter><filter id="m"><feGaussianBlur stdDeviation=".4901192"/></filter><linearGradient id="n" gradientTransform="matrix(.26458333 0 0 .20410714 -16.575145 7.37254)" gradientUnits="userSpaceOnUse" x1="154.28152" x2="154.28152" y1="104.82231" y2="115.19268"><stop offset="0" stop-color="#4c78fd"/><stop offset="1" stop-color="#85a2fe"/></linearGradient><linearGradient id="o" grad
ientTransform="matrix(-.26458333 0 0 .26458333 47.943628 -60.267332)" gradientUnits="userSpaceOnUse" x1="182.28288" x2="182.28288" y1="238.96916" y2="344.42404"><stop offset="0" stop-color="#8e79b9"/><stop offset="1" stop-color="#462886"/></linearGradient><radialGradient id="p" cx="102" cy="112.3047" gradientTransform="matrix(.25629663 0 0 -.25629663 31.095232 292.7746)" gradientUnits="userSpaceOnUse" r="139.5585" xlink:href="#h"/><radialGradient id="q" cx="102" cy="112.3047" gradientTransform="matrix(.25084352 0 0 -.25163671 31.444232 292.47636)" gradientUnits="userSpaceOnUse" r="139.55859" xlink:href="#j"/><g transform="matrix(.171875 0 0 .171875 .264624 .264543)"><g transform="translate(-25.934242 -256.85755)"><path d="m28.946235 8.9687825.040816 102.0638675h55.184949c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414v-67.2358705z" filter="url(#e)" opacity=".553425" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m28.670124 9.61403
46.04082 102.0326454 55.461056.00084c.53.00001 1.042476-.20752 1.414-.586l32.828-33.442867c.37152-.378483.586-.884.586-1.414v-67.204653z" filter="url(#e)" opacity=".306849" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m30.866234 10.931136v97.971234l52.729766-.0001c.53 0 1.039-.211 1.414-.586l31.484-31.76593c.375-.375.586-.884.586-1.414v-64.205204z" filter="url(#f)" opacity=".89589" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m28.670124 10.579552.04082 101.067128 55.46106.00084c.53.00001 1.042476-.20752 1.414-.586l32.828-33.442867c.37152-.378483.586-.884.586-1.414v-66.2391358z" filter="url(#e)" opacity=".306849" transform="matrix(.26697567 0 0 -.26545011 28.542944 293.6259)"/><path d="m36.709763 290.56123v-26.00648l14.164393-.00022c.135838 0 .266292.0541.362404.15019l8.413706 8.57693c.09611.0961.150188.22657.150188.3624v17.08018z" fill="url(#p)" stroke-width=".264583"/><path d="m38.520073 289.23848c-.138215 0-.250843-.11299-.
250843-.25164l.08518-22.42007c0-.1389.112628-.25164.250843-.25164h12.19708c.06597 0 .130689.0267.177346.0737l7.440941 7.20239c.04691.0471.0735.11173.0735.17791v15.39708c0 .13865-.112376.25163-.250841.25163z" fill="url(#q)" stroke-width=".264583"/><g transform="matrix(.29316259 0 0 -.29316259 27.192827 299.16799)"><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" fill="url(#a)" filter="url(#k)" opacity=".750685"/><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(#l)" opacity=".564"/><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(#b)" filter="url(#m)" opacity=".1"/><path d="m79.721619 119.31106 31.505501-31.505504h-31.505501z" fill="url(#c)"/></g></g><path d="m28.946235 8.9687825.040816 102.0638675h55.184949c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414
v-67.2358705z" filter="url(#e)" opacity=".553425" transform="matrix(.26697567 0 0 .26545011 -8.240556 -2.901214)"/><path d="m28.946235 9 .04082 102.03265h55.184945c.53 0 1.039-.211 1.414-.586l32.828-32.827997c.375-.375.586-.884.586-1.414v-67.204653z" filter="url(#e)" opacity=".306849" transform="matrix(.26697567 0 0 .26545011 -8.240556 -2.901214)"/><path d="m28.946235 9.9655172.04001 101.6811728h55.184949c.53 0 1.042466-.20753 1.414-.586l32.828806-33.442037c.37153-.378474.586-.884.586-1.414v-66.2391358z" filter="url(#e)" opacity=".306849" transform="matrix(.26697567 0 0 .26545011 -8.240556 -2.901214)"/><path d="m20.011839 27.70918h10.775606v3.07875h-10.775606z" fill="url(#n)"/><g transform="translate(-1.539394 -1.539394)"><path d="m30.866234 10.931136v97.971234l52.729766-.0001c.53 0 1.039-.211 1.414-.586l31.484-31.76593c.375-.375.586-.884.586-1.414v-64.205204z" filter="url(#f)" opacity=".89589" transform="matrix(.26697567 0 0 .26545011 -6.701162 -1.36182)"/><path d="m1.5393723 1.539
85-.0002149 26.169476h14.0906776c.135838 0 .266292-.0541.362404-.15019l8.413921-8.576706c.09611-.0961.150188-.22657.150188-.3624v-17.08018z" fill="url(#g)" stroke-width=".264583"/><path d="m3.2759668 3.0256c-.138215 0-.250843.11299-.250843.25164l.08518 22.42007c0 .1389.112628.25164.250843.25164h12.1970802c.06597 0 .130689-.0267.177346-.0737l7.440941-7.20239c.04691-.0471.0735-.11173.0735-.17791v-15.39708c0-.13865-.112376-.25163-.250841-.25163z" fill="url(#i)" stroke-width=".264583"/><g fill="#b3b3b3" transform="translate(.073608 -263.06488)"><path d="m4.544509 283.07718h16.933098v1.53937h-16.933098z"/><path d="m4.544509 286.15594h12.699821v1.53937h-12.699821z"/><path d="m4.544509 267.68347h16.933098v1.53937h-16.933098z"/><path d="m4.544509 270.76221h16.933098v1.53937h-16.933098z"/><path d="m4.544509 273.84094h16.933098v1.53937h-16.933098z"/><path d="m4.544509 276.91971h16.933098v1.53937h-16.933098z"/><path d="m4.544509 279.99844h16.933098v1.53937h-16.933098z"/></g><path d="m4.6181169
6.1579656h13.8543501v3.07875h-13.8543501z" fill="#f60"/><g transform="matrix(.29316259 0 0 .29316259 -8.05128 -6.90391)"><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" fill="url(#a)" filter="url(#k)" opacity=".750685"/><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(#l)" opacity=".564"/><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(#b)" filter="url(#m)" opacity=".1"/><path d="m79.721619 119.31106 31.505501-31.505504h-31.505501z" fill="url(#c)"/></g><path d="m81.578125 17.451172a5.8296842 5.8296842 0 0 0 -5.958984 5.824219v11.632812a5.8296842 5.8296842 0 0 0 5.707031 5.824219l11.484375.242187v-23.287109z" fill="url(#d)" stroke-width=".999999" transform="scale(.26458334)"/></g><path d="m21.551212 6.1579656v3.0783649l4.365222.091749c.42394 0 .827112.1374396 1.157551.4041097.
330441.2666799.654741.6384708.654741 1.1353308l-.02003 10.684169-2.217435-.0057c-.2345.000291-.386944.0959-.446484.214974-.0781.15613-.05289.367282.04961.504362l3.629751 4.150651.0078.0078.02479.03307c.01431.0132.02814.02704.04134.04134.0882.11509.246687.198438.388607.198438.141931 0 .300437-.0833.388607-.198438.01331-.0143.02704-.02814.04134-.04134.008-.0112.0163-.02227.02479-.03307l.0083-.0078 3.638021-4.150651v-.0083c.0521-.0715.08705-.158203.09095-.264583.008-.23821-.209606-.447015-.487826-.446485l-2.103747.0062.02003-10.684629c.000706-2.5790601-2.287794-4.6178061-4.890746-4.6178061z" fill="url(#o)" stroke-width=".264583"/></g></svg>
\ No newline at end of file
diff --git a/icon-themes/karasa_jaga_svg/cmd/lc_insertsymbol.svg b/icon-themes/karasa_jaga_svg/cmd/lc_insertsymbol.svg
index 9f95e13b8b31..33bc2886704c 100644
--- a/icon-themes/karasa_jaga_svg/cmd/lc_insertsymbol.svg
+++ b/icon-themes/karasa_jaga_svg/cmd/lc_insertsymbol.svg
@@ -1 +1 @@
-<svg height="24" viewBox="0 0 6.3499999 6.3500002" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.82 0 0 .84594534 3.048 -219.91585)" gradientUnits="userSpaceOnUse" x1="64.812958" x2="61.531181" y1="11.956258" y2="71.017647"><stop offset="0" stop-color="#3b3e22"/><stop offset="1" stop-color="#454545" stop-opacity="0"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="16.174987" x2="17.199136" y1="29.032235" y2="5.476768"><stop offset="0" stop-color="#555"/><stop offset="1"/></linearGradient><path d="m4.8145984 23.337961h.8602864q.071691 1.290429.7527507 1.935644.6810601.645215 2.1148708.645215h4.6957297l-.03585-1.541347q-1.182889-.250917-2.437473-.931977-1.2187392-.68106-2.3657878-1.792263-1.1112033-1.147049-1.8281087-2.903467-.7169053-1.792263-.7169053-3.871289 0-4.337277 3.1902288-7.3124345 3.190229-2.9751572 8.316102-2.9751572 4.946647 0 8.101031 2.7959309 3.154384
2.7600858 3.154384 7.3482798 0 3.620372-1.935645 6.165386-1.899799 2.509169-5.269254 3.476991l-.179227 1.541347h4.803266q2.688395 0 2.760086-2.580859h.860286l-.215071 5.484326h-9.749913l.465988-5.269255q4.373123-1.397965 4.373123-8.351947 0-2.65255-.716905-4.588195-.716906-1.9356442-1.8998-2.9034664-1.147048-.9678222-2.294097-1.3979655-1.147048-.4301432-2.329942-.4301432-3.297765 0-5.340945 2.5450141-2.0073353 2.545014-2.0073353 6.523839 0 6.953982 4.4806583 8.602864l.358453 5.269255h-9.749913z" fill="url(#b)" stroke-width=".851569" transform="matrix(.16921875 0 0 .17457294 .264624 .264542)"/><path d="m64.603516 18.894531c-12.478765 0-22.436984 3.690795-30.111328 11.074219-7.696838 7.405065-11.482422 16.358963-11.482422 27.148438 0 3.875022.485235 7.530792 1.449218 10.982421a64.000003 41.491526 0 0 0 13.302735 5.431641c-1.328852-4.629387-1.996094-9.999878-1.996094-16.142578 0-10.395121 2.552198-19.064707 7.724609-25.830078a1.2269074 1.2657275 0 0 1 .0078-.0078c5.270493-6.77272 12.3
39478-10.242187 20.835937-10.242187 3.082689 0 6.123814.58119 9.09961 1.732422 3.003674 1.162016 5.966053 3.035151 8.896484 5.585937 3.143562 2.659324 5.598969 6.57994 7.427734 11.673828 1.841849 5.130338 2.746094 11.152215 2.746094 18.054688 0 5.993476-.616135 11.213186-1.851562 15.695312a64.000003 41.491526 0 0 0 12.806639-4.830078c1.1935-3.858386 1.79297-8.069522 1.79297-12.658203 0-11.452265-3.74462-20.418968-11.316406-27.253906a1.2269074 1.2657275 0 0 1 -.0059-.0078c-7.586998-6.937689-17.285634-10.406276-29.326118-10.406276z" fill="url(#a)" opacity=".75" transform="matrix(.04547526 0 0 .04547526 .264624 .264542)"/></svg>
\ No newline at end of file
+<svg height="24" viewBox="0 0 6.3499999 6.3500002" width="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientTransform="matrix(.04685614 0 0 .0483387 -.309412 -13.050021)" gradientUnits="userSpaceOnUse" x1="64.812958" x2="61.531181" y1="11.956258" y2="71.017647"><stop offset="0" stop-color="#3b3e22"/><stop offset="1" stop-color="#454545" stop-opacity="0"/></linearGradient><linearGradient id="b" gradientTransform="matrix(.21263067 0 0 .21935844 -.48358 -.483671)" gradientUnits="userSpaceOnUse" x1="16.174987" x2="17.199136" y1="29.032235" y2="5.476768"><stop offset="0" stop-color="#555"/><stop offset="1"/></linearGradient><path d="m.5377733 4.7255335h.18292328c.0101625.188711.0635151.3302443.16005788.4245999.0965429.094356.24643834.1415333.44968644.1415333h.9984562l-.0052447-.4279331c-.1676789-.0366938-.3404394-.1048395-.5182815-.204437-.1727609-.0995975-.3404405-.2306468-.503039-.393148-.1575173-.1677433-.2870879-.3800433-
.38871199-.6369-.10162403-.2620987-.15243605-.5451653-.15243605-.8491999 0-.6342789.22611348-1.1689603.67834044-1.6040442.4522271-.43508392 1.0416465-.65262588 1.7682584-.65262588.7012059 0 1.2753817.20443703 1.7225276.61331108.4471459.4036321.6707188.9409345.6707188 1.6119072 0 .5294394-.1371925.9802492-.4115775 1.3524294-.2693037.3669383-.642772.621174-1.120405.7627073l-.0404872.4279331h1.0213216c.3810901 0 .5767164-.1887111.586879-.5661332h.182923l-.0433524 1.1132076h-2.0731306l.099083-1.1558556c.6199067-.2044369.92986-.8151269.92986-1.83207 0-.3879062-.050812-.7233926-.152436-1.0064593-.1016239-.2830666-.2362756-.4953666-.4039553-.6368999-.1625984-.1415333-.3251969-.24375181-.4877954-.30665552-.1625984-.06290369-.3277374-.09435554-.4954171-.09435554-.4674707 0-.8460202.18609012-1.1356487.55827036-.2845474.3721802-.4268211.8491999-.4268211 1.4310591 0 1.0169431.3175751 1.6459801.9527254 1.8871108l.076218 1.1558556h-2.07313043z" fill="url(#b)" stroke-width=".183912"/><path d="m3.2
079704.59599345c-.713057 0-1.2820858.21089804-1.7206103.63279895-.4398099.4231374-.65612432.9347778-.65612432 1.5513059 0 .2214251.0277271.4303217.0828107.6275534.23274242.1233169.48804812.2275608.76013992.3103729-.0759328-.2645308-.1140601-.5714094-.1140601-.9224132 0-.5939942.1458368-1.0893884.4413968-1.4759728.0001479-.0001492.0002965-.0002978.0004457-.0004457.3011645-.38700422.7050979-.58525522 1.1905994-.58525522.1761498 0 .3499247.0332101.5199665.0989934.1716348.0663995.34091.17343352.5083596.31918952.1796282.1519581.3199342.3759885.4244328.6670616.1052463.2931559.1569163.6372557.1569163 1.0316743 0 .3424769-.035207.6407397-.1058013.8968557.2595895-.0733225.5051654-.1659426.7317922-.2759986.0681986-.2204744.1024533-.4611056.1024533-.7233103 0-.6544011-.2139737-1.1667731-.6466379-1.5573326-.000113-.0001481-.0002254-.0002967-.0003372-.0004457-.4335334-.39643084-.9877292-.59463155-1.6757421-.59463155z" fill="url(#a)" opacity=".75" stroke-width=".057142"/></svg>
\ No newline at end of file
commit 07370d6efc986a5060a75cc9972742202a0b73c3
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Thu Jun 11 09:45:03 2020 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 17 10:18:44 2020 +0200
tdf#128197: sw: different line height for DOCX with compat=14
Lines containing just a shape inline without any other text are
treated in DOCX with compatibility option 15 and 14 in a different
way: while compat=15 is layouting line exatly as LO does, in
compat=14 mode minimal line height takes into account just shape
height and not current font.
Change-Id: Id2bdab941a0bbaa9080567d736435d9e0babd490
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96080
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100542
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index f182027ded95..814f139b64fc 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -63,7 +63,8 @@ enum class DocumentSettingId
// tdf#104349 tdf#104668
MS_WORD_COMP_TRAILING_BLANKS,
-
+ // tdf#128197 MS Word in some modes can have line height based on shape height, not on font
+ MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY,
UNIX_FORCE_ZERO_EXT_LEADING,
TABS_RELATIVE_TO_INDENT,
PROTECT_FORM,
diff --git a/sw/qa/extras/ooxmlexport/data/128197_compat14.docx b/sw/qa/extras/ooxmlexport/data/128197_compat14.docx
new file mode 100644
index 000000000000..507e28396019
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/128197_compat14.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/128197_compat15.docx b/sw/qa/extras/ooxmlexport/data/128197_compat15.docx
new file mode 100644
index 000000000000..d618b117cfec
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/128197_compat15.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index a060b92b02cd..dbe3790a3366 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -42,6 +42,21 @@ protected:
}
};
+CPPUNIT_TEST_FIXTURE(Test, testTdf128197)
+{
+ load(mpTestDocumentPath, "128197_compat14.docx");
+ xmlDocPtr pLayout14 = parseLayoutDump();
+ sal_Int32 nHeight14 = getXPath(pLayout14, "//page[1]/body/txt[1]/infos/bounds", "height").toInt32();
+
+ load(mpTestDocumentPath, "128197_compat15.docx");
+ xmlDocPtr pLayout15 = parseLayoutDump();
+ sal_Int32 nHeight15 = getXPath(pLayout15, "//page[1]/body/txt[1]/infos/bounds", "height").toInt32();
+
+ // In compat mode=14 second line has size of the shape thus entire paragraph height is smaller
+ // So nHeight14 < nHeight15
+ CPPUNIT_ASSERT_LESS(nHeight15, nHeight14);
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf78749, "tdf78749.docx")
{
//Shape lost the background image before, now check if it still has...
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 3d31102f602d..7a4442afcf52 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -76,6 +76,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
mbTabRelativeToIndent(true),
mbProtectForm(false), // i#78591#
mbMsWordCompTrailingBlanks(false), // tdf#104349 tdf#104668
+ mbMsWordCompMinLineHeightByFly(false),
mbInvertBorderSpacing (false),
mbCollapseEmptyCellPara(true),
mbTabAtLeftIndentForParagraphsInList(false), //#i89181#
@@ -181,6 +182,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/ DocumentSettingId id) const
case DocumentSettingId::PROTECT_FORM: return mbProtectForm;
// tdf#104349 tdf#104668
case DocumentSettingId::MS_WORD_COMP_TRAILING_BLANKS: return mbMsWordCompTrailingBlanks;
+ case DocumentSettingId::MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY: return mbMsWordCompMinLineHeightByFly;
// #i89181#
case DocumentSettingId::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: return mbTabAtLeftIndentForParagraphsInList;
case DocumentSettingId::INVERT_BORDER_SPACING: return mbInvertBorderSpacing;
@@ -326,6 +328,10 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
mbMsWordCompTrailingBlanks = value;
break;
+ case DocumentSettingId::MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY:
+ mbMsWordCompMinLineHeightByFly = value;
+ break;
+
case DocumentSettingId::TABS_RELATIVE_TO_INDENT:
mbTabRelativeToIndent = value;
break;
@@ -596,6 +602,7 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti
mbClipAsCharacterAnchoredWriterFlyFrames = rSource.mbClipAsCharacterAnchoredWriterFlyFrames;
mbUnixForceZeroExtLeading = rSource.mbUnixForceZeroExtLeading;
mbTabRelativeToIndent = rSource.mbTabRelativeToIndent;
+ mbMsWordCompMinLineHeightByFly = rSource.mbMsWordCompMinLineHeightByFly;
mbTabAtLeftIndentForParagraphsInList = rSource.mbTabAtLeftIndentForParagraphsInList;
mbSubtractFlys = rSource.mbSubtractFlys;
mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks;
diff --git a/sw/source/core/inc/DocumentSettingManager.hxx b/sw/source/core/inc/DocumentSettingManager.hxx
index fe87b339307c..e548c55a26b2 100644
--- a/sw/source/core/inc/DocumentSettingManager.hxx
+++ b/sw/source/core/inc/DocumentSettingManager.hxx
@@ -142,6 +142,7 @@ class DocumentSettingManager :
bool mbTabRelativeToIndent : 1; // #i24363# tab stops relative to indent
bool mbProtectForm : 1;
bool mbMsWordCompTrailingBlanks : 1; // tdf#104349 tdf#104668
+ bool mbMsWordCompMinLineHeightByFly : 1;
bool mbInvertBorderSpacing : 1;
bool mbCollapseEmptyCellPara : 1;
bool mbTabAtLeftIndentForParagraphsInList; // #i89181# - see above
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 89c7641df414..4e57a0b64d90 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -333,6 +333,16 @@ void SwTextFormatter::InsertPortion( SwTextFormatInfo &rInf,
m_pCurr->Height( pPor->Height() );
if( m_pCurr->GetAscent() < pPor->GetAscent() )
m_pCurr->SetAscent( pPor->GetAscent() );
+
+ if (GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(DocumentSettingId::MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY))
+ {
+ // For DOCX with compat=14 the only shape in line defines height of the line inspite of used font
+ if (pLast->IsFlyCntPortion() && pPor->IsTextPortion() && pPor->GetLen() == TextFrameIndex(0))
+ {
+ m_pCurr->SetAscent(pLast->GetAscent());
+ m_pCurr->Height(pLast->Height());
+ }
+ }
}
// Sometimes chains are constructed (e.g. by hyphenate)
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 9887cdc11dc8..51124bfe4071 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -114,6 +114,7 @@ enum SwDocumentSettingsPropertyHandles
HANDLE_USE_OLD_PRINTER_METRICS,
HANDLE_PROTECT_FORM,
HANDLE_MS_WORD_COMP_TRAILING_BLANKS,
+ HANDLE_MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY,
HANDLE_TABS_RELATIVE_TO_INDENT,
HANDLE_RSID,
HANDLE_RSID_ROOT,
@@ -203,6 +204,7 @@ static MasterPropertySetInfo * lcl_createSettingsInfo()
{ OUString("RsidRoot"), HANDLE_RSID_ROOT, cppu::UnoType<sal_Int32>::get(), 0},
{ OUString("ProtectForm"), HANDLE_PROTECT_FORM, cppu::UnoType<bool>::get(), 0},
{ OUString("MsWordCompTrailingBlanks"), HANDLE_MS_WORD_COMP_TRAILING_BLANKS, cppu::UnoType<bool>::get(), 0 },
+ { OUString("MsWordCompMinLineHeightByFly"), HANDLE_MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY, cppu::UnoType<bool>::get(), 0 },
{ OUString("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, cppu::UnoType<bool>::get(), 0},
{ OUString("ModifyPasswordInfo"), HANDLE_MODIFYPASSWORDINFO, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), 0},
{ OUString("MathBaselineAlignment"), HANDLE_MATH_BASELINE_ALIGNMENT, cppu::UnoType<bool>::get(), 0},
@@ -749,6 +751,12 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::MS_WORD_COMP_TRAILING_BLANKS, bTmp);
}
break;
+ case HANDLE_MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY:
+ {
+ bool bTmp = *o3tl::doAccess<bool>(rValue);
+ mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY, bTmp);
+ }
+ break;
case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST:
{
bool bTmp = *o3tl::doAccess<bool>(rValue);
@@ -1275,6 +1283,11 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::MS_WORD_COMP_TRAILING_BLANKS);
}
break;
+ case HANDLE_MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY:
+ {
+ rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::MS_WORD_COMP_MIN_LINE_HEIGHT_BY_FLY);
+ }
+ break;
case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST:
{
rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST);
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 58399cf0a151..90fb9c98752d 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -23,6 +23,7 @@
#include <rtl/ustring.hxx>
#include <sfx2/zoomitem.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
@@ -701,6 +702,13 @@ void SettingsTable::ApplyProperties(uno::Reference<text::XTextDocument> const& x
{
uno::Reference< beans::XPropertySet> xDocProps( xDoc, uno::UNO_QUERY );
+ if (GetWordCompatibilityMode() <= 14)
+ {
+ uno::Reference<lang::XMultiServiceFactory> xTextFactory(xDoc, uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet> xDocumentSettings(xTextFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY_THROW);
+ xDocumentSettings->setPropertyValue("MsWordCompMinLineHeightByFly", uno::makeAny(true));
+ }
+
// Show changes value
if (xDocProps.is())
{
commit f8c1d40c9fdffc00ad02e4f43686fb4140d753ef
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 11 15:29:38 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 17 10:18:36 2020 +0200
tdf#135442 min supported version of gtk3 is 3.18 not 3.20
Change-Id: Iaa2eefbe08fad3a7dd6eff98bf5fb513053a263d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100541
Tested-by: Xisco Fauli <xiscofauli at libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sd/uiconfig/simpress/ui/clientboxfragment.ui b/sd/uiconfig/simpress/ui/clientboxfragment.ui
index 361caeeb4823..e5811360878d 100644
--- a/sd/uiconfig/simpress/ui/clientboxfragment.ui
+++ b/sd/uiconfig/simpress/ui/clientboxfragment.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface domain="sd">
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.18"/>
<object class="GtkGrid" id="ClientboxFragment">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/vcl/uiconfig/ui/wizard.ui b/vcl/uiconfig/ui/wizard.ui
index e1f68da9e66a..76f92607f1ce 100644
--- a/vcl/uiconfig/ui/wizard.ui
+++ b/vcl/uiconfig/ui/wizard.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface domain="vcl">
- <requires lib="gtk+" version="3.20"/>
+ <requires lib="gtk+" version="3.18"/>
<object class="GtkAssistant" id="Wizard">
<property name="can_focus">True</property>
<property name="border_width">6</property>
commit 9cca8de2a7295bcadeefb2ec2f56e256050d3580
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Wed Jul 22 10:44:46 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 17 10:18:27 2020 +0200
tdf#134043 DOCX import: new unit tests: ComboBox to DropDown
Change-Id: I034b0cd9c6f66c531460d1bb69d9ede5ff46f7d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97531
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99994
tdf#134572 DOCX: Incorrect default value in dropdown text fields
Change-Id: I3169e817c2f033d1525adc3b02ac3680ad220d70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99074
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100306
diff --git a/sw/CppunitTest_sw_ooxmlexport4.mk b/sw/CppunitTest_sw_ooxmlexport4.mk
index e3285932e004..0f026bc8384e 100644
--- a/sw/CppunitTest_sw_ooxmlexport4.mk
+++ b/sw/CppunitTest_sw_ooxmlexport4.mk
@@ -11,4 +11,8 @@
$(eval $(call sw_ooxmlexport_test,4))
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_ooxmlexport4,\
+ officecfg/registry \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 94103ce59e1e..5fbe91f16070 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -900,7 +900,7 @@ DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
uno::Sequence<OUString> aItems = getProperty< uno::Sequence<OUString> >(aField, "Items");
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aItems.getLength());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aItems.getLength());
}
}
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index f75afc5d322e..9681dc77c186 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -23,6 +23,9 @@
#include <com/sun/star/util/Date.hpp>
#include <unotools/tempfile.hxx>
#include <config_features.h>
+#include <comphelper/configuration.hxx>
+#include <officecfg/Office/Writer.hxx>
+
class Test : public SwModelTestBase
{
@@ -43,6 +46,19 @@ protected:
// If the testcase is stored in some other format, it's pointless to test.
return (OString(filename).endsWith(".docx") && std::find(vBlacklist.begin(), vBlacklist.end(), filename) == vBlacklist.end());
}
+
+ virtual std::unique_ptr<Resetter> preTest(const char* filename) override
+ {
+ if (OString(filename) == "combobox-control.docx" )
+ {
+ std::shared_ptr< comphelper::ConfigurationChanges > batch(comphelper::ConfigurationChanges::create());
+ officecfg::Office::Writer::Filter::Import::DOCX::ImportComboBoxAsDropDown::set(true, batch);
+ batch->commit();
+ }
+ return nullptr;
+ }
+
+ void verifyComboBoxExport(bool aComboBoxAsDropDown);
};
DECLARE_OOXMLEXPORT_TEST(testRelorientation, "relorientation.docx")
@@ -765,12 +781,48 @@ DECLARE_OOXMLEXPORT_TEST(testFDO76312, "FDO76312.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl[1]/w:tr[1]/w:tc[1]");
}
-DECLARE_OOXMLEXPORT_TEST(testComboBoxControl, "combobox-control.docx")
+void Test::verifyComboBoxExport(bool aComboBoxAsDropDown)
+{
+ if (aComboBoxAsDropDown)
+ {
+ // ComboBox was imported as DropDown text field
+ uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<container::XEnumerationAccess> xFieldsAccess(xTextFieldsSupplier->getTextFields());
+ uno::Reference<container::XEnumeration> xFields(xFieldsAccess->createEnumeration());
+ CPPUNIT_ASSERT(xFields->hasMoreElements());
+ uno::Any aField = xFields->nextElement();
+ uno::Reference<lang::XServiceInfo> xServiceInfo(aField, uno::UNO_QUERY);
+ CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
+
+ uno::Sequence<OUString> aItems = getProperty< uno::Sequence<OUString> >(aField, "Items");
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aItems.getLength());
+ CPPUNIT_ASSERT_EQUAL(OUString("manolo"), aItems[0]);
+ CPPUNIT_ASSERT_EQUAL(OUString("pepito"), aItems[1]);
+ CPPUNIT_ASSERT_EQUAL(OUString("Manolo"), aItems[2]);
+ }
+ else
+ {
+ uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
+ uno::Reference<drawing::XShape> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY);
+ uno::Reference<drawing::XControlShape> xControl(xShape, uno::UNO_QUERY);
+
+ CPPUNIT_ASSERT_EQUAL(OUString("Manolo"), getProperty<OUString>(xControl->getControl(), "Text"));
+
+ uno::Sequence<OUString> aItems = getProperty< uno::Sequence<OUString> >(xControl->getControl(), "StringItemList");
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aItems.getLength());
+ CPPUNIT_ASSERT_EQUAL(OUString("manolo"), aItems[0]);
+ CPPUNIT_ASSERT_EQUAL(OUString("pepito"), aItems[1]);
+ }
+}
+
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testComboBoxControl, "combobox-control.docx")
{
// check XML
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
if (!pXmlDoc)
return;
+
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:dropDownList/w:listItem[1]", "value", "manolo");
assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:dropDownList/w:listItem[2]", "value", "pepito");
assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtContent/w:r/w:t", "Manolo");
@@ -779,35 +831,27 @@ DECLARE_OOXMLEXPORT_TEST(testComboBoxControl, "combobox-control.docx")
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
// check imported control
- if (xDrawPage->getCount() > 0)
- {
- uno::Reference<drawing::XControlShape> xControl(getShape(1), uno::UNO_QUERY);
+ verifyComboBoxExport(xDrawPage->getCount() == 0);
+}
- CPPUNIT_ASSERT_EQUAL(OUString("Manolo"), getProperty<OUString>(xControl->getControl(), "Text"));
+CPPUNIT_TEST_FIXTURE(Test, tdf134043_ImportComboBoxAsDropDown_true)
+{
+ std::shared_ptr< comphelper::ConfigurationChanges > batch(comphelper::ConfigurationChanges::create());
+ officecfg::Office::Writer::Filter::Import::DOCX::ImportComboBoxAsDropDown::set(true, batch);
+ batch->commit();
- uno::Sequence<OUString> aItems = getProperty< uno::Sequence<OUString> >(xControl->getControl(), "StringItemList");
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aItems.getLength());
- CPPUNIT_ASSERT_EQUAL(OUString("manolo"), aItems[0]);
- CPPUNIT_ASSERT_EQUAL(OUString("pepito"), aItems[1]);
- }
- else
- {
- // ComboBox was imported as DropDown text field
- uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
- uno::Reference<container::XEnumerationAccess> xFieldsAccess(xTextFieldsSupplier->getTextFields());
- uno::Reference<container::XEnumeration> xFields(xFieldsAccess->createEnumeration());
- CPPUNIT_ASSERT(xFields->hasMoreElements());
- uno::Any aField = xFields->nextElement();
- uno::Reference<lang::XServiceInfo> xServiceInfo(aField, uno::UNO_QUERY);
- CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
+ load(mpTestDocumentPath, "combobox-control.docx");
+ verifyComboBoxExport(true);
+}
- CPPUNIT_ASSERT_EQUAL(OUString("manolo"), getProperty<OUString>(aField, "SelectedItem"));
+CPPUNIT_TEST_FIXTURE(Test, tdf134043_ImportComboBoxAsDropDown_false)
+{
+ std::shared_ptr< comphelper::ConfigurationChanges > batch(comphelper::ConfigurationChanges::create());
+ officecfg::Office::Writer::Filter::Import::DOCX::ImportComboBoxAsDropDown::set(false, batch);
+ batch->commit();
- uno::Sequence<OUString> aItems = getProperty< uno::Sequence<OUString> >(aField, "Items");
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aItems.getLength());
- CPPUNIT_ASSERT_EQUAL(OUString("manolo"), aItems[0]);
- CPPUNIT_ASSERT_EQUAL(OUString("pepito"), aItems[1]);
- }
+ load(mpTestDocumentPath, "combobox-control.docx");
+ verifyComboBoxExport(false);
}
DECLARE_OOXMLEXPORT_TEST(testCheckBoxControl, "checkbox-control.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 0e1416b7ee00..fbe8d9d01421 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -959,9 +959,10 @@ DECLARE_OOXMLEXPORT_TEST(testN779630, "n779630.docx")
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
uno::Sequence<OUString> aItems = getProperty< uno::Sequence<OUString> >(aField, "Items");
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aItems.getLength());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aItems.getLength());
CPPUNIT_ASSERT_EQUAL(OUString("Yes"), aItems[0]);
CPPUNIT_ASSERT_EQUAL(OUString("No"), aItems[1]);
+ CPPUNIT_ASSERT_EQUAL(OUString("dropdown default text"), aItems[2]);
}
}
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index 3685e92cf942..154e7660d842 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -93,6 +93,15 @@ void SdtHelper::createDropDownControl()
m_rDM_Impl.GetTextFactory()->createInstance("com.sun.star.text.TextField.DropDown"),
uno::UNO_QUERY);
+ const auto it = std::find_if(
+ m_aDropDownItems.begin(), m_aDropDownItems.end(),
+ [aDefaultText](const OUString& item) -> bool { return !item.compareTo(aDefaultText); });
+
+ if (m_aDropDownItems.end() == it)
+ {
+ m_aDropDownItems.push_back(aDefaultText);
+ }
+
// set properties
uno::Reference<beans::XPropertySet> xPropertySet(xControlModel, uno::UNO_QUERY);
xPropertySet->setPropertyValue("SelectedItem", uno::makeAny(aDefaultText));
commit 43936aae8e70d2f6f15f8095c86b839d1c7cbe71
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 5 21:08:04 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 17 10:18:19 2020 +0200
tdf#135098 update SwTableCursor m_SelectedBoxes before merge
so it does not contain the soon to-be-deleted SwTableBox so if the rPam is
queried via a11y it doesn't claim the deleted cell still exists.
tdf#122844 may be the same issue
Change-Id: I1ac3752676162ba5a29c0916039b2b467e2ac41a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100214
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 00e249b9e0fb..15a49729ce51 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2280,6 +2280,15 @@ TableMergeErr SwDoc::MergeTable( SwPaM& rPam )
while( &rPam != ( pTmp = pTmp->GetNext() ))
for( int i = 0; i < 2; ++i )
pTmp->GetBound( static_cast<bool>(i) ) = *rPam.GetPoint();
+
+ if (SwTableCursor* pTableCursor = dynamic_cast<SwTableCursor*>(&rPam))
+ {
+ // tdf#135098 update selection so rPam's m_SelectedBoxes is updated
+ // to not contain the soon to-be-deleted SwTableBox so if the rPam
+ // is queried via a11y it doesn't claim the deleted cell still
+ // exists
+ pTableCursor->NewTableSelection();
+ }
}
// Merge them
More information about the Libreoffice-commits
mailing list