diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-04-02 13:22:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-04-02 13:28:12 +0300 |
| commit | cbd8587ffb4b4e01705fc7f07fc4740382b78a08 (patch) | |
| tree | 0c780e9ceac1afc62791cd617facb6c00e4a7d32 /desktop | |
| parent | c8cf6766fd38d45b73d49cb85dd5fe2d7e3dba50 (diff) | |
Move osl::LibreOfficeKit stuff to comphelper for now
Let's see where it actually will be needed. Sal is a "picky" place for
new API, even inside LIBO_INTERNAL_ONLY.
Change-Id: Ia0c5ee8cfc6ee526c5ad34d2f8aab0b14b5f805b
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 6 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 8c0ac218d6e7..d148b8ae60d8 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -26,7 +26,6 @@ #include "dispatchwatcher.hxx" #include <boost/scoped_ptr.hpp> #include <stdio.h> -#include <osl/lok.hxx> #include <osl/process.h> #include <unotools/bootstrap.hxx> #include <vcl/svapp.hxx> @@ -40,6 +39,7 @@ #include <unotools/moduleoptions.hxx> #include <rtl/bootstrap.hxx> #include <rtl/strbuf.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/file.hxx> @@ -467,7 +467,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() // from LibreOfficeKit's lo_initialize() I am not completely sure, but that code, and this, is // such horrible crack that I don't want to change it too much. - if (osl::LibreOfficeKit::isActive()) + if (comphelper::LibreOfficeKit::isActive()) { // Setting nPipeMode to PIPEMODE_CREATED causes the trivial path to be taken below, starting // the listeing thread. (Which will immediately finish, see the execute() function, but what @@ -707,7 +707,7 @@ void OfficeIPCThread::execute() #if HAVE_FEATURE_DESKTOP || defined(ANDROID) #ifndef ANDROID - if (osl::LibreOfficeKit::isActive()) + if (comphelper::LibreOfficeKit::isActive()) return; #endif diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 339e3fd17ad9..450757a8351f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -22,13 +22,13 @@ #include <tools/errinf.hxx> #include <osl/file.hxx> -#include <osl/lok.hxx> #include <osl/process.h> #include <osl/thread.h> #include <rtl/strbuf.hxx> #include <rtl/bootstrap.hxx> #include <cppuhelper/bootstrap.hxx> #include <comphelper/dispatchcommand.hxx> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -853,7 +853,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) if (bInitialized) return 1; - osl::LibreOfficeKit::setActive(); + comphelper::LibreOfficeKit::setActive(); OUString aAppPath; if (pAppPath) |