.

ASCOfficeDocFile/Common/FormatUtils.h

@@ -963,4 +963,3 @@ namespace DocFormatUtils
 	};
 }
 
-using namespace DocFormatUtils;

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -32,6 +32,8 @@
 
 #include "AnnotationReferenceDescriptor.h"
 
+using namespace DocFormatUtils;
+
 namespace DocFileFormat
 {
 	ByteStructure* AnnotationReferenceDescriptor::ConstructObject(VirtualStreamReader* reader, int length)

ASCOfficeDocFile/DocDocxConverter/BorderCode.h

@@ -34,6 +34,8 @@
 #include "IVisitable.h"
 #include "Global.h"
 
+using namespace DocFormatUtils;
+
 namespace DocFileFormat
 {
 	typedef enum _BorderType

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -33,6 +33,8 @@
 
 #include "../Common/FormatUtils.h"
 
+using namespace DocFormatUtils;
+
 namespace DocFileFormat
 {
   class DateAndTime

ASCOfficeDocFile/DocDocxConverter/DrawingPrimitives.cpp

@@ -33,6 +33,7 @@
 #include "DrawingPrimitives.h"
 #include "VirtualStreamReader.h"
 
+using namespace DocFormatUtils;
 
 namespace DocFileFormat
 {

ASCOfficeDocFile/DocDocxConverter/FileInformationBlock.h

@@ -34,6 +34,8 @@
 #include "VirtualStreamReader.h"
 #include "../../ASCOfficeXlsFile2/source/XlsFormat/Crypt/Decryptor.h"
 
+using namespace DocFormatUtils;
+
 namespace DocFileFormat
 {
 	typedef enum FibVersion

ASCOfficeDocFile/DocDocxConverter/MemoryStream.h

@@ -72,7 +72,7 @@ public:
 
 		if (m_Data)
 		{
-			rdUShort	=	FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
+            rdUShort	=	DocFormatUtils::FormatUtils::BytesToUInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUShort);
 		}
 
@@ -85,7 +85,7 @@ public:
 
 		if (m_Data)
 		{
-			rdShort		=	FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
+            rdShort		=	DocFormatUtils::FormatUtils::BytesToInt16 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdShort);
 		}
 
@@ -98,7 +98,7 @@ public:
 
 		if (m_Data)
 		{
-			rdInt		=	FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
+            rdInt		=	DocFormatUtils::FormatUtils::BytesToInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdInt);
 		}
 
@@ -111,7 +111,7 @@ public:
 
 		if (m_Data )
 		{
-			rdUInt		=	FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
+            rdUInt		=	DocFormatUtils::FormatUtils::BytesToUInt32 (m_Data, m_Position, m_Size);
 			m_Position	+=	sizeof(rdUInt);
 		}
 

ASCOfficeDocFile/DocDocxConverter/Spa.cpp

@@ -32,6 +32,8 @@
 #include "Spa.h"
 #include "VirtualStreamReader.h"
 
+using namespace DocFormatUtils;
+
 namespace DocFileFormat
 {
 

ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h

@@ -197,20 +197,20 @@ public:
 			int cchSize = 1;
 			cch = ReadBytes( cchSize, true );
 
-			int xstzSize = FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;      
+            int xstzSize = DocFormatUtils::FormatUtils::BytesToUChar( cch, 0, cchSize ) * 1;
 			xstz = ReadBytes(xstzSize, true);
 
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
+            DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_WINDOWS_1250 );
 		}
 		else
 		{
 			int cchSize = 2;
 			cch = ReadBytes( cchSize, true );
 
-			int xstzSize = FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;      
+            int xstzSize = DocFormatUtils::FormatUtils::BytesToInt16( cch, 0, cchSize ) * 2;
 			xstz = ReadBytes(xstzSize, true);
 
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
+            DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &wstrResult, xstz, xstzSize, ENCODING_UTF16 );
 		}
 
 		RELEASEARRAYOBJECTS(xstz);
@@ -234,7 +234,7 @@ public:
 			//dont read the terminating zero
 			unsigned char* stringBytes = ReadBytes( ( cch * 2 ), true );
 
-			FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
+            DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( ( cch * 2 ) - 2 ), ENCODING_UTF16 );
 
 			RELEASEARRAYOBJECTS( stringBytes );
 		}
@@ -278,7 +278,7 @@ public:
 				//dont read the terminating zero
 				stringBytes = ReadBytes( cch, true );
 
-				FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
+                DocFormatUtils::FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &result, stringBytes, ( cch - 1 ), ENCODING_WINDOWS_1250);
 
 			}
 		RELEASEARRAYOBJECTS( stringBytes );