summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegina Henschel <rb.henschel@t-online.de>2011-10-27 20:31:52 +0200
committerAndras Timar <atimar@suse.com>2011-10-28 10:24:01 +0200
commit7661f0943d6286b7e7075c5f2e172f23d53ea47d (patch)
tree8e0ca40eb41068eedae77876956be07c8b456017
parentd1932bfb76fc6bafa94fd56ddf5ac74a28f62fb2 (diff)
Add UML line ends to palette standard.soe (AOOo #i10547#)
-rw-r--r--extras/source/palettes/standard.soe37
-rwxr-xr-xsvx/inc/svx/dialogs.hrc73
-rw-r--r--svx/source/dialog/sdstring.src72
3 files changed, 139 insertions, 43 deletions
diff --git a/extras/source/palettes/standard.soe b/extras/source/palettes/standard.soe
index 85319d05ca9d..5a8acd982d56 100644
--- a/extras/source/palettes/standard.soe
+++ b/extras/source/palettes/standard.soe
@@ -1,16 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
<office:marker-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script">
- <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20"/>
- <draw:marker draw:name="Square" svg:viewBox="0 0 10 10" svg:d="m0 0h10v10h-10"/>
- <draw:marker draw:name="Small Arrow" svg:viewBox="0 0 1321 3493" svg:d="m1321 3493h-1321l702-3493z"/>
- <draw:marker draw:name="Dimension Lines" svg:viewBox="0 0 836 110" svg:d="m0 0h278 278 280v36 36 38h-278-278-280v-36-36z"/>
- <draw:marker draw:name="Double Arrow" svg:viewBox="0 0 1131 1918" svg:d="m737 1131h394l-564-1131-567 1131h398l-398 787h1131z"/>
- <draw:marker draw:name="Rounded short Arrow" svg:viewBox="0 0 1013 1130" svg:d="m1009 1050-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 17 13 21 4h903l21-4 21-13 9-21 4-21v-8z"/>
- <draw:marker draw:name="Symmetric Arrow" svg:viewBox="0 0 1131 902" svg:d="m564 0-564 902h1131z"/>
- <draw:marker draw:name="Line Arrow" svg:viewBox="0 0 1122 2243" svg:d="m0 2108v17 17l12 42 30 34 38 21 43 4 29-8 30-21 25-26 13-34 343-1532 339 1520 13 42 29 34 39 21 42 4 42-12 34-30 21-42v-39-12l-4 4-440-1998-9-42-25-39-38-25-43-8-42 8-38 25-26 39-8 42z"/>
- <draw:marker draw:name="Rounded large Arrow" svg:viewBox="0 0 1131 2256" svg:d="m1127 2120-449-2006-9-42-25-39-38-25-38-8-43 8-38 25-25 39-9 42-449 2006v13l-4 9 9 42 25 38 38 25 42 9h903l42-9 38-25 26-38 8-42v-9z"/>
- <draw:marker draw:name="Circle" svg:viewBox="0 0 1131 1131" svg:d="m462 1118-102-29-102-51-93-72-72-93-51-102-29-102-13-105 13-102 29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 102 29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z"/>
- <draw:marker draw:name="Square 45" svg:viewBox="0 0 1131 1131" svg:d="m0 564 564 567 567-567-567-564z"/>
- <draw:marker draw:name="Arrow concave" svg:viewBox="0 0 1131 1580" svg:d="m1013 1491 118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z"/>
-</office:marker-table>
+ <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="m10 0-10 30h20" />
+ <draw:marker draw:name="Square" svg:viewBox="0 0 10 10" svg:d="m0 0h10v10h-10" />
+ <draw:marker draw:name="Small Arrow" svg:viewBox="0 0 1321 3493" svg:d="m1321 3493h-1321l702-3493z" />
+ <draw:marker draw:name="Dimension Lines" svg:viewBox="0 0 836 110" svg:d="m0 0h278 278 280v36 36 38h-278-278-280v-36-36z" />
+ <draw:marker draw:name="Double Arrow" svg:viewBox="0 0 1131 1918" svg:d="m737 1131h394l-564-1131-567 1131h398l-398 787h1131z" />
+ <draw:marker draw:name="Rounded short Arrow" svg:viewBox="0 0 1013 1130" svg:d="m1009 1050-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 17 13 21 4h903l21-4 21-13 9-21 4-21v-8z" />
+ <draw:marker draw:name="Symmetric Arrow" svg:viewBox="0 0 1131 902" svg:d="m564 0-564 902h1131z" />
+ <draw:marker draw:name="Line Arrow" svg:viewBox="0 0 1122 2243" svg:d="m0 2108v17 17l12 42 30 34 38 21 43 4 29-8 30-21 25-26 13-34 343-1532 339 1520 13 42 29 34 39 21 42 4 42-12 34-30 21-42v-39-12l-4 4-440-1998-9-42-25-39-38-25-43-8-42 8-38 25-26 39-8 42z" />
+ <draw:marker draw:name="Rounded large Arrow" svg:viewBox="0 0 1131 2256" svg:d="m1127 2120-449-2006-9-42-25-39-38-25-38-8-43 8-38 25-25 39-9 42-449 2006v13l-4 9 9 42 25 38 38 25 42 9h903l42-9 38-25 26-38 8-42v-9z" />
+ <draw:marker draw:name="Circle" svg:viewBox="0 0 1131 1131" svg:d="m462 1118-102-29-102-51-93-72-72-93-51-102-29-102-13-105 13-102 29-106 51-102 72-89 93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 102 29 106 13 102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z" />
+ <draw:marker draw:name="Square 45" svg:viewBox="0 0 1131 1131" svg:d="m0 564 564 567 567-567-567-564z" />
+ <draw:marker draw:name="Arrow concave" svg:viewBox="0 0 1131 1580" svg:d="m1013 1491 118 89-567-1580-564 1580 114-85 136-68 148-46 161-17 161 13 153 46z"></draw:marker>
+ <draw:marker draw:name="Short line Arrow" svg:viewBox="0 0 3000 3000" svg:d="m1500 0 1500 2789v211h-114l-1286-2392v2392h-200v-2392l-1286 2392h-114v-211z"></draw:marker>
+ <draw:marker draw:name="Triangle unfilled" svg:viewBox="0 0 3000 3000" svg:d="m1500 0 1500 3000h-3000zm1500-2553-1176 2353h2353z"></draw:marker>
+ <draw:marker draw:name="Diamond unfilled" svg:viewBox="0 0 3000 6000" svg:d="m1500 0 1500 3000-1500 3000-1500-3000zm1500-2553-1276 2553 1276 2553 1276-2553z"></draw:marker>
+ <draw:marker draw:name="Diamond" svg:viewBox="0 0 3000 6000" svg:d="m1500 0 1500 3000-1500 3000-1500-3000z"></draw:marker>
+ <draw:marker draw:name="Circle unfilled" svg:viewBox="0 0 3000 3000" svg:d="m1500 3000c-276 0-511-63-750-201s-411-310-549-549-201-474-201-750 63-511 201-750 310-411 549-549 474-201 750-201 511 63 750 201 411 310 549 549 201 474 201 750-63 511-201 750-310 411-549 549-474 201-750 201zm0-200c-239 0-443-55-650-174s-356-269-476-476-174-411-174-650 55-443 174-650 269-356 476-476c207-119 411-174 650-174s443 55 650 174c207 120 356 269 476 476s174 411 174 650-55 443-174 650-269 356-476 476c-207 119-411 174-650 174z"></draw:marker>
+ <draw:marker draw:name="Square 45 unfilled" svg:viewBox="0 0 3000 3000" svg:d="m1500 3000-1500-1500 1500-1500 1500 1500zm-1500 1215-1215-1215 1215-1215 1215 1215z"></draw:marker>
+ <draw:marker draw:name="Square unfilled" svg:viewBox="0 0 300 300" svg:d="m0 0h300v300h-300zm20-280h260v260h-260z"></draw:marker>
+ <draw:marker draw:name="Half Circle unfilled" svg:viewBox="0 0 15000 8746" svg:d="m14971 0c21 229 29 423 29 653 0 690-79 1328-244 1943-165 614-416 1206-761 1804-345 597-733 1110-1183 1560-451 450-964 837-1562 1182-598 345-1190 596-1806 760-600 161-1223 240-1894 244v600h-100v-600c-671-4-1294-83-1894-244-616-164-1208-415-1806-760-598-345-1111-732-1562-1182-450-450-838-963-1183-1560-345-598-596-1190-761-1804-165-615-244-1253-244-1943 0-230 8-424 29-653l298 26 299 26c-18 211-26 390-26 601 0 635 72 1222 224 1787 151 566 383 1110 700 1659 318 550 674 1022 1088 1437 415 414 888 769 1438 1087 550 317 1095 548 1661 700 566 151 1154 223 1789 223s1223-72 1789-223c566-152 1111-383 1661-700 550-318 1023-673 1438-1087 414-415 770-887 1088-1437 317-549 549-1093 700-1659 152-565 224-1152 224-1787 0-211-8-390-26-601l299-26z" />
+</office:marker-table> \ No newline at end of file
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 41e4cdd3ba80..079be0af5127 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -908,36 +908,53 @@
#define RID_SVXSTR_DASH_END RID_SVXSTR_DASH12
// Default-Line-End-Names
-#define RID_SVXSTR_LEND0_DEF (RID_SVX_START + 770)
-#define RID_SVXSTR_LEND1_DEF (RID_SVX_START + 771)
-#define RID_SVXSTR_LEND2_DEF (RID_SVX_START + 772)
-#define RID_SVXSTR_LEND3_DEF (RID_SVX_START + 773)
-#define RID_SVXSTR_LEND4_DEF (RID_SVX_START + 774)
-#define RID_SVXSTR_LEND5_DEF (RID_SVX_START + 775)
-#define RID_SVXSTR_LEND6_DEF (RID_SVX_START + 776)
-#define RID_SVXSTR_LEND7_DEF (RID_SVX_START + 777)
-#define RID_SVXSTR_LEND8_DEF (RID_SVX_START + 778)
-#define RID_SVXSTR_LEND9_DEF (RID_SVX_START + 779)
-#define RID_SVXSTR_LEND10_DEF (RID_SVX_START + 780)
-#define RID_SVXSTR_LEND11_DEF (RID_SVX_START + 781)
-#define RID_SVXSTR_LEND12_DEF (RID_SVX_START + 782)
-#define RID_SVXSTR_LEND0 (RID_SVX_START + 783)
-#define RID_SVXSTR_LEND1 (RID_SVX_START + 784)
-#define RID_SVXSTR_LEND2 (RID_SVX_START + 785)
-#define RID_SVXSTR_LEND3 (RID_SVX_START + 786)
-#define RID_SVXSTR_LEND4 (RID_SVX_START + 787)
-#define RID_SVXSTR_LEND5 (RID_SVX_START + 788)
-#define RID_SVXSTR_LEND6 (RID_SVX_START + 789)
-#define RID_SVXSTR_LEND7 (RID_SVX_START + 790)
-#define RID_SVXSTR_LEND8 (RID_SVX_START + 791)
-#define RID_SVXSTR_LEND9 (RID_SVX_START + 792)
-#define RID_SVXSTR_LEND10 (RID_SVX_START + 793)
-#define RID_SVXSTR_LEND11 (RID_SVX_START + 794)
-#define RID_SVXSTR_LEND12 (RID_SVX_START + 795)
+// Shifted numbers. Old value range from +770 to +795 is unused now
+#define RID_SVXSTR_LEND0_DEF (RID_SVX_START + 2770)
+#define RID_SVXSTR_LEND1_DEF (RID_SVX_START + 2771)
+#define RID_SVXSTR_LEND2_DEF (RID_SVX_START + 2772)
+#define RID_SVXSTR_LEND3_DEF (RID_SVX_START + 2773)
+#define RID_SVXSTR_LEND4_DEF (RID_SVX_START + 2774)
+#define RID_SVXSTR_LEND5_DEF (RID_SVX_START + 2775)
+#define RID_SVXSTR_LEND6_DEF (RID_SVX_START + 2776)
+#define RID_SVXSTR_LEND7_DEF (RID_SVX_START + 2777)
+#define RID_SVXSTR_LEND8_DEF (RID_SVX_START + 2778)
+#define RID_SVXSTR_LEND9_DEF (RID_SVX_START + 2779)
+#define RID_SVXSTR_LEND10_DEF (RID_SVX_START + 2780)
+#define RID_SVXSTR_LEND11_DEF (RID_SVX_START + 2781)
+#define RID_SVXSTR_LEND12_DEF (RID_SVX_START + 2782)
+#define RID_SVXSTR_LEND13_DEF (RID_SVX_START + 2783)
+#define RID_SVXSTR_LEND14_DEF (RID_SVX_START + 2784)
+#define RID_SVXSTR_LEND15_DEF (RID_SVX_START + 2785)
+#define RID_SVXSTR_LEND16_DEF (RID_SVX_START + 2786)
+#define RID_SVXSTR_LEND17_DEF (RID_SVX_START + 2787)
+#define RID_SVXSTR_LEND18_DEF (RID_SVX_START + 2788)
+#define RID_SVXSTR_LEND19_DEF (RID_SVX_START + 2789)
+#define RID_SVXSTR_LEND20_DEF (RID_SVX_START + 2790)
+#define RID_SVXSTR_LEND0 (RID_SVX_START + 2791)
+#define RID_SVXSTR_LEND1 (RID_SVX_START + 2792)
+#define RID_SVXSTR_LEND2 (RID_SVX_START + 2793)
+#define RID_SVXSTR_LEND3 (RID_SVX_START + 2794)
+#define RID_SVXSTR_LEND4 (RID_SVX_START + 2795)
+#define RID_SVXSTR_LEND5 (RID_SVX_START + 2796)
+#define RID_SVXSTR_LEND6 (RID_SVX_START + 2797)
+#define RID_SVXSTR_LEND7 (RID_SVX_START + 2798)
+#define RID_SVXSTR_LEND8 (RID_SVX_START + 2799)
+#define RID_SVXSTR_LEND9 (RID_SVX_START + 2800)
+#define RID_SVXSTR_LEND10 (RID_SVX_START + 2801)
+#define RID_SVXSTR_LEND11 (RID_SVX_START + 2802)
+#define RID_SVXSTR_LEND12 (RID_SVX_START + 2803)
+#define RID_SVXSTR_LEND13 (RID_SVX_START + 2804)
+#define RID_SVXSTR_LEND14 (RID_SVX_START + 2805)
+#define RID_SVXSTR_LEND15 (RID_SVX_START + 2806)
+#define RID_SVXSTR_LEND16 (RID_SVX_START + 2807)
+#define RID_SVXSTR_LEND17 (RID_SVX_START + 2808)
+#define RID_SVXSTR_LEND18 (RID_SVX_START + 2809)
+#define RID_SVXSTR_LEND19 (RID_SVX_START + 2810)
+#define RID_SVXSTR_LEND20 (RID_SVX_START + 2811)
#define RID_SVXSTR_LEND_DEF_START RID_SVXSTR_LEND0_DEF
-#define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND12_DEF
+#define RID_SVXSTR_LEND_DEF_END RID_SVXSTR_LEND20_DEF
#define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0
-#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND12
+#define RID_SVXSTR_LEND_END RID_SVXSTR_LEND20
#define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802)
#define RID_SVXSTR_QRY_PRINT_MSG (RID_SVX_START + 803)
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 05d746dfcb60..4b1e25cc01ad 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1649,6 +1649,46 @@ String RID_SVXSTR_LEND11_DEF
/* do not translate */
String RID_SVXSTR_LEND12_DEF
{
+ Text = "Short line Arrow";
+};
+/* do not translate */
+String RID_SVXSTR_LEND13_DEF
+{
+ Text = "Triangle unfilled";
+};
+/* do not translate */
+String RID_SVXSTR_LEND14_DEF
+{
+ Text = "Diamond unfilled";
+};
+/* do not translate */
+String RID_SVXSTR_LEND15_DEF
+{
+ Text = "Diamond";
+};
+/* do not translate */
+String RID_SVXSTR_LEND16_DEF
+{
+ Text = "Circle unfilled";
+};
+/* do not translate */
+String RID_SVXSTR_LEND17_DEF
+{
+ Text = "Square 45 unfilled";
+};
+/* do not translate */
+String RID_SVXSTR_LEND18_DEF
+{
+ Text = "Square unfilled";
+};
+/* do not translate */
+String RID_SVXSTR_LEND19_DEF
+{
+ Text = "Half Circle unfilled";
+};
+/* do not translate */
+String RID_SVXSTR_LEND20_DEF
+{
Text = "Arrowhead";
};
@@ -1703,6 +1743,38 @@ String RID_SVXSTR_LEND11
String RID_SVXSTR_LEND12
{
+ Text [ en-US ] = "Short line arrow";
+};
+String RID_SVXSTR_LEND13
+{
+ Text [ en-US ] = "Triangle unfilled";
+};
+String RID_SVXSTR_LEND14
+{
+ Text [ en-US ] = "Diamond unfilled";
+};
+String RID_SVXSTR_LEND15
+{
+ Text [ en-US ] = "Diamond";
+};
+String RID_SVXSTR_LEND16
+{
+ Text [ en-US ] = "Circle unfilled";
+};
+String RID_SVXSTR_LEND17
+{
+ Text [ en-US ] = "Square 45 unfilled";
+};
+String RID_SVXSTR_LEND18
+{
+ Text [ en-US ] = "Square unfilled";
+};
+String RID_SVXSTR_LEND19
+{
+ Text [ en-US ] = "Half circle unfilled";
+};
+String RID_SVXSTR_LEND20
+{
Text [ en-US ] = "Arrowhead";
};