Attachment #80683 for issue #122317

View | Details | Raw Unified | Return to issue 122317
Collapse All | Expand All




  <draw:color draw:name="Magenta" draw:color="#ff33ff"/>
  <draw:color draw:name="Purple" draw:color="#9900ff"/>
  <draw:color draw:name="Blue" draw:color="#6666ff"/>
  <draw:color draw:name="Sky blue" draw:color="#00ccff"/>
  <draw:color draw:name="Cyan" draw:color="#66ffff"/>
  <draw:color draw:name="Turquoise" draw:color="#33ff99"/>
  <draw:color draw:name="Green" draw:color="#99ff66"/>
  <draw:color draw:name="Yellow green" draw:color="#ccff00"/>
  <draw:color draw:name="Yellow 1" draw:color="#ffff66"/>
  <draw:color draw:name="Orange 1" draw:color="#ffcc00"/>
  <draw:color draw:name="Red 1" draw:color="#ff9999"/>

  <draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>
  <draw:color draw:name="Purple 1" draw:color="#cc66ff"/>
  <draw:color draw:name="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="Turquoise 1" draw:color="#66ff99"/>
  <draw:color draw:name="Green 1" draw:color="#99ff99"/>
  <draw:color draw:name="Yellow green 1" draw:color="#ccff66"/>
  <draw:color draw:name="Yellow 2" draw:color="#ffff00"/>
  <draw:color draw:name="Orange 2" draw:color="#ff9900"/>
  <draw:color draw:name="Red 2" draw:color="#ff6666"/>

  <draw:color draw:name="Magenta 2" draw:color="#ff66ff"/>
  <draw:color draw:name="Purple 2" draw:color="#9933ff"/>
  <draw:color draw:name="Blue 2" draw:color="#3333ff"/>
  <draw:color draw:name="Sky blue 2" draw:color="#3399ff"/>
  <draw:color draw:name="Cyan 2" draw:color="#00ffff"/>
  <draw:color draw:name="Turquoise 2" draw:color="#00ff66"/>
  <draw:color draw:name="Green 2" draw:color="#66ff66"/>
  <draw:color draw:name="Yellow green 2" draw:color="#99ff33"/>
  <draw:color draw:name="Yellow 3" draw:color="#cc9900"/>
  <draw:color draw:name="Orange 3" draw:color="#ff3300"/>
  <draw:color draw:name="Red 3" draw:color="#ff0000"/>

  <draw:color draw:name="Magenta 3" draw:color="#ff00ff"/>
  <draw:color draw:name="Purple 3" draw:color="#6600ff"/>
  <draw:color draw:name="Blue 3" draw:color="#0000ff"/>
  <draw:color draw:name="Sky blue 3" draw:color="#0066ff"/>
  <draw:color draw:name="Cyan 3" draw:color="#00cccc"/>
  <draw:color draw:name="Turquoise 3" draw:color="#00cc33"/>
  <draw:color draw:name="Green 3" draw:color="#00cc00"/>
  <draw:color draw:name="Yellow green 3" draw:color="#66ff00"/>
  <draw:color draw:name="Yellow 4" draw:color="#996600"/>
  <draw:color draw:name="Orange 4" draw:color="#cc3300"/>
  <draw:color draw:name="Red 4" draw:color="#cc0000"/>

  <draw:color draw:name="Magenta 4" draw:color="#cc00cc"/>
  <draw:color draw:name="Purple 4" draw:color="#6600cc"/>
  <draw:color draw:name="Blue 4" draw:color="#0000cc"/>
  <draw:color draw:name="Sky blue 4" draw:color="#0066cc"/>
  <draw:color draw:name="Cyan 4" draw:color="#009999"/>
  <draw:color draw:name="Turquoise 4" draw:color="#009933"/>
  <draw:color draw:name="Green 4" draw:color="#009900"/>
  <draw:color draw:name="Yellow green 4" draw:color="#66cc00"/>
  <draw:color draw:name="Yellow 5" draw:color="#663300"/>
  <draw:color draw:name="Orange 5" draw:color="#801900"/>
  <draw:color draw:name="Red 5" draw:color="#990000"/>

  <draw:color draw:name="Magenta 5" draw:color="#990099"/>
  <draw:color draw:name="Purple 5" draw:color="#330099"/>
  <draw:color draw:name="Blue 5" draw:color="#000099"/>
  <draw:color draw:name="Sky blue 5" draw:color="#006699"/>
  <draw:color draw:name="Cyan 5" draw:color="#006666"/>
  <draw:color draw:name="Turquoise 5" draw:color="#007826"/>
  <draw:color draw:name="Green 5" draw:color="#006600"/>
  <draw:color draw:name="Yellow green 5" draw:color="#669900"/>
  <draw:color draw:name="Yellow 6" draw:color="#333300"/>
  <draw:color draw:name="Orange 6" draw:color="#461900"/>
  <draw:color draw:name="Red 6" draw:color="#330000"/>

  <draw:color draw:name="Magenta 6" draw:color="#660066"/>
  <draw:color draw:name="Purple 6" draw:color="#000033"/>
  <draw:color draw:name="Blue 6" draw:color="#000066"/>
  <draw:color draw:name="Sky blue 6" draw:color="#000080"/>
  <draw:color draw:name="Cyan 6" draw:color="#003333"/>
  <draw:color draw:name="Turquoise 6" draw:color="#00331a"/>
  <draw:color draw:name="Green 6" draw:color="#003300"/>
  <draw:color draw:name="Yellow green 6" draw:color="#193300"/>
  <draw:color draw:name="Yellow 7" draw:color="#666633"/>
  <draw:color draw:name="Orange 7" draw:color="#661900"/>
  <draw:color draw:name="Red 7" draw:color="#663333"/>

  <draw:color draw:name="Magenta 7" draw:color="#663366"/>
  <draw:color draw:name="Purple 7" draw:color="#330066"/>
  <draw:color draw:name="Blue 7" draw:color="#333366"/>
  <draw:color draw:name="Sky blue 7" draw:color="#003366"/>
  <draw:color draw:name="Cyan 7" draw:color="#336666"/>
  <draw:color draw:name="Turquoise 7" draw:color="#006633"/>
  <draw:color draw:name="Green 7" draw:color="#336633"/>
  <draw:color draw:name="Yellow green 7" draw:color="#336600"/>
  <draw:color draw:name="Yellow 8" draw:color="#999966"/>
  <draw:color draw:name="Orange 8" draw:color="#996633"/>
  <draw:color draw:name="Red 8" draw:color="#996666"/>

  <draw:color draw:name="Magenta 8" draw:color="#996699"/>
  <draw:color draw:name="Purple 8" draw:color="#663399"/>
  <draw:color draw:name="Blue 8" draw:color="#666699"/>
  <draw:color draw:name="Sky blue 8" draw:color="#336699"/>
  <draw:color draw:name="Cyan 8" draw:color="#669999"/>
  <draw:color draw:name="Turquoise 8" draw:color="#339966"/>
  <draw:color draw:name="Green 8" draw:color="#669966"/>
  <draw:color draw:name="Yellow green 8" draw:color="#669933"/>
  <draw:color draw:name="Yellow 9" draw:color="#cccc99"/>
  <draw:color draw:name="Orange 9" draw:color="#cc9966"/>
  <draw:color draw:name="Red 9" draw:color="#cc9999"/>

  <draw:color draw:name="Magenta 9" draw:color="#cc99cc"/>
  <draw:color draw:name="Purple 9" draw:color="#9966cc"/>
  <draw:color draw:name="Blue 9" draw:color="#9999cc"/>
  <draw:color draw:name="Sky blue 9" draw:color="#6699cc"/>
  <draw:color draw:name="Cyan 9" draw:color="#99cccc"/>
  <draw:color draw:name="Turquoise 9" draw:color="#66cc99"/>
  <draw:color draw:name="Green 9" draw:color="#99cc99"/>
  <draw:color draw:name="Yellow green 9" draw:color="#99cc66"/>
  <draw:color draw:name="Yellow 10" draw:color="#ffffcc"/>
  <draw:color draw:name="Orange 10" draw:color="#ffcc99"/>
  <draw:color draw:name="Red 10" draw:color="#ffcccc"/>

  <draw:color draw:name="Magenta 10" draw:color="#ffccff"/>
  <draw:color draw:name="Purple 10" draw:color="#cc99ff"/>
  <draw:color draw:name="Blue 10" draw:color="#ccccff"/>
  <draw:color draw:name="Sky blue 10" draw:color="#99ccff"/>
  <draw:color draw:name="Cyan 10" draw:color="#ccffff"/>
  <draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/>
  <draw:color draw:name="Green 10" draw:color="#ccffcc"/>
  <draw:color draw:name="Yellow green 10" draw:color="#ccff99"/>

  <!-- #121520# use some 'nice' colors from original palette -->
  <draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
  <draw:color draw:name="Blue 11" draw:color="#CFE7F5"/>

  <!-- #121520# add 'pale' colors from original palette -->
  <draw:color draw:name="Violet" draw:color="#9999ff"/>

