diff --git a/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro b/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro index 10e128cccf..1b00c5c024 100644 --- a/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro +++ b/ASCOfficeOdfFile/linux/OdfFileReaderLib.pro @@ -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 diff --git a/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp b/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp index 70773e500f..a867709154 100644 --- a/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp +++ b/ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp @@ -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 проверить что тут за путь .. diff --git a/X2tConverter/build/Qt/X2tConverter.pro b/X2tConverter/build/Qt/X2tConverter.pro index 5831b2fb96..0bbccb662d 100644 --- a/X2tConverter/build/Qt/X2tConverter.pro +++ b/X2tConverter/build/Qt/X2tConverter.pro @@ -7,7 +7,7 @@ QT -= core QT -= gui -VERSION = 2.0.2.369 +VERSION = 2.0.2.370 DEFINES += INTVER=$$VERSION mac {