icon-themes/galaxy/vcl/res/MergeEmptyHidden.svg | 100 +++++++++++++++++++++++
icon-themes/galaxy/vcl/res/MergeFirstCell.svg | 101 +++++++++++++++++++++++
icon-themes/galaxy/vcl/res/MergeKeepHidden.svg | 101 +++++++++++++++++++++++
sc/uiconfig/scalc/ui/mergecellsdialog.ui | 102 ++++++++++++++++--------
4 files changed, 373 insertions(+), 31 deletions(-)
New commits:
commit 38f83693f096ae14cd43292223c5b16bbb001b87
Author: heiko tietze <tietze.he...@gmail.com>
Date: Thu Apr 12 10:23:55 2018 +0200
tdf#106544 - Merge cells dialog is difficult to understand
Added images underneath the radio buttons, placed at vcl/res/Merge*.svg
Change-Id: Id77b8076f8cd9fb031fe9974d93f35dbe32f63a8
Reviewed-on: https://gerrit.libreoffice.org/52758
Reviewed-by: Sophie Gautier <gautier.sop...@gmail.com>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/icon-themes/galaxy/vcl/res/MergeEmptyHidden.svg
b/icon-themes/galaxy/vcl/res/MergeEmptyHidden.svg
new file mode 100644
index 000000000000..3522343f4592
--- /dev/null
+++ b/icon-themes/galaxy/vcl/res/MergeEmptyHidden.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg version="1.2" width="50.34mm" height="6.76mm" viewBox="3842 7081 5034
676" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222"
stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg";
xmlns:ooo="http://xml.openoffice.org/svg/export";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:presentation="http://sun.com/xmlns/staroffice/presentation";
xmlns:smil="http://www.w3.org/2001/SMIL20/";
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
xml:space="preserve">
+ <defs class="ClipPathGroup">
+ <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+ <rect x="3842" y="7081" width="5034" height="676"/>
+ </clipPath>
+ <clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse">
+ <rect x="3847" y="7081" width="5024" height="675"/>
+ </clipPath>
+ </defs>
+ <defs>
+ <font id="EmbeddedFont_1" horiz-adv-x="2048">
+ <font-face font-family="DejaVu Sans embedded" units-per-em="2048"
font-weight="normal" font-style="normal" ascent="1879" descent="476"/>
+ <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0
Z"/>
+ <glyph unicode="2" horiz-adv-x="980" d="M 393,170 L 1098,170 1098,0 150,0
150,170 C 227,249 331,356 464,490 596,623 679,709 713,748 778,821 823,882
849,933 874,983 887,1032 887,1081 887,1160 859,1225 804,1275 748,1325 675,1350
586,1350 523,1350 456,1339 386,1317 315,1295 240,1262 160,1217 L 160,1421 C
241,1454 317,1478 388,1495 459,1512 523,1520 582,1520 737,1520 860,1481
952,1404 1044,1327 1090,1223 1090,1094 1090,1033 1079,975 1056,920 1033,865
991,800 930,725 913,706 860,650 771,558 682,465 556,336 393,170 Z"/>
+ <glyph unicode="1" horiz-adv-x="900" d="M 254,170 L 584,170 584,1309
225,1237 225,1421 582,1493 784,1493 784,170 1114,170 1114,0 254,0 254,170 Z"/>
+ </font>
+ </defs>
+ <defs class="TextShapeIndex">
+ <g ooo:slide="id1" ooo:id-list="id3"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+ <g id="bullet-char-template-57356"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+ </g>
+ <g id="bullet-char-template-57354"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+ </g>
+ <g id="bullet-char-template-10146"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346
659,739 1358,739 Z"/>
+ </g>
+ <g id="bullet-char-template-10132"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936
717,1481 1274,1481 2015,739 Z"/>
+ </g>
+ <g id="bullet-char-template-10007"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954
215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L
381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937
835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L
727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110
111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2
Z"/>
+ </g>
+ <g id="bullet-char-template-10004"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549
55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C
377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133
1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6
338,-33 285,-33 Z"/>
+ </g>
+ <g id="bullet-char-template-9679"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773
276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023
1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+ </g>
+ <g id="bullet-char-template-8226"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796
101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796
608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+ </g>
+ <g id="bullet-char-template-8211"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+ </g>
+ <g id="bullet-char-template-61548"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 173,740 C 173,903 231,1043 346,1159 462,1274 601,1332 765,1332
928,1332 1067,1274 1183,1159 1299,1043 1357,903 1357,740 1357,577 1299,437
1183,322 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577
173,740 Z"/>
+ </g>
+ </defs>
+ <defs class="TextEmbeddedBitmaps"/>
+ <g class="SlideGroup">
+ <g>
+ <g id="container-id1">
+ <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+ <g class="Page">
+ <g class="com.sun.star.drawing.TableShape">
+ <g>
+ <rect class="BoundingBox" stroke="none" fill="none" x="3842" y="7081"
width="2115" height="677"/>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 3844,7083 L 4900,7083
4900,7755 3844,7755 3844,7083 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="4427" y="7539"><tspan
fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 4900,7083 L 5954,7083
5954,7755 4900,7755 4900,7083 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="5481" y="7539"><tspan
fill="rgb(0,0,0)" stroke="none">2</tspan></tspan></tspan></text>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3843,7083 L 4901,7083"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3843,7755 L 4901,7755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4899,7083 L 5955,7083"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4899,7755 L 5955,7755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3844,7082 L 3844,7756"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4900,7082 L 4900,7756"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 5954,7082 L 5954,7756"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.TableShape">
+ <g>
+ <rect class="BoundingBox" stroke="none" fill="none" x="7130" y="7081"
width="1747" height="677"/>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 7132,7083 L 8874,7083
8874,7755 7132,7755 7132,7083 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="8401" y="7539"><tspan
fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7131,7083 L 8875,7083"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7131,7755 L 8875,7755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7132,7082 L 7132,7756"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 8874,7082 L 8874,7756"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.LineShape">
+ <g id="id3">
+ <rect class="BoundingBox" stroke="none" fill="none" x="6080" y="7305"
width="892" height="256"/>
+ <path fill="none" stroke="rgb(0,0,0)" d="M 6081,7432 L 6606,7432"/>
+ <path fill="rgb(0,0,0)" stroke="none" d="M 6970,7432 L 6589,7305
6589,7559 6970,7432 Z"/>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/icon-themes/galaxy/vcl/res/MergeFirstCell.svg
b/icon-themes/galaxy/vcl/res/MergeFirstCell.svg
new file mode 100644
index 000000000000..9597e36bb8a3
--- /dev/null
+++ b/icon-themes/galaxy/vcl/res/MergeFirstCell.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg version="1.2" width="50.34mm" height="6.92mm" viewBox="3841 3080 5034
692" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222"
stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg";
xmlns:ooo="http://xml.openoffice.org/svg/export";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:presentation="http://sun.com/xmlns/staroffice/presentation";
xmlns:smil="http://www.w3.org/2001/SMIL20/";
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
xml:space="preserve">
+ <defs class="ClipPathGroup">
+ <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+ <rect x="3841" y="3080" width="5034" height="692"/>
+ </clipPath>
+ <clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse">
+ <rect x="3846" y="3080" width="5024" height="691"/>
+ </clipPath>
+ </defs>
+ <defs>
+ <font id="EmbeddedFont_1" horiz-adv-x="2048">
+ <font-face font-family="DejaVu Sans embedded" units-per-em="2048"
font-weight="normal" font-style="normal" ascent="1879" descent="476"/>
+ <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0
Z"/>
+ <glyph unicode="2" horiz-adv-x="980" d="M 393,170 L 1098,170 1098,0 150,0
150,170 C 227,249 331,356 464,490 596,623 679,709 713,748 778,821 823,882
849,933 874,983 887,1032 887,1081 887,1160 859,1225 804,1275 748,1325 675,1350
586,1350 523,1350 456,1339 386,1317 315,1295 240,1262 160,1217 L 160,1421 C
241,1454 317,1478 388,1495 459,1512 523,1520 582,1520 737,1520 860,1481
952,1404 1044,1327 1090,1223 1090,1094 1090,1033 1079,975 1056,920 1033,865
991,800 930,725 913,706 860,650 771,558 682,465 556,336 393,170 Z"/>
+ <glyph unicode="1" horiz-adv-x="900" d="M 254,170 L 584,170 584,1309
225,1237 225,1421 582,1493 784,1493 784,170 1114,170 1114,0 254,0 254,170 Z"/>
+ <glyph unicode=" " horiz-adv-x="635"/>
+ </font>
+ </defs>
+ <defs class="TextShapeIndex">
+ <g ooo:slide="id1" ooo:id-list="id3"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+ <g id="bullet-char-template-57356"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+ </g>
+ <g id="bullet-char-template-57354"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+ </g>
+ <g id="bullet-char-template-10146"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346
659,739 1358,739 Z"/>
+ </g>
+ <g id="bullet-char-template-10132"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936
717,1481 1274,1481 2015,739 Z"/>
+ </g>
+ <g id="bullet-char-template-10007"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954
215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L
381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937
835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L
727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110
111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2
Z"/>
+ </g>
+ <g id="bullet-char-template-10004"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549
55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C
377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133
1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6
338,-33 285,-33 Z"/>
+ </g>
+ <g id="bullet-char-template-9679"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773
276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023
1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+ </g>
+ <g id="bullet-char-template-8226"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796
101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796
608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+ </g>
+ <g id="bullet-char-template-8211"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+ </g>
+ <g id="bullet-char-template-61548"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 173,740 C 173,903 231,1043 346,1159 462,1274 601,1332 765,1332
928,1332 1067,1274 1183,1159 1299,1043 1357,903 1357,740 1357,577 1299,437
1183,322 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577
173,740 Z"/>
+ </g>
+ </defs>
+ <defs class="TextEmbeddedBitmaps"/>
+ <g class="SlideGroup">
+ <g>
+ <g id="container-id1">
+ <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+ <g class="Page">
+ <g class="com.sun.star.drawing.TableShape">
+ <g>
+ <rect class="BoundingBox" stroke="none" fill="none" x="3841" y="3080"
width="2115" height="677"/>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 3843,3082 L 4899,3082
4899,3754 3843,3754 3843,3082 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="4426" y="3538"><tspan
fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 4899,3082 L 5953,3082
5953,3754 4899,3754 4899,3082 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="5480" y="3538"><tspan
fill="rgb(0,0,0)" stroke="none">2</tspan></tspan></tspan></text>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3842,3082 L 4900,3082"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3842,3754 L 4900,3754"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4898,3082 L 5954,3082"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4898,3754 L 5954,3754"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3843,3081 L 3843,3755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4899,3081 L 4899,3755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 5953,3081 L 5953,3755"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.TableShape">
+ <g>
+ <rect class="BoundingBox" stroke="none" fill="none" x="7129" y="3080"
width="1747" height="693"/>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 7131,3082 L 8873,3082
8873,3770 7131,3770 7131,3082 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="7381" y="3538"><tspan
fill="rgb(0,0,0)" stroke="none">1 2</tspan></tspan></tspan></text>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7130,3082 L 8874,3082"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7130,3770 L 8874,3770"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7131,3081 L 7131,3771"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 8873,3081 L 8873,3771"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.LineShape">
+ <g id="id3">
+ <rect class="BoundingBox" stroke="none" fill="none" x="6079" y="3304"
width="892" height="256"/>
+ <path fill="none" stroke="rgb(0,0,0)" d="M 6080,3431 L 6605,3431"/>
+ <path fill="rgb(0,0,0)" stroke="none" d="M 6969,3431 L 6588,3304
6588,3558 6969,3431 Z"/>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/icon-themes/galaxy/vcl/res/MergeKeepHidden.svg
b/icon-themes/galaxy/vcl/res/MergeKeepHidden.svg
new file mode 100644
index 000000000000..d2857fc035e3
--- /dev/null
+++ b/icon-themes/galaxy/vcl/res/MergeKeepHidden.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg version="1.2" width="50.34mm" height="6.76mm" viewBox="3842 5081 5034
676" preserveAspectRatio="xMidYMid" fill-rule="evenodd" stroke-width="28.222"
stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg";
xmlns:ooo="http://xml.openoffice.org/svg/export";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:presentation="http://sun.com/xmlns/staroffice/presentation";
xmlns:smil="http://www.w3.org/2001/SMIL20/";
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
xml:space="preserve">
+ <defs class="ClipPathGroup">
+ <clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
+ <rect x="3842" y="5081" width="5034" height="676"/>
+ </clipPath>
+ <clipPath id="presentation_clip_path_shrink" clipPathUnits="userSpaceOnUse">
+ <rect x="3847" y="5081" width="5024" height="675"/>
+ </clipPath>
+ </defs>
+ <defs>
+ <font id="EmbeddedFont_1" horiz-adv-x="2048">
+ <font-face font-family="DejaVu Sans embedded" units-per-em="2048"
font-weight="normal" font-style="normal" ascent="1879" descent="476"/>
+ <missing-glyph horiz-adv-x="2048" d="M 0,0 L 2047,0 2047,2047 0,2047 0,0
Z"/>
+ <glyph unicode="2" horiz-adv-x="980" d="M 393,170 L 1098,170 1098,0 150,0
150,170 C 227,249 331,356 464,490 596,623 679,709 713,748 778,821 823,882
849,933 874,983 887,1032 887,1081 887,1160 859,1225 804,1275 748,1325 675,1350
586,1350 523,1350 456,1339 386,1317 315,1295 240,1262 160,1217 L 160,1421 C
241,1454 317,1478 388,1495 459,1512 523,1520 582,1520 737,1520 860,1481
952,1404 1044,1327 1090,1223 1090,1094 1090,1033 1079,975 1056,920 1033,865
991,800 930,725 913,706 860,650 771,558 682,465 556,336 393,170 Z"/>
+ <glyph unicode="1" horiz-adv-x="900" d="M 254,170 L 584,170 584,1309
225,1237 225,1421 582,1493 784,1493 784,170 1114,170 1114,0 254,0 254,170 Z"/>
+ <glyph unicode=" " horiz-adv-x="635"/>
+ </font>
+ </defs>
+ <defs class="TextShapeIndex">
+ <g ooo:slide="id1" ooo:id-list="id3"/>
+ </defs>
+ <defs class="EmbeddedBulletChars">
+ <g id="bullet-char-template-57356"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
+ </g>
+ <g id="bullet-char-template-57354"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
+ </g>
+ <g id="bullet-char-template-10146"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346
659,739 1358,739 Z"/>
+ </g>
+ <g id="bullet-char-template-10132"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936
717,1481 1274,1481 2015,739 Z"/>
+ </g>
+ <g id="bullet-char-template-10007"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954
215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L
381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937
835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L
727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110
111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2
Z"/>
+ </g>
+ <g id="bullet-char-template-10004"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549
55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C
377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133
1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6
338,-33 285,-33 Z"/>
+ </g>
+ <g id="bullet-char-template-9679"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773
276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023
1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
+ </g>
+ <g id="bullet-char-template-8226"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796
101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796
608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
+ </g>
+ <g id="bullet-char-template-8211"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
+ </g>
+ <g id="bullet-char-template-61548"
transform="scale(0.00048828125,-0.00048828125)">
+ <path d="M 173,740 C 173,903 231,1043 346,1159 462,1274 601,1332 765,1332
928,1332 1067,1274 1183,1159 1299,1043 1357,903 1357,740 1357,577 1299,437
1183,322 1067,206 928,148 765,148 601,148 462,206 346,322 231,437 173,577
173,740 Z"/>
+ </g>
+ </defs>
+ <defs class="TextEmbeddedBitmaps"/>
+ <g class="SlideGroup">
+ <g>
+ <g id="container-id1">
+ <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
+ <g class="Page">
+ <g class="com.sun.star.drawing.TableShape">
+ <g>
+ <rect class="BoundingBox" stroke="none" fill="none" x="3842" y="5081"
width="2115" height="677"/>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 3844,5083 L 4900,5083
4900,5755 3844,5755 3844,5083 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="4427" y="5539"><tspan
fill="rgb(0,0,0)" stroke="none">1</tspan></tspan></tspan></text>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 4900,5083 L 5954,5083
5954,5755 4900,5755 4900,5083 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="5481" y="5539"><tspan
fill="rgb(0,0,0)" stroke="none">2</tspan></tspan></tspan></text>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3843,5083 L 4901,5083"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3843,5755 L 4901,5755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4899,5083 L 5955,5083"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4899,5755 L 5955,5755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 3844,5082 L 3844,5756"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 4900,5082 L 4900,5756"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 5954,5082 L 5954,5756"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.TableShape">
+ <g>
+ <rect class="BoundingBox" stroke="none" fill="none" x="7130" y="5081"
width="1747" height="677"/>
+ <path fill="rgb(255,255,255)" stroke="none" d="M 7132,5083 L 8874,5083
8874,5755 7132,5755 7132,5083 Z"/>
+ <text class="TextShape"><tspan class="TextParagraph"
font-family="DejaVu Sans, sans-serif" font-size="353px"
font-weight="400"><tspan class="TextPosition" x="8067" y="5539"><tspan
fill="rgb(0,0,0)" stroke="none">1 </tspan><tspan fill="rgb(153,153,153)"
stroke="none">2</tspan></tspan></tspan></text>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7131,5083 L 8875,5083"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7131,5755 L 8875,5755"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 7132,5082 L 7132,5756"/>
+ <path fill="none" stroke="rgb(204,204,204)" stroke-width="2"
stroke-linejoin="round" d="M 8874,5082 L 8874,5756"/>
+ </g>
+ </g>
+ <g class="com.sun.star.drawing.LineShape">
+ <g id="id3">
+ <rect class="BoundingBox" stroke="none" fill="none" x="6080" y="5305"
width="892" height="256"/>
+ <path fill="none" stroke="rgb(0,0,0)" d="M 6081,5432 L 6606,5432"/>
+ <path fill="rgb(0,0,0)" stroke="none" d="M 6970,5432 L 6589,5305
6589,5559 6970,5432 Z"/>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui
b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
index 99c81ac099e6..86492c3d31da 100644
--- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sc">
<requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="MergeCellsDialog">
@@ -7,6 +7,9 @@
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="mergecellsdialog|MergeCellsDialog">Merge Cells</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -72,39 +75,50 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkLabel" id="label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="mergecellsdialog|label">Some cells are not empty.</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label">
+ <object class="GtkRadioButton" id="move-cells-radio">
+ <property name="label" translatable="yes"
context="mergecellsdialog|move-cells-radio">Move the contents of the hidden
cells into the first cell</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="mergecellsdialog|label">Some cells are not empty.</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="move-cells-radio">
- <property name="label" translatable="yes"
context="mergecellsdialog|move-cells-radio">Move the contents of the hidden
cells into the first cell</property>
+ <object class="GtkRadioButton" id="empty-cells-radio">
+ <property name="label" translatable="yes"
context="mergecellsdialog|empty-cells-radio">Empty the contents of the hidden
cells</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="group">keep-content-radio</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
</packing>
</child>
<child>
@@ -119,33 +133,59 @@
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="empty-cells-radio">
- <property name="label" translatable="yes"
context="mergecellsdialog|empty-cells-radio">Empty the contents of the hidden
cells</property>
+ <object class="GtkImage" id="imMergeFirstCell">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">keep-content-radio</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">24</property>
+ <property name="margin_bottom">6</property>
+ <property name="hexpand">False</property>
+ <property name="pixbuf">vcl/res/MergeFirstCell.svg</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imMergeKeepHidden">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">24</property>
+ <property name="margin_bottom">6</property>
+ <property name="hexpand">True</property>
+ <property name="pixbuf">vcl/res/MergeKeepHidden.svg</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imMergeEmptyHidden">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">24</property>
+ <property name="hexpand">True</property>
+ <property name="pixbuf">vcl/res/MergeEmptyHidden.svg</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
