merge vosremoval-security patch

3 files changed, 3 insertions, 4 deletions

diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx
index 74f64c4f93..ddd024942e 100644
--- a/sfx2/inc/pch/precompiled_sfx2.hxx
+++ b/sfx2/inc/pch/precompiled_sfx2.hxx
@@ -661,7 +661,6 @@
 #include "vos/module.hxx"
 #include "vos/mutex.hxx"
 #include "vos/process.hxx"
-#include "vos/security.hxx"
 #include "vos/xception.hxx"
 //---MARKER---
 #endif
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index fe4e62e6fd..5103bc091c 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -50,7 +50,7 @@
 #include <comphelper/processfactory.hxx>
 #include <unotools/configmgr.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <vos/security.hxx>
+#include <osl/security.hxx>
 #include <ucbhelper/configurationkeys.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/historyoptions.hxx>
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 7e7552e20a..ce1851c3f8 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -65,7 +65,7 @@
 #include <unotools/ucbhelper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <vos/mutex.hxx>
-#include <vos/security.hxx>
+#include <osl/security.hxx>
 #include <osl/thread.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/msgbox.hxx>
@@ -2721,7 +2721,7 @@ void FileDialogHelper::SetDisplayDirectory( const String& _rPath )
         if ( sFolder.getLength() == 0 )
         {
             // _rPath is not a valid path -> fallback to home directory
-            NAMESPACE_VOS( OSecurity ) aSecurity;
+            osl::Security aSecurity;
             aSecurity.getHomeDir( sFolder );
         }
         mpImp->displayFolder( sFolder );