pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 16:18:03 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,377 Commits 58 Branches 10,452 Tags
72dee74fffedee8f77ec6c2ebb404fd2c2ed678d
Commit Graph

213 Commits

Author SHA1 Message Date
Oleg.Korshul
72dee74fff презентация без слайдов 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60054 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:34:51 +03:00
Oleg.Korshul
27ea791024 save layout type to pptx 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60019 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:34:39 +03:00
Sergey.Konovalov
973274b60b merge from branches\Docx2DoctConverter Revision: 59967 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@60002 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:34:36 +03:00
Sergey.Konovalov
503f6b014f (2.0.0.249): ASCOfficeDocxFile2 
Bug 27824 - [Docx] После выгрузки документа Word 2013 не открывает документ.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59996 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:34:33 +03:00
Sergey.Konovalov
b5c4fea9cb (2.0.0.248): ASCOfficeDocxFile2 
Заглушка для невалидных xml при конвертации ppt->pptx(allenamenti_ipertrofici_confronto.ppt)

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59980 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:34:31 +03:00
Sergey.Konovalov
5e0a77b02c PPTX:merge from branches\Docx2DoctConverter Revision: 59944, 59941, 59883, 59848, 59833 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59961 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:34:18 +03:00
Sergey.Konovalov
065f9fd394 (2.0.0.245): ASCOfficeDocxFile2 
проблемы с записью в xlsx c_oSer_DrawingType::Ext

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59918 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:34:10 +03:00
Sergey.Konovalov
9ba7246e28 (2.0.0.243): ASCOfficeDocxFile2 
XLSX:не записывалось в xlsx если в автофильтре было только blank значение.
PPTX:ошибки и бесконечные циклы при чтении Transition нулевой длины.
PPTX:merge from branches\Docx2DoctConverter Revision: 59746
car_profile.pptx - в списках bullet спецсимволы
PPTX:merge from branches\Docx2DoctConverter Revision: 59733
поправлено - выбор шаблона для слайда при чтении из бинарника.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59752 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:33:49 +03:00
Sergey.Konovalov
72811a33df merge from branches\Docx2DoctConverter Revision: 59733 
поправлено - выбор шаблона для слайда при чтении из бинарника.



git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59737 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:33:44 +03:00
Sergey.Konovalov
1322465846 (2.0.0.241): ASCOfficeDocxFile2 
Bug 27244 - [Autosave] Потеря изображений после вставки скопированного содержимого документа и переоткрытия

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59665 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:33:36 +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
Sergey.Konovalov
b76d4486f8 отвалилась запись rels в theme.xml 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59572 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:33:14 +03:00
Elen.Subbotina
ddbcac8718 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59564 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:33:09 +03:00
Elen.Subbotina
00f7281560 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59563 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:33:06 +03:00
Elen.Subbotina
c8100927d0 linux 
docx->doct->docx 
xlsx->xlst->xlsx

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59556 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:32:54 +03:00
Elen.Subbotina
af58ceac8d xml из ресурсов встроены в код 
все пути к файлам обернуты  CPath


git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59541 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:32:26 +03:00
Sergey.Konovalov
beac7a446d отвалилась конвертация docx->doct 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59531 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:32:13 +03:00
Elen.Subbotina
7fab382655 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59523 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:32:05 +03:00
Elen.Subbotina
a9fb2ecc92 fix Win32 build 
fix linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59519 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:32:02 +03:00
Ivan.Shulga
15dbdb6712 paths 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59503 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:31:52 +03:00
Elen.Subbotina
4a2b0f0f90 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59499 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:31:49 +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
Elen.Subbotina
1f1b74a7cf linux build - finish debug build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59459 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:31:21 +03:00
Ivan.Shulga
1bee719ef8 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59439 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:31:11 +03:00
Ivan.Shulga
d35e7b99ff linux build, undefined symbols error (cximage) are present 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59389 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:53 +03:00
Oleg.Korshul
a9ee11d449 RECT->Aggplus::RECT 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59376 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:48 +03:00
Sergey.Konovalov
265eada999 SaveImageAsPng/Jpg через CBgraFrame 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59368 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:45 +03:00
Sergey.Konovalov
c231b8a81d SetDefaultFont Arial 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59364 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30: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
Elen.Subbotina
4c8f041af8 fix linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59347 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:27 +03:00
Ivan.Shulga
c3cbdcbe63 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59324 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:30:00 +03:00
Sergey.Konovalov
6e7dd51e90 revert from Revision: 59298 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59321 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:57 +03:00
Elen.Subbotina
0a33f3e60c linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59315 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:55 +03:00
Elen.Subbotina
1e23168842 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59303 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:45 +03:00
Elen.Subbotina
9c4d8e51fa fix for WIN32 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59302 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:42 +03:00
Elen.Subbotina
14f9e4e475 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59298 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:37 +03:00
Ivan.Shulga
0e4f306014 merged 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59286 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:34 +03:00
Elen.Subbotina
7a38697040 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59280 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:27 +03:00
Elen.Subbotina
5eef800b4a git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59276 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:24 +03:00
Elen.Subbotina
3c2483d6fe git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59264 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:19 +03:00
Elen.Subbotina
20a3709488 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59261 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:29:12 +03:00
Elen.Subbotina
1174c745e5 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59259 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:10 +03:00
Elen.Subbotina
4324f8b644 delete 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59251 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:02 +03:00
Elen.Subbotina
a8832d0255 linux build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59249 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:29:00 +03:00
Elen.Subbotina
ab3e457ea4 git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59235 954022d7-b5bf-4e40-9824-e11837661b57 2016-05-20 23:28:52 +03:00
Ivan.Shulga
3c4da71eb0 min->std::min 
max->std::max

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59232 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:28:47 +03:00
Elen.Subbotina
6c1121866d fix WIN32 build 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59204 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:28:23 +03:00
Elen.Subbotina
0956d00e2a fix WIN32 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59203 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:28:21 +03:00
Ivan.Shulga
e5773581b2 fixed paths 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59185 954022d7-b5bf-4e40-9824-e11837661b57
 2016-05-20 23:27:58 +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