Resolves: #i122318# Adapted color palette stuff, some cleanups

(cherry picked from commit 710925d1d93a8ccf36957fa2f4d98d7dedb4cb9f)

Conflicts:
	extras/source/palettes/standard.soc
	svx/inc/svx/dialogs.hrc
	svx/source/dialog/sdstring.src
	svx/source/unodraw/unoprov.cxx
	svx/source/xoutdev/xtabcolr.cxx

Change-Id: I15899fc51e61e29da443838d1a42ea5d7c53acb9

1 files changed, 78 insertions, 90 deletions

diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 32ab65ace43b..bc46d8f4b41b 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1204,102 +1204,90 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
 
 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,
-    RID_SVXSTR_GREY_DEF,
-    RID_SVXSTR_LIGHTGREY_DEF,
-    RID_SVXSTR_LIGHTBLUE_DEF,
-    RID_SVXSTR_LIGHTGREEN_DEF,
-    RID_SVXSTR_LIGHTCYAN_DEF,
-    RID_SVXSTR_LIGHTRED_DEF,
-    RID_SVXSTR_LIGHTMAGENTA_DEF,
-    RID_SVXSTR_YELLOW_DEF,
-    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,
-    RID_SVXSTR_DKVIOLET_DEF,
-    RID_SVXSTR_SALMON_DEF,
-    RID_SVXSTR_SEABLUE_DEF,
-    RID_SVXSTR_COLOR_SUN_DEF,
+    RID_SVXSTR_COLOR_BLUEGREY_DEF,
+    RID_SVXSTR_COLOR_BLACK_DEF,
+    RID_SVXSTR_COLOR_BLUE_DEF,
+    RID_SVXSTR_COLOR_GREEN_DEF,
+    RID_SVXSTR_COLOR_CYAN_DEF,
+    RID_SVXSTR_COLOR_RED_DEF,
+    RID_SVXSTR_COLOR_MAGENTA_DEF,
+    RID_SVXSTR_COLOR_GREY_DEF,
+    RID_SVXSTR_COLOR_YELLOW_DEF,
+    RID_SVXSTR_COLOR_WHITE_DEF,
+    RID_SVXSTR_COLOR_ORANGE_DEF,
+    RID_SVXSTR_COLOR_VIOLET_DEF,
+    RID_SVXSTR_COLOR_BORDEAUX_DEF,
+    RID_SVXSTR_COLOR_PALE_YELLOW_DEF,
+    RID_SVXSTR_COLOR_PALE_GREEN_DEF,
+    RID_SVXSTR_COLOR_DARKVIOLET_DEF,
+    RID_SVXSTR_COLOR_SALMON_DEF,
+    RID_SVXSTR_COLOR_SEABLUE_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,
-    RID_SVXSTR_TANGO_BUTTER_DEF,
-    RID_SVXSTR_TANGO_ORANGE_DEF,
-    RID_SVXSTR_TANGO_CHOCOLATE_DEF,
-    RID_SVXSTR_TANGO_CHAMELEON_DEF,
-    RID_SVXSTR_TANGO_SKY_BLUE_DEF,
-    RID_SVXSTR_TANGO_PLUM_DEF,
-    RID_SVXSTR_TANGO_SCARLET_RED_DEF,
-    RID_SVXSTR_TANGO_ALUMINIUM_DEF
+    RID_SVXSTR_COLOR_PURPLE_DEF,
+    RID_SVXSTR_COLOR_SKYBLUE_DEF,
+    RID_SVXSTR_COLOR_YELLOWGREEN_DEF,
+    RID_SVXSTR_COLOR_PINK_DEF,
+    RID_SVXSTR_COLOR_TURQUOISE_DEF,
+    RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF,
+    RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF,
+    RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF,
+    RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF,
+    RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF,
+    RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF,
+    RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF,
+    RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF,
+    RID_SVXSTR_COLOR_TANGO_BUTTER_DEF,
+    RID_SVXSTR_COLOR_TANGO_ORANGE_DEF,
+    RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF,
+    RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF,
+    RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF,
+    RID_SVXSTR_COLOR_TANGO_PLUM_DEF,
+    RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF,
+    RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF
 };
 
 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,
