diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-20 22:58:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-20 22:58:27 +0200 |
| commit | f95d418d128aec937e16585087769afe1b16752c (patch) | |
| tree | c7ee829ca8dbc3c8343409fe9760591230f1c5ca /fpicker | |
| parent | 212f0e9f0028373fd86ba8a7d7682a0664fccddd (diff) | |
String -> OUString
Change-Id: I18b79fa866c21a8036a25c05fbc13c1d72e542aa
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/resourceprovider.mm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 1b64ffc43253..32b5772bc25f 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: |