Lines 482-487 Link Here

(-)a/main/svx/inc/svx/dialogs.hrc (+11 lines)
482	#define RID_SVXSTR_BLUEGREY (RID_SVX_START + 291)	482	#define RID_SVXSTR_BLUEGREY (RID_SVX_START + 291)
483	#define RID_SVXSTR_ORANGE (RID_SVX_START + 292)	483	#define RID_SVXSTR_ORANGE (RID_SVX_START + 292)
484		484
		485	#define RID_SVXSTR_COLOR_TURQUOISE (RID_SVX_START + 293)
		486	#define RID_SVXSTR_COLOR_TURQUOISE_DEF (RID_SVX_START + 294)
		487
485	// Linienenden-Strings	488	// Linienenden-Strings
486	#define RID_SVXSTR_ARROW (RID_SVX_START + 300)	489	#define RID_SVXSTR_ARROW (RID_SVX_START + 300)
487	#define RID_SVXSTR_SQUARE (RID_SVX_START + 301)	490	#define RID_SVXSTR_SQUARE (RID_SVX_START + 301)
Lines 661-666 Link Here
661	#define RID_SVXSTR_COLOR_SUN_DEF (RID_SVX_START + 620)	664	#define RID_SVXSTR_COLOR_SUN_DEF (RID_SVX_START + 620)
662	#define RID_SVXSTR_COLOR_CHART (RID_SVX_START + 621)	665	#define RID_SVXSTR_COLOR_CHART (RID_SVX_START + 621)
663	#define RID_SVXSTR_COLOR_CHART_DEF (RID_SVX_START + 622)	666	#define RID_SVXSTR_COLOR_CHART_DEF (RID_SVX_START + 622)
		667	#define RID_SVXSTR_COLOR_PURPLE (RID_SVX_START + 623)
		668	#define RID_SVXSTR_COLOR_PURPLE_DEF (RID_SVX_START + 624)
		669	#define RID_SVXSTR_COLOR_SKYBLUE (RID_SVX_START + 625)
		670	#define RID_SVXSTR_COLOR_SKYBLUE_DEF (RID_SVX_START + 626)
		671	#define RID_SVXSTR_COLOR_YELLOWGREEN (RID_SVX_START + 627)
		672	#define RID_SVXSTR_COLOR_YELLOWGREEN_DEF (RID_SVX_START + 628)
		673	#define RID_SVXSTR_COLOR_PINK (RID_SVX_START + 629)
		674	#define RID_SVXSTR_COLOR_PINK_DEF (RID_SVX_START + 630)
664		675
665	// Default-Gradient-Names	676	// Default-Gradient-Names
666	#define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 631)	677	#define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 631)




{
	/* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */
	/* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */
	Text [ en-US ] = "Cyan" ;
};
String RID_SVXSTR_RED
{

	Text [ en-US ] = "Chart" ;
};

