pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,563 Commits 55 Branches 10,393 Tags
e7a531cdfad331c65efd64d2c19c4d82e4c7372b
Commit Graph

45 Commits

Author SHA1 Message Date
Oleg.Korshul
48302b8d9e font_selection.bin в папке с процессом 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61041 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:40:24 +03:00
Sergey.Konovalov
ab0a40f482 Bug 28378 - Падение при открытии docx с emf картинками 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60905 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:39:53 +03:00
Oleg.Korshul
db1692b5d6 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59879 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:34:02 +03:00
Sergey.Konovalov
945d20bc48 откатились изменения с crossplatform до Revision: 59486 Date: 18:53:47, 6 ноября 2014 г. 
revert revisions 59572, 59565, 59564, 59563, 59556, 59550, 59548, 59547, 59546, 59545, 59544, 59543, 59542, 59541, 59533, 59531, 59523, 59519, 59503, 59499, 59490.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59588 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:33:23 +03:00
Ivan.Shulga
6e38da0fc3 some '%ls' are wrong 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59565 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:33:11 +03:00
Elen.Subbotina
b92a0ddc4c linux build - %s 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59490 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:31:40 +03:00
Ivan.Shulga
4ad5b8dfcb linux build, changes some file separators 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59360 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:37 +03:00
Sergey.Konovalov
bf5214e515 Bug 27248 - Docx\Doc ошибка при открытии документа с wmf. 
FontManager::LoadString1

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59304 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:47 +03:00
Sergey.Konovalov
f394e3ac35 ошибка в возвращаемом значении LoadFontByName 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59197 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:28:15 +03:00
Ivan.Shulga
43b90c3922 std::max -> (std::max) 
std::min -> (std::min)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59188 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:28:03 +03:00
Ivan.Shulga
fb822d16ea min->std::min 
max->std::max

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59184 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:55 +03:00
Sergey.Konovalov
3a5745cc0c add ascii_to_unicode unicode_to_ascii 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59114 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:17 +03:00
Sergey.Konovalov
8e91112c59 ASCHTMLRendererLib Linux build,некоторые файла переведены в utf8. 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58853 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:20:50 +03:00
Sergey.Konovalov
1555436d6c отказ от FontManager из ASCGraphics, прокидываем во все классы один FontManager. 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58768 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:18:57 +03:00
Sergey.Konovalov
27a51bca41 переход от IASCRenderer к IRenderer из DesktopEditor; отказ от импорта длл ASCImageStudio3 ASCHTMLRenderer; от AscGraphics только FontPicker и FontManager. 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58742 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:18:41 +03:00
Sergey.Konovalov
50abb28c74 add atlbase.h 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58408 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:15:41 +03:00
Oleg.Korshul
3a16812603 (1.0.1.177) подбор шривтов с использованием словаря 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@56344 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:55:15 +03:00
Oleg.Korshul
17e0e3a3cc fonts dictionary 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@56327 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:55:02 +03:00
Oleg.Korshul
db50a8c532 (1.0.1.176) unconverted to wmf emf files 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@55767 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:51:49 +03:00
Oleg.Korshul
f3f69f210e git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@54865 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:44:25 +03:00
Oleg.Korshul
c3cb7fd17d (1.0.1.175) unhandle uncorrect font 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53940 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:39:35 +03:00
Oleg.Korshul
a6a366d5ec (1.0.1.174) emf+ 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53470 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:37:32 +03:00
Oleg.Korshul
bf584f95e4 (1.0.1.173) doctrenderer 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53445 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:37:28 +03:00
Oleg.Korshul
129807d4b5 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53208 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:35:35 +03:00
Oleg.Korshul
8fea30bea8 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52672 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:31:34 +03:00
Ivan.Shulga
4561e226ca git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52622 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:30:08 +03:00
Ivan.Shulga
7822d9b501 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52607 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:29:55 +03:00
Oleg.Korshul
7cde031993 (1.0.1.172) ASC document renderer 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52588 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:29:23 +03:00
Ivan.Shulga
62881bd0fb git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52576 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:29:04 +03:00
Ivan.Shulga
86ad65fe3b git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52537 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:28:14 +03:00
Ivan.Shulga
aee6f92414 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52488 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:27:37 +03:00
Oleg.Korshul
e2d04e7769 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52484 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:27:33 +03:00
Oleg.Korshul
937677d036 (1.0.1.171) ASC version 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52480 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:27:25 +03:00
Oleg.Korshul
ad823ccf53 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52441 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:26:39 +03:00
Oleg.Korshul
3c15212188 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52438 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:26:37 +03:00
Ivan.Shulga
119bd7652e git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52379 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:25:13 +03:00
Ivan.Shulga
dfe8b145cc git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52375 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:25:07 +03:00
Ivan.Shulga
4ef3eb63b6 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52370 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:24:58 +03:00
Ivan.Shulga
92dad50995 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52367 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:24:52 +03:00
Ivan.Shulga
429863f95a git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52366 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:24:50 +03:00
Ivan.Shulga
fa78b61af6 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52365 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:24:48 +03:00
Ivan.Shulga
f44094d422 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52364 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:24:46 +03:00
Ivan.Shulga
4b869aa9fa unresolved dependency from AVSPPTFile.dll 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52363 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 22:24:44 +03:00
Ivan.Shulga
cd431bd9b3 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52362 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:24:42 +03:00
Ivan.Shulga
30103a750d git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52361 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 22:24:38 +03:00