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

x2t version up

Browse Source
This commit is contained in:
ElenaSubbotina
2016-06-03 18:01:46 +03:00
parent bff7e2cdbe
commit 89211eb25d
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
View File

@ -352,7 +352,9 @@ SOURCES += \
../src/odf/datatypes/mathvariant.cpp \
../formulasconvert/formulasconvert_odf.cpp \
../src/odf/calcext_elements.cpp \
../src/odf/table_database_ranges.cpp
../src/odf/table_database_ranges.cpp \
../src/docx/xlsx_conditionalFormatting.cpp \
../src/docx/xlsx_dxfs.cpp
HEADERS += \
../formulasconvert/formulasconvert.h \
@ -622,7 +624,9 @@ HEADERS += \
../src/odf/math_token_elements.h \
../src/odf/datatypes/mathvariant.h \
../src/odf/calcext_elements.h \
../src/odf/table_database_ranges.h
../src/odf/table_database_ranges.h \
../src/docx/xlsx_conditionalFormatting.h \
../src/docx/xlsx_dxfs.h
unix {
target.path = /usr/lib
INSTALLS += target

2
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
View File

@ -503,7 +503,7 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
if ((oFile.IsInit() && (OOX::FileTypes::OleObject == oFile->type())))
{
OOX::OleObject* pO = (OOX::OleObject*)oFile.operator->();
sRelativePath = pO->m_sFilename;
sRelativePath = pO->filename().m_strFilename;
}
}
//todooo проверить что тут за путь ..

2
X2tConverter/build/Qt/X2tConverter.pro
View File

@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.2.369
VERSION = 2.0.2.370
DEFINES += INTVER=$$VERSION
mac {