extras/source/gallery/diagrams/Cycle01-Transparent.svg | 149 +++++++++++-
extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg | 108 ++++++++
svx/source/toolbars/fontworkbar.cxx | 5
3 files changed, 259 insertions(+), 3 deletions(-)
New commits:
commit 640ae4bf97530882614796aed669be8c4fd91fe4
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Fri Nov 2 19:14:05 2018 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Nov 8 14:20:17 2018 +0100
tdf#119648 - even if we fail to import a fontwork, we shouldn't crash.
Change-Id: Id2dcfb69ad8440ea63564334a5a26a5f9b9bde14
Reviewed-on: https://gerrit.libreoffice.org/62789
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
(cherry picked from commit f10b7e820844d94b4dbec3dcaf24392275940914)
Reviewed-on: https://gerrit.libreoffice.org/63061
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/toolbars/fontworkbar.cxx
b/svx/source/toolbars/fontworkbar.cxx
index 338907dc1096..e374b0d3cb69 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -358,7 +358,10 @@ void GetGeometryForCustomShape(
SdrCustomShapeGeometryItem& rGeometryItem, const
rPool.FreezeIdRanges();
if ( GalleryExplorer::GetSdrObj( GALLERY_THEME_POWERPOINT,
i, &aFormModel ) )
{
- const SdrObject* pSourceObj = aFormModel.GetPage( 0
)->GetObj( 0 );
+ const SdrObject* pSourceObj = nullptr;
+ if (aFormModel.GetPageCount() > 0)
+ pSourceObj = aFormModel.GetPage( 0 )->GetObj( 0 );
+ SAL_WARN_IF(!pSourceObj, "svx.form", "No content in
gallery custom shape '" << rCustomShape << "'" );
if( pSourceObj )
{
PropertyValue aPropVal_;
commit 1b5e1ca38c1ebc374f25d50a7c551cbb4b8fa398
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Fri Nov 2 08:02:50 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Nov 8 14:19:36 2018 +0100
tdf#120038 Missing arrow for Gallery Cycle-Transparent icon update
Change-Id: I2eca0010f1c533d35212ecd2b9f3fb0e45b797e9
Reviewed-on: https://gerrit.libreoffice.org/62770
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kain...@gmail.com>
(cherry picked from commit f8a493ae29a66d70d4672dbc105614075aad5a92)
Reviewed-on: https://gerrit.libreoffice.org/62826
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extras/source/gallery/diagrams/Cycle01-Transparent.svg
b/extras/source/gallery/diagrams/Cycle01-Transparent.svg
index 065aabeac350..a9de89e98de9 100644
--- a/extras/source/gallery/diagrams/Cycle01-Transparent.svg
+++ b/extras/source/gallery/diagrams/Cycle01-Transparent.svg
@@ -1 +1,148 @@
-<svg enable-background="new 0 0 354 355" height="355" viewBox="0 0 354 355"
width="354" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink";><linearGradient id="a"
gradientUnits="userSpaceOnUse" x1="310.20309" x2="231.6548" y1="298.58499"
y2="273.54059"><stop offset="0" stop-color="#5cb41b"/><stop offset="1"
stop-color="#448e0e"/></linearGradient><mask id="b" height="142.801"
maskUnits="userSpaceOnUse" width="283.164" x="53.889" y="204.543"><path
d="m212.621 235.004 25.899-25.9 38.419-1.991 42.122-13.093 6.261 30.168 20.491
46.108v22.766l-7.4 22.766-22.767-14.23-26.751 13.091-25.617 21.629-44.967
12.527-49.518
13.087-50.092-13.661-23.337-14.229h-18.213l-10.244-10.243-21.632-23.342-12.521-23.903
24.475-15.938 22.769-10.246 25.613-26.753 10.244-17.074 51.228 33.014z"
fill="url(#f)"/></mask><linearGradient id="c" gradientUnits="userSpaceOnUse"
x1="102.479" x2="3.4378" y1="181.66409" y2="221.5083"><stop offset="0"
stop-color="#fa7700"/><stop offset="1" stop-colo
r="#fda904"/></linearGradient><mask id="d" height="271.886"
maskUnits="userSpaceOnUse" width="175.503" x="8.322" y="32.726"><path d="m3.725
281.676 88.796 71.719 40.981-111.563.568-96.191 67.736-6.263-20.49-62.611
2.276-66.031-114.979 45.539v5.691l-64.888 126.36z"
fill="url(#g)"/></mask><linearGradient id="e" gradientUnits="userSpaceOnUse"
x1="187.31149" x2="274.9686" y1="59.868698" y2="163.4633"><stop offset="0"
stop-color="#0d69c8"/><stop offset="1"
stop-color="#1b3962"/></linearGradient><linearGradient id="f"
gradientUnits="userSpaceOnUse" x1="221.4453" x2="41.0089" y1="276.06049"
y2="260.69229"><stop offset="0" stop-color="#fff"/><stop
offset="1"/></linearGradient><linearGradient id="g"
gradientUnits="userSpaceOnUse" x1="57.358898" x2="191.6898" y1="235.7139"
y2="56.9851"><stop offset="0" stop-color="#fff"/><stop offset=".1309"
stop-color="#fbfbfb"/><stop offset=".2572" stop-color="#f0f0f0"/><stop
offset=".3816" stop-color="#dcdcdc"/><stop offset=".5049"
stop-color="#c1c1c1"/><s
top offset=".6274" stop-color="#9e9e9e"/><stop offset=".7494"
stop-color="#727272"/><stop offset=".871" stop-color="#3f3f3f"/><stop
offset=".9893" stop-color="#060606"/><stop offset="1"/></linearGradient><path
d="m203.229 99.475s93.227 39.093 45.104 131.471l68.039-26.402 12.335
58.275c13.414-58.141 25.801-190.138-127.55-218.834l-1.053-38.165-74.276 66.769
77.847 62.569z" fill="url(#e)"/><path d="m183.825 119.202-57.998-46.614
44.343-39.862c-55.391 16.2-182.257 70.64-129.322 220.951l-32.526 19.992 94.961
30.942 15.263-98.699-30.679 18.224s-13.138-103.247 95.958-104.934z"
fill="url(#c)" mask="url(#d)"/><path d="m316.371 204.543-93.11 36.13 31.124
17.46s-83.099 63.191-139.109-31.068l-11.992 77.547-49.395-16.094c45.815 41.318
150.817 110.805 249.587-4.438l33.577 18.171z" fill="url(#a)"
mask="url(#b)"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ enable-background="new 0 0 401 390"
+ height="355"
+ viewBox="0 0 354 355"
+ width="354"
+ version="1.1"
+ id="svg50"
+ sodipodi:docname="Cycle01-Transparent.svg"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)">
+ <metadata
+ id="metadata22">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs20" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1319"
+ id="namedview18"
+ showgrid="false"
+ inkscape:zoom="0.66478873"
+ inkscape:cx="-110.30932"
+ inkscape:cy="177.5"
+ inkscape:window-x="0"
+ inkscape:window-y="30"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg50" />
+ <linearGradient
+ id="d"
+
gradientTransform="matrix(0.996,-0.0891,0.0891,0.996,-648.58434,199.99594)"
+ gradientUnits="userSpaceOnUse"
+ x1="295.19919"
+ x2="227.25101"
+ y1="106.3379"
+ y2="108.6417">
+ <stop
+ offset="0"
+ stop-color="#5ac0ff"
+ id="stop17"
+ style="stop-color:#f16422;stop-opacity:1" />
+ <stop
+ offset="1"
+ stop-color="#92dbff"
+ id="stop19"
+ style="stop-color:#ffc10e;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#d"
+ id="linearGradient838"
+ x1="125.828"
+ y1="134.3195"
+ x2="336.11755"
+ y2="134.3195"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="c"
+
gradientTransform="matrix(0.996,-0.0891,0.0891,0.996,-461.06927,34.207907)"
+ gradientUnits="userSpaceOnUse"
+ x1="230.59959"
+ x2="201.80791"
+ y1="265.89841"
+ y2="218.1037">
+ <stop
+ offset="0"
+ stop-color="#4591d6"
+ id="stop12"
+ style="stop-color:#00bc00;stop-opacity:1" />
+ <stop
+ offset="1"
+ stop-color="#5ac0ff"
+ id="stop14"
+ style="stop-color:#029902;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#c"
+ id="linearGradient858"
+ x1="53.889"
+ y1="275.94366"
+ x2="337.05301"
+ y2="275.94366"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="b"
+ gradientTransform="matrix(0.996,-0.0891,0.0891,0.996,-251.15897,13.6785)"
+ gradientUnits="userSpaceOnUse"
+ x1="106.0449"
+ x2="60.556099"
+ y1="199.70309"
+ y2="231.9483">
+ <stop
+ offset="0"
+ stop-color="#0d69c8"
+ id="stop7"
+ style="stop-color:#0683f4;stop-opacity:1" />
+ <stop
+ offset="1"
+ stop-color="#0683f4"
+ id="stop9"
+ style="stop-color:#0d69c8;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#b"
+ id="linearGradient878"
+ x1="8.3219995"
+ y1="168.6685"
+ x2="183.825"
+ y2="168.6685"
+ gradientUnits="userSpaceOnUse" />
+ <path
+ style="fill:url(#linearGradient838);fill-opacity:1.0"
+ d="m 203.229,99.475 c 0,0 93.227,39.093 45.104,131.471 l 68.039,-26.402
12.335,58.275 C 342.121,204.678 354.508,72.681 201.157,43.985 l -1.053,-38.165
-74.276,66.769 77.847,62.569 z"
+ id="path2" />
+ <path
+ style="fill:url(#linearGradient878);fill-opacity:1.0"
+ d="M 183.825,119.202 125.827,72.588 170.17,32.726 c -55.391,16.2
-182.257,70.64 -129.322,220.951 l -32.526,19.992 94.961,30.942 15.263,-98.699
-30.679,18.224 c 0,0 -13.138,-103.247 95.958,-104.934 z"
+ id="path4" />
+ <path
+ style="fill:url(#linearGradient858);fill-opacity:1.0"
+ d="m 316.371,204.543 -93.11,36.13 31.124,17.46 c 0,0 -83.099,63.191
-139.109,-31.068 l -11.992,77.547 -49.395,-16.094 c 45.815,41.318
150.817,110.805 249.587,-4.438 l 33.577,18.171 z"
+ id="path6" />
+</svg>
diff --git a/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg
b/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg
index 686d4fdd23a8..6e3b5bd21757 100644
--- a/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg
+++ b/extras/source/gallery/diagrams/Cycle02-Transparent-Blue.svg
@@ -1 +1,107 @@
-<svg enable-background="new 0 0 401 390" height="390" viewBox="0 0 401 390"
width="401" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink";><mask id="a" height="173.826"
maskUnits="userSpaceOnUse" width="218.165" x="48.15" y="215.074"><path
d="m243.439 274.979 51.645 51.649-66.512 66.517-61.042
23.474v-53.212l-106.422-26.608-29.739-46.95-6.259-54.777 70.429
10.953-4.696-57.906 122.075 56.342z" fill="url(#j)"/></mask><linearGradient
id="b" gradientUnits="userSpaceOnUse" x1="7.3623" x2="186.81351" y1="155.8291"
y2="155.8291"><stop offset="0" stop-color="#0d69c8"/><stop offset="1"
stop-color="#0683f4"/></linearGradient><mask id="c" height="219.357"
maskUnits="userSpaceOnUse" width="179.451" x="7.362" y="46.15"><path d="m37.626
253.852 31.305 12.518h14.086l48.514-62.599 17.219-39.129h-26.607l35.211-35.214
39.913-14.867 14.084-26.606-14.084-50.081-40.692 7.821-98.598 26.608-25.043
53.212-18.781 73.558z" fill="url(#k)"/></mask><linearGradient id="d"><stop
offset=
"0" stop-color="#0d69c8"/><stop offset="1"
stop-color="#1b3962"/></linearGradient><linearGradient id="e"
gradientUnits="userSpaceOnUse" x1="135.7305" x2="353.89551" xlink:href="#d"
y1="92.735397" y2="92.735397"/><mask id="f" height="173.826"
maskUnits="userSpaceOnUse" width="218.165" x="135.73" y="5.822"><path
d="m214.481-5.95-97.034 82.948 93.906 61.039 27.047-15.483"
fill="url(#l)"/><path d="m424.198
200.64-26.606-93.904-71.99-53.214-50.083-29.735h-42.257l-13.302-35.214h-22.693l-82.56
82.555 92.574 64.262 22.206 8.904v-30.653l33.512 43.174 14.084 15.652-27.387
36.779z" fill="url(#m)"/></mask><linearGradient id="g"
gradientUnits="userSpaceOnUse" x1="215.23241" x2="394.68359" y1="238.8887"
y2="238.8887"><stop offset="0" stop-color="#0078a3"/><stop offset="1"
stop-color="#00a0da"/></linearGradient><mask id="h" height="219.361"
maskUnits="userSpaceOnUse" width="179.451" x="215.232" y="129.208"><path
d="m258.304 385.316 120.509-48.517 39.126-169.025-100.162-54.777-61.037
78.253-82.947
42.257-25.823 25.821z" fill="url(#n)"/></mask><linearGradient id="i"><stop
offset="0" stop-color="#fff"/><stop
offset="1"/></linearGradient><linearGradient id="j"
gradientUnits="userSpaceOnUse" x1="169.80859" x2="25.8232" xlink:href="#i"
y1="319.58981" y2="258.55289"/><linearGradient id="k"
gradientUnits="userSpaceOnUse" x1="60.369099" x2="165.2282" xlink:href="#i"
y1="216.89549" y2="24.392099"/><linearGradient id="l"
gradientUnits="userSpaceOnUse" x1="117.4473" x2="238.40041" xlink:href="#d"
y1="66.043503" y2="66.043503"/><linearGradient id="m"
gradientUnits="userSpaceOnUse" x1="244.25391" x2="349.11209" xlink:href="#i"
y1="73.841301" y2="206.871"/><linearGradient id="n"
gradientUnits="userSpaceOnUse" x1="323.44919" x2="202.94009" xlink:href="#i"
y1="240.457" y2="354.70551"/><path d="m186.813 114.217-51.083-34.923
31.581-33.144c-55.12 11.354-110.817 47.663-121.363 145.293l-25.986 2.736-12.6
1.327 73.474 70.001 57.271-83.772-36.111 3.248s19.279-69.337 84.817-70.766z"
fill="url(#b)"
mask="url(#c)"/><path d="m216.256 100.454s65.343 18.171 70.473
79.194l34.479-50.44 32.688
31.143c-12.603-53.304-49.662-105.746-144.095-115.945l-4.064-38.583-70.007
73.471 83.778 57.274z" fill="url(#e)" mask="url(#f)"/><path d="m182.539 258.151
3.252 36.111s-65.344-18.168-70.472-79.188l-34.483 50.434-32.686-31.139c12.601
53.302 49.66 105.745 144.098 115.947l4.063 38.584 70.005-73.472z"
fill="#31a7ff" mask="url(#a)"/><path d="m321.208 129.208-57.27 83.779
36.112-3.252s-19.277 69.339-84.818 70.771l51.083 34.923-31.579
33.141c55.119-11.355 110.818-47.661 121.364-145.295l38.583-4.063z"
fill="url(#g)" mask="url(#h)"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ enable-background="new 0 0 401 390"
+ height="355"
+ viewBox="0 0 354 355"
+ width="354"
+ version="1.1"
+ id="svg50">
+ <linearGradient
+ id="d"
+
gradientTransform="matrix(0.996,-0.0891,0.0891,0.996,-648.58434,199.99594)"
+ gradientUnits="userSpaceOnUse"
+ x1="295.19919"
+ x2="227.25101"
+ y1="106.3379"
+ y2="108.6417">
+ <stop
+ offset="0"
+ stop-color="#5ac0ff"
+ id="stop17" />
+ <stop
+ offset="1"
+ stop-color="#92dbff"
+ id="stop19" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#d"
+ id="linearGradient838"
+ x1="125.828"
+ y1="134.3195"
+ x2="336.11755"
+ y2="134.3195"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="c"
+
gradientTransform="matrix(0.996,-0.0891,0.0891,0.996,-461.06927,34.207907)"
+ gradientUnits="userSpaceOnUse"
+ x1="230.59959"
+ x2="201.80791"
+ y1="265.89841"
+ y2="218.1037">
+ <stop
+ offset="0"
+ stop-color="#4591d6"
+ id="stop12" />
+ <stop
+ offset="1"
+ stop-color="#5ac0ff"
+ id="stop14" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#c"
+ id="linearGradient858"
+ x1="53.889"
+ y1="275.94366"
+ x2="337.05301"
+ y2="275.94366"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="b"
+
gradientTransform="matrix(0.996,-0.0891,0.0891,0.996,-251.15897,13.6785)"
+ gradientUnits="userSpaceOnUse"
+ x1="106.0449"
+ x2="60.556099"
+ y1="199.70309"
+ y2="231.9483">
+ <stop
+ offset="0"
+ stop-color="#0d69c8"
+ id="stop7" />
+ <stop
+ offset="1"
+ stop-color="#0683f4"
+ id="stop9" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#b"
+ id="linearGradient878"
+ x1="8.3219995"
+ y1="168.6685"
+ x2="183.825"
+ y2="168.6685"
+ gradientUnits="userSpaceOnUse" />
+ <path
+ style="fill:url(#linearGradient838);fill-opacity:1.0"
+ d="m 203.229,99.475 c 0,0 93.227,39.093 45.104,131.471 l 68.039,-26.402
12.335,58.275 C 342.121,204.678 354.508,72.681 201.157,43.985 l -1.053,-38.165
-74.276,66.769 77.847,62.569 z"
+ id="path2" />
+ <path
+ style="fill:url(#linearGradient878);fill-opacity:1.0"
+ d="M 183.825,119.202 125.827,72.588 170.17,32.726 c -55.391,16.2
-182.257,70.64 -129.322,220.951 l -32.526,19.992 94.961,30.942 15.263,-98.699
-30.679,18.224 c 0,0 -13.138,-103.247 95.958,-104.934 z"
+ id="path4" />
+ <path
+ style="fill:url(#linearGradient858);fill-opacity:1.0"
+ d="m 316.371,204.543 -93.11,36.13 31.124,17.46 c 0,0 -83.099,63.191
-139.109,-31.068 l -11.992,77.547 -49.395,-16.094 c 45.815,41.318
150.817,110.805 249.587,-4.438 l 33.577,18.171 z"
+ id="path6" />
+</svg>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
