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

5c694e28 · Oleg.Korshul · Alexander Trofimov · e8eddad0 · 5c694e28 · 5c694e28
Commit 5c694e28 authored Mar 23, 2015 by Oleg.Korshul Committed by Alexander Trofimov May 20, 2016
Showing with 2 additions and 2 deletions

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

DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj ...os_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj +2 -0

No files found.
--- a/DesktopEditor/Word_Api/Editor_Api.h
+++ b/DesktopEditor/Word_Api/Editor_Api.h
@@ -1974,7 +1974,6 @@ namespace NSEditorApi
    {
    public:
        js_wrapper<bool>			m_bAbove;
-        js_wrapper<bool>			m_bBelow;
        js_wrapper<bool>            m_bIsAdd;   // true - add, false - remove
        js_wrapper<int>             m_nType;    // 1 - column, 2 - row
        
@@ -1987,7 +1986,6 @@ namespace NSEditorApi
        }
        
        LINK_PROPERTY_BOOL_JS(Above)
-        LINK_PROPERTY_BOOL_JS(Below)
        LINK_PROPERTY_BOOL_JS(IsAdd)
        LINK_PROPERTY_INT_JS(Type)
    };

--- a/DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj
+++ b/DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj
@@ -465,6 +465,7 @@
 					FILEDOWNLOADER_OWN_IMPLEMENTATION,
 					_IOS,
 					FILTER_FLATE_DECODE_ENABLED,
+					_ARM_ALIGN_,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -500,6 +501,7 @@
 					FILEDOWNLOADER_OWN_IMPLEMENTATION,
 					_IOS,
 					FILTER_FLATE_DECODE_ENABLED,
+					_ARM_ALIGN_,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",