Commit 89211eb2 authored by ElenaSubbotina's avatar ElenaSubbotina

x2t version up

parent bff7e2cd
...@@ -352,7 +352,9 @@ SOURCES += \ ...@@ -352,7 +352,9 @@ SOURCES += \
../src/odf/datatypes/mathvariant.cpp \ ../src/odf/datatypes/mathvariant.cpp \
../formulasconvert/formulasconvert_odf.cpp \ ../formulasconvert/formulasconvert_odf.cpp \
../src/odf/calcext_elements.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 += \ HEADERS += \
../formulasconvert/formulasconvert.h \ ../formulasconvert/formulasconvert.h \
...@@ -622,7 +624,9 @@ HEADERS += \ ...@@ -622,7 +624,9 @@ HEADERS += \
../src/odf/math_token_elements.h \ ../src/odf/math_token_elements.h \
../src/odf/datatypes/mathvariant.h \ ../src/odf/datatypes/mathvariant.h \
../src/odf/calcext_elements.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 { unix {
target.path = /usr/lib target.path = /usr/lib
INSTALLS += target INSTALLS += target
......
...@@ -503,7 +503,7 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap ...@@ -503,7 +503,7 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
if ((oFile.IsInit() && (OOX::FileTypes::OleObject == oFile->type()))) if ((oFile.IsInit() && (OOX::FileTypes::OleObject == oFile->type())))
{ {
OOX::OleObject* pO = (OOX::OleObject*)oFile.operator->(); OOX::OleObject* pO = (OOX::OleObject*)oFile.operator->();
sRelativePath = pO->m_sFilename; sRelativePath = pO->filename().m_strFilename;
} }
} }
//todooo проверить что тут за путь .. //todooo проверить что тут за путь ..
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.2.369 VERSION = 2.0.2.370
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
mac { mac {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment