системные шрифты

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

DesktopEditor/fontengine/ApplicationFonts_ios.mm

@@ -11,6 +11,12 @@ CArray<std::wstring> CApplicationFonts::GetSetupFontFiles_ios()
 {
     CArray<std::wstring> oArray;
     NSDirectory::GetFiles2(L"/System/Library/Fonts", oArray, true);
+    
+    if (oArray.GetCount() == 0)
+    {
+        NSDirectory::GetFiles2(L"/Library/Fonts", oArray, true);
+    }
+    
     return oArray;
 }
 

DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj

@@ -463,6 +463,7 @@
 					DONT_WRITE_EMBEDDED_FONTS,
 					LIBXML_READER_ENABLED,
 					FILEDOWNLOADER_OWN_IMPLEMENTATION,
+					_IOS,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -496,6 +497,7 @@
 					DONT_WRITE_EMBEDDED_FONTS,
 					LIBXML_READER_ENABLED,
 					FILEDOWNLOADER_OWN_IMPLEMENTATION,
+					_IOS,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -549,6 +551,7 @@
 				7C560F851AA71A91000E5860 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		7C560F8A1AA71AEA000E5860 /* Build configuration list for PBXAggregateTarget "BuildAll" */ = {
 			isa = XCConfigurationList;
@@ -557,6 +560,7 @@
 				7C560F8C1AA71AEA000E5860 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

DesktopEditor/ios_projects/libxml2/libxml2.xcodeproj/project.pbxproj

@@ -442,6 +442,7 @@
 					HAVE_TIME_H,
 					HAVE_MALLOC_H,
 					LIBXML_OUTPUT_ENABLED,
+					_IOS,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -481,12 +482,13 @@
 					HAVE_TIME_H,
 					HAVE_MALLOC_H,
 					LIBXML_OUTPUT_ENABLED,
+					_IOS,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					../../Common/DocxFormat/Source/XML/libxml2/XML/include,
-					../../Common/DocxFormat/Source/XML/libxml2/XML/include/libxml,
+					../../../Common/DocxFormat/Source/XML/libxml2/XML/include,
+					../../../Common/DocxFormat/Source/XML/libxml2/XML/include/libxml,
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";