summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-18 18:40:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-19 09:13:23 +0100
commitbd4f553ef03b45b4126314fa8287f933988575ea (patch)
tree976a9895e9f08e0b84baeec5bd993316ae003182 /extensions/source
parent2e4c6b51699362252d0bbdc27e0311c68e2ab21b (diff)
remove some UniString ctors
Change-Id: Ic2e712f4447b733b79d980e178d9d6d9d8bf0e40
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/scanner/sanedlg.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 4fbd382523bf..ef2e0b1dfd7d 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -832,7 +832,7 @@ void SaneDlg::EstablishStringOption()
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
maOptionDescTxt.Show( sal_True );
- maStringEdit.SetText( String( aValue, osl_getThreadTextEncoding() ) );
+ maStringEdit.SetText(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()));
maStringEdit.Show( sal_True );
}
}
@@ -845,7 +845,7 @@ void SaneDlg::EstablishStringRange()
maStringRangeBox.InsertEntry( String( ppStrings[i], osl_getThreadTextEncoding() ) );
rtl::OString aValue;
mrSane.GetOptionValue( mnCurrentOption, aValue );
- maStringRangeBox.SelectEntry( String( aValue, osl_getThreadTextEncoding() ) );
+ maStringRangeBox.SelectEntry(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()));
maStringRangeBox.Show( sal_True );
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
maOptionDescTxt.Show( sal_True );