git-svn-id:...

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

git-svn-id:...
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59563 954022d7-b5bf-4e40-9824-e11837661b57
00f72815 · Elen.Subbotina · Alexander Trofimov · 9b937d34 · 00f72815 · 00f72815
Commit 00f72815 authored Nov 10, 2014 by Elen.Subbotina Committed by Alexander Trofimov May 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

ASCOfficePPTXFile/Editor/imagemanager.h ASCOfficePPTXFile/Editor/imagemanager.h +2 -1

DesktopEditor/common/File.h DesktopEditor/common/File.h +2 -2

No files found.
--- a/ASCOfficePPTXFile/Editor/imagemanager.h
+++ b/ASCOfficePPTXFile/Editor/imagemanager.h
@@ -19,8 +19,9 @@ using namespace NSFontCutter;
 #include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
 #include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../../DesktopEditor/graphics/Image.h"
-#include "../../Common/DocxFormat/Source/SystemUtility/File.h"

+#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
+#include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
 #include <list>

 #ifndef min

--- a/DesktopEditor/common/File.h
+++ b/DesktopEditor/common/File.h
@@ -12,8 +12,8 @@
 #include <wchar.h>
 #endif

-#include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
-
+//#include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
+//перенесено выше
 namespace NSFile
 {
 	#define WriteUtf16_WCHAR(code, p)				\