-    RID_SVXSTR_GREY,
-    RID_SVXSTR_LIGHTGREY,
-    RID_SVXSTR_LIGHTBLUE,
-    RID_SVXSTR_LIGHTGREEN,
-    RID_SVXSTR_LIGHTCYAN,
-    RID_SVXSTR_LIGHTRED,
-    RID_SVXSTR_LIGHTMAGENTA,
-    RID_SVXSTR_YELLOW,
-    RID_SVXSTR_WHITE,
-    RID_SVXSTR_ORANGE,
-    RID_SVXSTR_VIOLET,
-    RID_SVXSTR_PINK,
-    RID_SVXSTR_BORDEAUX,
-    RID_SVXSTR_PALE_YELLOW,
-    RID_SVXSTR_PALE_GREEN,
-    RID_SVXSTR_DKVIOLET,
-    RID_SVXSTR_SALMON,
-    RID_SVXSTR_SEABLUE,
-    RID_SVXSTR_COLOR_SUN,
+    RID_SVXSTR_COLOR_BLUEGREY,
+    RID_SVXSTR_COLOR_BLACK,
+    RID_SVXSTR_COLOR_BLUE,
+    RID_SVXSTR_COLOR_GREEN,
+    RID_SVXSTR_COLOR_CYAN,
+    RID_SVXSTR_COLOR_RED,
+    RID_SVXSTR_COLOR_MAGENTA,
+    RID_SVXSTR_COLOR_GREY,
+    RID_SVXSTR_COLOR_YELLOW,
+    RID_SVXSTR_COLOR_WHITE,
+    RID_SVXSTR_COLOR_ORANGE,
+    RID_SVXSTR_COLOR_VIOLET,
+    RID_SVXSTR_COLOR_BORDEAUX,
+    RID_SVXSTR_COLOR_PALE_YELLOW,
+    RID_SVXSTR_COLOR_PALE_GREEN,
+    RID_SVXSTR_COLOR_DARKVIOLET,
+    RID_SVXSTR_COLOR_SALMON,
+    RID_SVXSTR_COLOR_SEABLUE,
     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,
-    RID_SVXSTR_TANGO_BUTTER,
-    RID_SVXSTR_TANGO_ORANGE,
-    RID_SVXSTR_TANGO_CHOCOLATE,
-    RID_SVXSTR_TANGO_CHAMELEON,
-    RID_SVXSTR_TANGO_SKY_BLUE,
-    RID_SVXSTR_TANGO_PLUM,
-    RID_SVXSTR_TANGO_SCARLET_RED,
-    RID_SVXSTR_TANGO_ALUMINIUM
+    RID_SVXSTR_COLOR_PURPLE,
+    RID_SVXSTR_COLOR_SKYBLUE,
+    RID_SVXSTR_COLOR_YELLOWGREEN,
+    RID_SVXSTR_COLOR_PINK,
+    RID_SVXSTR_COLOR_TURQUOISE,
+    RID_SVXSTR_COLOR_BLUE_CLASSIC,
+    RID_SVXSTR_COLOR_LIBRE_GREEN_1,
+    RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT,
+    RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT,
+    RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT,
+    RID_SVXSTR_COLOR_LIBRE_PURPLE,
+    RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT,
+    RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT,
+    RID_SVXSTR_COLOR_TANGO_BUTTER,
+    RID_SVXSTR_COLOR_TANGO_ORANGE,
+    RID_SVXSTR_COLOR_TANGO_CHOCOLATE,
+    RID_SVXSTR_COLOR_TANGO_CHAMELEON,
+    RID_SVXSTR_COLOR_TANGO_SKY_BLUE,
+    RID_SVXSTR_COLOR_TANGO_PLUM,
+    RID_SVXSTR_COLOR_TANGO_SCARLET_RED,
+    RID_SVXSTR_COLOR_TANGO_ALUMINIUM
 };
 
 bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()