Skip to content

C
core
Kaydet (Commit) dde5dbde authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

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

(cherry picked from commit 710925d1)

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
üst 9e8e5568
Hide whitespace changes
Inline Side-by-side
Showing with 458 additions and 657 deletions
extras/source/palettes/standard.soc
Dosyayı görüntüle @ dde5dbde
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<office:color-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script"> <office:color-table xmlns:office="http://openoffice.org/2000/office" xmlns:style="http://openoffice.org/2000/style" xmlns:text="http://openoffice.org/2000/text" xmlns:table="http://openoffice.org/2000/table" xmlns:draw="http://openoffice.org/2000/drawing" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="http://openoffice.org/2000/meta" xmlns:number="http://openoffice.org/2000/datastyle" xmlns:svg="http://www.w3.org/2000/svg" xmlns:chart="http://openoffice.org/2000/chart" xmlns:dr3d="http://openoffice.org/2000/dr3d" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="http://openoffice.org/2000/form" xmlns:script="http://openoffice.org/2000/script">
<!-- #i121520# use Symphony palette as base, it is organized as groups of twelve entries --> <!-- use Symphony palette as base, it is organized as groups of twelve entries -->
<!-- Gray palette from white to black -->
<draw:color draw:name="Black" draw:color="#000000"/> <draw:color draw:name="Black" draw:color="#000000"/>
<draw:color draw:name="White" draw:color="#ffffff"/> <draw:color draw:name="White" draw:color="#ffffff"/>
<draw:color draw:name="Gray 1" draw:color="#eeeeee"/> <draw:color draw:name="Gray 1" draw:color="#eeeeee"/>
...@@ -13,6 +14,8 @@ ...@@ -13,6 +14,8 @@
<draw:color draw:name="Gray 8" draw:color="#333333"/> <draw:color draw:name="Gray 8" draw:color="#333333"/>
<draw:color draw:name="Gray 9" draw:color="#1c1c1c"/> <draw:color draw:name="Gray 9" draw:color="#1c1c1c"/>
<draw:color draw:name="Gray 10" draw:color="#111111"/> <draw:color draw:name="Gray 10" draw:color="#111111"/>
<!-- Base colors step 0 -->
<draw:color draw:name="Yellow" draw:color="#ffff99"/> <draw:color draw:name="Yellow" draw:color="#ffff99"/>
<draw:color draw:name="Orange" draw:color="#ff6600"/> <draw:color draw:name="Orange" draw:color="#ff6600"/>
<draw:color draw:name="Red" draw:color="#ff3333"/> <draw:color draw:name="Red" draw:color="#ff3333"/>
...@@ -20,11 +23,13 @@ ...@@ -20,11 +23,13 @@
<draw:color draw:name="Magenta" draw:color="#ff33ff"/> <draw:color draw:name="Magenta" draw:color="#ff33ff"/>
<draw:color draw:name="Purple" draw:color="#9900ff"/> <draw:color draw:name="Purple" draw:color="#9900ff"/>
<draw:color draw:name="Blue" draw:color="#6666ff"/> <draw:color draw:name="Blue" draw:color="#6666ff"/>
<draw:color draw:name="Sky Blue" draw:color="#00ccff"/> <draw:color draw:name="Sky blue" draw:color="#00ccff"/>
<draw:color draw:name="Cyan" draw:color="#66ffff"/> <draw:color draw:name="Cyan" draw:color="#66ffff"/>
<draw:color draw:name="Turquoise" draw:color="#33ff99"/> <draw:color draw:name="Turquoise" draw:color="#33ff99"/>
<draw:color draw:name="Green" draw:color="#99ff66"/> <draw:color draw:name="Green" draw:color="#99ff66"/>
<draw:color draw:name="Yellow Green" draw:color="#ccff00"/> <draw:color draw:name="Yellow green" draw:color="#ccff00"/>
<!-- Base colors step 1 -->
<draw:color draw:name="Yellow 1" draw:color="#ffff66"/> <draw:color draw:name="Yellow 1" draw:color="#ffff66"/>
<draw:color draw:name="Orange 1" draw:color="#ffcc00"/> <draw:color draw:name="Orange 1" draw:color="#ffcc00"/>
<draw:color draw:name="Red 1" draw:color="#ff9999"/> <draw:color draw:name="Red 1" draw:color="#ff9999"/>
...@@ -32,11 +37,13 @@ ...@@ -32,11 +37,13 @@
<draw:color draw:name="Magenta 1" draw:color="#ff99ff"/> <draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>
<draw:color draw:name="Purple 1" draw:color="#cc66ff"/> <draw:color draw:name="Purple 1" draw:color="#cc66ff"/>
<draw:color draw:name="Blue 1" draw:color="#9999ff"/> <draw:color draw:name="Blue 1" draw:color="#9999ff"/>
<draw:color draw:name="Sky Blue 1" draw:color="#9999ff"/> <draw:color draw:name="Sky blue 1" draw:color="#9999ff"/>
<draw:color draw:name="Cyan 1" draw:color="#99ffff"/> <draw:color draw:name="Cyan 1" draw:color="#99ffff"/>
<draw:color draw:name="Turquoise 1" draw:color="#66ff99"/> <draw:color draw:name="Turquoise 1" draw:color="#66ff99"/>
<draw:color draw:name="Green 1" draw:color="#99ff99"/> <draw:color draw:name="Green 1" draw:color="#99ff99"/>
<draw:color draw:name="Yellow Green 1" draw:color="#ccff66"/> <draw:color draw:name="Yellow green 1" draw:color="#ccff66"/>
<!-- Base colors step 2 -->
<draw:color draw:name="Yellow 2" draw:color="#ffff00"/> <draw:color draw:name="Yellow 2" draw:color="#ffff00"/>
<draw:color draw:name="Orange 2" draw:color="#ff9900"/> <draw:color draw:name="Orange 2" draw:color="#ff9900"/>
<draw:color draw:name="Red 2" draw:color="#ff6666"/> <draw:color draw:name="Red 2" draw:color="#ff6666"/>
...@@ -44,11 +51,13 @@ ...@@ -44,11 +51,13 @@
<draw:color draw:name="Magenta 2" draw:color="#ff66ff"/> <draw:color draw:name="Magenta 2" draw:color="#ff66ff"/>
<draw:color draw:name="Purple 2" draw:color="#9933ff"/> <draw:color draw:name="Purple 2" draw:color="#9933ff"/>
<draw:color draw:name="Blue 2" draw:color="#3333ff"/> <draw:color draw:name="Blue 2" draw:color="#3333ff"/>
<draw:color draw:name="Sky Blue 2" draw:color="#3399ff"/> <draw:color draw:name="Sky blue 2" draw:color="#3399ff"/>
<draw:color draw:name="Cyan 2" draw:color="#00ffff"/> <draw:color draw:name="Cyan 2" draw:color="#00ffff"/>
<draw:color draw:name="Turquoise 2" draw:color="#00ff66"/> <draw:color draw:name="Turquoise 2" draw:color="#00ff66"/>
<draw:color draw:name="Green 2" draw:color="#66ff66"/> <draw:color draw:name="Green 2" draw:color="#66ff66"/>
<draw:color draw:name="Yellow Green 2" draw:color="#99ff33"/> <draw:color draw:name="Yellow green 2" draw:color="#99ff33"/>
<!-- Base colors step 3 -->
<draw:color draw:name="Yellow 3" draw:color="#cc9900"/> <draw:color draw:name="Yellow 3" draw:color="#cc9900"/>
<draw:color draw:name="Orange 3" draw:color="#ff3300"/> <draw:color draw:name="Orange 3" draw:color="#ff3300"/>
<draw:color draw:name="Red 3" draw:color="#ff0000"/> <draw:color draw:name="Red 3" draw:color="#ff0000"/>
...@@ -56,11 +65,13 @@ ...@@ -56,11 +65,13 @@
<draw:color draw:name="Magenta 3" draw:color="#ff00ff"/> <draw:color draw:name="Magenta 3" draw:color="#ff00ff"/>
<draw:color draw:name="Purple 3" draw:color="#6600ff"/> <draw:color draw:name="Purple 3" draw:color="#6600ff"/>
<draw:color draw:name="Blue 3" draw:color="#0000ff"/> <draw:color draw:name="Blue 3" draw:color="#0000ff"/>
<draw:color draw:name="Sky Blue 3" draw:color="#0066ff"/> <draw:color draw:name="Sky blue 3" draw:color="#0066ff"/>
<draw:color draw:name="Cyan 3" draw:color="#00cccc"/> <draw:color draw:name="Cyan 3" draw:color="#00cccc"/>
<draw:color draw:name="Turquoise 3" draw:color="#00cc33"/> <draw:color draw:name="Turquoise 3" draw:color="#00cc33"/>
<draw:color draw:name="Green 3" draw:color="#00cc00"/> <draw:color draw:name="Green 3" draw:color="#00cc00"/>
<draw:color draw:name="Yellow Green 3" draw:color="#66ff00"/> <draw:color draw:name="Yellow green 3" draw:color="#66ff00"/>
<!-- Base colors step 4 -->
<draw:color draw:name="Yellow 4" draw:color="#996600"/> <draw:color draw:name="Yellow 4" draw:color="#996600"/>
<draw:color draw:name="Orange 4" draw:color="#cc3300"/> <draw:color draw:name="Orange 4" draw:color="#cc3300"/>
<draw:color draw:name="Red 4" draw:color="#cc0000"/> <draw:color draw:name="Red 4" draw:color="#cc0000"/>
...@@ -68,11 +79,13 @@ ...@@ -68,11 +79,13 @@
<draw:color draw:name="Magenta 4" draw:color="#cc00cc"/> <draw:color draw:name="Magenta 4" draw:color="#cc00cc"/>
<draw:color draw:name="Purple 4" draw:color="#6600cc"/> <draw:color draw:name="Purple 4" draw:color="#6600cc"/>
<draw:color draw:name="Blue 4" draw:color="#0000cc"/> <draw:color draw:name="Blue 4" draw:color="#0000cc"/>
<draw:color draw:name="Sky Blue 4" draw:color="#0066cc"/> <draw:color draw:name="Sky blue 4" draw:color="#0066cc"/>
<draw:color draw:name="Cyan 4" draw:color="#009999"/> <draw:color draw:name="Cyan 4" draw:color="#009999"/>
<draw:color draw:name="Turquoise 4" draw:color="#009933"/> <draw:color draw:name="Turquoise 4" draw:color="#009933"/>
<draw:color draw:name="Green 4" draw:color="#009900"/> <draw:color draw:name="Green 4" draw:color="#009900"/>
<draw:color draw:name="Yellow Green 4" draw:color="#66cc00"/> <draw:color draw:name="Yellow green 4" draw:color="#66cc00"/>
<!-- Base colors step 5 -->
<draw:color draw:name="Yellow 5" draw:color="#663300"/> <draw:color draw:name="Yellow 5" draw:color="#663300"/>
<draw:color draw:name="Orange 5" draw:color="#801900"/> <draw:color draw:name="Orange 5" draw:color="#801900"/>
<draw:color draw:name="Red 5" draw:color="#990000"/> <draw:color draw:name="Red 5" draw:color="#990000"/>
...@@ -80,11 +93,13 @@ ...@@ -80,11 +93,13 @@
<draw:color draw:name="Magenta 5" draw:color="#990099"/> <draw:color draw:name="Magenta 5" draw:color="#990099"/>
<draw:color draw:name="Purple 5" draw:color="#330099"/> <draw:color draw:name="Purple 5" draw:color="#330099"/>
<draw:color draw:name="Blue 5" draw:color="#000099"/> <draw:color draw:name="Blue 5" draw:color="#000099"/>
<draw:color draw:name="Sky Blue 5" draw:color="#006699"/> <draw:color draw:name="Sky blue 5" draw:color="#006699"/>
<draw:color draw:name="Cyan 5" draw:color="#006666"/> <draw:color draw:name="Cyan 5" draw:color="#006666"/>
<draw:color draw:name="Turquoise 5" draw:color="#007826"/> <draw:color draw:name="Turquoise 5" draw:color="#007826"/>
<draw:color draw:name="Green 5" draw:color="#006600"/> <draw:color draw:name="Green 5" draw:color="#006600"/>
<draw:color draw:name="Yellow Green 5" draw:color="#669900"/> <draw:color draw:name="Yellow green 5" draw:color="#669900"/>
<!-- Base colors step 6 -->
<draw:color draw:name="Yellow 6" draw:color="#333300"/> <draw:color draw:name="Yellow 6" draw:color="#333300"/>
<draw:color draw:name="Orange 6" draw:color="#461900"/> <draw:color draw:name="Orange 6" draw:color="#461900"/>
<draw:color draw:name="Red 6" draw:color="#330000"/> <draw:color draw:name="Red 6" draw:color="#330000"/>
...@@ -92,11 +107,13 @@ ...@@ -92,11 +107,13 @@
<draw:color draw:name="Magenta 6" draw:color="#660066"/> <draw:color draw:name="Magenta 6" draw:color="#660066"/>
<draw:color draw:name="Purple 6" draw:color="#000033"/> <draw:color draw:name="Purple 6" draw:color="#000033"/>
<draw:color draw:name="Blue 6" draw:color="#000066"/> <draw:color draw:name="Blue 6" draw:color="#000066"/>
<draw:color draw:name="Sky Blue 6" draw:color="#000080"/> <draw:color draw:name="Sky blue 6" draw:color="#000080"/>
<draw:color draw:name="Cyan 6" draw:color="#003333"/> <draw:color draw:name="Cyan 6" draw:color="#003333"/>
<draw:color draw:name="Turquoise 6" draw:color="#00331a"/> <draw:color draw:name="Turquoise 6" draw:color="#00331a"/>
<draw:color draw:name="Green 6" draw:color="#003300"/> <draw:color draw:name="Green 6" draw:color="#003300"/>
<draw:color draw:name="Yellow Green 6" draw:color="#193300"/> <draw:color draw:name="Yellow green 6" draw:color="#193300"/>
<!-- Base colors step 7 -->
<draw:color draw:name="Yellow 7" draw:color="#666633"/> <draw:color draw:name="Yellow 7" draw:color="#666633"/>
<draw:color draw:name="Orange 7" draw:color="#661900"/> <draw:color draw:name="Orange 7" draw:color="#661900"/>
<draw:color draw:name="Red 7" draw:color="#663333"/> <draw:color draw:name="Red 7" draw:color="#663333"/>
...@@ -104,11 +121,13 @@ ...@@ -104,11 +121,13 @@
<draw:color draw:name="Magenta 7" draw:color="#663366"/> <draw:color draw:name="Magenta 7" draw:color="#663366"/>
<draw:color draw:name="Purple 7" draw:color="#330066"/> <draw:color draw:name="Purple 7" draw:color="#330066"/>
<draw:color draw:name="Blue 7" draw:color="#333366"/> <draw:color draw:name="Blue 7" draw:color="#333366"/>
<draw:color draw:name="Sky Blue 7" draw:color="#003366"/> <draw:color draw:name="Sky blue 7" draw:color="#003366"/>
<draw:color draw:name="Cyan 7" draw:color="#336666"/> <draw:color draw:name="Cyan 7" draw:color="#336666"/>
<draw:color draw:name="Turquoise 7" draw:color="#006633"/> <draw:color draw:name="Turquoise 7" draw:color="#006633"/>
<draw:color draw:name="Green 7" draw:color="#336633"/> <draw:color draw:name="Green 7" draw:color="#336633"/>
<draw:color draw:name="Yellow Green 7" draw:color="#336600"/> <draw:color draw:name="Yellow green 7" draw:color="#336600"/>
<!-- Base colors step 8 -->
<draw:color draw:name="Yellow 8" draw:color="#999966"/> <draw:color draw:name="Yellow 8" draw:color="#999966"/>
<draw:color draw:name="Orange 8" draw:color="#996633"/> <draw:color draw:name="Orange 8" draw:color="#996633"/>
<draw:color draw:name="Red 8" draw:color="#996666"/> <draw:color draw:name="Red 8" draw:color="#996666"/>
...@@ -116,23 +135,27 @@ ...@@ -116,23 +135,27 @@
<draw:color draw:name="Magenta 8" draw:color="#996699"/> <draw:color draw:name="Magenta 8" draw:color="#996699"/>
<draw:color draw:name="Purple 8" draw:color="#663399"/> <draw:color draw:name="Purple 8" draw:color="#663399"/>
<draw:color draw:name="Blue 8" draw:color="#666699"/> <draw:color draw:name="Blue 8" draw:color="#666699"/>
<draw:color draw:name="Sky Blue 8" draw:color="#336699"/> <draw:color draw:name="Sky blue 8" draw:color="#336699"/>
<draw:color draw:name="Cyan 8" draw:color="#669999"/> <draw:color draw:name="Cyan 8" draw:color="#669999"/>
<draw:color draw:name="Turquoise 8" draw:color="#339966"/> <draw:color draw:name="Turquoise 8" draw:color="#339966"/>
<draw:color draw:name="Green 8" draw:color="#669966"/> <draw:color draw:name="Green 8" draw:color="#669966"/>
<draw:color draw:name="Yellow Green 8" draw:color="#669933"/> <draw:color draw:name="Yellow green 8" draw:color="#669933"/>
<draw:color draw:name="Yellow 9" draw:color="#cccc99"/> <draw:color draw:name="Yellow 9" draw:color="#cccc99"/>
<!-- Base colors step 9 -->
<draw:color draw:name="Orange 9" draw:color="#cc9966"/> <draw:color draw:name="Orange 9" draw:color="#cc9966"/>
<draw:color draw:name="Red 9" draw:color="#cc9999"/> <draw:color draw:name="Red 9" draw:color="#cc9999"/>
<draw:color draw:name="Pink 9" draw:color="#cc6699"/> <draw:color draw:name="Pink 9" draw:color="#cc6699"/>
<draw:color draw:name="Magenta 9" draw:color="#cc99cc"/> <draw:color draw:name="Magenta 9" draw:color="#cc99cc"/>
<draw:color draw:name="Purple 9" draw:color="#9966cc"/> <draw:color draw:name="Purple 9" draw:color="#9966cc"/>
<draw:color draw:name="Blue 9" draw:color="#9999cc"/> <draw:color draw:name="Blue 9" draw:color="#9999cc"/>
<draw:color draw:name="Sky Blue 9" draw:color="#6699cc"/> <draw:color draw:name="Sky blue 9" draw:color="#6699cc"/>
<draw:color draw:name="Cyan 9" draw:color="#99cccc"/> <draw:color draw:name="Cyan 9" draw:color="#99cccc"/>
<draw:color draw:name="Turquoise 9" draw:color="#66cc99"/> <draw:color draw:name="Turquoise 9" draw:color="#66cc99"/>
<draw:color draw:name="Green 9" draw:color="#99cc99"/> <draw:color draw:name="Green 9" draw:color="#99cc99"/>
<draw:color draw:name="Yellow Green 9" draw:color="#99cc66"/> <draw:color draw:name="Yellow green 9" draw:color="#99cc66"/>
<!-- Base colors step 10 -->
<draw:color draw:name="Yellow 10" draw:color="#ffffcc"/> <draw:color draw:name="Yellow 10" draw:color="#ffffcc"/>
<draw:color draw:name="Orange 10" draw:color="#ffcc99"/> <draw:color draw:name="Orange 10" draw:color="#ffcc99"/>
<draw:color draw:name="Red 10" draw:color="#ffcccc"/> <draw:color draw:name="Red 10" draw:color="#ffcccc"/>
...@@ -140,17 +163,17 @@ ...@@ -140,17 +163,17 @@
<draw:color draw:name="Magenta 10" draw:color="#ffccff"/> <draw:color draw:name="Magenta 10" draw:color="#ffccff"/>
<draw:color draw:name="Purple 10" draw:color="#cc99ff"/> <draw:color draw:name="Purple 10" draw:color="#cc99ff"/>
<draw:color draw:name="Blue 10" draw:color="#ccccff"/> <draw:color draw:name="Blue 10" draw:color="#ccccff"/>
<draw:color draw:name="Sky Blue 10" draw:color="#99ccff"/> <draw:color draw:name="Sky blue 10" draw:color="#99ccff"/>
<draw:color draw:name="Cyan 10" draw:color="#ccffff"/> <draw:color draw:name="Cyan 10" draw:color="#ccffff"/>
<draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/> <draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/>
<draw:color draw:name="Green 10" draw:color="#ccffcc"/> <draw:color draw:name="Green 10" draw:color="#ccffcc"/>
<draw:color draw:name="Yellow Green 10" draw:color="#ccff99"/> <draw:color draw:name="Yellow green 10" draw:color="#ccff99"/>
<!-- #i121520# use some 'nice' colors from original palette --> <!-- use some 'nice' colors from original palette -->
<draw:color draw:name="Blue gray" draw:color="#e6e6ff"/> <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
<draw:color draw:name="Blue 11" draw:color="#CFE7F5"/> <draw:color draw:name="Blue classic" draw:color="#CFE7F5"/>
<!-- #i121520# add 'pale' colors from original palette --> <!-- add 'pale' colors from original palette -->
<draw:color draw:name="Violet" draw:color="#9999ff"/> <draw:color draw:name="Violet" draw:color="#9999ff"/>
<draw:color draw:name="Bordeaux" draw:color="#993366"/> <draw:color draw:name="Bordeaux" draw:color="#993366"/>
<draw:color draw:name="Pale yellow" draw:color="#ffffcc"/> <draw:color draw:name="Pale yellow" draw:color="#ffffcc"/>
...@@ -159,7 +182,7 @@ ...@@ -159,7 +182,7 @@
<draw:color draw:name="Salmon" draw:color="#ff8080"/> <draw:color draw:name="Salmon" draw:color="#ff8080"/>
<draw:color draw:name="Sea blue" draw:color="#0066cc"/> <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
<!-- #i121520# add Chart colors from original palette --> <!-- add Chart colors from original palette (also 12, coincidence?) -->
<draw:color draw:name="Chart 1" draw:color="#004586"/> <draw:color draw:name="Chart 1" draw:color="#004586"/>
<draw:color draw:name="Chart 2" draw:color="#ff420e"/> <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
<draw:color draw:name="Chart 3" draw:color="#ffd320"/> <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
......
include/svx/dialogs.hrc
Dosyayı görüntüle @ dde5dbde
...@@ -309,24 +309,21 @@ ...@@ -309,24 +309,21 @@
#define RID_SVXSTR_CLOSE (RID_SVX_START + 260) #define RID_SVXSTR_CLOSE (RID_SVX_START + 260)
// Color strings // Color strings
#define RID_SVXSTR_BLACK (RID_SVX_START + 275) #define RID_SVXSTR_COLOR_BLACK (RID_SVX_START + 275)
#define RID_SVXSTR_BLUE (RID_SVX_START + 276) #define RID_SVXSTR_COLOR_BLUE (RID_SVX_START + 276)
#define RID_SVXSTR_GREEN (RID_SVX_START + 277) #define RID_SVXSTR_COLOR_GREEN (RID_SVX_START + 277)
#define RID_SVXSTR_CYAN (RID_SVX_START + 278) #define RID_SVXSTR_COLOR_CYAN (RID_SVX_START + 278)
#define RID_SVXSTR_RED (RID_SVX_START + 279) #define RID_SVXSTR_COLOR_RED (RID_SVX_START + 279)
#define RID_SVXSTR_MAGENTA (RID_SVX_START + 280) #define RID_SVXSTR_COLOR_MAGENTA (RID_SVX_START + 280)
#define RID_SVXSTR_BROWN (RID_SVX_START + 281) #define RID_SVXSTR_COLOR_GREY (RID_SVX_START + 282)
#define RID_SVXSTR_GREY (RID_SVX_START + 282) #define RID_SVXSTR_COLOR_YELLOW (RID_SVX_START + 289)
#define RID_SVXSTR_LIGHTGREY (RID_SVX_START + 283) #define RID_SVXSTR_COLOR_WHITE (RID_SVX_START + 290)
#define RID_SVXSTR_LIGHTBLUE (RID_SVX_START + 284) #define RID_SVXSTR_COLOR_BLUEGREY (RID_SVX_START + 291)
#define RID_SVXSTR_LIGHTGREEN (RID_SVX_START + 285) #define RID_SVXSTR_COLOR_ORANGE (RID_SVX_START + 292)
#define RID_SVXSTR_LIGHTCYAN (RID_SVX_START + 286) #define RID_SVXSTR_COLOR_TURQUOISE (RID_SVX_START + 293)
#define RID_SVXSTR_LIGHTRED (RID_SVX_START + 287) #define RID_SVXSTR_COLOR_TURQUOISE_DEF (RID_SVX_START + 294)
#define RID_SVXSTR_LIGHTMAGENTA (RID_SVX_START + 288) #define RID_SVXSTR_COLOR_BLUE_CLASSIC (RID_SVX_START + 295)
#define RID_SVXSTR_YELLOW (RID_SVX_START + 289) #define RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF (RID_SVX_START + 296)
#define RID_SVXSTR_WHITE (RID_SVX_START + 290)
#define RID_SVXSTR_BLUEGREY (RID_SVX_START + 291)
#define RID_SVXSTR_ORANGE (RID_SVX_START + 292)
// Line endings strings // Line endings strings
#define RID_SVXSTR_ARROW (RID_SVX_START + 300) #define RID_SVXSTR_ARROW (RID_SVX_START + 300)
...@@ -410,23 +407,22 @@ ...@@ -410,23 +407,22 @@
#define RID_SVXSTR_BACKGROUND (RID_SVX_START + 531) #define RID_SVXSTR_BACKGROUND (RID_SVX_START + 531)
// BM: some additional standard colors // BM: some additional standard colors
#define RID_SVXSTR_VIOLET (RID_SVX_START + 540) #define RID_SVXSTR_COLOR_VIOLET (RID_SVX_START + 540)
#define RID_SVXSTR_BORDEAUX (RID_SVX_START + 541) #define RID_SVXSTR_COLOR_BORDEAUX (RID_SVX_START + 541)
#define RID_SVXSTR_PALE_YELLOW (RID_SVX_START + 542) #define RID_SVXSTR_COLOR_PALE_YELLOW (RID_SVX_START + 542)
#define RID_SVXSTR_PALE_GREEN (RID_SVX_START + 543) #define RID_SVXSTR_COLOR_PALE_GREEN (RID_SVX_START + 543)
#define RID_SVXSTR_DKVIOLET (RID_SVX_START + 544) #define RID_SVXSTR_COLOR_DARKVIOLET (RID_SVX_START + 544)
#define RID_SVXSTR_SALMON (RID_SVX_START + 545) #define RID_SVXSTR_COLOR_SALMON (RID_SVX_START + 545)
#define RID_SVXSTR_SEABLUE (RID_SVX_START + 546) #define RID_SVXSTR_COLOR_SEABLUE (RID_SVX_START + 546)
#define RID_SVXSTR_COLOR_SUN (RID_SVX_START + 547)
// LibreOffice palette colors // LibreOffice palette colors
#define RID_SVXSTR_LIBRE_GREEN_1 (RID_SVX_START + 548) #define RID_SVXSTR_COLOR_LIBRE_GREEN_1 (RID_SVX_START + 548)
#define RID_SVXSTR_LIBRE_GREEN_ACCENT (RID_SVX_START + 549) #define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT (RID_SVX_START + 549)
#define RID_SVXSTR_LIBRE_BLUE_ACCENT (RID_SVX_START + 550) #define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT (RID_SVX_START + 550)
#define RID_SVXSTR_LIBRE_ORANGE_ACCENT (RID_SVX_START + 551) #define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT (RID_SVX_START + 551)
#define RID_SVXSTR_LIBRE_PURPLE (RID_SVX_START + 552) #define RID_SVXSTR_COLOR_LIBRE_PURPLE (RID_SVX_START + 552)
#define RID_SVXSTR_LIBRE_PURPLE_ACCENT (RID_SVX_START + 553) #define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT (RID_SVX_START + 553)
#define RID_SVXSTR_LIBRE_YELLOW_ACCENT (RID_SVX_START + 554) #define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT (RID_SVX_START + 554)
// JP: string resource ids for table-autoformat-names, used in SW/SC // JP: string resource ids for table-autoformat-names, used in SW/SC
// !!! Urgent: the order of Ids is persistent. New Ids have to append !!! // !!! Urgent: the order of Ids is persistent. New Ids have to append !!!
...@@ -462,70 +458,62 @@ ...@@ -462,70 +458,62 @@
#define RID_SVXSTR_LINEJOINT_ROUND (RID_SVX_START + 592 ) #define RID_SVXSTR_LINEJOINT_ROUND (RID_SVX_START + 592 )
// Default-Color-Names // Default-Color-Names
#define RID_SVXSTR_BLACK_DEF (RID_SVX_START + 595) #define RID_SVXSTR_COLOR_BLACK_DEF (RID_SVX_START + 595)
#define RID_SVXSTR_BLUE_DEF (RID_SVX_START + 596) #define RID_SVXSTR_COLOR_BLUE_DEF (RID_SVX_START + 596)
#define RID_SVXSTR_GREEN_DEF (RID_SVX_START + 597) #define RID_SVXSTR_COLOR_GREEN_DEF (RID_SVX_START + 597)
#define RID_SVXSTR_CYAN_DEF (RID_SVX_START + 598) #define RID_SVXSTR_COLOR_CYAN_DEF (RID_SVX_START + 598)
#define RID_SVXSTR_RED_DEF (RID_SVX_START + 599) #define RID_SVXSTR_COLOR_RED_DEF (RID_SVX_START + 599)
#define RID_SVXSTR_MAGENTA_DEF (RID_SVX_START + 600) #define RID_SVXSTR_COLOR_MAGENTA_DEF (RID_SVX_START + 600)
#define RID_SVXSTR_BROWN_DEF (RID_SVX_START + 601) #define RID_SVXSTR_COLOR_GREY_DEF (RID_SVX_START + 602)
#define RID_SVXSTR_GREY_DEF (RID_SVX_START + 602) #define RID_SVXSTR_COLOR_YELLOW_DEF (RID_SVX_START + 609)
#define RID_SVXSTR_LIGHTGREY_DEF (RID_SVX_START + 603) #define RID_SVXSTR_COLOR_WHITE_DEF (RID_SVX_START + 610)
#define RID_SVXSTR_LIGHTBLUE_DEF (RID_SVX_START + 604) #define RID_SVXSTR_COLOR_BLUEGREY_DEF (RID_SVX_START + 611)
#define RID_SVXSTR_LIGHTGREEN_DEF (RID_SVX_START + 605) #define RID_SVXSTR_COLOR_ORANGE_DEF (RID_SVX_START + 612)
#define RID_SVXSTR_LIGHTCYAN_DEF (RID_SVX_START + 606) #define RID_SVXSTR_COLOR_VIOLET_DEF (RID_SVX_START + 613)
#define RID_SVXSTR_LIGHTRED_DEF (RID_SVX_START + 607) #define RID_SVXSTR_COLOR_BORDEAUX_DEF (RID_SVX_START + 614)
#define RID_SVXSTR_LIGHTMAGENTA_DEF (RID_SVX_START + 608) #define RID_SVXSTR_COLOR_PALE_YELLOW_DEF (RID_SVX_START + 615)
#define RID_SVXSTR_YELLOW_DEF (RID_SVX_START + 609) #define RID_SVXSTR_COLOR_PALE_GREEN_DEF (RID_SVX_START + 616)
#define RID_SVXSTR_WHITE_DEF (RID_SVX_START + 610) #define RID_SVXSTR_COLOR_DARKVIOLET_DEF (RID_SVX_START + 617)
#define RID_SVXSTR_BLUEGREY_DEF (RID_SVX_START + 611) #define RID_SVXSTR_COLOR_SALMON_DEF (RID_SVX_START + 618)
#define RID_SVXSTR_ORANGE_DEF (RID_SVX_START + 612) #define RID_SVXSTR_COLOR_SEABLUE_DEF (RID_SVX_START + 619)
#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_SUN_DEF (RID_SVX_START + 620) #define RID_SVXSTR_COLOR_SUN_DEF (RID_SVX_START + 620)
#define RID_SVXSTR_COLOR_CHART (RID_SVX_START + 621) #define RID_SVXSTR_COLOR_CHART (RID_SVX_START + 621)
#define RID_SVXSTR_COLOR_CHART_DEF (RID_SVX_START + 622) #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 // LibreOffice palette colors
#define RID_SVXSTR_LIBRE_GREEN_1_DEF (RID_SVX_START + 623) #define RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF (RID_SVX_START + 631)
#define RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF (RID_SVX_START + 624) #define RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF (RID_SVX_START + 632)
#define RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF (RID_SVX_START + 625) #define RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF (RID_SVX_START + 633)
#define RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF (RID_SVX_START + 626) #define RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF (RID_SVX_START + 634)
#define RID_SVXSTR_LIBRE_PURPLE_DEF (RID_SVX_START + 627) #define RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF (RID_SVX_START + 635)
#define RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF (RID_SVX_START + 628) #define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF (RID_SVX_START + 636)
#define RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF (RID_SVX_START + 629) #define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF (RID_SVX_START + 637)
// Tango palette colors // Tango palette colors
#define RID_SVXSTR_TANGO_BUTTER (RID_SVX_START + 630) #define RID_SVXSTR_COLOR_TANGO_BUTTER (RID_SVX_START + 638)
#define RID_SVXSTR_TANGO_ORANGE (RID_SVX_START + 631) #define RID_SVXSTR_COLOR_TANGO_ORANGE (RID_SVX_START + 639)
#define RID_SVXSTR_TANGO_CHOCOLATE (RID_SVX_START + 632) #define RID_SVXSTR_COLOR_TANGO_CHOCOLATE (RID_SVX_START + 640)
#define RID_SVXSTR_TANGO_CHAMELEON (RID_SVX_START + 633) #define RID_SVXSTR_COLOR_TANGO_CHAMELEON (RID_SVX_START + 641)
#define RID_SVXSTR_TANGO_SKY_BLUE (RID_SVX_START + 634) #define RID_SVXSTR_COLOR_TANGO_SKY_BLUE (RID_SVX_START + 642)
#define RID_SVXSTR_TANGO_PLUM (RID_SVX_START + 635) #define RID_SVXSTR_COLOR_TANGO_PLUM (RID_SVX_START + 643)
#define RID_SVXSTR_TANGO_SCARLET_RED (RID_SVX_START + 636) #define RID_SVXSTR_COLOR_TANGO_SCARLET_RED (RID_SVX_START + 644)
#define RID_SVXSTR_TANGO_ALUMINIUM (RID_SVX_START + 637) #define RID_SVXSTR_COLOR_TANGO_ALUMINIUM (RID_SVX_START + 645)
#define RID_SVXSTR_TANGO_BUTTER_DEF (RID_SVX_START + 638) #define RID_SVXSTR_COLOR_TANGO_BUTTER_DEF (RID_SVX_START + 646)
#define RID_SVXSTR_TANGO_ORANGE_DEF (RID_SVX_START + 639) #define RID_SVXSTR_COLOR_TANGO_ORANGE_DEF (RID_SVX_START + 647)
#define RID_SVXSTR_TANGO_CHOCOLATE_DEF (RID_SVX_START + 640) #define RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF (RID_SVX_START + 648)
#define RID_SVXSTR_TANGO_CHAMELEON_DEF (RID_SVX_START + 641) #define RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF (RID_SVX_START + 649)
#define RID_SVXSTR_TANGO_SKY_BLUE_DEF (RID_SVX_START + 642) #define RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF (RID_SVX_START + 650)
#define RID_SVXSTR_TANGO_PLUM_DEF (RID_SVX_START + 643) #define RID_SVXSTR_COLOR_TANGO_PLUM_DEF (RID_SVX_START + 651)
#define RID_SVXSTR_TANGO_SCARLET_RED_DEF (RID_SVX_START + 644) #define RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF (RID_SVX_START + 652)
#define RID_SVXSTR_TANGO_ALUMINIUM_DEF (RID_SVX_START + 645) #define RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF (RID_SVX_START + 653)
//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 // Default-Gradient-Names
#define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 2000) #define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 2000)
......
svx/source/dialog/sdstring.src
Dosyayı görüntüle @ dde5dbde
...@@ -59,100 +59,58 @@ String RID_SVXSTR_CLOSE ...@@ -59,100 +59,58 @@ String RID_SVXSTR_CLOSE
/* ### ATTENTION: New text in Resource? Close : Close */ /* ### ATTENTION: New text in Resource? Close : Close */
Text [ en-US ] = "Close" ; Text [ en-US ] = "Close" ;
}; };
String RID_SVXSTR_BLACK String RID_SVXSTR_COLOR_BLACK
{ {
Text [ en-US ] = "Black" ; Text [ en-US ] = "Black" ;
}; };
String RID_SVXSTR_BLUE String RID_SVXSTR_COLOR_BLUE
{ {
Text [ en-US ] = "Blue" ; Text [ en-US ] = "Blue" ;
}; };
String RID_SVXSTR_GREEN String RID_SVXSTR_COLOR_GREEN
{ {
/* ### ATTENTION: New text in Resource? Green : Green */ /* ### ATTENTION: New text in Resource? Green : Green */
Text [ en-US ] = "Green" ; Text [ en-US ] = "Green" ;
}; };
String RID_SVXSTR_CYAN String RID_SVXSTR_COLOR_CYAN
{ {
/* ### ATTENTION: New text in Resource? Turquoise : Turquoise */ /* ### 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" ; Text [ en-US ] = "Red" ;
}; };
String RID_SVXSTR_MAGENTA String RID_SVXSTR_COLOR_MAGENTA
{ {
/* ### ATTENTION: New text in Resource? Magenta : Violett */ /* ### ATTENTION: New text in Resource? Magenta : Violett */
Text [ en-US ] = "Magenta" ; Text [ en-US ] = "Magenta" ;
}; };
String RID_SVXSTR_BROWN String RID_SVXSTR_COLOR_GREY
{
Text [ en-US ] = "Brown" ;
};
String RID_SVXSTR_GREY
{ {
Text [ en-US ] = "Gray" ; Text [ en-US ] = "Gray" ;
}; };
String RID_SVXSTR_LIGHTGREY String RID_SVXSTR_COLOR_YELLOW
{
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
{ {
Text [ en-US ] = "Yellow" ; Text [ en-US ] = "Yellow" ;
}; };
String RID_SVXSTR_WHITE String RID_SVXSTR_COLOR_WHITE
{ {
/* ### ATTENTION: New text in Resource? White : White */ /* ### ATTENTION: New text in Resource? White : White */
Text [ en-US ] = "White" ; Text [ en-US ] = "White" ;
}; };
String RID_SVXSTR_BLUEGREY String RID_SVXSTR_COLOR_BLUEGREY
{ {
Text [ en-US ] = "Blue gray" ; Text [ en-US ] = "Blue gray" ;
}; };
String RID_SVXSTR_ORANGE String RID_SVXSTR_COLOR_BLUE_CLASSIC
{ {
Text [ en-US ] = "Orange" ; /* Old default color Blue9, probably often used in saved files */
}; Text [ en-US ] = "Blue classic" ;
String RID_SVXSTR_CYAN2
{
Text [ en-US ] = "Cyan" ;
}; };
String RID_SVXSTR_YELLOW_GREEN String RID_SVXSTR_COLOR_ORANGE
{ {
Text [ en-US ] = "Yellow Green" ; Text [ en-US ] = "Orange" ;
};
String RID_SVXSTR_SKY_BLUE
{
Text [ en-US ] = "Sky Blue" ;
};
String RID_SVXSTR_PINK
{
Text [ en-US ] = "Pink" ;
}; };
String RID_SVXSTR_ARROW String RID_SVXSTR_ARROW
{ {
...@@ -236,50 +194,69 @@ String STR_INSERT_VIDEO_TITLE ...@@ -236,50 +194,69 @@ String STR_INSERT_VIDEO_TITLE
// BM: some additional standard colors // BM: some additional standard colors
String RID_SVXSTR_VIOLET String RID_SVXSTR_COLOR_VIOLET
{ {
Text [ en-US ] = "Violet"; Text [ en-US ] = "Violet";
}; };
String RID_SVXSTR_BORDEAUX String RID_SVXSTR_COLOR_BORDEAUX
{ {
Text [ en-US ] = "Bordeaux"; Text [ en-US ] = "Bordeaux";
}; };
String RID_SVXSTR_PALE_YELLOW String RID_SVXSTR_COLOR_PALE_YELLOW
{ {
Text [ en-US ] = "Pale yellow"; Text [ en-US ] = "Pale yellow";
}; };
String RID_SVXSTR_PALE_GREEN String RID_SVXSTR_COLOR_PALE_GREEN
{ {
Text [ en-US ] = "Pale green"; Text [ en-US ] = "Pale green";
}; };
String RID_SVXSTR_DKVIOLET String RID_SVXSTR_COLOR_DARKVIOLET
{ {
Text [ en-US ] = "Dark violet"; Text [ en-US ] = "Dark violet";
}; };
String RID_SVXSTR_SALMON String RID_SVXSTR_COLOR_SALMON
{ {
Text [ en-US ] = "Salmon"; Text [ en-US ] = "Salmon";
}; };
String RID_SVXSTR_SEABLUE String RID_SVXSTR_COLOR_SEABLUE
{ {
Text [ en-US ] = "Sea blue"; 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 ] = "Chart" ;
Text [ en-US ] = "Sun" ;
}; };
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 String RID_SVXSTR_TBLAFMT_3D
...@@ -382,127 +359,92 @@ String RID_SVXSTR_LINECAP_SQUARE ...@@ -382,127 +359,92 @@ String RID_SVXSTR_LINECAP_SQUARE
// //
/* do not translate */ /* do not translate */
String RID_SVXSTR_BLACK_DEF String RID_SVXSTR_COLOR_BLACK_DEF
{ {
Text = "Black" ; Text = "Black" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_BLUE_DEF String RID_SVXSTR_COLOR_BLUE_DEF
{ {
Text = "Blue" ; Text = "Blue" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_GREEN_DEF String RID_SVXSTR_COLOR_GREEN_DEF
{ {
Text = "Green" ; Text = "Green" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_CYAN_DEF String RID_SVXSTR_COLOR_CYAN_DEF
{ {
Text = "Turquoise" ; Text = "Cyan" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_RED_DEF String RID_SVXSTR_COLOR_RED_DEF
{ {
Text = "Red" ; Text = "Red" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_MAGENTA_DEF String RID_SVXSTR_COLOR_MAGENTA_DEF
{ {
Text = "Magenta" ; Text = "Magenta" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_BROWN_DEF String RID_SVXSTR_COLOR_GREY_DEF
{
Text = "Brown" ;
};
/* do not translate */
String RID_SVXSTR_GREY_DEF
{ {
Text = "Gray" ; Text = "Gray" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_LIGHTGREY_DEF String RID_SVXSTR_COLOR_YELLOW_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
{ {
Text = "Yellow" ; Text = "Yellow" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_WHITE_DEF String RID_SVXSTR_COLOR_WHITE_DEF
{ {
Text = "White" ; Text = "White" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_BLUEGREY_DEF String RID_SVXSTR_COLOR_BLUEGREY_DEF
{ {
Text = "Blue gray" ; Text = "Blue gray" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_ORANGE_DEF String RID_SVXSTR_COLOR_ORANGE_DEF
{ {
Text = "Orange" ; Text = "Orange" ;
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_VIOLET_DEF String RID_SVXSTR_COLOR_VIOLET_DEF
{ {
Text = "Violet"; Text = "Violet";
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_BORDEAUX_DEF String RID_SVXSTR_COLOR_BORDEAUX_DEF
{ {
Text = "Bordeaux"; Text = "Bordeaux";
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_PALE_YELLOW_DEF String RID_SVXSTR_COLOR_PALE_YELLOW_DEF
{ {
Text = "Pale yellow"; Text = "Pale yellow";
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_PALE_GREEN_DEF String RID_SVXSTR_COLOR_PALE_GREEN_DEF
{ {
Text = "Pale green"; Text = "Pale green";
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_DKVIOLET_DEF String RID_SVXSTR_COLOR_DARKVIOLET_DEF
{ {
Text = "Dark violet"; Text = "Dark violet";
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_SALMON_DEF String RID_SVXSTR_COLOR_SALMON_DEF
{ {
Text = "Salmon"; Text = "Salmon";
}; };
/* do not translate */ /* do not translate */
String RID_SVXSTR_SEABLUE_DEF String RID_SVXSTR_COLOR_SEABLUE_DEF
{ {
Text = "Sea blue"; Text = "Sea blue";
}; };
...@@ -512,26 +454,40 @@ String RID_SVXSTR_COLOR_SUN_DEF ...@@ -512,26 +454,40 @@ String RID_SVXSTR_COLOR_SUN_DEF
// attention: this is the color string for the Sun Microsystems specific colors !!! // attention: this is the color string for the Sun Microsystems specific colors !!!
Text = "Sun"; 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 */ /* DO NOT TRANSLATE */
String RID_SVXSTR_COLOR_CHART_DEF 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 ...@@ -1858,160 +1814,160 @@ String RID_SVXSTR_COLOR_USER
Text [ en-US ] = "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)" ; 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" ; Text [ en-US ] = "Green Accent" ;
}; };
String RID_SVXSTR_LIBRE_BLUE_ACCENT String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT
{ {
Text [ en-US ] = "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" ; Text [ en-US ] = "Orange Accent" ;
}; };
String RID_SVXSTR_LIBRE_PURPLE String RID_SVXSTR_COLOR_LIBRE_PURPLE
{ {
Text [ en-US ] = "Purple" ; Text [ en-US ] = "Purple" ;
}; };
String RID_SVXSTR_LIBRE_PURPLE_ACCENT String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT
{ {
Text [ en-US ] = "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" ; 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)" ; Text = "Green 1 (LibreOffice Main Color)" ;
}; };
String RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF String RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF
{ {
Text = "Green Accent" ; Text = "Green Accent" ;
}; };
String RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF String RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF
{ {
Text = "Blue Accent" ; Text = "Blue Accent" ;
}; };
String RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF String RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF
{ {
Text = "Orange Accent" ; Text = "Orange Accent" ;
}; };
String RID_SVXSTR_LIBRE_PURPLE_DEF String RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF
{ {
Text = "Purple" ; Text = "Purple" ;
}; };
String RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF String RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF
{ {
Text = "Purple Accent" ; Text = "Purple Accent" ;
}; };
String RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF String RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF
{ {
Text = "Yellow Accent" ; Text = "Yellow Accent" ;
}; };
String RID_SVXSTR_TANGO_BUTTER String RID_SVXSTR_COLOR_TANGO_BUTTER
{ {
Text [ en-US ] = "Tango: Butter" ; Text [ en-US ] = "Tango: Butter" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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 [ en-US ] = "Tango: Orange" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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 [ en-US ] = "Tango: Chocolate" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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 [ en-US ] = "Tango: Chameleon" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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 [ en-US ] = "Tango: Sky Blue" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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 [ en-US ] = "Tango: Plum" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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 [ en-US ] = "Tango: Scarlet Red" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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 [ en-US ] = "Tango: Aluminium" ;
Text [ x-comment ] = "Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines" ; 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" ; Text = "Tango: Butter" ;
}; };
String RID_SVXSTR_TANGO_ORANGE_DEF String RID_SVXSTR_COLOR_TANGO_ORANGE_DEF
{ {
Text = "Tango: Orange" ; Text = "Tango: Orange" ;
}; };
String RID_SVXSTR_TANGO_CHOCOLATE_DEF String RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF
{ {
Text = "Tango: Chocolate" ; Text = "Tango: Chocolate" ;
}; };
String RID_SVXSTR_TANGO_CHAMELEON_DEF String RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF
{ {
Text = "Tango: Chameleon" ; Text = "Tango: Chameleon" ;
}; };
String RID_SVXSTR_TANGO_SKY_BLUE_DEF String RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF
{ {
Text = "Tango: Sky Blue" ; Text = "Tango: Sky Blue" ;
}; };
String RID_SVXSTR_TANGO_PLUM_DEF String RID_SVXSTR_COLOR_TANGO_PLUM_DEF
{ {
Text = "Tango: Plum" ; Text = "Tango: Plum" ;
}; };
String RID_SVXSTR_TANGO_SCARLET_RED_DEF String RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF
{ {
Text = "Tango: Scarlet Red" ; Text = "Tango: Scarlet Red" ;
}; };
String RID_SVXSTR_TANGO_ALUMINIUM_DEF String RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF
{ {
Text = "Tango: Aluminium" ; Text = "Tango: Aluminium" ;
}; };
......
svx/source/unodraw/unoprov.cxx
Dosyayı görüntüle @ dde5dbde
...@@ -1204,102 +1204,90 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount ...@@ -1204,102 +1204,90 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
static sal_uInt16 SvxUnoColorNameDefResId[] = static sal_uInt16 SvxUnoColorNameDefResId[] =
{ {
RID_SVXSTR_BLUEGREY_DEF, RID_SVXSTR_COLOR_BLUEGREY_DEF,
RID_SVXSTR_BLACK_DEF, RID_SVXSTR_COLOR_BLACK_DEF,
RID_SVXSTR_BLUE_DEF, RID_SVXSTR_COLOR_BLUE_DEF,
RID_SVXSTR_SKY_BLUE_DEF, RID_SVXSTR_COLOR_GREEN_DEF,
RID_SVXSTR_GREEN_DEF, RID_SVXSTR_COLOR_CYAN_DEF,
RID_SVXSTR_YELLOW_GREEN_DEF, RID_SVXSTR_COLOR_RED_DEF,
RID_SVXSTR_CYAN_DEF, RID_SVXSTR_COLOR_MAGENTA_DEF,
RID_SVXSTR_CYAN2_DEF, RID_SVXSTR_COLOR_GREY_DEF,
RID_SVXSTR_RED_DEF, RID_SVXSTR_COLOR_YELLOW_DEF,
RID_SVXSTR_MAGENTA_DEF, RID_SVXSTR_COLOR_WHITE_DEF,
RID_SVXSTR_BROWN_DEF, RID_SVXSTR_COLOR_ORANGE_DEF,
RID_SVXSTR_GREY_DEF, RID_SVXSTR_COLOR_VIOLET_DEF,
RID_SVXSTR_LIGHTGREY_DEF, RID_SVXSTR_COLOR_BORDEAUX_DEF,
RID_SVXSTR_LIGHTBLUE_DEF, RID_SVXSTR_COLOR_PALE_YELLOW_DEF,
RID_SVXSTR_LIGHTGREEN_DEF, RID_SVXSTR_COLOR_PALE_GREEN_DEF,
RID_SVXSTR_LIGHTCYAN_DEF, RID_SVXSTR_COLOR_DARKVIOLET_DEF,
RID_SVXSTR_LIGHTRED_DEF, RID_SVXSTR_COLOR_SALMON_DEF,
RID_SVXSTR_LIGHTMAGENTA_DEF, RID_SVXSTR_COLOR_SEABLUE_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_CHART_DEF, RID_SVXSTR_COLOR_CHART_DEF,
RID_SVXSTR_LIBRE_GREEN_1_DEF, RID_SVXSTR_COLOR_PURPLE_DEF,
RID_SVXSTR_LIBRE_GREEN_ACCENT_DEF, RID_SVXSTR_COLOR_SKYBLUE_DEF,
RID_SVXSTR_LIBRE_BLUE_ACCENT_DEF, RID_SVXSTR_COLOR_YELLOWGREEN_DEF,
RID_SVXSTR_LIBRE_ORANGE_ACCENT_DEF, RID_SVXSTR_COLOR_PINK_DEF,
RID_SVXSTR_LIBRE_PURPLE_DEF, RID_SVXSTR_COLOR_TURQUOISE_DEF,
RID_SVXSTR_LIBRE_PURPLE_ACCENT_DEF, RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF,
RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF, RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF,
RID_SVXSTR_TANGO_BUTTER_DEF, RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF,
RID_SVXSTR_TANGO_ORANGE_DEF, RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF,
RID_SVXSTR_TANGO_CHOCOLATE_DEF, RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF,
RID_SVXSTR_TANGO_CHAMELEON_DEF, RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF,
RID_SVXSTR_TANGO_SKY_BLUE_DEF, RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF,
RID_SVXSTR_TANGO_PLUM_DEF, RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF,
RID_SVXSTR_TANGO_SCARLET_RED_DEF, RID_SVXSTR_COLOR_TANGO_BUTTER_DEF,
RID_SVXSTR_TANGO_ALUMINIUM_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[] = static sal_uInt16 SvxUnoColorNameResId[] =
{ {
RID_SVXSTR_BLUEGREY, RID_SVXSTR_COLOR_BLUEGREY,
RID_SVXSTR_BLACK, RID_SVXSTR_COLOR_BLACK,
RID_SVXSTR_BLUE, RID_SVXSTR_COLOR_BLUE,
RID_SVXSTR_SKY_BLUE, RID_SVXSTR_COLOR_GREEN,
RID_SVXSTR_GREEN, RID_SVXSTR_COLOR_CYAN,
RID_SVXSTR_YELLOW_GREEN, RID_SVXSTR_COLOR_RED,
RID_SVXSTR_CYAN, RID_SVXSTR_COLOR_MAGENTA,
RID_SVXSTR_CYAN2, RID_SVXSTR_COLOR_GREY,
RID_SVXSTR_RED, RID_SVXSTR_COLOR_YELLOW,
RID_SVXSTR_MAGENTA, RID_SVXSTR_COLOR_WHITE,
RID_SVXSTR_BROWN, RID_SVXSTR_COLOR_ORANGE,
RID_SVXSTR_GREY, RID_SVXSTR_COLOR_VIOLET,
RID_SVXSTR_LIGHTGREY, RID_SVXSTR_COLOR_BORDEAUX,
RID_SVXSTR_LIGHTBLUE, RID_SVXSTR_COLOR_PALE_YELLOW,
RID_SVXSTR_LIGHTGREEN, RID_SVXSTR_COLOR_PALE_GREEN,
RID_SVXSTR_LIGHTCYAN, RID_SVXSTR_COLOR_DARKVIOLET,
RID_SVXSTR_LIGHTRED, RID_SVXSTR_COLOR_SALMON,
RID_SVXSTR_LIGHTMAGENTA, RID_SVXSTR_COLOR_SEABLUE,
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_CHART, RID_SVXSTR_COLOR_CHART,
RID_SVXSTR_LIBRE_GREEN_1, RID_SVXSTR_COLOR_PURPLE,
RID_SVXSTR_LIBRE_GREEN_ACCENT, RID_SVXSTR_COLOR_SKYBLUE,
RID_SVXSTR_LIBRE_BLUE_ACCENT, RID_SVXSTR_COLOR_YELLOWGREEN,
RID_SVXSTR_LIBRE_ORANGE_ACCENT, RID_SVXSTR_COLOR_PINK,
RID_SVXSTR_LIBRE_PURPLE, RID_SVXSTR_COLOR_TURQUOISE,
RID_SVXSTR_LIBRE_PURPLE_ACCENT, RID_SVXSTR_COLOR_BLUE_CLASSIC,
RID_SVXSTR_LIBRE_YELLOW_ACCENT, RID_SVXSTR_COLOR_LIBRE_GREEN_1,
RID_SVXSTR_TANGO_BUTTER, RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT,
RID_SVXSTR_TANGO_ORANGE, RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT,
RID_SVXSTR_TANGO_CHOCOLATE, RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT,
RID_SVXSTR_TANGO_CHAMELEON, RID_SVXSTR_COLOR_LIBRE_PURPLE,
RID_SVXSTR_TANGO_SKY_BLUE, RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT,
RID_SVXSTR_TANGO_PLUM, RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT,
RID_SVXSTR_TANGO_SCARLET_RED, RID_SVXSTR_COLOR_TANGO_BUTTER,
RID_SVXSTR_TANGO_ALUMINIUM 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() bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()
......
svx/source/xoutdev/xtabcolr.cxx
Dosyayı görüntüle @ dde5dbde
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
using namespace com::sun::star; using namespace com::sun::star;
XColorListRef XColorList::CreateStdColorList() XColorListRef XColorList::CreateStdColorList()
{ {
return XPropertyList::CreatePropertyList( return XPropertyList::CreatePropertyList(
...@@ -65,292 +64,139 @@ uno::Reference< container::XNameContainer > XColorList::createInstance() ...@@ -65,292 +64,139 @@ uno::Reference< container::XNameContainer > XColorList::createInstance()
bool XColorList::Create() bool XColorList::Create()
{ {
XubString aStr; sal_uInt32 a(0);
xub_StrLen nLen; sal_uInt32 b(0);
ResMgr& rRes = DIALOG_MGR();
// <!-- Gray palette from white to black -->
static sal_uInt16 aResId[] = 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, switch(a)
RID_SVXSTR_BLUE, {
RID_SVXSTR_GREEN, case 0:
RID_SVXSTR_CYAN, {
RID_SVXSTR_RED, aStrCol[0] = SVX_RESSTR(RID_SVXSTR_COLOR_YELLOW);
RID_SVXSTR_MAGENTA, aStrCol[1] = SVX_RESSTR(RID_SVXSTR_COLOR_ORANGE);
RID_SVXSTR_BROWN, aStrCol[2] = SVX_RESSTR(RID_SVXSTR_COLOR_RED);
RID_SVXSTR_GREY, aStrCol[3] = SVX_RESSTR(RID_SVXSTR_COLOR_PINK);
RID_SVXSTR_LIGHTGREY, aStrCol[4] = SVX_RESSTR(RID_SVXSTR_COLOR_MAGENTA);
RID_SVXSTR_LIGHTBLUE, aStrCol[5] = SVX_RESSTR(RID_SVXSTR_COLOR_PURPLE);
RID_SVXSTR_LIGHTGREEN, aStrCol[6] = SVX_RESSTR(RID_SVXSTR_COLOR_BLUE);
RID_SVXSTR_LIGHTCYAN, aStrCol[7] = SVX_RESSTR(RID_SVXSTR_COLOR_SKYBLUE);
RID_SVXSTR_LIGHTRED, aStrCol[8] = SVX_RESSTR(RID_SVXSTR_COLOR_CYAN);
RID_SVXSTR_LIGHTMAGENTA, aStrCol[9] = SVX_RESSTR(RID_SVXSTR_COLOR_TURQUOISE);
RID_SVXSTR_YELLOW, aStrCol[10] = SVX_RESSTR(RID_SVXSTR_COLOR_GREEN);
RID_SVXSTR_WHITE aStrCol[11] = SVX_RESSTR(RID_SVXSTR_COLOR_YELLOWGREEN);
}; break;
}
// MT: COL_XXX ist in VCL kein enum mehr!!! case 1:
// COL_WHITE ist seeeehr gross! ( => Zugriff ueber das obige Array hinweg ) {
// Mit der unteren Schleife gibt es keinen Absturtz, aber es ist for(b = 0; b < nNumColorsInGroup; b++)
// alles schwarz, weil alles kleine Werte. {
// Ausserdem ist die ganze Vorgehensweise laut MM sehr unperformant aStrCol[b].AppendAscii(" 1");
// => lieber gleich Stringlisten laden. }
break;
// BM: ifndef VCL part removed (deprecated) }
case 10:
static ColorData const aColTab[] = {
{ for(b = 0; b < nNumColorsInGroup; b++)
COL_BLACK, {
COL_BLUE, aStrCol[b].SetChar(aStrCol[b].Len() - 1, sal_Unicode('1'));
COL_GREEN, aStrCol[b].AppendAscii("0");
COL_CYAN, }
COL_RED, break;
COL_MAGENTA, }
COL_BROWN, default: // 2 .. 9, 11
COL_GRAY, {
COL_LIGHTGRAY, for(b = 0; b < nNumColorsInGroup; b++)
COL_LIGHTBLUE, {
COL_LIGHTGREEN, aStrCol[b].SetChar(aStrCol[b].Len() - 1, sal_Unicode('0') + sal_Unicode(a % 10));
COL_LIGHTCYAN, }
COL_LIGHTRED, break;
COL_LIGHTMAGENTA, }
COL_YELLOW, }
COL_WHITE
}; const sal_uInt32 nOffset(a * nNumColorsInGroup);
for( sal_uInt16 n = 0; n < 16; ++n ) for(b = 0; b < nNumColorsInGroup; b++)
{ {
Insert( new XColorEntry( Insert( new XColorEntry( aStdCol[nOffset + b], aStrCol[b] ) );
Color( aColTab[n] ), }
String( ResId( aResId[ n ], rRes ) )
),
n
);
} }
aStr = SVX_RESSTR( RID_SVXSTR_GREY ); // <!-- use some 'nice' colors from original palette -->
aStr.AppendAscii(" 80%"); Insert( new XColorEntry( Color( 0xe6, 0xe6, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_BLUEGREY) ) );
nLen = aStr.Len() - 3; Insert( new XColorEntry( Color( 0xCF, 0xE7, 0xF5 ), SVX_RESSTR( RID_SVXSTR_COLOR_BLUE_CLASSIC ) ) );
Insert( new XColorEntry( Color( 51, 51, 51 ), aStr ), 16 );
aStr.SetChar(nLen, sal_Unicode('7')); // <!-- add 'pale' colors from original palette -->
Insert( new XColorEntry( Color( 76, 76, 76 ), aStr ), 17 ); Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_VIOLET ) ) );
aStr.SetChar(nLen, sal_Unicode('6')); Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), SVX_RESSTR( RID_SVXSTR_COLOR_BORDEAUX ) ) );
Insert( new XColorEntry( Color(102,102,102 ), aStr ), 18 ); Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), SVX_RESSTR( RID_SVXSTR_COLOR_PALE_YELLOW ) ) );
aStr.SetChar(nLen, sal_Unicode('4')); Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_COLOR_PALE_GREEN ) ) );
Insert( new XColorEntry( Color(153,153,153 ), aStr ), 19 ); Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), SVX_RESSTR( RID_SVXSTR_COLOR_DARKVIOLET ) ) );
aStr.SetChar(nLen, sal_Unicode('3')); Insert( new XColorEntry( Color( 0xff, 0x80, 0x80 ), SVX_RESSTR( RID_SVXSTR_COLOR_SALMON ) ) );
Insert( new XColorEntry( Color(179,179,179 ), aStr ), 20 ); Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), SVX_RESSTR( RID_SVXSTR_COLOR_SEABLUE ) ) );
aStr.SetChar(nLen, sal_Unicode('2'));
Insert( new XColorEntry( Color(204,204,204 ), aStr ), 21 ); // <!-- add Chart colors from original palette (also 12, coincidence?) -->
// BM: new 15% XubString aStrChart( SVX_RESSTR( RID_SVXSTR_COLOR_CHART ) );
aStr.SetChar(nLen, sal_Unicode('1')); aStrChart.AppendAscii(" 1");
aStr.SetChar(nLen + 1, sal_Unicode('5')); Insert( new XColorEntry( Color( 0x00, 0x45, 0x86 ), aStrChart ) );
Insert( new XColorEntry( Color(217,217,217 ), aStr ), 22 ); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('2'));
aStr.SetChar(nLen + 1, sal_Unicode('0')); Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStrChart ) );
Insert( new XColorEntry( Color(230,230,230 ), aStr ), 23 ); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('3'));
Insert( new XColorEntry( Color(230,230,255 ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ), 24 ); Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStrChart ) );
aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('4'));
aStr = SVX_RESSTR( RID_SVXSTR_RED ); Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStrChart ) );
aStr.AppendAscii(" 1"); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('5'));
nLen = aStr.Len() - 1; Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStrChart ) );
Insert( new XColorEntry( Color(255, 51,102 ), aStr ), 25 ); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('6'));
aStr.SetChar(nLen, sal_Unicode('2')); Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStrChart ) );
Insert( new XColorEntry( Color(220, 35, 0 ), aStr ), 26 ); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('7'));
aStr.SetChar(nLen, sal_Unicode('3')); Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStrChart ) );
Insert( new XColorEntry( Color(184, 71, 0 ), aStr ), 27 ); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('8'));
aStr.SetChar(nLen, sal_Unicode('4')); Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStrChart ) );
Insert( new XColorEntry( Color(255, 51, 51 ), aStr ), 28 ); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('9'));
aStr.SetChar(nLen, sal_Unicode('5')); Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStrChart ) );
Insert( new XColorEntry( Color(235, 97, 61 ), aStr ), 29 ); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('1'));
aStr.SetChar(nLen, sal_Unicode('6')); aStrChart.AppendAscii("0");
Insert( new XColorEntry( Color(184, 71, 71 ), aStr ), 30 ); Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStrChart ) );
aStr.SetChar(nLen, sal_Unicode('7')); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('1'));
Insert( new XColorEntry( Color(184, 0, 71 ), aStr ), 31 ); Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStrChart ) );
aStr.SetChar(nLen, sal_Unicode('8')); aStrChart.SetChar(aStrChart.Len() - 1, sal_Unicode('2'));
Insert( new XColorEntry( Color(153, 40, 76 ), aStr ), 32 ); Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStrChart ) );
aStr = SVX_RESSTR( RID_SVXSTR_MAGENTA ); return(165 == Count());
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;
} }
Bitmap XColorList::CreateBitmapForUI( long /*nIndex*/ ) Bitmap XColorList::CreateBitmapForUI( long /*nIndex*/ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment