[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/svx svx/source

[Andras Timar]

 include/svx/dialogs.hrc        |   10 ++++++++++
 svx/source/dialog/sdstring.src |   32 ++++++++++++++++++++++++++++++++
 svx/source/unodraw/unoprov.cxx |    8 ++++++++
 3 files changed, 50 insertions(+)

New commits:
commit 93e034b26eec63f2d37865446899458a94f6c002
Author: Andras Timar <atimar at suse.com>
Date:   Sun Jun 16 22:43:47 2013 +0200

    l10n of additional colors in standard palette
    
    Change-Id: I9200ce7f0e18491f2a1b8b60a43883df6dcb6cf2

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index e714c39..a411b35 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -549,6 +549,16 @@
 #define RID_SVXSTR_TANGO_SCARLET_RED_DEF                (RID_SVX_START + 644)
 #define RID_SVXSTR_TANGO_ALUMINIUM_DEF                  (RID_SVX_START + 645)
 
+//Additional color names in standard palette
+#define RID_SVXSTR_CYAN2                                (RID_SVX_START + 646)
+#define RID_SVXSTR_YELLOW_GREEN                         (RID_SVX_START + 647)
+#define RID_SVXSTR_SKY_BLUE                             (RID_SVX_START + 648)
+#define RID_SVXSTR_PINK                                 (RID_SVX_START + 649)
+#define RID_SVXSTR_CYAN2_DEF                            (RID_SVX_START + 650)
+#define RID_SVXSTR_YELLOW_GREEN_DEF                     (RID_SVX_START + 651)
+#define RID_SVXSTR_SKY_BLUE_DEF                         (RID_SVX_START + 652)
+#define RID_SVXSTR_PINK_DEF                             (RID_SVX_START + 653)
+
 // Default-Gradient-Names
 #define RID_SVXSTR_GRDT0_DEF                 (RID_SVX_START + 2000)
 #define RID_SVXSTR_GRDT1_DEF                 (RID_SVX_START + 2001)
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 401d6f3..8154d53 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -138,6 +138,22 @@ String RID_SVXSTR_ORANGE
 {
     Text [ en-US ] = "Orange" ;
 };
+String RID_SVXSTR_CYAN2
+{
+    Text [ en-US ] = "Cyan" ;
+};
+String RID_SVXSTR_YELLOW_GREEN
+{
+    Text [ en-US ] = "Yellow Green" ;
+};
+String RID_SVXSTR_SKY_BLUE
+{
+    Text [ en-US ] = "Sky Blue" ;
+};
+String RID_SVXSTR_PINK
+{
+    Text [ en-US ] = "Pink" ;
+};
 String RID_SVXSTR_ARROW
 {
     Text [ en-US ] = "Arrow" ;
@@ -496,6 +512,22 @@ String RID_SVXSTR_COLOR_SUN_DEF
     // attention: this is the color string for the Sun Microsystems specific colors !!!
     Text = "Sun";
 };
+String RID_SVXSTR_CYAN2_DEF
+{
+    Text = "Cyan" ;
+};
+String RID_SVXSTR_YELLOW_GREEN_DEF
+{
+    Text = "Yellow Green" ;
+};
+String RID_SVXSTR_SKY_BLUE_DEF
+{
+    Text = "Sky Blue" ;
+};
+String RID_SVXSTR_PINK_DEF
+{
+    Text = "Pink" ;
+};
 /* do not translate */
 String RID_SVXSTR_COLOR_CHART_DEF
 {
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index b2fd24f..32ab65a 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1207,8 +1207,11 @@ static sal_uInt16 SvxUnoColorNameDefResId[] =
     RID_SVXSTR_BLUEGREY_DEF,
     RID_SVXSTR_BLACK_DEF,
     RID_SVXSTR_BLUE_DEF,
+    RID_SVXSTR_SKY_BLUE_DEF,
     RID_SVXSTR_GREEN_DEF,
+    RID_SVXSTR_YELLOW_GREEN_DEF,
     RID_SVXSTR_CYAN_DEF,
+    RID_SVXSTR_CYAN2_DEF,
     RID_SVXSTR_RED_DEF,
     RID_SVXSTR_MAGENTA_DEF,
     RID_SVXSTR_BROWN_DEF,
@@ -1223,6 +1226,7 @@ static sal_uInt16 SvxUnoColorNameDefResId[] =
     RID_SVXSTR_WHITE_DEF,
     RID_SVXSTR_ORANGE_DEF,
     RID_SVXSTR_VIOLET_DEF,
+    RID_SVXSTR_PINK_DEF,
     RID_SVXSTR_BORDEAUX_DEF,
     RID_SVXSTR_PALE_YELLOW_DEF,
     RID_SVXSTR_PALE_GREEN_DEF,
@@ -1253,8 +1257,11 @@ static sal_uInt16 SvxUnoColorNameResId[] =
     RID_SVXSTR_BLUEGREY,
     RID_SVXSTR_BLACK,
     RID_SVXSTR_BLUE,
+    RID_SVXSTR_SKY_BLUE,
     RID_SVXSTR_GREEN,
+    RID_SVXSTR_YELLOW_GREEN,
     RID_SVXSTR_CYAN,
+    RID_SVXSTR_CYAN2,
     RID_SVXSTR_RED,
     RID_SVXSTR_MAGENTA,
     RID_SVXSTR_BROWN,
@@ -1269,6 +1276,7 @@ static sal_uInt16 SvxUnoColorNameResId[] =
     RID_SVXSTR_WHITE,
     RID_SVXSTR_ORANGE,
     RID_SVXSTR_VIOLET,
+    RID_SVXSTR_PINK,
     RID_SVXSTR_BORDEAUX,
     RID_SVXSTR_PALE_YELLOW,
     RID_SVXSTR_PALE_GREEN,