improve the handling of property mapping sequences

Change-Id: I4ddd656a41ab975786ce6e5cd05597f6b773b334

chart2/source/controller/dialogs/DialogModel.cxx

@@ -94,6 +94,8 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
         aTranslationMap[ "values-x" ] =     ::chart::SchResId( STR_DATA_ROLE_X ).toString();
         aTranslationMap[ "values-y" ] =     ::chart::SchResId( STR_DATA_ROLE_Y ).toString();
         aTranslationMap[ "values-size" ] =  ::chart::SchResId( STR_DATA_ROLE_SIZE ).toString();
+        aTranslationMap[ "FillColor" ] =    ::chart::SchResId( STR_PROPERTY_ROLE_FILLCOLOR ).toString();
+        aTranslationMap[ "BorderColor" ] =  ::chart::SchResId( STR_PROPERTY_ROLE_BORDERCOLOR ).toString();
     }
 
     if( bFromInternalToUI )
@@ -216,7 +218,7 @@ struct lcl_RolesWithRangeAppend : public
                 {
                     OUString aRole;
                     Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
-                    if( xProp->getPropertyValue( "Role") >>= aRole )
+                    if( xProp->getPropertyValue( "Role" ) >>= aRole )
                     {
                         m_rDestCnt.insert(
                             tContainerType::value_type(

chart2/source/controller/dialogs/Strings.src

@@ -16,6 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #include "Strings.hrc"
 
 String STR_DLG_CHART_WIZARD
@@ -599,7 +600,14 @@ String STR_TEXT_DIRECTION_SUPER
     Text [ en-US ] = "Use superordinate object settings";
 };
 
+String STR_PROPERTY_ROLE_FILLCOLOR
+{
+    Text [ en-US ] = "Fill Color";
+};
 
-
+String STR_PROPERTY_ROLE_BORDERCOLOR
+{
+    Text [ en-US ] = "Border Color";
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

chart2/source/inc/Strings.hrc

@@ -22,8 +22,7 @@
 // this includes no link dependency
 #include <svl/solar.hrc>
 
-//next free is 303
-
+//next free is 305
 
 //chart types
 //see Strings_ChartTypes.src
@@ -111,6 +110,8 @@
 #define STR_DATA_ROLE_MAX                   (RID_APP_START + 249)
 #define STR_DATA_ROLE_CATEGORIES            (RID_APP_START + 260)
 #define STR_DATA_ROLE_SIZE                  (RID_APP_START + 284)
+#define STR_PROPERTY_ROLE_FILLCOLOR         (RID_APP_START + 303)
+#define STR_PROPERTY_ROLE_BORDERCOLOR       (RID_APP_START + 304)
 
 #define STR_DATA_UNNAMED_SERIES             (RID_APP_START + 250)
 #define STR_DATA_UNNAMED_SERIES_WITH_INDEX  (RID_APP_START + 251)