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, 79 insertions, 91 deletions

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 8ba1b2ddf04b..2849c3b5abba 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -309,24 +309,21 @@
 #define RID_SVXSTR_CLOSE                    (RID_SVX_START + 260)
 
 // Color strings
-#define RID_SVXSTR_BLACK                    (RID_SVX_START + 275)
-#define RID_SVXSTR_BLUE                     (RID_SVX_START + 276)
-#define RID_SVXSTR_GREEN                    (RID_SVX_START + 277)
-#define RID_SVXSTR_CYAN                     (RID_SVX_START + 278)
-#define RID_SVXSTR_RED                      (RID_SVX_START + 279)
-#define RID_SVXSTR_MAGENTA                  (RID_SVX_START + 280)
-#define RID_SVXSTR_BROWN                    (RID_SVX_START + 281)
-#define RID_SVXSTR_GREY                     (RID_SVX_START + 282)
-#define RID_SVXSTR_LIGHTGREY                (RID_SVX_START + 283)
-#define RID_SVXSTR_LIGHTBLUE                (RID_SVX_START + 284)
-#define RID_SVXSTR_LIGHTGREEN               (RID_SVX_START + 285)
-#define RID_SVXSTR_LIGHTCYAN                (RID_SVX_START + 286)
-#define RID_SVXSTR_LIGHTRED                 (RID_SVX_START + 287)
-#define RID_SVXSTR_LIGHTMAGENTA             (RID_SVX_START + 288)
-#define RID_SVXSTR_YELLOW                   (RID_SVX_START + 289)
-#define RID_SVXSTR_WHITE                    (RID_SVX_START + 290)
-#define RID_SVXSTR_BLUEGREY                 (RID_SVX_START + 291)
-#define RID_SVXSTR_ORANGE                   (RID_SVX_START + 292)
+#define RID_SVXSTR_COLOR_BLACK              (RID_SVX_START + 275)
+#define RID_SVXSTR_COLOR_BLUE               (RID_SVX_START + 276)
+#define RID_SVXSTR_COLOR_GREEN              (RID_SVX_START + 277)
+#define RID_SVXSTR_COLOR_CYAN               (RID_SVX_START + 278)
+#define RID_SVXSTR_COLOR_RED                (RID_SVX_START + 279)
+#define RID_SVXSTR_COLOR_MAGENTA            (RID_SVX_START + 280)
+#define RID_SVXSTR_COLOR_GREY               (RID_SVX_START + 282)
+#define RID_SVXSTR_COLOR_YELLOW             (RID_SVX_START + 289)
+#define RID_SVXSTR_COLOR_WHITE              (RID_SVX_START + 290)
+#define RID_SVXSTR_COLOR_BLUEGREY           (RID_SVX_START + 291)
+#define RID_SVXSTR_COLOR_ORANGE             (RID_SVX_START + 292)
+#define RID_SVXSTR_COLOR_TURQUOISE          (RID_SVX_START + 293)
+#define RID_SVXSTR_COLOR_TURQUOISE_DEF      (RID_SVX_START + 294)
+#define RID_SVXSTR_COLOR_BLUE_CLASSIC       (RID_SVX_START + 295)
+#define RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF   (RID_SVX_START + 296)
 
 // Line endings strings
 #define RID_SVXSTR_ARROW                    (RID_SVX_START + 300)
@@ -410,23 +407,22 @@
 #define RID_SVXSTR_BACKGROUND               (RID_SVX_START + 531)
 
 // BM: some additional standard colors
-#define RID_SVXSTR_VIOLET                   (RID_SVX_START + 540)
-#define RID_SVXSTR_BORDEAUX                 (RID_SVX_START + 541)
-#define RID_SVXSTR_PALE_YELLOW              (RID_SVX_START + 542)
-#define RID_SVXSTR_PALE_GREEN               (RID_SVX_START + 543)
-#define RID_SVXSTR_DKVIOLET                 (RID_SVX_START + 544)
-#define RID_SVXSTR_SALMON                   (RID_SVX_START + 545)
-#define RID_SVXSTR_SEABLUE                  (RID_SVX_START + 546)
-#define RID_SVXSTR_COLOR_SUN                (RID_SVX_START + 547)
+#define RID_SVXSTR_COLOR_VIOLET             (RID_SVX_START + 540)
+#define RID_SVXSTR_COLOR_BORDEAUX           (RID_SVX_START + 541)
+#define RID_SVXSTR_COLOR_PALE_YELLOW        (RID_SVX_START + 542)
+#define RID_SVXSTR_COLOR_PALE_GREEN         (RID_SVX_START + 543)
+#define RID_SVXSTR_COLOR_DARKVIOLET         (RID_SVX_START + 544)
+#define RID_SVXSTR_COLOR_SALMON             (RID_SVX_START + 545)
+#define RID_SVXSTR_COLOR_SEABLUE            (RID_SVX_START + 546)
 
 // 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)
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_1       (RID_SVX_START + 548)
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT  (RID_SVX_START + 549)
+#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT   (RID_SVX_START + 550)
+#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT (RID_SVX_START + 551)
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE        (RID_SVX_START + 552)
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT (RID_SVX_START + 553)
+#define RID_SVXSTR_COLOR_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 !!!
@@ -462,70 +458,62 @@
 #define RID_SVXSTR_LINEJOINT_ROUND          (RID_SVX_START + 592 )
 
 // Default-Color-Names
