Skip to content

C
core
Kaydet (Commit) 710925d1 authored tarafından Armin Le Grand's avatar Armin Le Grand
Dosyalara gözat
Seçenekler

i122318 Adapted color palette stuff, some cleanups

üst f03ec481
Expand all Show whitespace changes
Inline Side-by-side
Showing with 195 additions and 216 deletions
svx/inc/svx/dialogs.hrc
Dosyayı görüntüle @ 710925d1
...@@ -463,24 +463,21 @@ ...@@ -463,24 +463,21 @@
#define RID_SVXSTR_CLOSE (RID_SVX_START + 260) #define RID_SVXSTR_CLOSE (RID_SVX_START + 260)
// Farben-Strings // Farben-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)
// Linienenden-Strings // Linienenden-Strings
#define RID_SVXSTR_ARROW (RID_SVX_START + 300) #define RID_SVXSTR_ARROW (RID_SVX_START + 300)
...@@ -590,14 +587,13 @@ ...@@ -590,14 +587,13 @@
#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)
// 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 !!!
...@@ -633,34 +629,35 @@ ...@@ -633,34 +629,35 @@
#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)
// Default-Gradient-Names // Default-Gradient-Names
#define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 631) #define RID_SVXSTR_GRDT0_DEF (RID_SVX_START + 631)
......
svx/source/dialog/sdstring.src
Dosyayı görüntüle @ 710925d1
...@@ -66,87 +66,59 @@ String RID_SVXSTR_CLOSE ...@@ -66,87 +66,59 @@ String RID_SVXSTR_CLOSE
/* ### ACHTUNG: Neuer Text in Resource? Schlieen : Schlieen */ /* ### ACHTUNG: Neuer Text in Resource? Schlieen : Schlieen */
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
{ {
/* ### ACHTUNG: Neuer Text in Resource? Grn : Grn */ /* ### ACHTUNG: Neuer Text in Resource? Grn : Grn */
/* ### ACHTUNG: Neuer Text in Resource? Grn : Grn */ /* ### ACHTUNG: Neuer Text in Resource? Grn : Grn */
Text [ en-US ] = "Green" ; Text [ en-US ] = "Green" ;
}; };
String RID_SVXSTR_CYAN String RID_SVXSTR_COLOR_CYAN
{ {
/* ### ACHTUNG: Neuer Text in Resource? Trkis : Trkis */ /* ### ACHTUNG: Neuer Text in Resource? Trkis : Trkis */
/* ### ACHTUNG: Neuer Text in Resource? Trkis : Trkis */ /* ### ACHTUNG: Neuer Text in Resource? Trkis : Trkis */
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
{ {
/* ### ACHTUNG: Neuer Text in Resource? Magenta : Violett */ /* ### ACHTUNG: Neuer 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
{
/* ### ACHTUNG: Neuer Text in Resource? Hellgrn : Hellgrn */
/* ### ACHTUNG: Neuer Text in Resource? Hellgrn : Hellgrn */
Text [ en-US ] = "Light green" ;
};
String RID_SVXSTR_LIGHTCYAN
{
/* ### ACHTUNG: Neuer Text in Resource? Helltrkis : Helltrkis */
/* ### ACHTUNG: Neuer Text in Resource? Helltrkis : Helltrkis */
Text [ en-US ] = "Light cyan" ;
};
String RID_SVXSTR_LIGHTRED
{
Text [ en-US ] = "Light red" ;
};
String RID_SVXSTR_LIGHTMAGENTA
{
/* ### ACHTUNG: Neuer Text in Resource? Hellmagenta : Hellviolett */
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
{ {
/* ### ACHTUNG: Neuer Text in Resource? Wei : Wei */ /* ### ACHTUNG: Neuer Text in Resource? Wei : Wei */
/* ### ACHTUNG: Neuer Text in Resource? Wei : Wei */ /* ### ACHTUNG: Neuer Text in Resource? Wei : Wei */
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
{
/* Old default color Blue9, probably often used in saved files */
Text [ en-US ] = "Blue classic" ;
};
String RID_SVXSTR_COLOR_ORANGE
{ {
Text [ en-US ] = "Orange" ; Text [ en-US ] = "Orange" ;
}; };
...@@ -232,50 +204,69 @@ String STR_INSERT_VIDEO_TITLE ...@@ -232,50 +204,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
...@@ -379,127 +370,92 @@ String RID_SVXSTR_LINECAP_SQUARE ...@@ -379,127 +370,92 @@ String RID_SVXSTR_LINECAP_SQUARE
// //
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_BLACK_DEF String RID_SVXSTR_COLOR_BLACK_DEF
{ {
Text = "Black" ; Text = "Black" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_BLUE_DEF String RID_SVXSTR_COLOR_BLUE_DEF
{ {
Text = "Blue" ; Text = "Blue" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_GREEN_DEF String RID_SVXSTR_COLOR_GREEN_DEF
{ {
Text = "Green" ; Text = "Green" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_CYAN_DEF String RID_SVXSTR_COLOR_CYAN_DEF
{ {
Text = "Turquoise" ; Text = "Cyan" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_RED_DEF String RID_SVXSTR_COLOR_RED_DEF
{ {
Text = "Red" ; Text = "Red" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_MAGENTA_DEF String RID_SVXSTR_COLOR_MAGENTA_DEF
{ {
Text = "Magenta" ; Text = "Magenta" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_BROWN_DEF String RID_SVXSTR_COLOR_GREY_DEF
{
Text = "Brown" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_GREY_DEF
{ {
Text = "Gray" ; Text = "Gray" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_LIGHTGREY_DEF String RID_SVXSTR_COLOR_YELLOW_DEF
{
Text = "Light gray" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_LIGHTBLUE_DEF
{
Text = "Light blue" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_LIGHTGREEN_DEF
{
Text = "Light green" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_LIGHTCYAN_DEF
{
Text = "Light cyan" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_LIGHTRED_DEF
{
Text = "Light red" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_LIGHTMAGENTA_DEF
{
Text = "Light magenta" ;
};
/* nicht uebersetzen */
String RID_SVXSTR_YELLOW_DEF
{ {
Text = "Yellow" ; Text = "Yellow" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_WHITE_DEF String RID_SVXSTR_COLOR_WHITE_DEF
{ {
Text = "White" ; Text = "White" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_BLUEGREY_DEF String RID_SVXSTR_COLOR_BLUEGREY_DEF
{ {
Text = "Blue gray" ; Text = "Blue gray" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_ORANGE_DEF String RID_SVXSTR_COLOR_ORANGE_DEF
{ {
Text = "Orange" ; Text = "Orange" ;
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_VIOLET_DEF String RID_SVXSTR_COLOR_VIOLET_DEF
{ {
Text = "Violet"; Text = "Violet";
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_BORDEAUX_DEF String RID_SVXSTR_COLOR_BORDEAUX_DEF
{ {
Text = "Bordeaux"; Text = "Bordeaux";
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_PALE_YELLOW_DEF String RID_SVXSTR_COLOR_PALE_YELLOW_DEF
{ {
Text = "Pale yellow"; Text = "Pale yellow";
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_PALE_GREEN_DEF String RID_SVXSTR_COLOR_PALE_GREEN_DEF
{ {
Text = "Pale green"; Text = "Pale green";
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_DKVIOLET_DEF String RID_SVXSTR_COLOR_DARKVIOLET_DEF
{ {
Text = "Dark violet"; Text = "Dark violet";
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_SALMON_DEF String RID_SVXSTR_COLOR_SALMON_DEF
{ {
Text = "Salmon"; Text = "Salmon";
}; };
/* nicht uebersetzen */ /* nicht uebersetzen */
String RID_SVXSTR_SEABLUE_DEF String RID_SVXSTR_COLOR_SEABLUE_DEF
{ {
Text = "Sea blue"; Text = "Sea blue";
}; };
...@@ -514,6 +470,36 @@ String RID_SVXSTR_COLOR_CHART_DEF ...@@ -514,6 +470,36 @@ String RID_SVXSTR_COLOR_CHART_DEF
{ {
Text = "Chart"; 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";
};
/* 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" ;
};
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// //
......
svx/source/unodraw/unoprov.cxx
Dosyayı görüntüle @ 710925d1
...@@ -1232,64 +1232,60 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount ...@@ -1232,64 +1232,60 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] = static sal_uInt16 __READONLY_DATA 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_GREEN_DEF, RID_SVXSTR_COLOR_GREEN_DEF,
RID_SVXSTR_CYAN_DEF, RID_SVXSTR_COLOR_CYAN_DEF,
RID_SVXSTR_RED_DEF, RID_SVXSTR_COLOR_RED_DEF,
RID_SVXSTR_MAGENTA_DEF, RID_SVXSTR_COLOR_MAGENTA_DEF,
RID_SVXSTR_BROWN_DEF, RID_SVXSTR_COLOR_GREY_DEF,
RID_SVXSTR_GREY_DEF, RID_SVXSTR_COLOR_YELLOW_DEF,
RID_SVXSTR_LIGHTGREY_DEF, RID_SVXSTR_COLOR_WHITE_DEF,
RID_SVXSTR_LIGHTBLUE_DEF, RID_SVXSTR_COLOR_ORANGE_DEF,
RID_SVXSTR_LIGHTGREEN_DEF, RID_SVXSTR_COLOR_VIOLET_DEF,
RID_SVXSTR_LIGHTCYAN_DEF, RID_SVXSTR_COLOR_BORDEAUX_DEF,
RID_SVXSTR_LIGHTRED_DEF, RID_SVXSTR_COLOR_PALE_YELLOW_DEF,
RID_SVXSTR_LIGHTMAGENTA_DEF, RID_SVXSTR_COLOR_PALE_GREEN_DEF,
RID_SVXSTR_YELLOW_DEF, RID_SVXSTR_COLOR_DARKVIOLET_DEF,
RID_SVXSTR_WHITE_DEF, RID_SVXSTR_COLOR_SALMON_DEF,
RID_SVXSTR_ORANGE_DEF, RID_SVXSTR_COLOR_SEABLUE_DEF,
RID_SVXSTR_VIOLET_DEF, RID_SVXSTR_COLOR_CHART_DEF,
RID_SVXSTR_BORDEAUX_DEF, RID_SVXSTR_COLOR_PURPLE_DEF,
RID_SVXSTR_PALE_YELLOW_DEF, RID_SVXSTR_COLOR_SKYBLUE_DEF,
RID_SVXSTR_PALE_GREEN_DEF, RID_SVXSTR_COLOR_YELLOWGREEN_DEF,
RID_SVXSTR_DKVIOLET_DEF, RID_SVXSTR_COLOR_PINK_DEF,
RID_SVXSTR_SALMON_DEF, RID_SVXSTR_COLOR_TURQUOISE_DEF,
RID_SVXSTR_SEABLUE_DEF, RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF
RID_SVXSTR_COLOR_SUN_DEF,
RID_SVXSTR_COLOR_CHART_DEF
}; };
static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] = static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] =
{ {
RID_SVXSTR_BLUEGREY, RID_SVXSTR_COLOR_BLUEGREY,
RID_SVXSTR_BLACK, RID_SVXSTR_COLOR_BLACK,
RID_SVXSTR_BLUE, RID_SVXSTR_COLOR_BLUE,
RID_SVXSTR_GREEN, RID_SVXSTR_COLOR_GREEN,
RID_SVXSTR_CYAN, RID_SVXSTR_COLOR_CYAN,
RID_SVXSTR_RED, RID_SVXSTR_COLOR_RED,
RID_SVXSTR_MAGENTA, RID_SVXSTR_COLOR_MAGENTA,
RID_SVXSTR_BROWN, RID_SVXSTR_COLOR_GREY,
RID_SVXSTR_GREY, RID_SVXSTR_COLOR_YELLOW,
RID_SVXSTR_LIGHTGREY, RID_SVXSTR_COLOR_WHITE,
RID_SVXSTR_LIGHTBLUE, RID_SVXSTR_COLOR_ORANGE,
RID_SVXSTR_LIGHTGREEN, RID_SVXSTR_COLOR_VIOLET,
RID_SVXSTR_LIGHTCYAN, RID_SVXSTR_COLOR_BORDEAUX,
RID_SVXSTR_LIGHTRED, RID_SVXSTR_COLOR_PALE_YELLOW,
RID_SVXSTR_LIGHTMAGENTA, RID_SVXSTR_COLOR_PALE_GREEN,
RID_SVXSTR_YELLOW, RID_SVXSTR_COLOR_DARKVIOLET,
RID_SVXSTR_WHITE, RID_SVXSTR_COLOR_SALMON,
RID_SVXSTR_ORANGE, RID_SVXSTR_COLOR_SEABLUE,
RID_SVXSTR_VIOLET, RID_SVXSTR_COLOR_CHART,
RID_SVXSTR_BORDEAUX, RID_SVXSTR_COLOR_PURPLE,
RID_SVXSTR_PALE_YELLOW, RID_SVXSTR_COLOR_SKYBLUE,
RID_SVXSTR_PALE_GREEN, RID_SVXSTR_COLOR_YELLOWGREEN,
RID_SVXSTR_DKVIOLET, RID_SVXSTR_COLOR_PINK,
RID_SVXSTR_SALMON, RID_SVXSTR_COLOR_TURQUOISE,
RID_SVXSTR_SEABLUE, RID_SVXSTR_COLOR_BLUE_CLASSIC
RID_SVXSTR_COLOR_SUN,
RID_SVXSTR_COLOR_CHART
}; };
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 @ 710925d1
This diff is collapsed.
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