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
5d77cf94
Commit
5d77cf94
authored
Mar 01, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add ../ path for dll path
parent
512dad1d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
HtmlFile/HtmlFile.cpp
HtmlFile/HtmlFile.cpp
+4
-2
No files found.
HtmlFile/HtmlFile.cpp
View file @
5d77cf94
...
...
@@ -350,8 +350,10 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
case
0
:
// child process
{
std
::
string
sLibraryDir
=
sProgramm
;
if
(
std
::
string
::
npos
!=
sProgramm
.
find_last_of
(
'/'
))
sLibraryDir
=
"LD_LIBRARY_PATH="
+
sProgramm
.
substr
(
0
,
sProgramm
.
find_last_of
(
'/'
));
std
::
string
::
size_type
posLast
=
sProgramm
.
find_last_of
(
'/'
);
std
::
string
sProgrammDir
=
sProgramm
.
substr
(
0
,
posLast
);
if
(
std
::
string
::
npos
!=
posLast
)
sLibraryDir
=
"LD_LIBRARY_PATH="
+
sProgrammDir
+
":"
+
sProgrammDir
+
"/../"
;
if
(
!
IsLinuxXVFB
())
{
...
...
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