[Libreoffice-commits] .: svx/inc svx/source

[Andras Timar]

 svx/inc/svx/dialogs.hrc        |   17 ++++
 svx/source/dialog/sdstring.src |  142 ++++++++++++++++-------------------------
 svx/source/unodraw/unoprov.cxx |   18 ++++-
 3 files changed, 89 insertions(+), 88 deletions(-)

New commits:
commit f618e5fe2b1674eae680bf5793dadd3c7a86d186
Author: Andras Timar <timar at fsf.hu>
Date:   Mon Mar 14 13:04:22 2011 +0100

    make LibreOffice palette entries localizable - fdo#32628

diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 56c2961..498a30b 100755
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -577,6 +577,15 @@
 #define RID_SVXSTR_SEABLUE					(RID_SVX_START + 546)
 #define RID_SVXSTR_COLOR_SUN				(RID_SVX_START + 547)
 
+// LibreOffice palette colors
+#define RID_SVXSTR_LIBRE_GREEN_1                        (RID_SVX_START + 548)
+#define RID_SVXSTR_LIBRE_GREEN_ACCENT                   (RID_SVX_START + 549)
+#define RID_SVXSTR_LIBRE_BLUE_ACCENT                    (RID_SVX_START + 550)
+#define RID_SVXSTR_LIBRE_ORANGE_ACCENT                  (RID_SVX_START + 551)
+#define RID_SVXSTR_LIBRE_PURPLE                         (RID_SVX_START + 552)
+#define RID_SVXSTR_LIBRE_PURPLE_ACCENT                  (RID_SVX_START + 553)
+#define RID_SVXSTR_LIBRE_YELLOW_ACCENT                  (RID_SVX_START + 554)
+
 // JP: string resource ids for table-autoformat-names, used in SW/SC
 // !!! Urgent: the order of Ids is persistent. New Ids have to append !!!
 #define RID_SVXSTR_TBLAFMT_BEGIN   			(RID_SVX_START + 560)
@@ -634,6 +643,14 @@
 #define RID_SVXSTR_COLOR_SUN_DEF			(RID_SVX_START + 620)
 #define RID_SVXSTR_COLOR_CHART				(RID_SVX_START + 621)
 #define RID_SVXSTR_COLOR_CHART_DEF			(RID_SVX_START + 622)
+// LibreOffice palette colors
+#define RID_SVXSTR_LIBRE_GREEN_1_DEF                    (RID_SVX_START + 623)
+#define RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF               (RID_SVX_START + 624)
+#define RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF                (RID_SVX_START + 625)
+#define RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF              (RID_SVX_START + 626)
+#define RID_SVXSTR_LIBRE_PURPLE_DEF                     (RID_SVX_START + 627)
+#define RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF              (RID_SVX_START + 628)
+#define RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF              (RID_SVX_START + 629)
 
 // Default-Gradient-Names
 #define RID_SVXSTR_GRDT0_DEF				(RID_SVX_START + 631)
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src
index 4ee4874..09d6efc 100644
--- a/svx/source/dialog/sdstring.src
+++ b/svx/source/dialog/sdstring.src
@@ -1182,103 +1182,73 @@ String RID_SVXSTR_COLOR_USER
     Text [ en-US ] = "User" ;
 };
 
+String RID_SVXSTR_LIBRE_GREEN_1
+{
+    Text [ en-US ] = "Green 1 (LibreOffice Main Color)" ;
+};
 
+String RID_SVXSTR_LIBRE_GREEN_ACCENT
+{
+    Text [ en-US ] = "Green Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_BLUE_ACCENT
+{
+    Text [ en-US ] = "Blue Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_ORANGE_ACCENT
+{
+    Text [ en-US ] = "Orange Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_PURPLE
+{
+    Text [ en-US ] = "Purple" ;
+};
 
+String RID_SVXSTR_LIBRE_PURPLE_ACCENT
+{
+    Text [ en-US ] = "Purple Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_YELLOW_ACCENT
+{
+    Text [ en-US ] = "Yellow Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_GREEN_1_DEF
+{
+    Text = "Green 1 (LibreOffice Main Color)" ;
+};
 
+String RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF
+{
+    Text = "Green Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF
+{
+    Text = "Blue Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF
+{
+    Text = "Orange Accent" ;
+};
 
+String RID_SVXSTR_LIBRE_PURPLE_DEF
+{
+    Text = "Purple" ;
+};
 
+String RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF
+{
+    Text = "Purple Accent" ;
+};
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+String RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF
+{
+    Text = "Yellow Accent" ;
+};
 
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 0c43887..22f614c 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1277,7 +1277,14 @@ static USHORT const SvxUnoColorNameDefResId[] =
     RID_SVXSTR_SALMON_DEF,
     RID_SVXSTR_SEABLUE_DEF,
     RID_SVXSTR_COLOR_SUN_DEF,
-    RID_SVXSTR_COLOR_CHART_DEF
+    RID_SVXSTR_COLOR_CHART_DEF,
+    RID_SVXSTR_LIBRE_GREEN_1_DEF,
+    RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF,
+    RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF,
+    RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF,
+    RID_SVXSTR_LIBRE_PURPLE_DEF,
+    RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF,
+    RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF
 };
 
 static USHORT const SvxUnoColorNameResId[] =
@@ -1308,7 +1315,14 @@ static USHORT const SvxUnoColorNameResId[] =
     RID_SVXSTR_SALMON,
     RID_SVXSTR_SEABLUE,
     RID_SVXSTR_COLOR_SUN,
-    RID_SVXSTR_COLOR_CHART
+    RID_SVXSTR_COLOR_CHART,
+    RID_SVXSTR_LIBRE_GREEN_1,
+    RID_SVXSTR_LIBRE_GREEN_ACCENT,
+    RID_SVXSTR_LIBRE_BLUE_ACCENT,
+    RID_SVXSTR_LIBRE_ORANGE_ACCENT,
+    RID_SVXSTR_LIBRE_PURPLE,
+    RID_SVXSTR_LIBRE_PURPLE_ACCENT,
+    RID_SVXSTR_LIBRE_YELLOW_ACCENT
 };
 
 bool SvxUnoConvertResourceString( USHORT* pSourceResIds, USHORT* pDestResIds, int nCount, String& rString ) throw()