diff options
| author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-21 14:32:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-21 20:48:35 +0000 |
| commit | e3f11c10d8cc759d01afa4b8fd8bd98c81a03119 (patch) | |
| tree | 36191c6d90da559009161a1199d1176cf6a2bbba /svtools/source/dialogs | |
| parent | Fix Variable 'nMode' is reassigned (diff) | |
| download | core-e3f11c10d8cc759d01afa4b8fd8bd98c81a03119.tar.gz core-e3f11c10d8cc759d01afa4b8fd8bd98c81a03119.zip | |
Changed SetText() / GetText() to take/return OUString
replaced lots of Len() with isEmpty()
Change-Id: I6b82d48245ee2a0782e05a326f7934e9357227d0
Reviewed-on: https://gerrit.libreoffice.org/1795
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
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); |