diff options
author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2012-11-02 14:46:30 -0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-03 17:20:43 +0000 |
commit | b524b0bd98e4f841c88b91bff4bd23e68897a501 (patch) | |
tree | 7a0e049f0b65942dfacc58b920a96798492a906d /cui | |
parent | document writerfilter.profile log area (diff) | |
download | core-b524b0bd98e4f841c88b91bff4bd23e68897a501.tar.gz core-b524b0bd98e4f841c88b91bff4bd23e68897a501.zip |
fdo#38838 UniString removal
Change-Id: Id1a17001caa0f6350de10d8af016630f4c76a55b
Reviewed-on: https://gerrit.libreoffice.org/970
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 18 | ||||
-rw-r--r-- | cui/source/inc/cuifmsearch.hxx | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 225523be293f..2f2f32374845 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -226,7 +226,7 @@ FmSearchDialog::~FmSearchDialog() } //------------------------------------------------------------------------ -void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sInitialText) +void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sInitialText) { //the initialization of all the Controls m_rbSearchForText.SetClickHdl(LINK(this, FmSearchDialog, OnClickedFieldRadios)); @@ -279,10 +279,10 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI m_cmbSearchText.SetText(sInitialText); // if the Edit-line has changed the text (e.g. because it contains // control characters, as can be the case with memo fields), I use - // an empty UniString. - UniString sRealSetText = m_cmbSearchText.GetText(); - if (!sRealSetText.Equals(sInitialText)) - m_cmbSearchText.SetText(UniString()); + // an empty OUString. + OUString sRealSetText = m_cmbSearchText.GetText(); + if (!sRealSetText.equals(sInitialText)) + m_cmbSearchText.SetText(OUString()); LINK(this, FmSearchDialog, OnSearchTextModified).Call(&m_cmbSearchText); // initial @@ -336,17 +336,17 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) { if (m_pbClose.IsEnabled()) { // the button has the function 'search' - UniString strThisRoundText = m_cmbSearchText.GetText(); + OUString strThisRoundText = m_cmbSearchText.GetText(); // to history m_cmbSearchText.RemoveEntry(strThisRoundText); m_cmbSearchText.InsertEntry(strThisRoundText, 0); - // the remove/insert makes sure that a) the UniString does not appear twice and + // the remove/insert makes sure that a) the OUString does not appear twice and // that b) the last searched strings are at the beginning and limit the list length while (m_cmbSearchText.GetEntryCount() > MAX_HISTORY_ENTRIES) m_cmbSearchText.RemoveEntry(m_cmbSearchText.GetEntryCount()-1); // take out the 'overflow' hint - m_ftHint.SetText(UniString()); + m_ftHint.SetText(OUString()); m_ftHint.Invalidate(); if (m_cbStartOver.IsChecked()) @@ -457,7 +457,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox) sal_Int32 nCurrentContext = m_lbForm.GetSelectEntryPos(); if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND) - m_arrContextFields[nCurrentContext] = UniString(m_lbField.GetSelectEntry()); + m_arrContextFields[nCurrentContext] = OUString(m_lbField.GetSelectEntry()); return 0; } diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index a220495d0fcc..64cbd011aadc 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -140,7 +140,7 @@ public: protected: virtual sal_Bool Close(); - void Init(const String& strVisibleFields, const String& strInitialText); + void Init(const OUString& strVisibleFields, const OUString& strInitialText); // only to be used out of the constructors void OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos); |