-#define RID_SVXSTR_BLACK_DEF                (RID_SVX_START + 595)
-#define RID_SVXSTR_BLUE_DEF                 (RID_SVX_START + 596)
-#define RID_SVXSTR_GREEN_DEF                (RID_SVX_START + 597)
-#define RID_SVXSTR_CYAN_DEF                 (RID_SVX_START + 598)
-#define RID_SVXSTR_RED_DEF                  (RID_SVX_START + 599)
-#define RID_SVXSTR_MAGENTA_DEF              (RID_SVX_START + 600)
-#define RID_SVXSTR_BROWN_DEF                (RID_SVX_START + 601)
-#define RID_SVXSTR_GREY_DEF                 (RID_SVX_START + 602)
-#define RID_SVXSTR_LIGHTGREY_DEF            (RID_SVX_START + 603)
-#define RID_SVXSTR_LIGHTBLUE_DEF            (RID_SVX_START + 604)
-#define RID_SVXSTR_LIGHTGREEN_DEF           (RID_SVX_START + 605)
-#define RID_SVXSTR_LIGHTCYAN_DEF            (RID_SVX_START + 606)
-#define RID_SVXSTR_LIGHTRED_DEF             (RID_SVX_START + 607)
-#define RID_SVXSTR_LIGHTMAGENTA_DEF         (RID_SVX_START + 608)
-#define RID_SVXSTR_YELLOW_DEF               (RID_SVX_START + 609)
-#define RID_SVXSTR_WHITE_DEF                (RID_SVX_START + 610)
-#define RID_SVXSTR_BLUEGREY_DEF             (RID_SVX_START + 611)
-#define RID_SVXSTR_ORANGE_DEF               (RID_SVX_START + 612)
-#define RID_SVXSTR_VIOLET_DEF               (RID_SVX_START + 613)
-#define RID_SVXSTR_BORDEAUX_DEF             (RID_SVX_START + 614)
-#define RID_SVXSTR_PALE_YELLOW_DEF          (RID_SVX_START + 615)
-#define RID_SVXSTR_PALE_GREEN_DEF           (RID_SVX_START + 616)
-#define RID_SVXSTR_DKVIOLET_DEF             (RID_SVX_START + 617)
-#define RID_SVXSTR_SALMON_DEF               (RID_SVX_START + 618)
-#define RID_SVXSTR_SEABLUE_DEF              (RID_SVX_START + 619)
+#define RID_SVXSTR_COLOR_BLACK_DEF          (RID_SVX_START + 595)
+#define RID_SVXSTR_COLOR_BLUE_DEF           (RID_SVX_START + 596)
+#define RID_SVXSTR_COLOR_GREEN_DEF          (RID_SVX_START + 597)
+#define RID_SVXSTR_COLOR_CYAN_DEF           (RID_SVX_START + 598)
+#define RID_SVXSTR_COLOR_RED_DEF            (RID_SVX_START + 599)
+#define RID_SVXSTR_COLOR_MAGENTA_DEF        (RID_SVX_START + 600)
+#define RID_SVXSTR_COLOR_GREY_DEF           (RID_SVX_START + 602)
+#define RID_SVXSTR_COLOR_YELLOW_DEF         (RID_SVX_START + 609)
+#define RID_SVXSTR_COLOR_WHITE_DEF          (RID_SVX_START + 610)
+#define RID_SVXSTR_COLOR_BLUEGREY_DEF       (RID_SVX_START + 611)
+#define RID_SVXSTR_COLOR_ORANGE_DEF         (RID_SVX_START + 612)
+#define RID_SVXSTR_COLOR_VIOLET_DEF         (RID_SVX_START + 613)
+#define RID_SVXSTR_COLOR_BORDEAUX_DEF       (RID_SVX_START + 614)
+#define RID_SVXSTR_COLOR_PALE_YELLOW_DEF    (RID_SVX_START + 615)
+#define RID_SVXSTR_COLOR_PALE_GREEN_DEF     (RID_SVX_START + 616)
+#define RID_SVXSTR_COLOR_DARKVIOLET_DEF     (RID_SVX_START + 617)
+#define RID_SVXSTR_COLOR_SALMON_DEF         (RID_SVX_START + 618)
+#define RID_SVXSTR_COLOR_SEABLUE_DEF        (RID_SVX_START + 619)
 #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)
