svn commit: r1499961 - /openoffice/trunk/main/svx/source/unodraw/unoprov.cxx

[alg]

Author: alg
Date: Fri Jul  5 10:48:40 2013
New Revision: 1499961

URL: http://svn.apache.org/r1499961
Log:
i122469 reordering of color name defines
Patch by: hanya

Modified:
    openoffice/trunk/main/svx/source/unodraw/unoprov.cxx

Modified: openoffice/trunk/main/svx/source/unodraw/unoprov.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/unodraw/unoprov.cxx?rev=1499961&r1=1499960&r2=1499961&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/unodraw/unoprov.cxx (original)
+++ openoffice/trunk/main/svx/source/unodraw/unoprov.cxx Fri Jul  5 10:48:40 
2013
@@ -1230,16 +1230,30 @@ bool SvxUnoConvertResourceString( int nS
        return sal_False;
 }
 
+//////////////////////////////////////////////////////////////////////////////
+// #122649# Some comments on the below arrays:
+// - They need to have the same order and count of items
+// - They are used to translate between translated and non-translated color 
names
+// - To make longer names be found which start with the same basic string,
+//   these have to be in front of others
+//
+// It would be nice to:
+// - evtl. organize these in a single array with 2-dimensional inner to 
elliminate
+//   the possibility to define it wrong
+// - change the compare to also work when a shorter name is in front of a 
longer one
+
 static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] =
 {
        RID_SVXSTR_COLOR_BLUEGREY_DEF,
        RID_SVXSTR_COLOR_BLACK_DEF,
+       RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF,
        RID_SVXSTR_COLOR_BLUE_DEF,
        RID_SVXSTR_COLOR_GREEN_DEF,
        RID_SVXSTR_COLOR_CYAN_DEF,
        RID_SVXSTR_COLOR_RED_DEF,
        RID_SVXSTR_COLOR_MAGENTA_DEF,
        RID_SVXSTR_COLOR_GREY_DEF,
+       RID_SVXSTR_COLOR_YELLOWGREEN_DEF,
        RID_SVXSTR_COLOR_YELLOW_DEF,
        RID_SVXSTR_COLOR_WHITE_DEF,
        RID_SVXSTR_COLOR_ORANGE_DEF,
@@ -1253,22 +1267,22 @@ static sal_uInt16 __READONLY_DATA SvxUno
        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,
-    RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF
 };
 
 static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] =
 {
        RID_SVXSTR_COLOR_BLUEGREY,
        RID_SVXSTR_COLOR_BLACK,
+       RID_SVXSTR_COLOR_BLUE_CLASSIC,
        RID_SVXSTR_COLOR_BLUE,
        RID_SVXSTR_COLOR_GREEN,
        RID_SVXSTR_COLOR_CYAN,
        RID_SVXSTR_COLOR_RED,
        RID_SVXSTR_COLOR_MAGENTA,
        RID_SVXSTR_COLOR_GREY,
+       RID_SVXSTR_COLOR_YELLOWGREEN,
        RID_SVXSTR_COLOR_YELLOW,
        RID_SVXSTR_COLOR_WHITE,
        RID_SVXSTR_COLOR_ORANGE,
@@ -1282,12 +1296,12 @@ static sal_uInt16 __READONLY_DATA SvxUno
     RID_SVXSTR_COLOR_CHART,
     RID_SVXSTR_COLOR_PURPLE,
     RID_SVXSTR_COLOR_SKYBLUE,
-    RID_SVXSTR_COLOR_YELLOWGREEN,
     RID_SVXSTR_COLOR_PINK,
     RID_SVXSTR_COLOR_TURQUOISE,
-    RID_SVXSTR_COLOR_BLUE_CLASSIC
 };
 
+//////////////////////////////////////////////////////////////////////////////
+
 bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* 
pDestResIds, int nCount, String& rString ) throw()
 {
        int i = 0;