mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

String -> OUString

Browse Source 
Change-Id: I18b79fa866c21a8036a25c05fbc13c1d72e542aa
This commit is contained in:
Stephan Bergmann
2013-10-20 22:58:27 +02:00
parent 212f0e9f00
commit f95d418d12
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fpicker/source/aqua/resourceprovider.mm
View File

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