mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace a local functor and bind2nd by a lambda in formula.

Browse Source 
Change-Id: Ied06b3f167c566d754d32708eaec4a354f7ee663
Reviewed-on: https://gerrit.libreoffice.org/19848
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Mario J. Rugiero
2015-11-08 22:40:27 -03:00
committed by Noel Grandin
parent e589f187e4
commit 357a6f6ba2
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
formula/source/ui/dlg/formula.cxx
View File

@@ -58,7 +58,6 @@
#include <com/sun/star/sheet/FormulaMapGroup.hpp> #include <com/sun/star/sheet/FormulaMapGroup.hpp>
#include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp> #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <boost/ref.hpp>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
#include <map> #include <map>
@@ -454,17 +453,6 @@ void FormulaDlg_Impl::DeleteArgs()
::std::vector< OUString>().swap(m_aArguments); ::std::vector< OUString>().swap(m_aArguments);
nArgs = 0; nArgs = 0;
} }
namespace
{
// comparing two property instances
struct OpCodeCompare : public ::std::binary_function< sheet::FormulaOpCodeMapEntry, sal_Int32 , bool >
{
bool operator() (const sheet::FormulaOpCodeMapEntry& x, sal_Int32 y) const
{
return x.Token.OpCode == y;
}
};
}
sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos) sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
{ {
@@ -540,7 +528,9 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
bFlag = false; bFlag = false;
nFuncPos = nPrevFuncPos; nFuncPos = nPrevFuncPos;
} }
bool bIsFunction = ::std::find_if(m_aFunctionOpCodes.getConstArray(),m_pFunctionOpCodesEnd,::std::bind2nd(OpCodeCompare(),boost::cref(eOp))) != m_pFunctionOpCodesEnd; bool bIsFunction = ::std::find_if(m_aFunctionOpCodes.getConstArray(),
m_pFunctionOpCodesEnd,
[&eOp](const sheet::FormulaOpCodeMapEntry& aEntry) { return aEntry.Token.OpCode == eOp; } ) != m_pFunctionOpCodesEnd;
if( bIsFunction && m_aSpecialOpCodes[sheet::FormulaMapGroupSpecialOffset::SPACES].Token.OpCode != eOp ) if( bIsFunction && m_aSpecialOpCodes[sheet::FormulaMapGroupSpecialOffset::SPACES].Token.OpCode != eOp )
{ {