merge vosremoval-reference.diff

4 files changed, 10 insertions, 9 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index c04c8a2f27..f4cafd6c85 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -43,7 +43,6 @@
 using namespace com::sun::star::task;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
-using namespace rtl;
 
 #define DESKTOP_SAVETASKS_MOD 0x1
 #define DESKTOP_SAVETASKS_UNMOD 0x2
@@ -57,7 +56,7 @@ namespace desktop
  --------------------------------------------------------------------*/
 class CommandLineArgs;
 class Lockfile;
-class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {};
+class AcceptorMap : public std::map< rtl::OUString, Reference<XInitialization> > {};
 struct ConvertData;
 class Desktop : public Application
 {
@@ -193,9 +192,9 @@ class Desktop : public Application
         static sal_Bool         isUIOnSessionShutdownAllowed();
 
         // on-demand acceptors
-        static void							createAcceptor(const OUString& aDescription);
+        static void							createAcceptor(const rtl::OUString& aDescription);
         static void							enableAcceptors();
-        static void							destroyAcceptor(const OUString& aDescription);
+        static void							destroyAcceptor(const rtl::OUString& aDescription);
 
         sal_Bool						m_bMinimized;
         sal_Bool						m_bInvisible;
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 746040e888..187ade718e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,7 +102,7 @@
 #include <tools/solar.h>
 #include <toolkit/unohlp.hxx>
 #include <osl/security.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/componentcontext.hxx>
 #include <comphelper/configurationhelper.hxx>
@@ -163,7 +163,8 @@
 #define U2S(STRING)                                ::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
 
 using namespace vos;
-using namespace rtl;
+using rtl::OUString;
+using rtl::OUStringBuffer;
 
 //Gives an ICE with MSVC6
 //namespace css = ::com::sun::star;
diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx
index 08f04d1a92..79c3c57934 100644
--- a/desktop/source/app/appfirststart.cxx
+++ b/desktop/source/app/appfirststart.cxx
@@ -72,7 +72,7 @@ OUString Desktop::GetLicensePath()
     // determine the filename of the license to show
     OUString  aLangString;
     ::com::sun::star::lang::Locale aLocale;
-    OString aMgrName = OString("dkt");
+    rtl::OString aMgrName = rtl::OString("dkt");
 
     AllSettings aSettings(Application::GetSettings());
     aLocale = aSettings.GetUILocale();
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index 333efd58ee..e2c6b48bbd 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -41,7 +41,7 @@
 #include <osl/process.h>
 #include <osl/diagnose.h>
 #include <osl/security.hxx>
-#include <vos/ref.hxx>
+#include <rtl/ref.hxx>
 #include <vos/process.hxx>
 
 #include <tools/resmgr.hxx>
@@ -64,7 +64,8 @@
 
 #include "app.hxx"
 
-using namespace rtl;
+using rtl::OString;
+using rtl::OUString;
 using namespace osl;
 using namespace utl;
 using namespace com::sun::star::container;