(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/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 
 		{