5 files changed, 9 insertions, 13 deletions
diff --git a/fpicker/source/win32/misc/AutoBuffer.cxx b/fpicker/source/win32/misc/AutoBuffer.cxx
index 43e4bceba3e1..17162e3c479b 100644
--- a/fpicker/source/win32/misc/AutoBuffer.cxx
+++ b/fpicker/source/win32/misc/AutoBuffer.cxx
@@ -32,7 +32,6 @@
 // namespace directives
 //------------------------------------------------------------------------
 
-using rtl::OUString;
 
 //------------------------------------------------------------------------
 //
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index 403ab1cdeffc..5abdcb459e68 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -27,8 +27,6 @@
 // namespace directives
 //------------------------------------------------------------
 
-using rtl::OUString;
-using rtl::OUStringBuffer;
 using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::XInterface;
@@ -39,9 +37,9 @@ using ::com::sun::star::uno::Sequence;
 //
 //------------------------------------------------------------
 
-const rtl::OUString TILDE( "~" );
+const OUString TILDE( "~" );
 const sal_Unicode   TILDE_SIGN = L'~';
-const rtl::OUString AMPERSAND( "&" );
+const OUString AMPERSAND( "&" );
 const sal_Unicode   AMPERSAND_SIGN = L'&';
 
 //------------------------------------------------------------
@@ -447,7 +445,7 @@ void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar,
 // '&'  -> '&&'
 //------------------------------------------------------------
 
-OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
+OUString SOfficeToWindowsLabel( const OUString& aSOLabel )
 {
     OUString aWinLabel = aSOLabel;
 
@@ -459,7 +457,7 @@ OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
         // doubled in length, maybe some waste
         // of memory but how long is a label
         // normaly(?)
-        rtl::OUStringBuffer aBuffer( nStrLen * 2 );
+        OUStringBuffer aBuffer( nStrLen * 2 );
 
         Replace( aWinLabel, TILDE_SIGN, AMPERSAND_SIGN, aBuffer );
 
@@ -478,7 +476,7 @@ OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel )
 // '~'  -> '~~'
 //------------------------------------------------------------
 
-OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel )
+OUString WindowsToSOfficeLabel( const OUString& aWinLabel )
 {
     OUString aSOLabel = aWinLabel;
 
@@ -490,7 +488,7 @@ OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel )
         // doubled in length, maybe some waste
         // of memory but how long is a label
         // normaly(?)
-        rtl::OUStringBuffer aBuffer( nStrLen * 2 );
+        OUStringBuffer aBuffer( nStrLen * 2 );
 
         Replace( aSOLabel, AMPERSAND_SIGN, TILDE_SIGN, aBuffer );
 
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/misc/WinImplHelper.hxx
index 9c6a69ddab80..52ed28dd15ee 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/misc/WinImplHelper.hxx
@@ -82,7 +82,7 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr );
 // '~'  -> '&'
 // '~~' -> '~'
 // '&'  -> '&&'
-rtl::OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel );
+OUString SOfficeToWindowsLabel( const OUString& aSOLabel );
 
 // converts a windows label to a soffice label
 // the following rules for character replacements
@@ -90,7 +90,7 @@ rtl::OUString SOfficeToWindowsLabel( const rtl::OUString& aSOLabel );
 // '&'  -> '~'
 // '&&' -> '&'
 // '~'  -> '~~'
-rtl::OUString WindowsToSOfficeLabel( const rtl::OUString& aWinLabel );
+OUString WindowsToSOfficeLabel( const OUString& aWinLabel );
 
 #endif
 
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 4e4cc9e0a9e7..3cd22e602f37 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -32,7 +32,6 @@
 // namespace directives
 //------------------------------------------------------------
 
-using rtl::OUString;
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/misc/resourceprovider.hxx
index 852b225bf30c..d02164faf37e 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/misc/resourceprovider.hxx
@@ -33,7 +33,7 @@ public:
     CResourceProvider( );
     ~CResourceProvider( );
 
-    rtl::OUString getResString( sal_Int16 aId );
+    OUString getResString( sal_Int16 aId );
 
 private:
     CResourceProvider_Impl* m_pImpl;