Временно исправлена проблема с двумя одинаковыми классами POLE.

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

Common/DocxFormat/Source/CompoundDocument/detail/alloctable.hpp

@@ -34,7 +34,7 @@
 #include <vector>
 #include "util.hpp"
 
-namespace POLE
+namespace POLE2
 {
 
 template<typename _>

Common/DocxFormat/Source/CompoundDocument/detail/dirtree.hpp

@@ -36,7 +36,7 @@
 #include "util.hpp"
 #include <cstring>
 
-namespace POLE
+namespace POLE2
 {
 
 template<typename _>

Common/DocxFormat/Source/CompoundDocument/detail/header.hpp

@@ -32,7 +32,7 @@
 #include "alloctable.hpp"
 #include <cstring>
 
-namespace POLE
+namespace POLE2
 {
 
 template<typename _>

Common/DocxFormat/Source/CompoundDocument/detail/storage.hpp

@@ -38,7 +38,7 @@
 
 #include "../../../../../DesktopEditor/common/File.h"
 
-namespace POLE
+namespace POLE2
 {
 
 template<typename _>

Common/DocxFormat/Source/CompoundDocument/detail/stream.hpp

@@ -32,7 +32,7 @@
 
 #include "storage.hpp"
 
-namespace POLE
+namespace POLE2
 {
 
 template<typename _>

Common/DocxFormat/Source/CompoundDocument/detail/util.hpp

@@ -30,7 +30,7 @@
 // util header
 #pragma once
 
-namespace POLE
+namespace POLE2
 {
 
 typedef unsigned char ULONG8;

Common/DocxFormat/Source/CompoundDocument/pole.h

@@ -27,14 +27,14 @@
    THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef POLE_H
-#define POLE_H
+#ifndef POLE2_H
+#define POLE2_H
 
 #pragma once
 
 #include "./detail/stream.hpp"
 
-namespace POLE
+namespace POLE2
 {
 
 class Stream;

Common/DocxFormat/Source/DocxFormat/VmlDrawing.h

@@ -360,7 +360,7 @@ namespace OOX
 		{
 			return type().DefaultFileName();
 		}
-		const CPath& GetReadPath()
+		const CPath GetReadPath()
 		{
 			return m_sFilename;
 		}

Common/DocxFormat/Source/MathEquation/MathEquation.h

@@ -7,7 +7,7 @@
 #include "String.h"
 #include "OutputDev.h"
 
-using namespace POLE;
+using namespace POLE2;
 
 
 namespace MathEquation