diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-09-08 20:55:11 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-09-08 22:35:33 +0200 |
| commit | 9a08e65ae2b3d875d2b120acd046742d541ad5ec (patch) | |
| tree | db29324cea21edc7bd1c421841d7971650e5b455 /cui | |
| parent | 0f2435c20289f9d29b34eeae588805deb25adeae (diff) | |
String to OUString
Change-Id: I24af8d00178d47a8c675b945d4d1291f0bfd0f11
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/treeopt.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index bde476718386..d3c0b001786e 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -821,7 +821,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() SvTreeListEntry* pEntry = NULL; if ( pLastPageSaver ) { - String sExpand( EXPAND_PROTOCOL ); + OUString sExpand( EXPAND_PROTOCOL ); String sLastURL = bIsFromExtensionManager ? pLastPageSaver->m_sLastPageURL_ExtMgr : pLastPageSaver->m_sLastPageURL_Tools; if ( sLastURL.Len() == 0 ) @@ -848,13 +848,13 @@ void OfaTreeOptionsDialog::ActivateLastSelection() if ( aTreeLB.GetParent( pTemp ) && pTemp->GetUserData() ) { OptionsPageInfo* pPageInfo = (OptionsPageInfo*)pTemp->GetUserData(); - String sPageURL = pPageInfo->m_sPageURL; + OUString sPageURL = pPageInfo->m_sPageURL; if ( bMustExpand - && sPageURL.Len() > 0 - && sExpand.Match( sPageURL ) == STRING_MATCH ) + && !sPageURL.isEmpty() + && sPageURL.startsWith( sExpand ) ) { // cut protocol - OUString sTemp( sPageURL.Copy( sizeof( EXPAND_PROTOCOL ) -1 ) ); + OUString sTemp( sPageURL.copy( sExpand.getLength() ) ); // decode uri class chars sTemp = ::rtl::Uri::decode( sTemp, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); |