diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-27 20:37:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-28 09:55:03 +0000 |
| commit | 6f33482f8f4329b6c9874397bdb67c1b958b69c2 (patch) | |
| tree | ba19bc4bff6ddbd87354f90a61615cf5f4892c5a /toolkit | |
| parent | c95a10ca2079cdc33d09189aef0a8788eab274ff (diff) | |
ByteString->rtl::OUStringToOString
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 7 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 722ed95120a7..0eb2d1ae46e6 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -365,10 +365,9 @@ sal_uInt16 ImplGetComponentType( const String& rServiceName ) ComponentInfo aSearch; - ByteString aServiceName( rServiceName, osl_getThreadTextEncoding() ); - aServiceName.ToLowerAscii(); - if ( aServiceName.Len() ) - aSearch.pName = aServiceName.GetBuffer(); + rtl::OString aServiceName(rtl::OUStringToOString(rServiceName, osl_getThreadTextEncoding()).toAsciiLowerCase()); + if ( aServiceName.getLength() ) + aSearch.pName = aServiceName.getStr(); else aSearch.pName = "window"; diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index efa39bc6cf01..2669f0f21dce 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -6457,7 +6457,7 @@ void VCLXPatternField::setMasks( const ::rtl::OUString& EditMask, const ::rtl::O PatternField* pPatternField = (PatternField*) GetWindow(); if ( pPatternField ) { - pPatternField->SetMask( ByteString( UniString( EditMask ), RTL_TEXTENCODING_ASCII_US ), LiteralMask ); + pPatternField->SetMask( rtl::OUStringToOString(EditMask, RTL_TEXTENCODING_ASCII_US), LiteralMask ); } } |