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
562f5a9a
Commit
562f5a9a
authored
Jan 12, 2018
by
Boris Kocherov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable not used libraries
parent
17383b81
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
511 deletions
+10
-511
Makefile
Makefile
+2
-2
X2tConverter/build/Qt/X2tConverter.pri
X2tConverter/build/Qt/X2tConverter.pri
+7
-7
X2tConverter/src/ASCConverters.cpp
X2tConverter/src/ASCConverters.cpp
+1
-437
X2tConverter/src/cextracttools.cpp
X2tConverter/src/cextracttools.cpp
+0
-65
No files found.
Makefile
View file @
562f5a9a
...
...
@@ -274,9 +274,9 @@ endef
all
:
lib bin
bin
:
$(X2T)
$(ALLFONTSGEN)
bin
:
$(X2T)
lib
:
$(
PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(
UNICODECONVERTER)
lib
:
$(UNICODECONVERTER)
ext
:
$(HTMLFILEINTERNAL) $(DOCBUILDER)
...
...
X2tConverter/build/Qt/X2tConverter.pri
View file @
562f5a9a
...
...
@@ -121,7 +121,7 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lRtfFormatLib
#txt(xml) file
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lTxtXmlFormatLib
# pdf writer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter
#
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfWriter
#docxfile2
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lASCOfficeDocxFile2Lib
#pptxformat
...
...
@@ -133,14 +133,14 @@ LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lOfficeUtils
#graphics
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lgraphics
#doctrenderer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
#
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -ldoctrenderer
#HtmlRenderer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfReader
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDjVuFile
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lXpsFile
#
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlRenderer
#
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lPdfReader
#
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lDjVuFile
#
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lXpsFile
#HtmlFile
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlFile
#
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lHtmlFile
#UnicodeConverter
LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lUnicodeConverter
#Crypto++
...
...
X2tConverter/src/ASCConverters.cpp
View file @
562f5a9a
This diff is collapsed.
Click to expand it.
X2tConverter/src/cextracttools.cpp
View file @
562f5a9a
...
...
@@ -403,71 +403,6 @@ namespace NExtractTools
}
int
apply_changes
(
const
std
::
wstring
&
sBinFrom
,
const
std
::
wstring
&
sToResult
,
NSDoctRenderer
::
DoctRendererFormat
::
FormatFile
eType
,
const
std
::
wstring
&
sThemeDir
,
std
::
wstring
&
sBinTo
,
const
InputParams
&
params
)
{
std
::
wstring
sBinDir
=
NSDirectory
::
GetFolderPath
(
sBinFrom
);
std
::
wstring
sChangesDir
=
sBinDir
+
FILE_SEPARATOR_STR
+
_T
(
"changes"
);
if
(
NSDirectory
::
Exists
(
sChangesDir
))
{
sBinTo
=
sBinDir
+
FILE_SEPARATOR_STR
+
_T
(
"EditorWithChanges.bin"
);
std
::
wstring
sImagesDirectory
=
sBinDir
+
FILE_SEPARATOR_STR
+
_T
(
"media"
);
NSDoctRenderer
::
CDoctrenderer
oDoctRenderer
(
NULL
!=
params
.
m_sAllFontsPath
?
*
params
.
m_sAllFontsPath
:
_T
(
""
));
int
nChangeIndex
=
-
1
;
while
(
true
)
{
std
::
wstring
sXml
=
getDoctXml
(
eType
,
eType
,
sBinDir
,
sBinTo
,
sImagesDirectory
,
sThemeDir
,
nChangeIndex
,
_T
(
""
),
params
);
std
::
wstring
sResult
;
oDoctRenderer
.
Execute
(
sXml
,
sResult
);
bool
bContinue
=
false
;
if
(
!
sResult
.
empty
()
&&
-
1
!=
sResult
.
find
(
_T
(
"error"
)))
{
std
::
wcerr
<<
_T
(
"DoctRenderer:"
)
<<
sResult
<<
std
::
endl
;
params
.
m_bOutputConvertCorrupted
=
true
;
int
nErrorIndex
=
-
1
;
int
nErrorIndexStart
=
sResult
.
find
(
_T
(
"index"
));
if
(
-
1
!=
nErrorIndexStart
)
{
nErrorIndexStart
=
sResult
.
find
(
_T
(
"
\"
"
),
nErrorIndexStart
+
1
);
int
nErrorIndexEnd
=
sResult
.
find
(
_T
(
"
\"
"
),
nErrorIndexStart
+
1
);
nErrorIndex
=
_wtoi
(
sResult
.
substr
(
nErrorIndexStart
+
1
,
nErrorIndexEnd
-
nErrorIndexStart
-
1
).
c_str
());
}
if
(
nErrorIndex
>
0
&&
nChangeIndex
!=
nErrorIndex
)
{
nChangeIndex
=
nErrorIndex
;
bContinue
=
true
;
}
else
{
sBinTo
=
sBinFrom
;
}
}
if
(
!
bContinue
)
{
if
(
!
sToResult
.
empty
()
&&
!
params
.
getDontSaveAdditional
())
{
std
::
vector
<
std
::
wstring
>
aImages
=
oDoctRenderer
.
GetImagesInChanges
();
//todo сделать interface у COfficeUtils, чтобы можно было делать архив из файлов в разных папках.
for
(
int
i
=
0
;
i
<
aImages
.
size
();
++
i
)
{
std
::
wstring
sImageName
=
aImages
[
i
];
std
::
wstring
sImage
=
sImagesDirectory
+
FILE_SEPARATOR_STR
+
sImageName
;
std
::
wstring
sImageCopy
=
sChangesDir
+
FILE_SEPARATOR_STR
+
sImageName
;
NSFile
::
CFileBinary
::
Copy
(
sImage
,
sImageCopy
);
}
////copy doct for version history
// std::wstring sBinCopy = sChangesDir + FILE_SEPARATOR_STR + NSSystemPath::GetFileName(sBinFrom);
// NSFile::CFileBinary::Copy(sBinFrom, sBinCopy);
std
::
wstring
sToResultDir
=
NSDirectory
::
GetFolderPath
(
sToResult
);
std
::
wstring
sTo
=
sToResultDir
+
FILE_SEPARATOR_STR
+
_T
(
"changes.zip"
);
COfficeUtils
oCOfficeUtils
(
NULL
);
oCOfficeUtils
.
CompressFileOrDirectory
(
sChangesDir
,
sTo
);
}
break
;
}
}
}
else
sBinTo
=
sBinFrom
;
return
0
;
}
#endif
...
...
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