pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64256 954022d7-b5bf-4e40-9824-e11837661b57

Browse Source
This commit is contained in:
Oleg.Korshul
2015-08-24 15:26:38 +00:00
committed by Alexander Trofimov
parent 62c12607b7
commit f2fe81deb9
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DesktopEditor/ChromiumBasedEditors 2/lib/include/base.h
View File

@ -1,18 +1,26 @@
#ifndef APPLICATION_BASE_H
#define APPLICATION_BASE_H
#include "../../common/base_export.h"
#ifdef WIN32
#ifndef Q_DECL_EXPORT
#define Q_DECL_EXPORT __declspec(dllexport)
#include "windows.h"
#endif
#define WindowHandleId HWND
#include <wchar.h>
#endif
#if defined(_LINUX) && !defined(_MAC)
#define WindowHandleId XID
#endif
#ifdef _MAC
#define WindowHandleId XID
#endif
#endif // APPLICATION_BASE_H

11
DesktopEditor/ChromiumBasedEditors 2/lib/src/cefwrapper/client_renderer_wrapper.cpp
View File

@ -695,10 +695,13 @@ public:
CefRefPtr<CefV8Value> val = *arguments.begin();
std::wstring sFileUrl = val->GetStringValue().ToWString();
if (sFileUrl.find(L"file:///") == 0)
sFileUrl = sFileUrl.substr(8);
else if (sFileUrl.find(L"file://") == 0)
sFileUrl = sFileUrl.substr(7);
if (sFileUrl.find(L"file://") == 0)
{
if (NSFile::CFileBinary::Exists(sFileUrl.substr(7)))
sFileUrl = sFileUrl.substr(7);
else if (NSFile::CFileBinary::Exists(sFileUrl.substr(8)))
sFileUrl = sFileUrl.substr(8);
}
std::string sHeader = "";