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
fdb7716a
Commit
fdb7716a
authored
Dec 01, 2017
by
Oleg Korshul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
builder error (save to pdf & open file by url)
parent
f72d6dfe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
Common/FileDownloader/FileDownloader_curl.cpp
Common/FileDownloader/FileDownloader_curl.cpp
+6
-1
Common/FileDownloader/FileDownloader_win.cpp
Common/FileDownloader/FileDownloader_win.cpp
+1
-1
DesktopEditor/doctrenderer/docbuilder_p.h
DesktopEditor/doctrenderer/docbuilder_p.h
+1
-1
DesktopEditor/doctrenderer/doctrenderer.cpp
DesktopEditor/doctrenderer/doctrenderer.cpp
+1
-1
No files found.
Common/FileDownloader/FileDownloader_curl.cpp
View file @
fdb7716a
...
...
@@ -97,7 +97,12 @@ public :
m_bComplete
=
(
CURLE_OK
==
res
);
if
(
m_bComplete
)
m_sFilePath
=
NSFile
::
CUtf8Converter
::
GetUnicodeStringFromUTF8
((
BYTE
*
)
sOut
.
c_str
(),
sOut
.
length
());
{
if
(
m_sFilePath
.
empty
())
m_sFilePath
=
NSFile
::
CUtf8Converter
::
GetUnicodeStringFromUTF8
((
BYTE
*
)
sOut
.
c_str
(),
sOut
.
length
());
else
NSFile
::
CFileBinary
::
Move
(
UTF8_TO_U
(
sOut
),
m_sFilePath
);
}
//int nRes = execl("/usr/bin/wget", stringWstingToUtf8String (m_sFileUrl).c_str(), "-P", stringWstingToUtf8String (m_sFilePath).c_str(), (char *)NULL);
//m_bComplete = nRes >= 0;
...
...
Common/FileDownloader/FileDownloader_win.cpp
View file @
fdb7716a
...
...
@@ -70,7 +70,7 @@ public :
virtual
int
DownloadFile
()
{
CoInitialize
(
NULL
);
if
(
S_OK
!=
_DownloadFile
(
m_sFileUrl
)
)
if
(
/*S_OK != _DownloadFile ( m_sFileUrl )*/
TRUE
)
{
HRESULT
hrResultAll
=
DownloadFileAll
(
m_sFileUrl
,
m_sFilePath
);
...
...
DesktopEditor/doctrenderer/docbuilder_p.h
View file @
fdb7716a
...
...
@@ -939,7 +939,7 @@ namespace NSDoctRenderer
MoveFileOpen
(
path
,
sFileCopy
);
COfficeFileFormatChecker
oChecker
;
if
(
!
oChecker
.
isOfficeFile
(
path
))
if
(
!
oChecker
.
isOfficeFile
(
sFileCopy
))
return
false
;
if
(
oChecker
.
nFileType
&
AVS_OFFICESTUDIO_FILE_DOCUMENT
)
...
...
DesktopEditor/doctrenderer/doctrenderer.cpp
View file @
fdb7716a
...
...
@@ -1194,5 +1194,5 @@ bool Doct_renderer_SaveFile_ForBuilder(int nFormat, const std::wstring& strDstFi
oParams
.
m_strDstFilePath
=
strDstFile
;
return
NSDoctRenderer
::
CDoctRenderer_Private
::
Doct_renderer_SaveFile
(
&
oParams
,
pNative
,
isolate
,
global_js
,
args
,
try_catch
,
strError
,
tru
e
);
pNative
,
isolate
,
global_js
,
args
,
try_catch
,
strError
,
fals
e
);
}
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