diff options
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/selectlabeldialog.cxx | 20 | ||||
| -rw-r--r-- | extensions/source/propctrlr/taborder.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/update/tools/ztool.cxx | 4 |
3 files changed, 14 insertions, 12 deletions
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 655fd3fe1431..e559ca678b56 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -83,14 +83,15 @@ namespace pcr m_aControlTree.SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected)); // fill the description - UniString sDescription = m_aMainDesc.GetText(); + rtl::OUString sDescription = m_aMainDesc.GetText(); sal_Int16 nClassID = FormComponentType::CONTROL; if (::comphelper::hasProperty(PROPERTY_CLASSID, m_xControlModel)) nClassID = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID)); - sDescription.SearchAndReplace(String::CreateFromAscii("$control_class$"), GetUIHeadlineName(nClassID, makeAny(m_xControlModel))); - UniString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)).getStr(); - sDescription.SearchAndReplace(String::CreateFromAscii("$control_name$"), sName); + sDescription = sDescription.replaceAll(rtl::OUString("$control_class$"), + GetUIHeadlineName(nClassID, makeAny(m_xControlModel))); + rtl::OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME)); + sDescription = sDescription.replaceAll(rtl::OUString("$control_name$"), sName); m_aMainDesc.SetText(sDescription); // search for the root of the form hierarchy @@ -181,7 +182,7 @@ namespace pcr return 0; sal_Int32 nChildren = 0; - UniString sName,sDisplayName; + rtl::OUString sName; Reference< XPropertySet > xAsSet; for (sal_Int32 i=0; i<xContainer->getCount(); ++i) { @@ -228,10 +229,11 @@ namespace pcr // get the label if (!::comphelper::hasProperty(PROPERTY_LABEL, xAsSet)) continue; - sDisplayName = ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_LABEL)).getStr(); - sDisplayName += String::CreateFromAscii(" ("); - sDisplayName += sName; - sDisplayName += ')'; + + rtl::OUString sDisplayName = rtl::OUStringBuffer( + ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_LABEL))). + appendAscii(RTL_CONSTASCII_STRINGPARAM(" (")).append(sName).append(')'). + makeStringAndClear(); // all requirements met -> insert SvLBoxEntry* pCurrent = m_aControlTree.InsertEntry(sDisplayName, m_aRequiredControlImage, m_aRequiredControlImage, pContainerEntry); diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 767cfabc728f..8049ec877411 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -336,7 +336,7 @@ namespace pcr //------------------------------------------------------------------------ void TabOrderListBox::MoveSelection( long nRelPos ) { - UniString aSelEntryPrevText,aSelEntryNextText; + rtl::OUString aSelEntryPrevText, aSelEntryNextText; Image aImage; for (long i=0; i<labs(nRelPos); i++) { diff --git a/extensions/source/update/tools/ztool.cxx b/extensions/source/update/tools/ztool.cxx index 64803ceb313e..63930e1f9da2 100644 --- a/extensions/source/update/tools/ztool.cxx +++ b/extensions/source/update/tools/ztool.cxx @@ -43,8 +43,8 @@ int SAL_CALL main( int argc, char **argv ) show_usage(); return -1; } - UniString aInName = UniString::CreateFromAscii( argv[1] ); - UniString aOutName = UniString::CreateFromAscii( argv[2] ); + rtl::OUString aInName = rtl::OUString::createFromAscii(argv[1]); + rtl::OUString aOutName = rtl::OUString::createFromAscii(argv[2]); SvFileStream aInFile( aInName, STREAM_READ ); SvFileStream aOutFile( aOutName, STREAM_WRITE | STREAM_TRUNC ); |