парарурам

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

парарурам
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57884 954022d7-b5bf-4e40-9824-e11837661b57
4eb8c088 · Oleg.Korshul · Alexander Trofimov · f5167a88 · 4eb8c088 · 4eb8c088
Commit 4eb8c088 authored Aug 19, 2014 by Oleg.Korshul Committed by Alexander Trofimov May 20, 2016
Showing with 6 additions and 1 deletion

DesktopEditor/Qt_build/editor/project/NativeControl.h DesktopEditor/Qt_build/editor/project/NativeControl.h +1 -1

DesktopEditor/Word_Api/Editor_Api.h DesktopEditor/Word_Api/Editor_Api.h +5 -0

No files found.
--- a/DesktopEditor/Qt_build/editor/project/NativeControl.h
+++ b/DesktopEditor/Qt_build/editor/project/NativeControl.h
@@ -7,7 +7,7 @@
 #include <QPaintEvent>
 #include <QGLWidget>

-#define _USE_WEB_MENU_
+//#define _USE_WEB_MENU_

 #ifdef _USE_WEB_MENU_
 #include <QGraphicsView>

--- a/DesktopEditor/Word_Api/Editor_Api.h
+++ b/DesktopEditor/Word_Api/Editor_Api.h
@@ -4,6 +4,11 @@
 #include "./Editor_Defines.h"

 #include <string>
+
+#ifdef max
+#undef max
+#endif
+
 #include <vector>

 #ifndef max