diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-12-25 19:31:22 -0200 |
---|---|---|
committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2011-12-26 14:26:08 +0400 |
commit | 3e4f51f112248b4e586f5bd86388099737ed17e9 (patch) | |
tree | f17f47a54446c5a1260aecd64202dca85ad08c2d /formula | |
parent | e7bddf732798508e347221590110486e97bb45e6 (diff) |
Fix for fdo43460 Part XIX getLength() to isEmpty()
Part XIX
Module
formula and fpicker
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 18 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index b721c3ba71db..ee6530c2ac32 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -296,9 +296,9 @@ uno::Sequence< sheet::FormulaToken > FormulaCompiler::OpCodeMap::createSequenceO // Check for existence not needed here, only name-mapping is of // interest. } - if (!aIntName.getLength()) + if (aIntName.isEmpty()) aIntName = _rCompiler.FindAddInFunction(*pName, !isEnglish()); // bLocalFirst=false for english - if (!aIntName.getLength()) + if (aIntName.isEmpty()) pToken->OpCode = getOpCodeUnknown(); else { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index d2987951f7db..4197ae46909a 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -404,19 +404,19 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) if(pWin!=NULL) { aActivWinId = pWin->GetUniqueId(); - if(aActivWinId.getLength()==0) + if(aActivWinId.isEmpty()) { Window* pParent=pWin->GetParent(); while(pParent!=NULL) { aActivWinId=pParent->GetUniqueId(); - if(aActivWinId.getLength()!=0) break; + if(!aActivWinId.isEmpty()) break; pParent=pParent->GetParent(); } } - if(aActivWinId.getLength()) + if(!aActivWinId.isEmpty()) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -861,7 +861,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev) aFtEditName.Show(); pParaWin->Show(); const rtl::OString aHelpId = pFuncDesc->getHelpId(); - if ( aHelpId.getLength() ) + if ( !aHelpId.isEmpty() ) pMEdit->SetHelpId(aHelpId); } @@ -1284,7 +1284,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd ) sal_uInt16 i; for(i=0;i<=nEd;i++) { - if ( m_aArguments[i].getLength() == 0 ) + if ( m_aArguments[i].isEmpty() ) m_aArguments[i] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); } if(pParaWin->GetArgument(nEd).Len()!=0) @@ -1744,14 +1744,14 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin) if(pWin->HasFocus()) { aUniqueId=pWin->GetUniqueId(); - if(aUniqueId.getLength()==0) + if(aUniqueId.isEmpty()) { Window* pParent=pWin->GetParent(); while(pParent!=NULL) { aUniqueId=pParent->GetUniqueId(); - if(aUniqueId.getLength()!=0) break; + if(!aUniqueId.isEmpty()) break; pParent=pParent->GetParent(); } @@ -1765,7 +1765,7 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin) { Window* pChild=pWin->GetChild(i); aUniqueId=FindFocusWin(pChild); - if(aUniqueId.getLength()>0) break; + if(!aUniqueId.isEmpty()) break; } } return aUniqueId; @@ -1885,7 +1885,7 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); - if(!GetHelpId().getLength()) //Hack which hides the HelpId for a model Dialog in SfxModelessDialog + if(GetHelpId().isEmpty()) //Hack which hides the HelpId for a model Dialog in SfxModelessDialog SetHelpId(GetUniqueId()); //and will be changed in a UniqueId, //at this point we reverse it. SetText(m_pImpl->aTitle1); diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index ea3bbaa59bf0..22ea529b5003 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -188,7 +188,7 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) if ( pDesc ) { const rtl::OString sHelpId = pDesc->getHelpId(); - if ( sHelpId.getLength() ) + if ( !sHelpId.isEmpty() ) aLbFunction.SetHelpId(sHelpId); } aSelectionLink.Call(this); diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 5311aa5ba0ef..7eeaf21c8597 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -277,7 +277,7 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) nArgs = 0; if ( pFuncDesc!=NULL) { - if ( pFuncDesc->getDescription().getLength() ) + if ( !pFuncDesc->getDescription().isEmpty() ) { SetEditDesc(pFuncDesc->getDescription()); } |