linux build (not work)

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

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

@@ -13,6 +13,7 @@
 
 #if defined(_LINUX) && !defined(_MAC)
 
+#include <X11/X.h>
 #define WindowHandleId XID
 
 #endif

DesktopEditor/ChromiumBasedEditors 2/lib/src/applicationmanager.cpp

@@ -272,11 +272,11 @@ namespace NSCommon
                     oRenderer.put_FontPath(strFontPath);
                     pManager->LoadFontFromFile(strFontPath, lFaceIndex, 14, dDpi, dDpi);
 
-                    BOOL bIsSymbol = FALSE;
+                    bool bIsSymbol = FALSE;
 
                     if (pManager->m_pFont)
                     {
-                        bIsSymbol = (-1 != (pManager->m_pFont->m_nSymbolic)) ? TRUE : FALSE;
+                        bIsSymbol = (-1 != (pManager->m_pFont->m_nSymbolic)) ? true : false;
 
                         if (!bIsSymbol)
                         {
@@ -288,7 +288,7 @@ namespace NSCommon
                             if (NULL != pOS2)
                             {
                                 if (0 == (pOS2->ulCodePageRange1 & 0xF0000000))
-                                    bIsSymbol = TRUE;
+                                    bIsSymbol = true;
                             }
                         }
                     }
@@ -691,7 +691,7 @@ protected:
             oDownloader.Start( 0 );
             while ( oDownloader.IsRunned() )
             {
-                ::Sleep( 10 );
+                NSThreads::Sleep( 10 );
             }
 
             m_bRunThread = FALSE;
@@ -1034,7 +1034,7 @@ void CAscApplicationManager::SendKeyboardAttack()
 void CAscApplicationManager::CheckFonts(bool bAsync)
 {
     if (!NSDirectory::Exists(m_oSettings.fonts_cache_info_path))
-        NSDirectory::CreateDirectoryW(m_oSettings.fonts_cache_info_path);
+        NSDirectory::CreateDirectory(m_oSettings.fonts_cache_info_path);
 
     bool bIsStarted = m_pInternal->IsRunned();
     bool bIsInit = IsInitFonts();

DesktopEditor/ChromiumBasedEditors 2/lib/src/cef/linux/cefclient/browser/client_handler.h

@@ -260,7 +260,7 @@ class ClientHandler : public CefClient,
   // Returns true if this handler uses off-screen rendering.
   bool is_osr() const { return is_osr_; }
 
- private:
+ protected:
   // Create a new popup window using the specified information. |is_devtools|
   // will be true if the window will be used for DevTools. Return true to
   // proceed with popup browser creation or false to cancel the popup browser.

DesktopEditor/ChromiumBasedEditors 2/lib/src/cef/linux/cefclient/renderer/client_app_renderer.h

@@ -125,7 +125,7 @@ class ClientAppRenderer : public ClientApp,
       CefProcessId source_process,
       CefRefPtr<CefProcessMessage> message) OVERRIDE;
 
- private:
+ protected:
   // Set of supported Delegates.
   DelegateSet delegates_;
 

DesktopEditor/ChromiumBasedEditors 2/lib/src/cefapplication.cpp

@@ -5,7 +5,10 @@
 #include "cefwrapper/client_scheme.h"
 
 #include "cefclient/browser/main_context_impl.h"
+
+#ifdef WIN32
 #include "cefclient/browser/main_message_loop_multithreaded_win.h"
+#endif
 #include "cefclient/browser/main_message_loop_std.h"
 
 class CApplicationCEF_Private

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

@@ -167,10 +167,10 @@ public:
             std::wstring strAppPathEditors = strAppPath + L"/" + NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)m_sVersion.c_str(), (LONG)m_sVersion.length());
             if (!NSDirectory::Exists(strAppPathEditors))
             {
-                NSDirectory::CreateDirectoryW(strAppPathEditors);
-                NSDirectory::CreateDirectoryW(strAppPathEditors + L"/word");
-                NSDirectory::CreateDirectoryW(strAppPathEditors + L"/excel");
-                NSDirectory::CreateDirectoryW(strAppPathEditors + L"/powerpoint");
+                NSDirectory::CreateDirectory(strAppPathEditors);
+                NSDirectory::CreateDirectory(strAppPathEditors + L"/word");
+                NSDirectory::CreateDirectory(strAppPathEditors + L"/excel");
+                NSDirectory::CreateDirectory(strAppPathEditors + L"/powerpoint");
             }
 
             CefRefPtr<CefV8Value> val = *arguments.begin();
@@ -850,7 +850,7 @@ public:
         oDownloader.Start( 0 );
         while ( oDownloader.IsRunned() )
         {
-            ::Sleep( 10 );
+            NSThreads::Sleep(10);
         }
         return oDownloader.IsFileDownloaded();
     }

DesktopEditor/ChromiumBasedEditors 2/lib/src/keyboardchecker.cpp

@@ -211,8 +211,6 @@ void CAscKeyboardChecker::Check(CAscApplicationManager* pManager, int nLangInput
     default:
         break;
     }
-
-    OutputDebugStringA(sLang.c_str());
 #endif
 }