From ec6dc4a00457195d7da7f0ef2fdd804aea00c73c Mon Sep 17 00:00:00 2001
From: "Elen.Subbotina" <Elen.Subbotina@onlyoffice.com>
Date: Wed, 3 Jun 2015 08:13:16 +0000
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20win=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=20Odf?=
 =?UTF-8?q?FileReader?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62869 954022d7-b5bf-4e40-9824-e11837661b57
---
 .../formulasconvert/formulasconvert.h         |  2 +-
 .../formulasconvert/formulasconvert_odf.cpp   |  2 +-
 .../formulasconvert/formulasconvert_oox.cpp   |  2 +-
 ASCOfficeOdfFile/win32/cpodf.vcproj           |  4 +--
 ASCOfficeOdfFile/win32/formulasconvert.vcproj | 36 +++++--------------
 5 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/ASCOfficeOdfFile/formulasconvert/formulasconvert.h b/ASCOfficeOdfFile/formulasconvert/formulasconvert.h
index 2733548434..51d4eceaec 100644
--- a/ASCOfficeOdfFile/formulasconvert/formulasconvert.h
+++ b/ASCOfficeOdfFile/formulasconvert/formulasconvert.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include "../../../include/cpdoccore/CPScopedPtr.h"
+#include "../include/cpdoccore/CPScopedPtr.h"
 
 namespace cpdoccore {
 namespace formulasconvert {
diff --git a/ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp b/ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp
index 453169e0ca..6f915e1739 100644
--- a/ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp
+++ b/ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp
@@ -1,4 +1,4 @@
-#include "../include/cpdoccore/formulasconvert.h"
+#include "formulasconvert.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
diff --git a/ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp b/ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp
index 063452b676..78f7ff7fb0 100644
--- a/ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp
+++ b/ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp
@@ -1,4 +1,4 @@
-#include "../include/cpdoccore/formulasconvert.h"
+#include "formulasconvert.h"
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
diff --git a/ASCOfficeOdfFile/win32/cpodf.vcproj b/ASCOfficeOdfFile/win32/cpodf.vcproj
index a08231ad9c..0dc1a36316 100644
--- a/ASCOfficeOdfFile/win32/cpodf.vcproj
+++ b/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
diff --git a/ASCOfficeOdfFile/win32/formulasconvert.vcproj b/ASCOfficeOdfFile/win32/formulasconvert.vcproj
index a8c8321f3b..aa668e4e29 100644
--- a/ASCOfficeOdfFile/win32/formulasconvert.vcproj
+++ b/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>