String RID_SVXSTR_COLOR_PURPLE
{
    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
{
	Text [ en-US ] = "3D";

/* nicht uebersetzen */
String RID_SVXSTR_CYAN_DEF
{
	Text = "Cyan" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_RED_DEF

{
	Text = "Chart";
};
/* DO NOT TRANSLATE */
String RID_SVXSTR_COLOR_PURPLE_DEF
{
    Text = "Purple";
};
/* DO NOT TRANSLATE */
String RID_SVXSTR_COLOR_SKYBLUE_DEF
{
    Text = "Sky blue";
};
/* DO NOT TRANSLATE */
String RID_SVXSTR_COLOR_YELLOWGREEN_DEF
{
    Text = "Yellow green";
};
/* DO NOT TRANSLATE */
String RID_SVXSTR_COLOR_PINK_DEF
{
    Text = "Pink";
};
String RID_SVXSTR_COLOR_TURQUOISE_DEF
{
    Text = "Turquoise" ;
};

///////////////////////////////////////////////////////////////////////////////
//




	RID_SVXSTR_CYAN_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_DKVIOLET_DEF,
	RID_SVXSTR_SALMON_DEF,
	RID_SVXSTR_SEABLUE_DEF,
	RID_SVXSTR_COLOR_CHART_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
};

static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] =

	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,
	RID_SVXSTR_ORANGE,

	RID_SVXSTR_DKVIOLET,
	RID_SVXSTR_SALMON,
	RID_SVXSTR_SEABLUE,
    RID_SVXSTR_COLOR_CHART,
    RID_SVXSTR_COLOR_PURPLE,
    RID_SVXSTR_COLOR_SKYBLUE,
    RID_SVXSTR_COLOR_YELLOWGREEN,
    RID_SVXSTR_COLOR_PINK,
    RID_SVXSTR_COLOR_TURQUOISE
};

bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()




#define GLOBALOVERFLOW

using namespace com::sun::star;
using namespace rtl;

sal_Unicode const pszExtColor[]	 = {'s','o','c'};


