diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-19 15:20:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-01 10:08:36 +0200 |
| commit | a952bd8aacba91ed654f11da07cbf0059d378918 (patch) | |
| tree | c0fdd92d645df903db778c0b2606ac41be8a2e80 /extensions/source/scanner/sane.cxx | |
| parent | de6a35f52276b601a8ebc68fbcfd28ad2db84f6f (diff) | |
convert extensions module from String to OUString
Change-Id: Ia0cb9fe1eaebdd295fb1742074fe2c48be61c077
Diffstat (limited to 'extensions/source/scanner/sane.cxx')
| -rw-r--r-- | extensions/source/scanner/sane.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 35a4800ce890..52bafe842473 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -426,7 +426,7 @@ sal_Bool Sane::SetOptionValue( int n, sal_Bool bSet ) return sal_True; } -sal_Bool Sane::SetOptionValue( int n, const String& rSet ) +sal_Bool Sane::SetOptionValue( int n, const OUString& rSet ) { if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING ) return sal_False; @@ -980,15 +980,15 @@ static const char *ppUnits[] = { "[usec]" }; -String Sane::GetOptionUnitName( int n ) +OUString Sane::GetOptionUnitName( int n ) { - String aText; + OUString aText; SANE_Unit nUnit = mppOptions[n]->unit; size_t nUnitAsSize = (size_t)nUnit; if (nUnitAsSize >= SAL_N_ELEMENTS( ppUnits )) - aText = OUString("[unknown units]"); + aText = "[unknown units]"; else - aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() ); + aText = OUString( ppUnits[ nUnit ], strlen(ppUnits[ nUnit ]), osl_getThreadTextEncoding() ); return aText; } |