поправлен win проект OdfFileReader

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

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

 #pragma once
 
 #include <string>
-#include "../../../include/cpdoccore/CPScopedPtr.h"
+#include "../include/cpdoccore/CPScopedPtr.h"
 
 namespace cpdoccore {
 namespace formulasconvert {

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

-#include "../include/cpdoccore/formulasconvert.h"
+#include "formulasconvert.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

-#include "../include/cpdoccore/formulasconvert.h"
+#include "formulasconvert.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>

ASCOfficeOdfFile/win32/cpodf.vcproj

@@ -2254,11 +2254,11 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\ASCOfficeOdfFile\ConvertOO2OOX.cpp"
+			RelativePath="..\src\ConvertOO2OOX.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\ASCOfficeOdfFile\ConvertOO2OOX.h"
+			RelativePath="..\src\ConvertOO2OOX.h"
 			>
 		</File>
 		<File

ASCOfficeOdfFile/win32/formulasconvert.vcproj

@@ -271,36 +271,18 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+		<File
+			RelativePath="..\formulasconvert\formulasconvert.h"
 			>
-			<File
-				RelativePath="..\formulasconvert\src\formulasconvert_odf.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\formulasconvert\src\formulasconvert_oox.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+		</File>
+		<File
+			RelativePath="..\formulasconvert\formulasconvert_odf.cpp"
 			>
-			<File
-				RelativePath="..\formulasconvert\include\cpdoccore\formulasconvert.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+		</File>
+		<File
+			RelativePath="..\formulasconvert\formulasconvert_oox.cpp"
 			>
-		</Filter>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>