diff options
author | Armin Le Grand <alg@apache.org> | 2013-05-15 14:39:39 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-20 12:13:39 +0100 |
commit | dde5dbdef56b76c296d7d70120b905d2716fa9b0 (patch) | |
tree | 8d00d6c93f6ba286fd14db21f7011f791628c032 /svx | |
parent | make this more resilient to stream problems (diff) | |
download | core-dde5dbdef56b76c296d7d70120b905d2716fa9b0.tar.gz core-dde5dbdef56b76c296d7d70120b905d2716fa9b0.zip |
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
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/sdstring.src | 286 | ||||
-rw-r--r-- | svx/source/unodraw/unoprov.cxx | 168 | ||||
-rw-r--r-- | svx/source/xoutdev/xtabcolr.cxx | 414 |
3 files changed, 329 insertions, 539 deletions
diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 8154d532b4c8..32638adb6b96 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -59,100 +59,58 @@ String RID_SVXSTR_CLOSE /* ### ATTENTION: New text in Resource? Close : Close */ Text [ en-US ] = "Close" ; }; -String RID_SVXSTR_BLACK +String RID_SVXSTR_COLOR_BLACK { Text [ en-US ] = "Black" ; }; -String RID_SVXSTR_BLUE +String RID_SVXSTR_COLOR_BLUE { Text [ en-US ] = "Blue" ; }; -String RID_SVXSTR_GREEN +String RID_SVXSTR_COLOR_GREEN { /* ### ATTENTION: New text in Resource? Green : Green */ Text [ en-US ] = "Green" ; }; -String RID_SVXSTR_CYAN +String RID_SVXSTR_COLOR_CYAN { /* ### ATTENTION: New text in Resource? Turquoise : Turquoise */ - Text [ en-US ] = "Turquoise" ; + Text [ en-US ] = "Cyan" ; }; -String RID_SVXSTR_RED +String RID_SVXSTR_COLOR_RED { Text [ en-US ] = "Red" ; }; -String RID_SVXSTR_MAGENTA +String RID_SVXSTR_COLOR_MAGENTA { /* ### ATTENTION: New text in Resource? Magenta : Violett */ Text [ en-US ] = "Magenta" ; }; -String RID_SVXSTR_BROWN -{ - Text [ en-US ] = "Brown" ; -}; -String RID_SVXSTR_GREY +String RID_SVXSTR_COLOR_GREY { Text [ en-US ] = "Gray" ; }; -String RID_SVXSTR_LIGHTGREY -{ - Text [ en-US ] = "Light gray" ; -}; -String RID_SVXSTR_LIGHTBLUE -{ - Text [ en-US ] = "Light blue" ; -}; -String RID_SVXSTR_LIGHTGREEN -{ - /* ### ATTENTION: New text in Resource? Light green : Light green */ - Text [ en-US ] = "Light green" ; -}; -String RID_SVXSTR_LIGHTCYAN -{ - /* ### ATTENTION: New text in Resource? Light cyan : Light cyan */ - Text [ en-US ] = "Light cyan" ; -}; -String RID_SVXSTR_LIGHTRED -{ - Text [ en-US ] = "Light red" ; -}; -String RID_SVXSTR_LIGHTMAGENTA -{ - /* ### ATTENTION: New text in Resource? Light magenta : Light magenta */ - Text [ en-US ] = "Light magenta" ; -}; -String RID_SVXSTR_YELLOW +String RID_SVXSTR_COLOR_YELLOW { Text [ en-US ] = "Yellow" ; }; -String RID_SVXSTR_WHITE +String RID_SVXSTR_COLOR_WHITE { /* ### ATTENTION: New text in Resource? White : White */ Text [ en-US ] = "White" ; }; -String RID_SVXSTR_BLUEGREY +String RID_SVXSTR_COLOR_BLUEGREY { Text [ en-US ] = "Blue gray" ; }; -String RID_SVXSTR_ORANGE +String RID_SVXSTR_COLOR_BLUE_CLASSIC { - Text [ en-US ] = "Orange" ; -}; -String RID_SVXSTR_CYAN2 -{ - Text [ en-US ] = "Cyan" ; + /* Old default color Blue9, probably often used in saved files */ + Text [ en-US ] = "Blue classic" ; }; -String RID_SVXSTR_YELLOW_GREEN +String RID_SVXSTR_COLOR_ORANGE { - Text [ en-US ] = "Yellow Green" ; -}; -String RID_SVXSTR_SKY_BLUE -{ - Text [ en-US ] = "Sky Blue" ; -}; -String RID_SVXSTR_PINK -{ - Text [ en-US ] = "Pink" ; + Text [ en-US ] = "Orange" ; }; String RID_SVXSTR_ARROW { @@ -236,50 +194,69 @@ String STR_INSERT_VIDEO_TITLE // BM: some additional standard colors -String RID_SVXSTR_VIOLET +String RID_SVXSTR_COLOR_VIOLET { Text [ en-US ] = "Violet"; }; -String RID_SVXSTR_BORDEAUX +String RID_SVXSTR_COLOR_BORDEAUX { Text [ en-US ] = "Bordeaux"; }; -String RID_SVXSTR_PALE_YELLOW +String RID_SVXSTR_COLOR_PALE_YELLOW { Text [ en-US ] = "Pale yellow"; }; -String RID_SVXSTR_PALE_GREEN +String RID_SVXSTR_COLOR_PALE_GREEN { Text [ en-US ] = "Pale green"; }; -String RID_SVXSTR_DKVIOLET +String RID_SVXSTR_COLOR_DARKVIOLET { Text [ en-US ] = "Dark violet"; }; -String RID_SVXSTR_SALMON +String RID_SVXSTR_COLOR_SALMON { Text [ en-US ] = "Salmon"; }; -String RID_SVXSTR_SEABLUE +String RID_SVXSTR_COLOR_SEABLUE { Text [ en-US ] = "Sea blue"; }; -String RID_SVXSTR_COLOR_SUN +String RID_SVXSTR_COLOR_CHART { - // attention: this is the color string for the Sun Microsystems specific colors !!! - Text [ en-US ] = "Sun" ; + Text [ en-US ] = "Chart" ; }; -String RID_SVXSTR_COLOR_CHART +String RID_SVXSTR_COLOR_PURPLE { - Text [ en-US ] = "Chart" ; + Text [ en-US ] = "Purple"; +}; + +String RID_SVXSTR_COLOR_SKYBLUE +{ + Text [ en-US ] = "Sky blue"; +}; + +String RID_SVXSTR_COLOR_YELLOWGREEN +{ + Text [ en-US ] = "Yellow green"; +}; + +String RID_SVXSTR_COLOR_PINK +{ + Text [ en-US ] = "Pink"; +}; + +String RID_SVXSTR_COLOR_TURQUOISE +{ + Text [ en-US ] = "Turquoise" ; }; String RID_SVXSTR_TBLAFMT_3D @@ -382,127 +359,92 @@ String RID_SVXSTR_LINECAP_SQUARE // /* do not translate */ -String RID_SVXSTR_BLACK_DEF +String RID_SVXSTR_COLOR_BLACK_DEF { Text = "Black" ; }; /* do not translate */ -String RID_SVXSTR_BLUE_DEF +String RID_SVXSTR_COLOR_BLUE_DEF { Text = "Blue" ; }; /* do not translate */ -String RID_SVXSTR_GREEN_DEF +String RID_SVXSTR_COLOR_GREEN_DEF { Text = "Green" ; }; /* do not translate */ -String RID_SVXSTR_CYAN_DEF +String RID_SVXSTR_COLOR_CYAN_DEF { - Text = "Turquoise" ; + Text = "Cyan" ; }; /* do not translate */ -String RID_SVXSTR_RED_DEF +String RID_SVXSTR_COLOR_RED_DEF { Text = "Red" ; }; /* do not translate */ -String RID_SVXSTR_MAGENTA_DEF +String RID_SVXSTR_COLOR_MAGENTA_DEF { Text = "Magenta" ; }; /* do not translate */ -String RID_SVXSTR_BROWN_DEF -{ - Text = "Brown" ; -}; -/* do not translate */ -String RID_SVXSTR_GREY_DEF +String RID_SVXSTR_COLOR_GREY_DEF { Text = "Gray" ; }; /* do not translate */ -String RID_SVXSTR_LIGHTGREY_DEF -{ - Text = "Light gray" ; -}; -/* do not translate */ -String RID_SVXSTR_LIGHTBLUE_DEF -{ - Text = "Light blue" ; -}; -/* do not translate */ -String RID_SVXSTR_LIGHTGREEN_DEF -{ - Text = "Light green" ; -}; -/* do not translate */ -String RID_SVXSTR_LIGHTCYAN_DEF -{ - Text = "Light cyan" ; -}; -/* do not translate */ -String RID_SVXSTR_LIGHTRED_DEF -{ - Text = "Light red" ; -}; -/* do not translate */ -String RID_SVXSTR_LIGHTMAGENTA_DEF -{ - Text = "Light magenta" ; -}; -/* do not translate */ -String RID_SVXSTR_YELLOW_DEF +String RID_SVXSTR_COLOR_YELLOW_DEF { Text = "Yellow" ; }; /* do not translate */ -String RID_SVXSTR_WHITE_DEF +String RID_SVXSTR_COLOR_WHITE_DEF { Text = "White" ; }; /* do not translate */ -String RID_SVXSTR_BLUEGREY_DEF +String RID_SVXSTR_COLOR_BLUEGREY_DEF { Text = "Blue gray" ; }; /* do not translate */ -String RID_SVXSTR_ORANGE_DEF +String RID_SVXSTR_COLOR_ORANGE_DEF { Text = "Orange" ; }; /* do not translate */ -String RID_SVXSTR_VIOLET_DEF +String RID_SVXSTR_COLOR_VIOLET_DEF { Text = "Violet"; }; /* do not translate */ -String RID_SVXSTR_BORDEAUX_DEF +String RID_SVXSTR_COLOR_BORDEAUX_DEF { Text = "Bordeaux"; }; /* do not translate */ -String RID_SVXSTR_PALE_YELLOW_DEF +String RID_SVXSTR_COLOR_PALE_YELLOW_DEF { Text = "Pale yellow"; }; /* do not translate */ -String RID_SVXSTR_PALE_GREEN_DEF +String RID_SVXSTR_COLOR_PALE_GREEN_DEF { Text = "Pale green"; }; /* do not translate */ -String RID_SVXSTR_DKVIOLET_DEF +String RID_SVXSTR_COLOR_DARKVIOLET_DEF { Text = "Dark violet"; }; /* do not translate */ -String RID_SVXSTR_SALMON_DEF +String RID_SVXSTR_COLOR_SALMON_DEF { Text = "Salmon"; }; /* do not translate */ -String RID_SVXSTR_SEABLUE_DEF +String RID_SVXSTR_COLOR_SEABLUE_DEF { Text = "Sea blue"; }; @@ -512,26 +454,40 @@ 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 +/* do not translate */ +String RID_SVXSTR_COLOR_CHART_DEF { - Text = "Cyan" ; + Text = "Chart"; }; -String RID_SVXSTR_YELLOW_GREEN_DEF +/* DO NOT TRANSLATE */ +String RID_SVXSTR_COLOR_PURPLE_DEF { - Text = "Yellow Green" ; + Text = "Purple"; }; -String RID_SVXSTR_SKY_BLUE_DEF +/* DO NOT TRANSLATE */ +String RID_SVXSTR_COLOR_SKYBLUE_DEF { - Text = "Sky Blue" ; + Text = "Sky blue"; }; -String RID_SVXSTR_PINK_DEF +/* DO NOT TRANSLATE */ +String RID_SVXSTR_COLOR_YELLOWGREEN_DEF { - Text = "Pink" ; + Text = "Yellow green"; }; -/* do not translate */ -String RID_SVXSTR_COLOR_CHART_DEF +/* DO NOT TRANSLATE */ +String RID_SVXSTR_COLOR_PINK_DEF { - Text = "Chart"; + Text = "Pink"; +}; +/* DO NOT TRANSLATE */ +String RID_SVXSTR_COLOR_TURQUOISE_DEF +{ + Text = "Turquoise" ; +}; +/* DO NOT TRANSLATE */ +String RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF +{ + Text [ en-US ] = "Blue classic" ; }; /////////////////////////////////////////////////////////////////////////////// @@ -1858,160 +1814,160 @@ String RID_SVXSTR_COLOR_USER Text [ en-US ] = "User" ; }; -String RID_SVXSTR_LIBRE_GREEN_1 +String RID_SVXSTR_COLOR_LIBRE_GREEN_1 { Text [ en-US ] = "Green 1 (LibreOffice Main Color)" ; }; -String RID_SVXSTR_LIBRE_GREEN_ACCENT +String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT { Text [ en-US ] = "Green Accent" ; }; -String RID_SVXSTR_LIBRE_BLUE_ACCENT +String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT { Text [ en-US ] = "Blue Accent" ; }; -String RID_SVXSTR_LIBRE_ORANGE_ACCENT +String RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT { Text [ en-US ] = "Orange Accent" ; }; -String RID_SVXSTR_LIBRE_PURPLE +String RID_SVXSTR_COLOR_LIBRE_PURPLE { Text [ en-US ] = "Purple" ; }; -String RID_SVXSTR_LIBRE_PURPLE_ACCENT +String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT { Text [ en-US ] = "Purple Accent" ; }; -String RID_SVXSTR_LIBRE_YELLOW_ACCENT +String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT { Text [ en-US ] = "Yellow Accent" ; }; -String RID_SVXSTR_LIBRE_GREEN_1_DEF +String RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF { Text = "Green 1 (LibreOffice Main Color)" ; }; -String RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF +String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF { Text = "Green Accent" ; }; -String RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF +String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF { Text = "Blue Accent" ; }; -String RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF +String RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF { Text = "Orange Accent" ; }; -String RID_SVXSTR_LIBRE_PURPLE_DEF +String RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF { Text = "Purple" ; }; -String RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF +String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF { Text = "Purple Accent" ; }; -String RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF +String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF { Text = "Yellow Accent" ; }; -String RID_SVXSTR_TANGO_BUTTER +String RID_SVXSTR_COLOR_TANGO_BUTTER { Text [ en-US ] = "Tango: Butter" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_ORANGE +String RID_SVXSTR_COLOR_TANGO_ORANGE { Text [ en-US ] = "Tango: Orange" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_CHOCOLATE +String RID_SVXSTR_COLOR_TANGO_CHOCOLATE { Text [ en-US ] = "Tango: Chocolate" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_CHAMELEON +String RID_SVXSTR_COLOR_TANGO_CHAMELEON { Text [ en-US ] = "Tango: Chameleon" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_SKY_BLUE +String RID_SVXSTR_COLOR_TANGO_SKY_BLUE { Text [ en-US ] = "Tango: Sky Blue" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_PLUM +String RID_SVXSTR_COLOR_TANGO_PLUM { Text [ en-US ] = "Tango: Plum" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_SCARLET_RED +String RID_SVXSTR_COLOR_TANGO_SCARLET_RED { Text [ en-US ] = "Tango: Scarlet Red" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_ALUMINIUM +String RID_SVXSTR_COLOR_TANGO_ALUMINIUM { Text [ en-US ] = "Tango: Aluminium" ; Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; }; -String RID_SVXSTR_TANGO_BUTTER_DEF +String RID_SVXSTR_COLOR_TANGO_BUTTER_DEF { Text = "Tango: Butter" ; }; -String RID_SVXSTR_TANGO_ORANGE_DEF +String RID_SVXSTR_COLOR_TANGO_ORANGE_DEF { Text = "Tango: Orange" ; }; -String RID_SVXSTR_TANGO_CHOCOLATE_DEF +String RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF { Text = "Tango: Chocolate" ; }; -String RID_SVXSTR_TANGO_CHAMELEON_DEF +String RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF { Text = "Tango: Chameleon" ; }; -String RID_SVXSTR_TANGO_SKY_BLUE_DEF +String RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF { Text = "Tango: Sky Blue" ; }; -String RID_SVXSTR_TANGO_PLUM_DEF +String RID_SVXSTR_COLOR_TANGO_PLUM_DEF { Text = "Tango: Plum" ; }; -String RID_SVXSTR_TANGO_SCARLET_RED_DEF +String RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF { Text = "Tango: Scarlet Red" ; }; -String RID_SVXSTR_TANGO_ALUMINIUM_DEF +String RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF { Text = "Tango: Aluminium" ; }; 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() diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index ef81ea84e91b..3c77b50b2730 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; - XColorListRef XColorList::CreateStdColorList() { return XPropertyList::CreatePropertyList( @@ -65,292 +64,139 @@ uno::Reference< container::XNameContainer > XColorList::createInstance() bool XColorList::Create() { - XubString aStr; - xub_StrLen nLen; - ResMgr& rRes = DIALOG_MGR(); - - static sal_uInt16 aResId[] = + sal_uInt32 a(0); + sal_uInt32 b(0); + + // <!-- Gray palette from white to black --> + XubString aStrGrey( SVX_RESSTR( RID_SVXSTR_COLOR_GREY ) ); + + Insert( new XColorEntry( Color( 0xff, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_WHITE ) ) ); + aStrGrey.AppendAscii(" 1"); Insert( new XColorEntry( Color( 0xee, 0xee, 0xee ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('2')); Insert( new XColorEntry( Color( 0xdd, 0xdd, 0xdd ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('3')); Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xcc ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('4')); Insert( new XColorEntry( Color( 0xb2, 0xb2, 0xb2 ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('5')); Insert( new XColorEntry( Color( 0x99, 0x99, 0x99 ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('6')); Insert( new XColorEntry( Color( 0x80, 0x80, 0x80 ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('7')); Insert( new XColorEntry( Color( 0x66, 0x66, 0x66 ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('8')); Insert( new XColorEntry( Color( 0x33, 0x33, 0x33 ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('9')); Insert( new XColorEntry( Color( 0x1c, 0x1c, 0x1c ), aStrGrey ) ); + aStrGrey.SetChar(aStrGrey.Len() - 1, sal_Unicode('1')); aStrGrey.AppendAscii("0"); Insert( new XColorEntry( Color( 0x11, 0x11, 0x11 ), aStrGrey ) ); + Insert( new XColorEntry( Color( 0x00, 0x00, 0x00 ), SVX_RESSTR( RID_SVXSTR_COLOR_BLACK ) ) ); + + // <!-- Base colors step 0 to 10 --> + const sal_uInt32 nNumColorsInGroup(12); + const sal_uInt32 nNumGroups(11); + XubString aStrCol[nNumColorsInGroup]; + const sal_uInt32 aStdCol[nNumColorsInGroup * nNumGroups] = { + 0xffff99, 0xff6600, 0xff3333, 0xff00cc, 0xff33ff, 0x9900ff, 0x6666ff, 0x00ccff, 0x66ffff, 0x33ff99, 0x99ff66, 0xccff00, + 0xffff66, 0xffcc00, 0xff9999, 0xff66cc, 0xff99ff, 0xcc66ff, 0x9999ff, 0x9999ff, 0x99ffff, 0x66ff99, 0x99ff99, 0xccff66, + 0xffff00, 0xff9900, 0xff6666, 0xff3399, 0xff66ff, 0x9933ff, 0x3333ff, 0x3399ff, 0x00ffff, 0x00ff66, 0x66ff66, 0x99ff33, + 0xcc9900, 0xff3300, 0xff0000, 0xff0066, 0xff00ff, 0x6600ff, 0x0000ff, 0x0066ff, 0x00cccc, 0x00cc33, 0x00cc00, 0x66ff00, + 0x996600, 0xcc3300, 0xcc0000, 0xcc0066, 0xcc00cc, 0x6600cc, 0x0000cc, 0x0066cc, 0x009999, 0x009933, 0x009900, 0x66cc00, + 0x663300, 0x801900, 0x990000, 0x990066, 0x990099, 0x330099, 0x000099, 0x006699, 0x006666, 0x007826, 0x006600, 0x669900, + 0x333300, 0x461900, 0x330000, 0x330033, 0x660066, 0x000033, 0x000066, 0x000080, 0x003333, 0x00331a, 0x003300, 0x193300, + 0x666633, 0x661900, 0x663333, 0x660033, 0x663366, 0x330066, 0x333366, 0x003366, 0x336666, 0x006633, 0x336633, 0x336600, + 0x999966, 0x996633, 0x996666, 0x993366, 0x996699, 0x663399, 0x666699, 0x336699, 0x669999, 0x339966, 0x669966, 0x669933, + 0xcccc99, 0xcc9966, 0xcc9999, 0xcc6699, 0xcc99cc, 0x9966cc, 0x9999cc, 0x6699cc, 0x99cccc, 0x66cc99, 0x99cc99, 0x99cc66, + 0xffffcc, 0xffcc99, 0xffcccc, 0xff99cc, 0xffccff, 0xcc99ff, 0xccccff, 0x99ccff, 0xccffff, 0x99ffcc, 0xccffcc, 0xccff99 }; + + for(a = 0; a < nNumGroups; a++) { - RID_SVXSTR_BLACK, - RID_SVXSTR_BLUE, - RID_SVXSTR_GREEN, - RID_SVXSTR_CYAN, - 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 - }; - - // MT: COL_XXX ist in VCL kein enum mehr!!! - // COL_WHITE ist seeeehr gross! ( => Zugriff ueber das obige Array hinweg ) - // Mit der unteren Schleife gibt es keinen Absturtz, aber es ist - // alles schwarz, weil alles kleine Werte. - // Ausserdem ist die ganze Vorgehensweise laut MM sehr unperformant - // => lieber gleich Stringlisten laden. - - // BM: ifndef VCL part removed (deprecated) - - static ColorData const aColTab[] = - { - COL_BLACK, - COL_BLUE, - COL_GREEN, - COL_CYAN, - COL_RED, - COL_MAGENTA, - COL_BROWN, - COL_GRAY, - COL_LIGHTGRAY, - COL_LIGHTBLUE, - COL_LIGHTGREEN, - COL_LIGHTCYAN, - COL_LIGHTRED, - COL_LIGHTMAGENTA, - COL_YELLOW, - COL_WHITE - }; - - for( sal_uInt16 n = 0; n < 16; ++n ) - { - Insert( new XColorEntry( - Color( aColTab[n] ), - String( ResId( aResId[ n ], rRes ) ) - ), - n - ); + switch(a) + { + case 0: + { + aStrCol[0] = SVX_RESSTR(RID_SVXSTR_COLOR_YELLOW); + aStrCol[1] = SVX_RESSTR(RID_SVXSTR_COLOR_ORANGE); + aStrCol[2] = SVX_RESSTR(RID_SVXSTR_COLOR_RED); + aStrCol[3] = SVX_RESSTR(RID_SVXSTR_COLOR_PINK); + aStrCol[4] = SVX_RESSTR(RID_SVXSTR_COLOR_MAGENTA); + aStrCol[5] = SVX_RESSTR(RID_SVXSTR_COLOR_PURPLE); + aStrCol[6] = SVX_RESSTR(RID_SVXSTR_COLOR_BLUE); + aStrCol[7] = SVX_RESSTR(RID_SVXSTR_COLOR_SKYBLUE); + aStrCol[8] = SVX_RESSTR(RID_SVXSTR_COLOR_CYAN); + aStrCol[9] = SVX_RESSTR(RID_SVXSTR_COLOR_TURQUOISE); + aStrCol[10] = SVX_RESSTR(RID_SVXSTR_COLOR_GREEN); + aStrCol[11] = SVX_RESSTR(RID_SVXSTR_COLOR_YELLOWGREEN); + break; + } + case 1: + { + for(b = 0; b < nNumColorsInGroup; b++) + { + aStrCol[b].AppendAscii(" 1"); + } + break; + } + case 10: + { + for(b = 0; b < nNumColorsInGroup; b++) + { + aStrCol[b].SetChar(aStrCol[b].Len() - 1, sal_Unicode('1')); + aStrCol[b].AppendAscii("0"); + } + break; + } + default: // 2 .. 9, 11 + { + for(b = 0; b < nNumColorsInGroup; b++) + { + aStrCol[b].SetChar(aStrCol[b].Len() - 1, sal_Unicode('0') + sal_Unicode(a % 10)); + } + break; + } + } + + const sal_uInt32 nOffset(a * nNumColorsInGroup); + + for(b = 0; b < nNumColorsInGroup; b++) + { + Insert( new XColorEntry( aStdCol[nOffset + b], aStrCol[b] ) ); + } } - aStr = SVX_RESSTR( RID_SVXSTR_GREY ); - aStr.AppendAscii(" 80%"); - nLen = aStr.Len() - 3; - Insert( new XColorEntry( Color( 51, 51, 51 ), aStr ), 16 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color( 76, 76, 76 ), aStr ), 17 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color(102,102,102 ), aStr ), 18 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color(153,153,153 ), aStr ), 19 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color(179,179,179 ), aStr ), 20 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color(204,204,204 ), aStr ), 21 ); - // BM: new 15% - aStr.SetChar(nLen, sal_Unicode('1')); - aStr.SetChar(nLen + 1, sal_Unicode('5')); - Insert( new XColorEntry( Color(217,217,217 ), aStr ), 22 ); - aStr.SetChar(nLen + 1, sal_Unicode('0')); - Insert( new XColorEntry( Color(230,230,230 ), aStr ), 23 ); - Insert( new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ), 24 ); - - aStr = SVX_RESSTR( RID_SVXSTR_RED ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color(255, 51,102 ), aStr ), 25 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color(220, 35, 0 ), aStr ), 26 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color(184, 71, 0 ), aStr ), 27 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color(255, 51, 51 ), aStr ), 28 ); - aStr.SetChar(nLen, sal_Unicode('5')); - Insert( new XColorEntry( Color(235, 97, 61 ), aStr ), 29 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color(184, 71, 71 ), aStr ), 30 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color(184, 0, 71 ), aStr ), 31 ); - aStr.SetChar(nLen, sal_Unicode('8')); - Insert( new XColorEntry( Color(153, 40, 76 ), aStr ), 32 ); - - aStr = SVX_RESSTR( RID_SVXSTR_MAGENTA ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color(148, 0,107 ), aStr ), 33 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color(148, 71,107 ), aStr ), 34 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color(148, 71,148 ), aStr ), 35 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color(153,102,204 ), aStr ), 36 ); - aStr.SetChar(nLen, sal_Unicode('5')); - Insert( new XColorEntry( Color(107, 71,148 ), aStr ), 37 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color(107, 35,148 ), aStr ), 38 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color(107, 0,148 ), aStr ), 39 ); - aStr.SetChar(nLen, sal_Unicode('8')); - Insert( new XColorEntry( Color( 94, 17,166 ), aStr ), 40 ); - - aStr = SVX_RESSTR( RID_SVXSTR_BLUE ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color( 40, 0,153 ), aStr ), 41 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color( 71, 0,184 ), aStr ), 42 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color( 35, 0,220 ), aStr ), 43 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color( 35, 35,220 ), aStr ), 44 ); - aStr.SetChar(nLen, sal_Unicode('5')); - Insert( new XColorEntry( Color( 0, 71,255 ), aStr ), 45 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color( 0,153,255 ), aStr ), 46 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color( 0,184,255 ), aStr ), 47 ); - aStr.SetChar(nLen, sal_Unicode('8')); - Insert( new XColorEntry( Color(153,204,255 ), aStr ), 48 ); - - aStr = SVX_RESSTR( RID_SVXSTR_CYAN ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color( 0,220,255 ), aStr ), 49 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color( 0,204,204 ), aStr ), 50 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color( 35,184,220 ), aStr ), 51 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color( 71,184,184 ), aStr ), 52 ); - aStr.SetChar(nLen, sal_Unicode('5')); - Insert( new XColorEntry( Color( 51,163,163 ), aStr ), 53 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color( 25,138,138 ), aStr ), 54 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color( 0,107,107 ), aStr ), 55 ); - aStr.SetChar(nLen, sal_Unicode('8')); - Insert( new XColorEntry( Color( 0, 74, 74 ), aStr ), 56 ); - - aStr = SVX_RESSTR( RID_SVXSTR_GREEN ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color( 53, 94, 0 ), aStr ), 57 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color( 92,133, 38 ), aStr ), 58 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color(125,166, 71 ), aStr ), 59 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color(148,189, 94 ), aStr ), 60 ); - aStr.SetChar(nLen, sal_Unicode('5')); - Insert( new XColorEntry( Color( 0,174, 0 ), aStr ), 61 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color( 51,204,102 ), aStr ), 62 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color( 61,235, 61 ), aStr ), 63 ); - aStr.SetChar(nLen, sal_Unicode('8')); - Insert( new XColorEntry( Color( 35,255, 35 ), aStr ), 64 ); - - aStr = SVX_RESSTR( RID_SVXSTR_YELLOW ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color(230,255, 0 ), aStr ), 65 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color(255,255,153 ), aStr ), 66 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color(255,255,102 ), aStr ), 67 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color(230,230, 76 ), aStr ), 68 ); - aStr.SetChar(nLen, sal_Unicode('5')); - Insert( new XColorEntry( Color(204,204, 0 ), aStr ), 69 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color(179,179, 0 ), aStr ), 70 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color(128,128, 25 ), aStr ), 71 ); - aStr.SetChar(nLen, sal_Unicode('8')); - Insert( new XColorEntry( Color(102,102, 0 ), aStr ), 72 ); - - aStr = SVX_RESSTR( RID_SVXSTR_BROWN ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color( 76, 25, 0 ), aStr ), 73 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color(102, 51, 0 ), aStr ), 74 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color(128, 76, 25 ), aStr ), 75 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color(153,102, 51 ), aStr ), 76 ); - - aStr = SVX_RESSTR( RID_SVXSTR_ORANGE ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color(204,102, 51 ), aStr ), 77 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color(255,102, 51 ), aStr ), 78 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color(255,153,102 ), aStr ), 79 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color(255,204,153 ), aStr ), 80 ); - - // new chart colors - aStr = SVX_RESSTR( RID_SVXSTR_VIOLET ); - Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ), 81 ); - - aStr = SVX_RESSTR( RID_SVXSTR_BORDEAUX ); - Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ), 82 ); - - aStr = SVX_RESSTR( RID_SVXSTR_PALE_YELLOW ); - Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ), 83 ); - - aStr = SVX_RESSTR( RID_SVXSTR_PALE_GREEN ); - Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ), 84 ); - - aStr = SVX_RESSTR( RID_SVXSTR_DKVIOLET ); - Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ), 85 ); - - aStr = SVX_RESSTR( RID_SVXSTR_SALMON ); - Insert( new XColorEntry( Color( 0xff, 0x80, 0x80 ), aStr ), 86 ); - - aStr = SVX_RESSTR( RID_SVXSTR_SEABLUE ); - Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ), 87 ); - - // Sun colors - aStr = SVX_RESSTR( RID_SVXSTR_COLOR_SUN ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ), 88 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ), 89 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color( 0x99, 0x99, 0xcc ), aStr ), 90 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xff ), aStr ), 91 ); - - // Chart default colors - aStr = SVX_RESSTR( RID_SVXSTR_COLOR_CHART ); - aStr.AppendAscii(" 1"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStr ), 92 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStr ), 93 ); - aStr.SetChar(nLen, sal_Unicode('3')); - Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStr ), 94 ); - aStr.SetChar(nLen, sal_Unicode('4')); - Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStr ), 95 ); - aStr.SetChar(nLen, sal_Unicode('5')); - Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStr ), 96 ); - aStr.SetChar(nLen, sal_Unicode('6')); - Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStr ), 97 ); - aStr.SetChar(nLen, sal_Unicode('7')); - Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStr ), 98 ); - aStr.SetChar(nLen, sal_Unicode('8')); - Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStr ), 99 ); - aStr.SetChar(nLen, sal_Unicode('9')); - Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStr ), 100 ); - aStr.SetChar(nLen, sal_Unicode('1')); - aStr.AppendAscii("0"); - nLen = aStr.Len() - 1; - Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStr ), 101 ); - aStr.SetChar(nLen, sal_Unicode('1')); - Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStr ), 102 ); - aStr.SetChar(nLen, sal_Unicode('2')); - Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStr ), 103 ); - - return Count() == 104; + // <!-- use some 'nice' colors from original palette --> + Insert( new XColorEntry( Color( 0xe6, 0xe6, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_BLUEGREY) ) ); + Insert( new XColorEntry( Color( 0xCF, 0xE7, 0xF5 ), SVX_RESSTR( RID_SVXSTR_COLOR_BLUE_CLASSIC ) ) ); + + // <!-- add 'pale' colors from original palette --> + Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_VIOLET ) ) ); + Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), SVX_RESSTR( RID_SVXSTR_COLOR_BORDEAUX ) ) ); + Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), SVX_RESSTR( RID_SVXSTR_COLOR_PALE_YELLOW ) ) ); + Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_PALE_GREEN ) ) ); + Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), SVX_RESSTR( RID_SVXSTR_COLOR_DARKVIOLET ) ) ); + Insert( new XColorEntry( Color( 0xff, 0x80, 0x80 ), SVX_RESSTR( RID_SVXSTR_COLOR_SALMON ) ) ); + Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), SVX_RESSTR( RID_SVXSTR_COLOR_SEABLUE ) ) ); + + // <!-- add Chart colors from original palette (also 12, coincidence?) --> + XubString aStrChart( SVX_RESSTR( RID_SVXSTR_COLOR_CHART ) ); + aStrChart.AppendAscii(" 1"); + Insert( new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('2')); + Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('3')); + Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('4')); + Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('5')); + Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('6')); + Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('7')); + Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('8')); + Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('9')); + Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('1')); + aStrChart.AppendAscii("0"); + Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('1')); + Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStrChart ) ); + aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('2')); + Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStrChart ) ); + + return(165 == Count()); } Bitmap XColorList::CreateBitmapForUI( long /*nIndex*/ ) |