5 files changed, 14 insertions, 5 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 7cb4f2ab5751..373cf51e2e74 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -74,13 +74,15 @@
 
 using namespace comphelper;
 using namespace cppu;
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ucb;
 using namespace com::sun::star::beans;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
 #endif /* _USE_UNO */
 
 IMPL_GEN_RES_STR;
diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 0f6e577794c6..6af1675b9175 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -70,9 +70,10 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::xml::sax;
 using namespace com::sun::star;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+
 using com::sun::star::uno::Reference;
 
 #define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx
index c38fc75c4041..d36f424bb532 100644
--- a/basic/source/uno/modsizeexceeded.cxx
+++ b/basic/source/uno/modsizeexceeded.cxx
@@ -35,9 +35,10 @@
 
 using namespace com::sun::star;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+
 ModuleSizeExceeded::ModuleSizeExceeded( const uno::Sequence< ::rtl::OUString >& sModules )
 {
     script::ModuleSizeExceededRequest aReq;
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 2bd8276ee27d..d591398c319a 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -90,11 +90,15 @@ using namespace com::sun::star::frame;
 using namespace com::sun::star::deployment;
 using namespace com::sun::star;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 
 using com::sun::star::uno::Reference;
 
+using ::rtl::OUString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::Uri;
+
 // #i34411: Flag for error handling during migration
 static bool GbMigrationSuppressErrors = false;
 
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 7ee72a4a6298..d6bd191cd0da 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -80,11 +80,12 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::xml::sax;
 using namespace com::sun::star;
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 
 using com::sun::star::uno::Reference;
 
+using ::rtl::OUString;
+
 //============================================================================
 // Implementation class SfxScriptLibraryContainer