+#define RID_SVXSTR_COLOR_PURPLE             (RID_SVX_START + 623)
+#define RID_SVXSTR_COLOR_PURPLE_DEF         (RID_SVX_START + 624)
+#define RID_SVXSTR_COLOR_SKYBLUE            (RID_SVX_START + 625)
+#define RID_SVXSTR_COLOR_SKYBLUE_DEF        (RID_SVX_START + 626)
+#define RID_SVXSTR_COLOR_YELLOWGREEN        (RID_SVX_START + 627)
+#define RID_SVXSTR_COLOR_YELLOWGREEN_DEF    (RID_SVX_START + 628)
+#define RID_SVXSTR_COLOR_PINK               (RID_SVX_START + 629)
+#define RID_SVXSTR_COLOR_PINK_DEF           (RID_SVX_START + 630)
+
 // 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)
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF       (RID_SVX_START + 631)
+#define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF  (RID_SVX_START + 632)
+#define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF   (RID_SVX_START + 633)
+#define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF (RID_SVX_START + 634)
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF        (RID_SVX_START + 635)
+#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF (RID_SVX_START + 636)
+#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF (RID_SVX_START + 637)
 
 // Tango palette colors
-#define RID_SVXSTR_TANGO_BUTTER                         (RID_SVX_START + 630)
-#define RID_SVXSTR_TANGO_ORANGE                         (RID_SVX_START + 631)
-#define RID_SVXSTR_TANGO_CHOCOLATE                      (RID_SVX_START + 632)
-#define RID_SVXSTR_TANGO_CHAMELEON                      (RID_SVX_START + 633)
-#define RID_SVXSTR_TANGO_SKY_BLUE                       (RID_SVX_START + 634)
-#define RID_SVXSTR_TANGO_PLUM                           (RID_SVX_START + 635)
-#define RID_SVXSTR_TANGO_SCARLET_RED                    (RID_SVX_START + 636)
-#define RID_SVXSTR_TANGO_ALUMINIUM                      (RID_SVX_START + 637)
-#define RID_SVXSTR_TANGO_BUTTER_DEF                     (RID_SVX_START + 638)
-#define RID_SVXSTR_TANGO_ORANGE_DEF                     (RID_SVX_START + 639)
-#define RID_SVXSTR_TANGO_CHOCOLATE_DEF                  (RID_SVX_START + 640)
-#define RID_SVXSTR_TANGO_CHAMELEON_DEF                  (RID_SVX_START + 641)
-#define RID_SVXSTR_TANGO_SKY_BLUE_DEF                   (RID_SVX_START + 642)
-#define RID_SVXSTR_TANGO_PLUM_DEF                       (RID_SVX_START + 643)
-#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)
+#define RID_SVXSTR_COLOR_TANGO_BUTTER            (RID_SVX_START + 638)
+#define RID_SVXSTR_COLOR_TANGO_ORANGE            (RID_SVX_START + 639)
+#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE         (RID_SVX_START + 640)
+#define RID_SVXSTR_COLOR_TANGO_CHAMELEON         (RID_SVX_START + 641)
+#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE          (RID_SVX_START + 642)
+#define RID_SVXSTR_COLOR_TANGO_PLUM              (RID_SVX_START + 643)
+#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED       (RID_SVX_START + 644)
+#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM         (RID_SVX_START + 645)
+#define RID_SVXSTR_COLOR_TANGO_BUTTER_DEF        (RID_SVX_START + 646)
+#define RID_SVXSTR_COLOR_TANGO_ORANGE_DEF        (RID_SVX_START + 647)
+#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF     (RID_SVX_START + 648)
+#define RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF     (RID_SVX_START + 649)
+#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF      (RID_SVX_START + 650)
+#define RID_SVXSTR_COLOR_TANGO_PLUM_DEF          (RID_SVX_START + 651)
+#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF   (RID_SVX_START + 652)
+#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF     (RID_SVX_START + 653)
 
 // Default-Gradient-Names
 #define RID_SVXSTR_GRDT0_DEF                 (RID_SVX_START + 2000)