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

DesktopEditor/ChromiumBasedEditors 2/lib/include/base.h

 #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"
+#define WindowHandleId HWND
+#include <wchar.h>
 
 #endif
 
-#define WindowHandleId HWND
+#if defined(_LINUX) && !defined(_MAC)
 
-#include <wchar.h>
+#define WindowHandleId XID
+
+#endif
+
+#ifdef _MAC
+
+#define WindowHandleId XID
 
 #endif
 

DesktopEditor/ChromiumBasedEditors 2/lib/src/cefwrapper/client_renderer_wrapper.cpp

@@ -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 = "";