[Libreoffice-commits] core.git: fpicker/source

[Stephan Bergmann]

 fpicker/source/aqua/resourceprovider.mm |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit f95d418d128aec937e16585087769afe1b16752c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Oct 20 22:58:27 2013 +0200

    String -> OUString
    
    Change-Id: I18b79fa866c21a8036a25c05fbc13c1d72e542aa

diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index 1b64ffc..32b5772 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -23,7 +23,6 @@
 #include <vcl/fpicker.hrc>
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/string.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
@@ -155,8 +154,7 @@ public:
 
     NSString* getResString( sal_Int16 aId )
     {
-        String   aResString;
-        OUString aResOUString;
+        OUString aResString;
 
         const SolarMutexGuard aGuard;
 
@@ -167,22 +165,20 @@ public:
             // translate the control id to a resource id
             sal_Int16 aResId = CtrlIdToResId( aId );
             if ( aResId > -1 )
-                aResString = String( ResId( aResId, *m_ResMgr ) );
+                aResString = ResId( aResId, *m_ResMgr );
             else
             {
                 aResId = OtherCtrlIdToResId( aId );
                 if ( aResId > -1 ) {
-                    aResString = String( ResId( aResId, *m_OtherResMgr ) );
+                    aResString = ResId( aResId, *m_OtherResMgr );
                 }
             }
-            if ( aResId > -1 )
-                aResOUString = OUString( aResString );
         }
         catch(...)
         {
         }
 
-        return [NSString stringWithOUString:aResOUString];
+        return [NSString stringWithOUString:aResString];
     }
 
 public: