summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWinfried Donkers <winfrieddonkers@libreoffice.org>2014-02-20 07:28:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-21 12:44:44 +0000
commit00856ac90d4a230d6f219937f836ca0e9f3fe1e3 (patch)
treef096bf493647dc20007492d7d29a3a9e84169e00
parent194198098d6a6d5b1ce580a35d83ba5e831c0c97 (diff)
fdo#71077 wrong tips for some calc functions
Calc functions with name X where also calc functions with name XY exist show the tip for the first XY function instead of the X function as soon as the '(' is typed in the cell. This fixes that. Change-Id: I4dc6280db904765e40eacfe33be6a7e25e84ae79 Reviewed-on: https://gerrit.libreoffice.org/8143 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/ui/app/inputhdl.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b0c7d7e17424..c5be05bfb2da 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -994,7 +994,6 @@ void ScInputHandler::ShowTip( const OUString& rText )
{
// aManualTip muss hinterher von aussen gesetzt werden
HideTip();
-
EditView* pActiveView = pTopView ? pTopView : pTableView;
if (pActiveView)
{
@@ -1103,10 +1102,10 @@ void ScInputHandler::UseFormulaData()
{
nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 );
nArgs = static_cast<sal_uInt16>(ppFDesc->getParameterCount());
-
+ OUString aFuncName = ppFDesc->getFunctionName() + "(";
OUString aNew;
ScTypedCaseStrSet::const_iterator it =
- findText(*pFormulaDataPara, pFormulaDataPara->end(), ppFDesc->getFunctionName(), aNew, false);
+ findText(*pFormulaDataPara, pFormulaDataPara->end(), aFuncName, aNew, false);
if (it != pFormulaDataPara->end())
{
bool bFlag = false;