Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
onlyoffice_core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
onlyoffice_core
Commits
89211eb2
Commit
89211eb2
authored
Jun 03, 2016
by
ElenaSubbotina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x2t version up
parent
bff7e2cd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
+6
-2
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
...RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
+1
-1
X2tConverter/build/Qt/X2tConverter.pro
X2tConverter/build/Qt/X2tConverter.pro
+1
-1
No files found.
ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
View file @
89211eb2
...
...
@@ -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
...
...
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
View file @
89211eb2
...
...
@@ -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_s
Filename
;
sRelativePath
=
pO
->
filename
().
m_str
Filename
;
}
}
//todooo проверить что тут за путь ..
...
...
X2tConverter/build/Qt/X2tConverter.pro
View file @
89211eb2
...
...
@@ -7,7 +7,7 @@
QT
-=
core
QT
-=
gui
VERSION
=
2.0
.
2.3
69
VERSION
=
2.0
.
2.3
70
DEFINES
+=
INTVER
=
$$
VERSION
mac
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment