diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 00:53:57 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:36 -0500 |
| commit | 8daf7c66c52cfecc650904415d61a38a0797f6e6 (patch) | |
| tree | 94f025aabdb3d067e0e2a740a4bdf6ff7b6502fe /svtools | |
| parent | 75f4899265e23a405d30ef26a037d1b9c6bb8c18 (diff) | |
merge vosremoval-security patch
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/pch/precompiled_svtools.hxx | 3 | ||||
| -rw-r--r-- | svtools/source/dialogs/filedlg2.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx index d865b3f2eb78..96df529cf86e 100644 --- a/svtools/inc/pch/precompiled_svtools.hxx +++ b/svtools/inc/pch/precompiled_svtools.hxx @@ -362,6 +362,7 @@ #include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/process.h> +#include <osl/security.hxx> #include <osl/thread.h> #include <osl/thread.hxx> @@ -427,8 +428,6 @@ #include <vos/process.hxx> #include <vos/ref.hxx> #include <vos/refernce.hxx> -#include <vos/security.hxx> -#include <osl/thread.hxx> #include <vos/timer.hxx> //---MARKER--- diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index f4d2c45fc5ee..a4502631595e 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -39,7 +39,7 @@ #include <filedlg.hxx> #include <filedlg2.hrc> #include <vcl/msgbox.hxx> -#include <vos/security.hxx> +#include <osl/security.hxx> #include <com/sun/star/i18n/XCollator.hpp> #include <svtools/stdctrl.hxx> @@ -346,7 +346,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn ) if ( pBtn == pHomeBtn ) { ::rtl::OUString aHomeDir; - NAMESPACE_VOS( OSecurity ) aSecurity; + osl::Security aSecurity; if ( aSecurity.getHomeDir( aHomeDir ) ) { DirEntry aFile ( aHomeDir ); |