From d3756b8b7318ecae4eaf0552aea3cde940e91490 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Fri, 15 Oct 2010 12:10:06 -0500
Subject: merge vosremoval-reference.diff

---
 desktop/inc/app.hxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'desktop/inc/app.hxx')

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 1b9eeb370330..b22907691fcd 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;
-- 
cgit