diff options
Diffstat (limited to 'svtools/source/dialogs')
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 3d85f3e1e4df..b42d81b52b42 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -1175,7 +1175,7 @@ void AssignmentPersistentData::Commit() // ------------------------------------------------------------------- IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, ComboBox*, _pBox) { - if (_pBox->GetSavedValue() != _pBox->GetText()) + if (OUString(_pBox->GetSavedValue()) != _pBox->GetText()) { if (_pBox == &m_aDatasource) resetTables(); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 9ffc5f086428..38775201b5ae 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -227,14 +227,13 @@ namespace svt //--------------------------------------------------------------------- void OWizardMachine::implUpdateTitle() { - String sCompleteTitle(m_pImpl->sTitleBase); + OUString sCompleteTitle(m_pImpl->sTitleBase); // append the page title TabPage* pCurrentPage = GetPage(getCurrentState()); - if ( pCurrentPage && pCurrentPage->GetText().Len() ) + if ( pCurrentPage && !pCurrentPage->GetText().isEmpty() ) { - sCompleteTitle += rtl::OUString(" - "); - sCompleteTitle += pCurrentPage->GetText(); + sCompleteTitle += (" - " + pCurrentPage->GetText()); } SetText(sCompleteTitle); |