diff options
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 4 | ||||
| -rw-r--r-- | include/svx/fmsearch.hxx | 11 | ||||
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index ad3304c03295..ef25d65e30f4 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -175,7 +175,7 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, co ::comphelper::getProcessComponentContext(), fmscInitial.xCursor, fmscInitial.strUsedFields, fmscInitial.arrFields, SM_ALLOWSCHEDULE ); initCommon( fmscInitial.xCursor ); - if (fmscInitial.sFieldDisplayNames.Len() != 0) + if ( !fmscInitial.sFieldDisplayNames.isEmpty() ) { // use the display names if supplied DBG_ASSERT(comphelper::string::getTokenCount(fmscInitial.sFieldDisplayNames, ';') == comphelper::string::getTokenCount(fmscInitial.strUsedFields, ';'), "FmSearchDialog::FmSearchDialog : invalid initial context description !"); @@ -553,7 +553,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) // put the field names into the respective listbox m_lbField.Clear(); - if (fmscContext.sFieldDisplayNames.Len() != 0) + if (!fmscContext.sFieldDisplayNames.isEmpty()) { // use the display names if supplied DBG_ASSERT(comphelper::string::getTokenCount(fmscContext.sFieldDisplayNames, ';') == comphelper::string::getTokenCount(fmscContext.strUsedFields, ';'), diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx index 2cd75167ea05..5edd213026e7 100644 --- a/include/svx/fmsearch.hxx +++ b/include/svx/fmsearch.hxx @@ -63,13 +63,14 @@ struct FmFoundRecordInformation struct FmSearchContext { // [in] - sal_Int16 nContext; // the number of the context + sal_Int16 nContext; // the number of the context // [out] - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xCursor; // the iterator for the context - String strUsedFields; // a list of field names separeted by ';' - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > + css::uno::Reference< css::sdbc::XResultSet> + xCursor; // the iterator for the context + OUString strUsedFields; // a list of field names separeted by ';' + ::std::vector< css::uno::Reference< css::uno::XInterface > > arrFields; // the corresponding text interfaces for the fields in strUsedFields - String sFieldDisplayNames; // if not empty : names to be displayed for the searchable fields (must have the same token count as strUsedFields !) + OUString sFieldDisplayNames; // if not empty : names to be displayed for the searchable fields (must have the same token count as strUsedFields !) }; #endif // _FMSEARCH_HXX diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index ebf5260a53e3..1093578ec4a7 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2539,7 +2539,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn { pfmscContextInfo->arrFields.clear(); pfmscContextInfo->xCursor = NULL; - pfmscContextInfo->strUsedFields.Erase(); + pfmscContextInfo->strUsedFields = ""; return 0L; } |