(1.2.0.166): ASCOfficeOdfFileW

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58667 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//208
-#define INTVER 1,0,1,208
-#define STRVER "1,0,1,208\0"
+//209
+#define INTVER 1,0,1,209
+#define STRVER "1,0,1,209\0"

ASCOfficeOdfFileW/ASCOfficeOdfFileW.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Fri Sep 19 18:46:02 2014
+/* at Sun Oct 05 15:10:56 2014
  */
 /* Compiler settings for .\ASCOfficeOdfFileW.idl:
     Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555 

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h

@@ -402,7 +402,7 @@ public:
 		void convert(OOX::Spreadsheet::CT_SerTx					*ser_tx);
 		void convert(OOX::Spreadsheet::CT_DLbls					*ser_lbls);
 		void convert(OOX::Spreadsheet::CT_Marker				*marker);
-		void convert(OOX::Spreadsheet::CT_Marker				*marker, CAtlArray<OOX::Spreadsheet::CT_DPt*> & dPt);
+		void convert(OOX::Spreadsheet::CT_Marker				*marker, std::vector<OOX::Spreadsheet::CT_DPt*> & dPt);
 		void convert(OOX::Spreadsheet::CT_ExternalData			*external_data);
 		void convert(OOX::Spreadsheet::CT_NumData				*num_data);
 		void convert(OOX::Spreadsheet::CT_StrData				*str_data, bool label = false);

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConverterChart.cpp

@@ -116,7 +116,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_Legend* ct_legend)
 			odf_context()->chart_context()->set_legend_position(*ct_legend->m_legendPos->m_val);
 		
 		convert(ct_legend->m_oTxPr.GetPointer());
-		if (ct_legend->m_legendEntry.GetCount() > 0)
+		if (ct_legend->m_legendEntry.size() > 0)
 		{
 			convert(ct_legend->m_legendEntry[0]); //  odf     
 		}
@@ -137,7 +137,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_PlotArea* ct_plotArea)
 
 	convert(ct_plotArea->m_layout);
 ///////////////////////
-	for (unsigned int i=0; i< ct_plotArea->m_Items1.GetCount(); i++)
+	for (unsigned int i=0; i< ct_plotArea->m_Items1.size(); i++)
 	{
 		if (!ct_plotArea->m_ItemsElementName1[i]) continue;
 		switch(*ct_plotArea->m_ItemsElementName1[i])
@@ -148,7 +148,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_PlotArea* ct_plotArea)
 			case OOX::Spreadsheet::itemschoicetype6VALAX:	convert((OOX::Spreadsheet::CT_ValAx*)ct_plotArea->m_Items1[i]);break;				
 		}
 	}
-	for (unsigned int i=0; i< ct_plotArea->m_Items.GetCount(); i++)//
+	for (unsigned int i=0; i< ct_plotArea->m_Items.size(); i++)//
 	{
 		if (!ct_plotArea->m_ItemsElementName0[i]) continue;
 		switch(*ct_plotArea->m_ItemsElementName0[i])
@@ -376,7 +376,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_Area3DChart *chart)
 	if (chart->m_grouping && chart->m_grouping->m_val)
 		odf_context()->chart_context()->set_chart_grouping(*chart->m_grouping->m_val);
 
-	for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+	for (unsigned int i=0; i< chart->m_ser.size(); i++)
 	{
 		convert(chart->m_ser[i]);
 	}
@@ -395,11 +395,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_AreaChart *chart)
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
 
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -430,11 +430,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_Bar3DChart *chart)
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
 
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -461,11 +461,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_BarChart *chart)
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
 
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -483,11 +483,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_Line3DChart *chart)
 
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -509,11 +509,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_LineChart *chart)
 
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -528,11 +528,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_Pie3DChart *chart)
 	
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		//for (long i=0; i< chart->m_axId.GetCount(); i++)
+		//for (long i=0; i< chart->m_axId.size(); i++)
 		//{
 		//	odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		//}		
@@ -546,11 +546,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_PieChart *chart)
 	
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		//for (long i=0; i< chart->m_axId.GetCount(); i++)
+		//for (long i=0; i< chart->m_axId.size(); i++)
 		//{
 		//	odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		//}		
@@ -564,11 +564,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_Surface3DChart *chart)
 	odf_context()->chart_context()->set_chart_3D(true);
 	
 	odf_context()->chart_context()->start_group_series();
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -581,11 +581,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_SurfaceChart *chart)
 	odf_context()->chart_context()->set_chart_type(L"surface");
 	
 	odf_context()->chart_context()->start_group_series();
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -599,11 +599,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_BubbleChart *chart)
 	
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -619,7 +619,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_DoughnutChart *chart)
 	
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
@@ -638,11 +638,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_ScatterChart *chart)
 	
 
 	odf_context()->chart_context()->start_group_series();
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -659,11 +659,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_RadarChart *chart)
 	
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}		
-		//for (long i=0; i< chart->m_axId.GetCount(); i++)
+		//for (long i=0; i< chart->m_axId.size(); i++)
 		//{
 		//	odf_context()->chart_context()->add_axis_group_series(**chart->m_axId[i]->m_val->m_val);
 		//}		
@@ -677,11 +677,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_StockChart *chart)
 	
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		for (unsigned int i=0; i< chart->m_axId.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_axId.size(); i++)
 		{
 			odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		}		
@@ -725,11 +725,11 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_OfPieChart *chart)
 
 	odf_context()->chart_context()->start_group_series();
 		convert(chart->m_dLbls);
-		for (unsigned int i=0; i< chart->m_ser.GetCount(); i++)
+		for (unsigned int i=0; i< chart->m_ser.size(); i++)
 		{
 			convert(chart->m_ser[i]);
 		}
-		//for (long i=0; i< chart->m_axId.GetCount(); i++)
+		//for (long i=0; i< chart->m_axId.size(); i++)
 		//{
 		//	odf_context()->chart_context()->add_axis_group_series(*chart->m_axId[i]->m_val);
 		//}		
@@ -743,7 +743,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_AreaSer* ser)
 		convert(ser->m_cat,1);
 		convert(ser->m_val);
 		convert(ser->m_tx);
-		if (ser->m_dPt.GetCount() > 0)
+		if (ser->m_dPt.size() > 0)
 		{
 			convert(NULL, ser->m_dPt);
 		}
@@ -758,7 +758,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_BubbleSer* ser)
 		convert(ser->m_dLbls);
 		convert(ser->m_xVal, 2);
 		convert(ser->m_tx);
-		if (ser->m_dPt.GetCount() > 0)
+		if (ser->m_dPt.size() > 0)
 		{
 			convert(NULL, ser->m_dPt);
 		}
@@ -769,7 +769,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_BubbleSer* ser)
 		convert(ser->m_dLbls);
 		convert(ser->m_yVal);
 		convert(ser->m_tx);
-		if (ser->m_dPt.GetCount() > 0)
+		if (ser->m_dPt.size() > 0)
 		{
 			convert(NULL, ser->m_dPt);
 		}
@@ -780,7 +780,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_BubbleSer* ser)
 		convert(ser->m_dLbls);
 		convert(ser->m_bubbleSize);
 		convert(ser->m_tx);
-		if (ser->m_dPt.GetCount() > 0)
+		if (ser->m_dPt.size() > 0)
 		{
 			convert(NULL, ser->m_dPt);
 		}
@@ -809,7 +809,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_PieSer* ser)
 		convert(ser->m_cat,1);
 		convert(ser->m_val);
 		convert(ser->m_tx);
-		if (ser->m_dPt.GetCount() > 0)
+		if (ser->m_dPt.size() > 0)
 		{
 			convert(NULL, ser->m_dPt);
 		}
@@ -825,7 +825,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_BarSer* ser)
 		convert(ser->m_cat,1);
 		convert(ser->m_val);
 		convert(ser->m_tx);
-		if (ser->m_dPt.GetCount() > 0)
+		if (ser->m_dPt.size() > 0)
 		{
 			convert(NULL, ser->m_dPt);
 		}
@@ -846,7 +846,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_ScatterSer* ser)
 		convert(ser->m_dLbls);
 		convert(ser->m_xVal, 2);//domain
 		convert(ser->m_tx);
-		if (ser->m_marker || ser->m_dPt.GetCount() > 0)
+		if (ser->m_marker || ser->m_dPt.size() > 0)
 		{
 			convert(ser->m_marker, ser->m_dPt);
 		}
@@ -857,7 +857,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_ScatterSer* ser)
 		convert(ser->m_dLbls);
 		convert(ser->m_yVal);
 		convert(ser->m_tx);
-		if (ser->m_marker || ser->m_dPt.GetCount() > 0)
+		if (ser->m_marker || ser->m_dPt.size() > 0)
 		{
 			convert(ser->m_marker, ser->m_dPt);
 		}
@@ -873,7 +873,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_RadarSer* ser)
 		convert(ser->m_cat,1);
 		convert(ser->m_val);
 		convert(ser->m_tx);
-		if (ser->m_marker || ser->m_dPt.GetCount() > 0)
+		if (ser->m_marker || ser->m_dPt.size() > 0)
 		{
 			convert(ser->m_marker, ser->m_dPt);
 		}
@@ -889,20 +889,20 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_LineSer* ser)
 		convert(ser->m_cat,1);
 		convert(ser->m_val);
 		convert(ser->m_tx);
-		if (ser->m_marker || ser->m_dPt.GetCount() > 0)
+		if (ser->m_marker || ser->m_dPt.size() > 0)
 		{
 			convert(ser->m_marker, ser->m_dPt);
 		}
 	odf_context()->chart_context()->end_series();
 }
-void OoxConverter::convert(OOX::Spreadsheet::CT_Marker* marker, CAtlArray<OOX::Spreadsheet::CT_DPt*> & dPt)
+void OoxConverter::convert(OOX::Spreadsheet::CT_Marker* marker, std::vector<OOX::Spreadsheet::CT_DPt*> & dPt)
 {	
-	if (dPt.GetCount() <1) return convert(marker);
+	if (dPt.size() <1) return convert(marker);
 
 	long count_point = odf_context()->chart_context()->get_count_data_points_series();
 	long current_point = 0;
 	long set_point;
-	for (unsigned int i =0 ;i < dPt.GetCount(); i++)
+	for (unsigned int i =0 ;i < dPt.size(); i++)
 	{
 		if (dPt[i] == NULL)continue;
 
@@ -944,7 +944,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_DLbls* ser_lbls)
 {
 	if (ser_lbls == NULL)return;
 
-	for (unsigned int i=0; i< ser_lbls->m_Items.GetCount(); i++)
+	for (unsigned int i=0; i< ser_lbls->m_Items.size(); i++)
 	{
 		bool boolVal = false;
 
@@ -1088,7 +1088,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_NumData	*num_data)
 	//std::vector<double> data;
 	std::vector<std::wstring> data;
 
-	for (unsigned int i=0; i < num_data->m_pt.GetCount(); i++)
+	for (unsigned int i=0; i < num_data->m_pt.size(); i++)
 	{
 
 		if (num_data->m_pt[i] && num_data->m_pt[i]->m_v)
@@ -1114,7 +1114,7 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_StrData *str_data, bool label)
 	if (str_data == NULL)return;
 	std::vector<std::wstring> data;
 
-	for (unsigned int i=0; i < str_data->m_pt.GetCount(); i++)
+	for (unsigned int i=0; i < str_data->m_pt.size(); i++)
 	{
 		if (str_data->m_pt[i] && str_data->m_pt[i]->m_v)
 			data.push_back(string2std_string(*str_data->m_pt[i]->m_v));

ASCOfficeOdfFileW/version.h

@@ -2,6 +2,6 @@
 //1
 //2
 //0
-//159
-#define INTVER 1,2,0,159
-#define STRVER "1,2,0,159\0"
+//167
+#define INTVER 1,2,0,167
+#define STRVER "1,2,0,167\0"

Common/DocxFormat/Projects/DocxFormat2005.vcproj

@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".\..\Source\XML\libxml2\XML\include;.\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;..\..\..\..\..\Redist;..\..\..\..\..\..\ASCOfficeOdtFile\Source\OfficeSvmFile;.\..\Source\Base;.\..\Source\SystemUtility"
-				PreprocessorDefinitions="USE_LITE_READER;_USE_XMLLITE_READER_;_DOCWRAPPER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
+				PreprocessorDefinitions="USE_LITE_READER;_USE_XMLLITE_READER_;_DOCWRAPPER_;LIBXML_READER_ENABLED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -106,7 +106,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=".\..\Source\XML\libxml2\XML\include;.\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;..\..\..\..\..\Redist;..\..\ASCOfficeOdtFile\Source\OfficeSvmFile"
-				PreprocessorDefinitions="USE_LITE_READER;_USE_XMLLITE_READER_;_DOCWRAPPER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
+				PreprocessorDefinitions="USE_LITE_READER;_USE_XMLLITE_READER_;_DOCWRAPPER_;LIBXML_READER_ENABLED"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				ProgramDataBaseFileName="$(IntDir)\DocxFormat.pdb"
@@ -996,10 +996,6 @@
 				RelativePath="..\Source\Common\SimpleTypes_Vml.h"
 				>
 			</File>
-			<File
-				RelativePath="..\Source\Common\SimpleTypes_Word.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\Source\Common\SimpleTypes_Word.h"
 				>

Common/DocxFormat/Source/Common/SimpleTypes_Word.cpp

-#include "SimpleTypes_Word.h"
-
-namespace SimpleTypes
-{	
-    template<>
-    EHexColor CHexColor<EHexColor::hexcolorAuto>::FromString (CString &sValue)
-    {
-        if ( _T("auto") == sValue || _T("none") == sValue )
-            this->m_eValue = hexcolorAuto;
-        else
-        {
-            //   ,     ,       word  .
-            //CHighlightColor<highlightcolorNone> oHighlightColor(sValue);
-            CHighlightColor<> oHighlightColor(sValue);
-            if(SimpleTypes::highlightcolorNone != oHighlightColor.GetValue())
-            {
-                this->m_eValue = hexcolorRGB;
-                m_unR = oHighlightColor.Get_R();
-                m_unG = oHighlightColor.Get_G();
-                m_unB = oHighlightColor.Get_B();
-            }
-            else if ( 6 <= sValue.GetLength() )
-            {
-                this->m_eValue = hexcolorRGB;
-                m_sValue = sValue.Mid( 0, 6 );
-                Parse();
-            }
-            else if ( 3 == sValue.GetLength() )// a la #339 (Compo 3AP.docx)
-            {
-                this->m_eValue = hexcolorRGB;
-                m_sValue = sValue;
-                Parse3();
-            }
-            else   this->m_eValue = EHexColor::hexcolorAuto;//eDefValue;
-
-        }
-
-        return this->m_eValue;
-
-    }
-} // SimpleTypes

Common/DocxFormat/Source/Common/SimpleTypes_Word.h

@@ -2571,7 +2571,41 @@ namespace SimpleTypes
 
         void SetColorByString ();
 
-        virtual EHexColor FromString(CString &sValue);
+        virtual EHexColor FromString(CString &sValue)
+		{
+			if ( _T("auto") == sValue || _T("none") == sValue )
+				this->m_eValue = hexcolorAuto;
+			else
+			{
+				//   ,     ,       word  .
+				//CHighlightColor<highlightcolorNone> oHighlightColor(sValue);
+				CHighlightColor<> oHighlightColor(sValue);
+				if(SimpleTypes::highlightcolorNone != oHighlightColor.GetValue())
+				{
+					this->m_eValue = hexcolorRGB;
+					m_unR = oHighlightColor.Get_R();
+					m_unG = oHighlightColor.Get_G();
+					m_unB = oHighlightColor.Get_B();
+				}
+				else if ( 6 <= sValue.GetLength() )
+				{
+					this->m_eValue = hexcolorRGB;
+					m_sValue = sValue.Mid( 0, 6 );
+					Parse();
+				}
+				else if ( 3 == sValue.GetLength() )// a la #339 (Compo 3AP.docx)
+				{
+					this->m_eValue = hexcolorRGB;
+					m_sValue = sValue;
+					Parse3();
+				}
+				else   this->m_eValue = hexcolorAuto;//eDefValue;
+
+			}
+
+			return this->m_eValue;
+
+		}
 
 		virtual CString   ToString  () const 
 		{