diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 00:53:56 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:32 -0500 |
| commit | 58cbef55a44cebbedecace6e4867aa3f49f85d11 (patch) | |
| tree | eed0af681403b43f70742349e62c3626cd016f3d /desktop/source/app | |
| parent | c9f896c3f94c70adf8b90fbc88da64517ed55f6c (diff) | |
merge vosremoval-security patch
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/appinit.cxx | 3 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.cxx | 4 | ||||
| -rw-r--r-- | desktop/source/app/officeipcthread.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/app/userinstall.cxx | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index fb5e3f7d9e..308949e87d 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -101,7 +101,7 @@ #include <tools/testtoolloader.hxx> #include <tools/solar.h> #include <toolkit/unohlp.hxx> -#include <vos/security.hxx> +#include <osl/security.hxx> #include <vos/ref.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/componentcontext.hxx> diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index b2f12c2c67..1f591cc77b 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -52,6 +52,7 @@ #include <cppuhelper/bootstrap.hxx> #include <osl/file.hxx> #include <osl/module.h> +#include <osl/security.hxx> #include <vos/process.hxx> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> @@ -108,7 +109,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) } rtl::OUString aPipe; - vos::OSecurity().getUserIdent(aPipe); + osl::Security().getUserIdent(aPipe); rtl::OUStringBuffer aPortal; if (rPortalConnect.getLength() != 0) diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 29ab71ae12..55aaaf682f 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -221,7 +221,7 @@ bool addArgument( } OfficeIPCThread* OfficeIPCThread::pGlobalOfficeIPCThread = 0; -namespace { struct Security : public rtl::Static<OSecurity, Security> {}; } + namespace { struct Security : public rtl::Static<osl::Security, Security> {}; } ::osl::Mutex* OfficeIPCThread::pOfficeIPCThreadMutex = 0; // Turns a string in aMsg such as file://home/foo/.libreoffice/3 @@ -504,7 +504,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() PipeMode nPipeMode = PIPEMODE_DONTKNOW; do { - OSecurity &rSecurity = Security::get(); + osl::Security &rSecurity = Security::get(); // Try to create pipe if ( pThread->maPipe.create( pThread->maPipeIdent.getStr(), OPipe::TOption_Create, rSecurity )) { diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 15753f6fb8..f65f9df875 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <vos/pipe.hxx> -#include <vos/security.hxx> +#include <osl/security.hxx> #include <vos/signal.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index e11473646d..333efd58ee 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -40,7 +40,7 @@ #include <osl/mutex.hxx> #include <osl/process.h> #include <osl/diagnose.h> -#include <vos/security.hxx> +#include <osl/security.hxx> #include <vos/ref.hxx> #include <vos/process.hxx> |