{
	XubString aStr;
	xub_StrLen nLen;
	ResMgr& rRes = DIALOG_MGR();

    long nCount(0);

    Insert( new XColorEntry( Color( 0x00, 0x00, 0x00 ), SVX_RESSTR( RID_SVXSTR_BLACK ) ), nCount);
    Insert( new XColorEntry( Color( 0xe6, 0xe6, 0xff ), SVX_RESSTR( RID_SVXSTR_BLUEGREY ) ), ++nCount);
    Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), SVX_RESSTR( RID_SVXSTR_BORDEAUX ) ), ++nCount);
    Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), SVX_RESSTR( RID_SVXSTR_DKVIOLET ) ), ++nCount);
    Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_PALE_GREEN ) ), ++nCount);
    Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), SVX_RESSTR( RID_SVXSTR_PALE_YELLOW ) ), ++nCount);
    Insert( new XColorEntry( Color( 0xff, 0x80, 0x80 ), SVX_RESSTR( RID_SVXSTR_SALMON ) ), ++nCount);
    Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), SVX_RESSTR( RID_SVXSTR_SEABLUE ) ), ++nCount);
    Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), SVX_RESSTR( RID_SVXSTR_VIOLET ) ), ++nCount);
    Insert( new XColorEntry( Color( 0xff, 0xff, 0xff ), SVX_RESSTR( RID_SVXSTR_WHITE ) ), ++nCount);

    // WARNING no "Gray"
    aStr = SVX_RESSTR( RID_SVXSTR_GREY );
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xee, 0xee, 0xee ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0xdd, 0xdd, 0xdd ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0xb2, 0xb2, 0xb2 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x99, 0x99, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x80, 0x80, 0x80 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x66, 0x66, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x33, 0x33, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x1c, 0x1c, 0x1c  ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0x11, 0x11, 0x11 ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_BLUE );
    Insert( new XColorEntry( Color( 0x66, 0x66, 0xff ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x33, 0x33, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0x00, 0x00, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x00, 0x00, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x00, 0x00, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x00, 0x00, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x33, 0x33, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x66, 0x66, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x99, 0x99, 0xcc  ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xcc, 0xcc, 0xff  ), aStr ), ++nCount);
    aStr.SetChar(nLen+1, sal_Unicode('1'));
    Insert( new XColorEntry( Color( 0xCF, 0xE7, 0xF5  ), aStr ), ++nCount);

    aStr = SVX_RESSTR( RID_SVXSTR_CYAN );
    Insert( new XColorEntry( Color( 0x66, 0xff, 0xff ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0x99, 0xff, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x00, 0xff, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0x00, 0xcc, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x00, 0x99, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x00, 0x66, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x00, 0x33, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x33, 0x66, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x66, 0x99, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x99, 0xcc, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xcc, 0xff, 0xff ), aStr ), ++nCount);

    aStr = SVX_RESSTR( RID_SVXSTR_GREEN );
      Insert( new XColorEntry( Color( 0x99, 0xff, 0x66 ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0x99, 0xff, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x66, 0xff, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0x00, 0xcc, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x00, 0x99, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x00, 0x66, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x00, 0x33, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x33, 0x66, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x66, 0x99, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x99, 0xcc, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xcc, 0xff, 0xcc ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_MAGENTA );
    Insert( new XColorEntry( Color( 0xff, 0x33, 0xff ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xff, 0x99, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0xff, 0x66, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0xff, 0x00, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0xcc, 0x00, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x99, 0x00, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x66, 0x00, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x66, 0x33, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x99, 0x66, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0xcc, 0x99, 0xcc  ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xff, 0xcc, 0xff ), aStr ), ++nCount);

    aStr = SVX_RESSTR( RID_SVXSTR_ORANGE );
    Insert( new XColorEntry( Color( 0xff, 0x66, 0x00 ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xff, 0xcc, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0xff, 0x99, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0xff, 0x33, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0xcc, 0x33, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x80, 0x19, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x46, 0x19, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x66, 0x19, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x99, 0x66, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0xcc, 0x99, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xff, 0xcc, 0x99 ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_COLOR_PINK );
    Insert( new XColorEntry( Color( 0xff, 0x00, 0xcc ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xff, 0x66, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0xff, 0x33, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0xff, 0x00, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0xcc, 0x00, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x99, 0x00, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x33, 0x00, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x66, 0x00, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x99, 0x33, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0xcc, 0x66, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xff, 0x99, 0xcc ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_COLOR_PURPLE );
    Insert( new XColorEntry( Color( 0x99, 0x00, 0xff ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xcc, 0x66, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x99, 0x33, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0x66, 0x00, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x66, 0x00, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x33, 0x00, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x00, 0x00, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x33, 0x00, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x66, 0x33, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x99, 0x66, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xcc, 0x99, 0xff ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_RED );
    Insert( new XColorEntry( Color( 0xff, 0x33, 0x33 ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xff, 0x99, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0xff, 0x66, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0xff, 0x00, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0xcc, 0x00, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x99, 0x00, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x33, 0x00, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x66, 0x33, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x99, 0x66, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0xcc, 0x99, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xff, 0xcc, 0xcc ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_COLOR_SKYBLUE );
    Insert( new XColorEntry( Color( 0x00, 0xcc, 0xff ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0x99, 0x99, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x33, 0x99, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0x00, 0x66, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x00, 0x66, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x00, 0x66, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x00, 0x00, 0x80 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x00, 0x33, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x33, 0x66, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x66, 0x99, 0xcc ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0x99, 0xcc, 0xff ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_COLOR_TURQUOISE );
    Insert( new XColorEntry( Color( 0x33, 0xff, 0x99 ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0x66, 0xff, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x00, 0xff, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0x00, 0xcc, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x00, 0x99, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x00, 0x78, 0x26 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x00, 0x33, 0x1a ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x00, 0x66, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x33, 0x99, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x66, 0xcc, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0x99, 0xff, 0xcc ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_YELLOW );
    Insert( new XColorEntry( Color( 0xff, 0xff, 0x99 ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xff, 0xff, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0xff, 0xff, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0xcc, 0x99, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x99, 0x66, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x66, 0x33, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x33, 0x33, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x66, 0x66, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x99, 0x99, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0xcc, 0xcc, 0x99 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xff, 0xff, 0xcc ), aStr ), ++nCount);


    aStr = SVX_RESSTR( RID_SVXSTR_COLOR_YELLOWGREEN );
    Insert( new XColorEntry( Color( 0xcc, 0xff, 0x00 ), aStr ), ++nCount);
    aStr.AppendAscii(" 1");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xcc, 0xff, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x99, 0xff, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0x66, 0xff, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x66, 0xcc, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x66, 0x99, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x19, 0x33, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x33, 0x66, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0x66, 0x99, 0x33 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x99, 0xcc, 0x66 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    Insert( new XColorEntry( Color( 0xcc, 0xff, 0x99 ), aStr ), ++nCount);

    // 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 ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0xff, 0x42, 0x0e ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('3'));
    Insert( new XColorEntry( Color( 0xff, 0xd3, 0x20 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('4'));
    Insert( new XColorEntry( Color( 0x57, 0x9d, 0x1c ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('5'));
    Insert( new XColorEntry( Color( 0x7e, 0x00, 0x21 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('6'));
    Insert( new XColorEntry( Color( 0x83, 0xca, 0xff ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('7'));
    Insert( new XColorEntry( Color( 0x31, 0x40, 0x04 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('8'));
    Insert( new XColorEntry( Color( 0xae, 0xcf, 0x00 ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('9'));
    Insert( new XColorEntry( Color( 0x4b, 0x1f, 0x6f ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    aStr.AppendAscii("0");
    nLen = aStr.Len() - 1;
    Insert( new XColorEntry( Color( 0xff, 0x95, 0x0e ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('1'));
    Insert( new XColorEntry( Color( 0xc5, 0x00, 0x0b ), aStr ), ++nCount);
    aStr.SetChar(nLen, sal_Unicode('2'));
    Insert( new XColorEntry( Color( 0x00, 0x84, 0xd1 ), aStr ), ++nCount);


    return( Count() == ++nCount );
}

/************************************************************************/

Return to issue 122317

Lines 1239-1252 static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] = Link Here

(-)a/main/svx/source/unodraw/unoprov.cxx (-18 / +12 lines)
1239	RID_SVXSTR_CYAN_DEF,	1239	RID_SVXSTR_CYAN_DEF,
1240	RID_SVXSTR_RED_DEF,	1240	RID_SVXSTR_RED_DEF,
1241	RID_SVXSTR_MAGENTA_DEF,	1241	RID_SVXSTR_MAGENTA_DEF,
1242	RID_SVXSTR_BROWN_DEF,
1243	RID_SVXSTR_GREY_DEF,	1242	RID_SVXSTR_GREY_DEF,
1244	RID_SVXSTR_LIGHTGREY_DEF,
1245	RID_SVXSTR_LIGHTBLUE_DEF,
1246	RID_SVXSTR_LIGHTGREEN_DEF,
1247	RID_SVXSTR_LIGHTCYAN_DEF,
1248	RID_SVXSTR_LIGHTRED_DEF,
1249	RID_SVXSTR_LIGHTMAGENTA_DEF,
1250	RID_SVXSTR_YELLOW_DEF,	1243	RID_SVXSTR_YELLOW_DEF,
1251	RID_SVXSTR_WHITE_DEF,	1244	RID_SVXSTR_WHITE_DEF,
1252	RID_SVXSTR_ORANGE_DEF,	1245	RID_SVXSTR_ORANGE_DEF,
Lines 1257-1264 static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] = Link Here
1257	RID_SVXSTR_DKVIOLET_DEF,	1250	RID_SVXSTR_DKVIOLET_DEF,
1258	RID_SVXSTR_SALMON_DEF,	1251	RID_SVXSTR_SALMON_DEF,
1259	RID_SVXSTR_SEABLUE_DEF,	1252	RID_SVXSTR_SEABLUE_DEF,
1260	RID_SVXSTR_COLOR_SUN_DEF,	1253	RID_SVXSTR_COLOR_CHART_DEF,
1261	RID_SVXSTR_COLOR_CHART_DEF	1254	RID_SVXSTR_COLOR_PURPLE_DEF,
		1255	RID_SVXSTR_COLOR_SKYBLUE_DEF,
		1256	RID_SVXSTR_COLOR_YELLOWGREEN_DEF,
		1257	RID_SVXSTR_COLOR_PINK_DEF,
		1258	RID_SVXSTR_COLOR_TURQUOISE_DEF
1262	};	1259	};
1263		1260
1264	static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] =	1261	static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] =
Lines 1270-1283 static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] = Link Here
1270	RID_SVXSTR_CYAN,	1267	RID_SVXSTR_CYAN,
1271	RID_SVXSTR_RED,	1268	RID_SVXSTR_RED,
1272	RID_SVXSTR_MAGENTA,	1269	RID_SVXSTR_MAGENTA,
1273	RID_SVXSTR_BROWN,
1274	RID_SVXSTR_GREY,	1270	RID_SVXSTR_GREY,
1275	RID_SVXSTR_LIGHTGREY,
1276	RID_SVXSTR_LIGHTBLUE,
1277	RID_SVXSTR_LIGHTGREEN,
1278	RID_SVXSTR_LIGHTCYAN,
1279	RID_SVXSTR_LIGHTRED,
1280	RID_SVXSTR_LIGHTMAGENTA,
1281	RID_SVXSTR_YELLOW,	1271	RID_SVXSTR_YELLOW,
1282	RID_SVXSTR_WHITE,	1272	RID_SVXSTR_WHITE,
1283	RID_SVXSTR_ORANGE,	1273	RID_SVXSTR_ORANGE,
Lines 1288-1295 static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] = Link Here
1288	RID_SVXSTR_DKVIOLET,	1278	RID_SVXSTR_DKVIOLET,
1289	RID_SVXSTR_SALMON,	1279	RID_SVXSTR_SALMON,
1290	RID_SVXSTR_SEABLUE,	1280	RID_SVXSTR_SEABLUE,
1291	RID_SVXSTR_COLOR_SUN,	1281	RID_SVXSTR_COLOR_CHART,
1292	RID_SVXSTR_COLOR_CHART	1282	RID_SVXSTR_COLOR_PURPLE,
		1283	RID_SVXSTR_COLOR_SKYBLUE,
		1284	RID_SVXSTR_COLOR_YELLOWGREEN,
		1285	RID_SVXSTR_COLOR_PINK,
		1286	RID_SVXSTR_COLOR_TURQUOISE
1293	};	1287	};
1294		1288
1295	bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()	1289	bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()

Lines 20-30 Link Here

(-)a/main/extras/source/palettes/standard.soc (-23 / +23 lines)
20	<draw:color draw:name="Magenta" draw:color="#ff33ff"/>	20	<draw:color draw:name="Magenta" draw:color="#ff33ff"/>
21	<draw:color draw:name="Purple" draw:color="#9900ff"/>	21	<draw:color draw:name="Purple" draw:color="#9900ff"/>
22	<draw:color draw:name="Blue" draw:color="#6666ff"/>	22	<draw:color draw:name="Blue" draw:color="#6666ff"/>
23	<draw:color draw:name="Sky Blue" draw:color="#00ccff"/>	23	<draw:color draw:name="Sky blue" draw:color="#00ccff"/>
24	<draw:color draw:name="Cyan" draw:color="#66ffff"/>	24	<draw:color draw:name="Cyan" draw:color="#66ffff"/>
25	<draw:color draw:name="Turquoise" draw:color="#33ff99"/>	25	<draw:color draw:name="Turquoise" draw:color="#33ff99"/>
26	<draw:color draw:name="Green" draw:color="#99ff66"/>	26	<draw:color draw:name="Green" draw:color="#99ff66"/>
27	<draw:color draw:name="Yellow Green" draw:color="#ccff00"/>	27	<draw:color draw:name="Yellow green" draw:color="#ccff00"/>
28	<draw:color draw:name="Yellow 1" draw:color="#ffff66"/>	28	<draw:color draw:name="Yellow 1" draw:color="#ffff66"/>
29	<draw:color draw:name="Orange 1" draw:color="#ffcc00"/>	29	<draw:color draw:name="Orange 1" draw:color="#ffcc00"/>
30	<draw:color draw:name="Red 1" draw:color="#ff9999"/>	30	<draw:color draw:name="Red 1" draw:color="#ff9999"/>
Lines 32-42 Link Here
32	<draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>	32	<draw:color draw:name="Magenta 1" draw:color="#ff99ff"/>
33	<draw:color draw:name="Purple 1" draw:color="#cc66ff"/>	33	<draw:color draw:name="Purple 1" draw:color="#cc66ff"/>
34	<draw:color draw:name="Blue 1" draw:color="#9999ff"/>	34	<draw:color draw:name="Blue 1" draw:color="#9999ff"/>
35	<draw:color draw:name="Sky Blue 1" draw:color="#9999ff"/>	35	<draw:color draw:name="Sky blue 1" draw:color="#9999ff"/>
36	<draw:color draw:name="Cyan 1" draw:color="#99ffff"/>	36	<draw:color draw:name="Cyan 1" draw:color="#99ffff"/>
37	<draw:color draw:name="Turquoise 1" draw:color="#66ff99"/>	37	<draw:color draw:name="Turquoise 1" draw:color="#66ff99"/>
38	<draw:color draw:name="Green 1" draw:color="#99ff99"/>	38	<draw:color draw:name="Green 1" draw:color="#99ff99"/>
39	<draw:color draw:name="Yellow Green 1" draw:color="#ccff66"/>	39	<draw:color draw:name="Yellow green 1" draw:color="#ccff66"/>
40	<draw:color draw:name="Yellow 2" draw:color="#ffff00"/>	40	<draw:color draw:name="Yellow 2" draw:color="#ffff00"/>
41	<draw:color draw:name="Orange 2" draw:color="#ff9900"/>	41	<draw:color draw:name="Orange 2" draw:color="#ff9900"/>
42	<draw:color draw:name="Red 2" draw:color="#ff6666"/>	42	<draw:color draw:name="Red 2" draw:color="#ff6666"/>
Lines 44-54 Link Here
44	<draw:color draw:name="Magenta 2" draw:color="#ff66ff"/>	44	<draw:color draw:name="Magenta 2" draw:color="#ff66ff"/>
45	<draw:color draw:name="Purple 2" draw:color="#9933ff"/>	45	<draw:color draw:name="Purple 2" draw:color="#9933ff"/>
46	<draw:color draw:name="Blue 2" draw:color="#3333ff"/>	46	<draw:color draw:name="Blue 2" draw:color="#3333ff"/>
47	<draw:color draw:name="Sky Blue 2" draw:color="#3399ff"/>	47	<draw:color draw:name="Sky blue 2" draw:color="#3399ff"/>
48	<draw:color draw:name="Cyan 2" draw:color="#00ffff"/>	48	<draw:color draw:name="Cyan 2" draw:color="#00ffff"/>
49	<draw:color draw:name="Turquoise 2" draw:color="#00ff66"/>	49	<draw:color draw:name="Turquoise 2" draw:color="#00ff66"/>
50	<draw:color draw:name="Green 2" draw:color="#66ff66"/>	50	<draw:color draw:name="Green 2" draw:color="#66ff66"/>
51	<draw:color draw:name="Yellow Green 2" draw:color="#99ff33"/>	51	<draw:color draw:name="Yellow green 2" draw:color="#99ff33"/>
52	<draw:color draw:name="Yellow 3" draw:color="#cc9900"/>	52	<draw:color draw:name="Yellow 3" draw:color="#cc9900"/>
53	<draw:color draw:name="Orange 3" draw:color="#ff3300"/>	53	<draw:color draw:name="Orange 3" draw:color="#ff3300"/>
54	<draw:color draw:name="Red 3" draw:color="#ff0000"/>	54	<draw:color draw:name="Red 3" draw:color="#ff0000"/>
Lines 56-66 Link Here
56	<draw:color draw:name="Magenta 3" draw:color="#ff00ff"/>	56	<draw:color draw:name="Magenta 3" draw:color="#ff00ff"/>
57	<draw:color draw:name="Purple 3" draw:color="#6600ff"/>	57	<draw:color draw:name="Purple 3" draw:color="#6600ff"/>
58	<draw:color draw:name="Blue 3" draw:color="#0000ff"/>	58	<draw:color draw:name="Blue 3" draw:color="#0000ff"/>
59	<draw:color draw:name="Sky Blue 3" draw:color="#0066ff"/>	59	<draw:color draw:name="Sky blue 3" draw:color="#0066ff"/>
60	<draw:color draw:name="Cyan 3" draw:color="#00cccc"/>	60	<draw:color draw:name="Cyan 3" draw:color="#00cccc"/>
61	<draw:color draw:name="Turquoise 3" draw:color="#00cc33"/>	61	<draw:color draw:name="Turquoise 3" draw:color="#00cc33"/>
62	<draw:color draw:name="Green 3" draw:color="#00cc00"/>	62	<draw:color draw:name="Green 3" draw:color="#00cc00"/>
63	<draw:color draw:name="Yellow Green 3" draw:color="#66ff00"/>	63	<draw:color draw:name="Yellow green 3" draw:color="#66ff00"/>
64	<draw:color draw:name="Yellow 4" draw:color="#996600"/>	64	<draw:color draw:name="Yellow 4" draw:color="#996600"/>
65	<draw:color draw:name="Orange 4" draw:color="#cc3300"/>	65	<draw:color draw:name="Orange 4" draw:color="#cc3300"/>
66	<draw:color draw:name="Red 4" draw:color="#cc0000"/>	66	<draw:color draw:name="Red 4" draw:color="#cc0000"/>
Lines 68-78 Link Here
68	<draw:color draw:name="Magenta 4" draw:color="#cc00cc"/>	68	<draw:color draw:name="Magenta 4" draw:color="#cc00cc"/>
69	<draw:color draw:name="Purple 4" draw:color="#6600cc"/>	69	<draw:color draw:name="Purple 4" draw:color="#6600cc"/>
70	<draw:color draw:name="Blue 4" draw:color="#0000cc"/>	70	<draw:color draw:name="Blue 4" draw:color="#0000cc"/>
71	<draw:color draw:name="Sky Blue 4" draw:color="#0066cc"/>	71	<draw:color draw:name="Sky blue 4" draw:color="#0066cc"/>
72	<draw:color draw:name="Cyan 4" draw:color="#009999"/>	72	<draw:color draw:name="Cyan 4" draw:color="#009999"/>
73	<draw:color draw:name="Turquoise 4" draw:color="#009933"/>	73	<draw:color draw:name="Turquoise 4" draw:color="#009933"/>
74	<draw:color draw:name="Green 4" draw:color="#009900"/>	74	<draw:color draw:name="Green 4" draw:color="#009900"/>
75	<draw:color draw:name="Yellow Green 4" draw:color="#66cc00"/>	75	<draw:color draw:name="Yellow green 4" draw:color="#66cc00"/>
76	<draw:color draw:name="Yellow 5" draw:color="#663300"/>	76	<draw:color draw:name="Yellow 5" draw:color="#663300"/>
77	<draw:color draw:name="Orange 5" draw:color="#801900"/>	77	<draw:color draw:name="Orange 5" draw:color="#801900"/>
78	<draw:color draw:name="Red 5" draw:color="#990000"/>	78	<draw:color draw:name="Red 5" draw:color="#990000"/>
Lines 80-90 Link Here
80	<draw:color draw:name="Magenta 5" draw:color="#990099"/>	80	<draw:color draw:name="Magenta 5" draw:color="#990099"/>
81	<draw:color draw:name="Purple 5" draw:color="#330099"/>	81	<draw:color draw:name="Purple 5" draw:color="#330099"/>
82	<draw:color draw:name="Blue 5" draw:color="#000099"/>	82	<draw:color draw:name="Blue 5" draw:color="#000099"/>
83	<draw:color draw:name="Sky Blue 5" draw:color="#006699"/>	83	<draw:color draw:name="Sky blue 5" draw:color="#006699"/>
84	<draw:color draw:name="Cyan 5" draw:color="#006666"/>	84	<draw:color draw:name="Cyan 5" draw:color="#006666"/>
85	<draw:color draw:name="Turquoise 5" draw:color="#007826"/>	85	<draw:color draw:name="Turquoise 5" draw:color="#007826"/>
86	<draw:color draw:name="Green 5" draw:color="#006600"/>	86	<draw:color draw:name="Green 5" draw:color="#006600"/>
87	<draw:color draw:name="Yellow Green 5" draw:color="#669900"/>	87	<draw:color draw:name="Yellow green 5" draw:color="#669900"/>
88	<draw:color draw:name="Yellow 6" draw:color="#333300"/>	88	<draw:color draw:name="Yellow 6" draw:color="#333300"/>
89	<draw:color draw:name="Orange 6" draw:color="#461900"/>	89	<draw:color draw:name="Orange 6" draw:color="#461900"/>
90	<draw:color draw:name="Red 6" draw:color="#330000"/>	90	<draw:color draw:name="Red 6" draw:color="#330000"/>
Lines 92-102 Link Here
92	<draw:color draw:name="Magenta 6" draw:color="#660066"/>	92	<draw:color draw:name="Magenta 6" draw:color="#660066"/>
93	<draw:color draw:name="Purple 6" draw:color="#000033"/>	93	<draw:color draw:name="Purple 6" draw:color="#000033"/>
94	<draw:color draw:name="Blue 6" draw:color="#000066"/>	94	<draw:color draw:name="Blue 6" draw:color="#000066"/>
95	<draw:color draw:name="Sky Blue 6" draw:color="#000080"/>	95	<draw:color draw:name="Sky blue 6" draw:color="#000080"/>
96	<draw:color draw:name="Cyan 6" draw:color="#003333"/>	96	<draw:color draw:name="Cyan 6" draw:color="#003333"/>
97	<draw:color draw:name="Turquoise 6" draw:color="#00331a"/>	97	<draw:color draw:name="Turquoise 6" draw:color="#00331a"/>
98	<draw:color draw:name="Green 6" draw:color="#003300"/>	98	<draw:color draw:name="Green 6" draw:color="#003300"/>
99	<draw:color draw:name="Yellow Green 6" draw:color="#193300"/>	99	<draw:color draw:name="Yellow green 6" draw:color="#193300"/>
100	<draw:color draw:name="Yellow 7" draw:color="#666633"/>	100	<draw:color draw:name="Yellow 7" draw:color="#666633"/>
101	<draw:color draw:name="Orange 7" draw:color="#661900"/>	101	<draw:color draw:name="Orange 7" draw:color="#661900"/>
102	<draw:color draw:name="Red 7" draw:color="#663333"/>	102	<draw:color draw:name="Red 7" draw:color="#663333"/>
Lines 104-114 Link Here
104	<draw:color draw:name="Magenta 7" draw:color="#663366"/>	104	<draw:color draw:name="Magenta 7" draw:color="#663366"/>
105	<draw:color draw:name="Purple 7" draw:color="#330066"/>	105	<draw:color draw:name="Purple 7" draw:color="#330066"/>
106	<draw:color draw:name="Blue 7" draw:color="#333366"/>	106	<draw:color draw:name="Blue 7" draw:color="#333366"/>
107	<draw:color draw:name="Sky Blue 7" draw:color="#003366"/>	107	<draw:color draw:name="Sky blue 7" draw:color="#003366"/>
108	<draw:color draw:name="Cyan 7" draw:color="#336666"/>	108	<draw:color draw:name="Cyan 7" draw:color="#336666"/>
109	<draw:color draw:name="Turquoise 7" draw:color="#006633"/>	109	<draw:color draw:name="Turquoise 7" draw:color="#006633"/>
110	<draw:color draw:name="Green 7" draw:color="#336633"/>	110	<draw:color draw:name="Green 7" draw:color="#336633"/>
111	<draw:color draw:name="Yellow Green 7" draw:color="#336600"/>	111	<draw:color draw:name="Yellow green 7" draw:color="#336600"/>
112	<draw:color draw:name="Yellow 8" draw:color="#999966"/>	112	<draw:color draw:name="Yellow 8" draw:color="#999966"/>
113	<draw:color draw:name="Orange 8" draw:color="#996633"/>	113	<draw:color draw:name="Orange 8" draw:color="#996633"/>
114	<draw:color draw:name="Red 8" draw:color="#996666"/>	114	<draw:color draw:name="Red 8" draw:color="#996666"/>
Lines 116-126 Link Here
116	<draw:color draw:name="Magenta 8" draw:color="#996699"/>	116	<draw:color draw:name="Magenta 8" draw:color="#996699"/>
117	<draw:color draw:name="Purple 8" draw:color="#663399"/>	117	<draw:color draw:name="Purple 8" draw:color="#663399"/>
118	<draw:color draw:name="Blue 8" draw:color="#666699"/>	118	<draw:color draw:name="Blue 8" draw:color="#666699"/>
119	<draw:color draw:name="Sky Blue 8" draw:color="#336699"/>	119	<draw:color draw:name="Sky blue 8" draw:color="#336699"/>
120	<draw:color draw:name="Cyan 8" draw:color="#669999"/>	120	<draw:color draw:name="Cyan 8" draw:color="#669999"/>
121	<draw:color draw:name="Turquoise 8" draw:color="#339966"/>	121	<draw:color draw:name="Turquoise 8" draw:color="#339966"/>
122	<draw:color draw:name="Green 8" draw:color="#669966"/>	122	<draw:color draw:name="Green 8" draw:color="#669966"/>
123	<draw:color draw:name="Yellow Green 8" draw:color="#669933"/>	123	<draw:color draw:name="Yellow green 8" draw:color="#669933"/>
124	<draw:color draw:name="Yellow 9" draw:color="#cccc99"/>	124	<draw:color draw:name="Yellow 9" draw:color="#cccc99"/>
125	<draw:color draw:name="Orange 9" draw:color="#cc9966"/>	125	<draw:color draw:name="Orange 9" draw:color="#cc9966"/>
126	<draw:color draw:name="Red 9" draw:color="#cc9999"/>	126	<draw:color draw:name="Red 9" draw:color="#cc9999"/>
Lines 128-138 Link Here
128	<draw:color draw:name="Magenta 9" draw:color="#cc99cc"/>	128	<draw:color draw:name="Magenta 9" draw:color="#cc99cc"/>
129	<draw:color draw:name="Purple 9" draw:color="#9966cc"/>	129	<draw:color draw:name="Purple 9" draw:color="#9966cc"/>
130	<draw:color draw:name="Blue 9" draw:color="#9999cc"/>	130	<draw:color draw:name="Blue 9" draw:color="#9999cc"/>
131	<draw:color draw:name="Sky Blue 9" draw:color="#6699cc"/>	131	<draw:color draw:name="Sky blue 9" draw:color="#6699cc"/>
132	<draw:color draw:name="Cyan 9" draw:color="#99cccc"/>	132	<draw:color draw:name="Cyan 9" draw:color="#99cccc"/>
133	<draw:color draw:name="Turquoise 9" draw:color="#66cc99"/>	133	<draw:color draw:name="Turquoise 9" draw:color="#66cc99"/>
134	<draw:color draw:name="Green 9" draw:color="#99cc99"/>	134	<draw:color draw:name="Green 9" draw:color="#99cc99"/>
135	<draw:color draw:name="Yellow Green 9" draw:color="#99cc66"/>	135	<draw:color draw:name="Yellow green 9" draw:color="#99cc66"/>
136	<draw:color draw:name="Yellow 10" draw:color="#ffffcc"/>	136	<draw:color draw:name="Yellow 10" draw:color="#ffffcc"/>
137	<draw:color draw:name="Orange 10" draw:color="#ffcc99"/>	137	<draw:color draw:name="Orange 10" draw:color="#ffcc99"/>
138	<draw:color draw:name="Red 10" draw:color="#ffcccc"/>	138	<draw:color draw:name="Red 10" draw:color="#ffcccc"/>
Lines 140-154 Link Here
140	<draw:color draw:name="Magenta 10" draw:color="#ffccff"/>	140	<draw:color draw:name="Magenta 10" draw:color="#ffccff"/>
141	<draw:color draw:name="Purple 10" draw:color="#cc99ff"/>	141	<draw:color draw:name="Purple 10" draw:color="#cc99ff"/>
142	<draw:color draw:name="Blue 10" draw:color="#ccccff"/>	142	<draw:color draw:name="Blue 10" draw:color="#ccccff"/>
143	<draw:color draw:name="Sky Blue 10" draw:color="#99ccff"/>	143	<draw:color draw:name="Sky blue 10" draw:color="#99ccff"/>
144	<draw:color draw:name="Cyan 10" draw:color="#ccffff"/>	144	<draw:color draw:name="Cyan 10" draw:color="#ccffff"/>
145	<draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/>	145	<draw:color draw:name="Turquoise 10" draw:color="#99ffcc"/>
146	<draw:color draw:name="Green 10" draw:color="#ccffcc"/>	146	<draw:color draw:name="Green 10" draw:color="#ccffcc"/>
147	<draw:color draw:name="Yellow Green 10" draw:color="#ccff99"/>	147	<draw:color draw:name="Yellow green 10" draw:color="#ccff99"/>
148		148
149	<!-- #121520# use some 'nice' colors from original palette -->	149	<!-- #121520# use some 'nice' colors from original palette -->
150	<draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>	150	<draw:color draw:name="Blue gray" draw:color="#e6e6ff"/>
151	<draw:color draw:name="Blue nine" draw:color="#CFE7F5"/>	151	<draw:color draw:name="Blue 11" draw:color="#CFE7F5"/>
152		152
153	<!-- #121520# add 'pale' colors from original palette -->	153	<!-- #121520# add 'pale' colors from original palette -->
154	<draw:color draw:name="Violet" draw:color="#9999ff"/>	154	<draw:color draw:name="Violet" draw:color="#9999ff"/>

Lines 84-90 String RID_SVXSTR_CYAN Link Here

(-)a/main/svx/source/dialog/sdstring.src (-2 / +51 lines)
84	{	84	{
85	/* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */	85	/* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */
86	/* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */	86	/* ### ACHTUNG: Neuer Text in Resource? Türkis : T³rkis */
87	Text [ en-US ] = "Turquoise" ;	87	Text [ en-US ] = "Cyan" ;
88	};	88	};
89	String RID_SVXSTR_RED	89	String RID_SVXSTR_RED
90	{	90	{
Lines 278-283 String RID_SVXSTR_COLOR_CHART Link Here
278	Text [ en-US ] = "Chart" ;	278	Text [ en-US ] = "Chart" ;
279	};	279	};
280		280
		281	String RID_SVXSTR_COLOR_PURPLE
		282	{
		283	Text [ en-US ] = "Purple";
		284	};
		285
		286	String RID_SVXSTR_COLOR_SKYBLUE
		287	{
		288	Text [ en-US ] = "Sky blue";
		289	};
		290
		291	String RID_SVXSTR_COLOR_YELLOWGREEN
		292	{
		293	Text [ en-US ] = "Yellow green";
		294	};
		295
		296	String RID_SVXSTR_COLOR_PINK
		297	{
		298	Text [ en-US ] = "Pink";
		299	};
		300
		301	String RID_SVXSTR_COLOR_TURQUOISE
		302	{
		303	Text [ en-US ] = "Turquoise" ;
		304	};
		305
281	String RID_SVXSTR_TBLAFMT_3D	306	String RID_SVXSTR_TBLAFMT_3D
282	{	307	{
283	Text [ en-US ] = "3D";	308	Text [ en-US ] = "3D";
Lines 396-402 String RID_SVXSTR_GREEN_DEF Link Here
396	/* nicht uebersetzen */	421	/* nicht uebersetzen */
397	String RID_SVXSTR_CYAN_DEF	422	String RID_SVXSTR_CYAN_DEF
398	{	423	{
399	Text = "Turquoise" ;	424	Text = "Cyan" ;
400	};	425	};
401	/* nicht uebersetzen */	426	/* nicht uebersetzen */
402	String RID_SVXSTR_RED_DEF	427	String RID_SVXSTR_RED_DEF
Lines 514-519 String RID_SVXSTR_COLOR_CHART_DEF Link Here
514	{	539	{
515	Text = "Chart";	540	Text = "Chart";
516	};	541	};
		542	/* DO NOT TRANSLATE */
		543	String RID_SVXSTR_COLOR_PURPLE_DEF
		544	{
		545	Text = "Purple";
		546	};
		547	/* DO NOT TRANSLATE */
		548	String RID_SVXSTR_COLOR_SKYBLUE_DEF
		549	{
		550	Text = "Sky blue";
		551	};
		552	/* DO NOT TRANSLATE */
		553	String RID_SVXSTR_COLOR_YELLOWGREEN_DEF
		554	{
		555	Text = "Yellow green";
		556	};
		557	/* DO NOT TRANSLATE */
		558	String RID_SVXSTR_COLOR_PINK_DEF
		559	{
		560	Text = "Pink";
		561	};
		562	String RID_SVXSTR_COLOR_TURQUOISE_DEF
		563	{
		564	Text = "Turquoise" ;
		565	};
517		566
518	///////////////////////////////////////////////////////////////////////////////	567	///////////////////////////////////////////////////////////////////////////////
519	//	568	//