diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-11 13:15:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-11 14:46:46 +0100 |
| commit | 8f5629fd5aafc85e509a4160a11a285b0a66e7c0 (patch) | |
| tree | 143883c85467b5ce9f5c665338e0f8a25067a0cd /svx/source/form | |
| parent | 2106d8e648449d34b195068eef5f672a14ea64a8 (diff) | |
remove EraseLeadingChars and EraseTrailingChars
Change-Id: Ib9797fe97cd008cc6508ce8cec47dc5373416892
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/datanavi.cxx | 3 | ||||
| -rw-r--r-- | svx/source/form/filtnav.cxx | 7 | ||||
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 08f3cf88c026..cbee3dfdc90c 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -63,6 +63,7 @@ #include <com/sun/star/xml/dom/DOMException.hpp> #include <com/sun/star/form/binding/XValueBinding.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/string.hxx> #include <rtl/logfile.hxx> using namespace ::com::sun::star::beans; @@ -3116,7 +3117,7 @@ namespace svxform //------------------------------------------------------------------------ IMPL_LINK_NOARG(AddConditionDialog, ResultHdl) { - String sCondition = m_aConditionED.GetText().EraseLeadingChars().EraseTrailingChars(); + String sCondition = comphelper::string::strip(m_aConditionED.GetText(), ' '); String sResult; if ( sCondition.Len() > 0 ) { diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 0c69784cca00..0b278843aa82 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -44,9 +44,9 @@ /** === end UNO includes === **/ #include <comphelper/processfactory.hxx> -#include <svx/fmtools.hxx> #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/string.hxx> #include <comphelper/uno3.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/implbase1.hxx> @@ -59,6 +59,7 @@ #include <sfx2/request.hxx> #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> +#include <svx/fmtools.hxx> #include <svx/svxids.hrc> #include <tools/shl.hxx> #include <vcl/wrkwin.hxx> @@ -1233,9 +1234,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUStrin DBG_ASSERT(((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItem), "FmFilterNavigator::EditedEntry() wrong entry"); - UniString aText(rNewText); - aText.EraseTrailingChars(); - aText.EraseLeadingChars(); + UniString aText(comphelper::string::strip(rNewText, ' ')); if (aText.Len() == 0) { // deleting the entry asynchron diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index f3daa69e0656..d3d644f00111 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2562,8 +2562,8 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn } } - strFieldList.EraseTrailingChars(';'); - sFieldDisplayNames.EraseTrailingChars(';'); + strFieldList = comphelper::string::stripEnd(strFieldList, ';'); + sFieldDisplayNames = comphelper::string::stripEnd(sFieldDisplayNames, ';'); if (pfmscContextInfo->arrFields.empty()) { |