Attachment #53759 for issue #87974

View | Details | Raw Unified | Return to issue 87974
Collapse All | Expand All




void ScInputHandler::UpdateFormulaMode()
{
	SfxApplication* pSfxApp = SFX_APP();
    bool bRefMode=false;

    if( pEngine->GetText((USHORT)0).GetChar(0) == '=' ||
         ( pEngine->GetText((USHORT)0).GetChar(0) == '=' ||
           pEngine->GetText((USHORT)0).GetChar(0) == '+' ||
           pEngine->GetText((USHORT)0).GetChar(0) == '-' )
    {
        String aString = GetEditString();
        EditView* pActiveView = pTopView ? pTopView : pTableView;
        if (pActiveView)
        {
            ESelection aSel = pActiveView->GetSelection();
            if(aSel.nStartPos != aSel.nEndPos)
            {
                aString = String(aString, 0, aSel.nStartPos);
            }
        }

        if(aString.Len() == 1)
        {
            bRefMode=true;
        }
        else
        {
            if ( !GetSelIsRef() && aString.Len() > 2 &&
                    ( aString.GetChar(0) == '+' || aString.GetChar(0) == '-' ) )
            {
                String aStr('=');
                aStr += aString;
                aString = aStr;
            }
            if(pActiveViewSh)
            {
                ScViewData* pViewData = pActiveViewSh->GetViewData();
                ScDocument* pDoc = pViewData->GetDocument();
                ScAddress aPos( pViewData->GetCurPos() );
                ScCompiler aComp( pDoc, aPos );
                aComp.SetCloseBrackets( false );
                ScTokenArray* pArr = aComp.CompileString( aString );
                if ( pArr->MayReferenceFollow() )
                {
                    bRefMode = true;
                }
            }
        }
    }

    if ( pEngine->GetParagraphCount() == 1 &&
         ( bRefMode == true ) &&
         !bProtected )
    {
		if (!bFormulaMode)
		{
			bFormulaMode = TRUE;




//------------------------------------------------------------------
void ScTabViewShell::ExecuteInputDirect()
{
    bool bRefInputMode = false;
    ScModule* pScMod = SC_MOD();

    if ( !pScMod->IsFormulaMode() )
    {
        ScInputHandler* pHdl = pScMod->GetInputHdl();
        String aString = pHdl->GetEditString();

        if ( !pHdl->GetSelIsRef() && aString.Len() > 1 &&
             ( aString.GetChar(0) == '+' || aString.GetChar(0) == '-' ) )
        {
            ScViewData* pViewData = GetViewData();
            ScDocument* pDoc = pViewData->GetDocument();
            ScAddress aPos( pViewData->GetCurPos() );
            ScCompiler aComp( pDoc, aPos );
            aComp.SetCloseBrackets( false );
            ScTokenArray* pArr = aComp.CompileString( aString );
            if ( pArr->MayReferenceFollow() )
            {
                bRefInputMode = true;
            }
        }
        else
        {
            bRefInputMode = true;
        }
    }

    if ( !bRefInputMode )
    {
        pScMod->InputEnterHandler();
    }

Lines 743-749 void ScViewFunc::EnterData( SCCOL nCol, Link Here

(-)sc/source/ui/view/viewfunc.cxx (-1 / +5 lines)
743	if ( !bSimple && aEngine.GetParagraphCount() == 1 )	743	if ( !bSimple && aEngine.GetParagraphCount() == 1 )
744	{	744	{
745	String aParStr = aEngine.GetText( (USHORT) 0 );	745	String aParStr = aEngine.GetText( (USHORT) 0 );
746	if ( aParStr.GetChar(0) == '=' )	746	if ( aParStr.GetChar(0) == '=' \|\| aParStr.GetChar(0) == '+' \|\| aParStr.GetChar(0) == '-')
747	bSimple = TRUE;	747	bSimple = TRUE;
748	}	748	}
749		749
Lines 755-761 void ScViewFunc::EnterData( SCCOL nCol, Link Here
755	}	755	}
756		756
757	if (bSimple)	757	if (bSimple)
		758	{
758	aString = aEngine.GetText();	759	aString = aEngine.GetText();
		760	EnterData(nCol, nRow, nTab, aString, bRecord);
		761	return;
		762	}
759	}	763	}
760		764
761	//	765	//

Lines 252-258 void ScCellShell::Execute( SfxRequest& r Link Here

(-)sc/source/ui/view/cellsh3.cxx (-1 / +1 lines)
252	if (nSlot == FID_INPUTLINE_BLOCK)	252	if (nSlot == FID_INPUTLINE_BLOCK)
253	pTabViewShell->EnterBlock( String(), pData );	253	pTabViewShell->EnterBlock( String(), pData );
254	else	254	else
255	pTabViewShell->EnterData( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), pData );	255	pTabViewShell->EnterData( aCursorPos.Col(), aCursorPos.Row(), aCursorPos.Tab(), pData, TRUE, TRUE );
256	}	256	}
257	else	257	else
258	{	258	{

Return to issue 87974

Lines 1792-1804 void ScInputHandler::DataChanged( BOOL b Link Here

(-)sc/source/ui/app/inputhdl.cxx (-4 / +47 lines)
1792	void ScInputHandler::UpdateFormulaMode()	1792	void ScInputHandler::UpdateFormulaMode()
1793	{	1793	{
1794	SfxApplication* pSfxApp = SFX_APP();	1794	SfxApplication* pSfxApp = SFX_APP();
		1795	bool bRefMode=false;
1795		1796
1796	if ( pEngine->GetParagraphCount() == 1 &&	1797	if( pEngine->GetText((USHORT)0).GetChar(0) == '=' \|\|
1797	( pEngine->GetText((USHORT)0).GetChar(0) == '=' \|\|
1798	pEngine->GetText((USHORT)0).GetChar(0) == '+' \|\|	1798	pEngine->GetText((USHORT)0).GetChar(0) == '+' \|\|
1799	pEngine->GetText((USHORT)0).GetChar(0) == '-' ) &&	1799	pEngine->GetText((USHORT)0).GetChar(0) == '-' )
		1800	{
		1801	String aString = GetEditString();
		1802	EditView* pActiveView = pTopView ? pTopView : pTableView;
		1803	if (pActiveView)
		1804	{
		1805	ESelection aSel = pActiveView->GetSelection();
		1806	if(aSel.nStartPos != aSel.nEndPos)
		1807	{
		1808	aString = String(aString, 0, aSel.nStartPos);
		1809	}
		1810	}
		1811
		1812	if(aString.Len() == 1)
		1813	{
		1814	bRefMode=true;
		1815	}
		1816	else
		1817	{
		1818	if ( !GetSelIsRef() && aString.Len() > 2 &&
		1819	( aString.GetChar(0) == '+' \|\| aString.GetChar(0) == '-' ) )
		1820	{
		1821	String aStr('=');
		1822	aStr += aString;
		1823	aString = aStr;
		1824	}
		1825	if(pActiveViewSh)
		1826	{
		1827	ScViewData* pViewData = pActiveViewSh->GetViewData();
		1828	ScDocument* pDoc = pViewData->GetDocument();
		1829	ScAddress aPos( pViewData->GetCurPos() );
		1830	ScCompiler aComp( pDoc, aPos );
		1831	aComp.SetCloseBrackets( false );
		1832	ScTokenArray* pArr = aComp.CompileString( aString );
		1833	if ( pArr->MayReferenceFollow() )
		1834	{
		1835	bRefMode = true;
		1836	}
		1837	}
		1838	}
		1839	}
		1840
		1841	if ( pEngine->GetParagraphCount() == 1 &&
		1842	( bRefMode == true ) &&
1800	!bProtected )	1843	!bProtected )
1801	{	1844	{
1802	if (!bFormulaMode)	1845	if (!bFormulaMode)
1803	{	1846	{
1804	bFormulaMode = TRUE;	1847	bFormulaMode = TRUE;

Lines 469-503 void ScTabViewShell::ExecuteCellFormatDl Link Here

(-)sc/source/ui/view/tabvwsha.cxx (-27 / +1 lines)
469	//------------------------------------------------------------------	469	//------------------------------------------------------------------
470	void ScTabViewShell::ExecuteInputDirect()	470	void ScTabViewShell::ExecuteInputDirect()
471	{	471	{
472	bool bRefInputMode = false;
473	ScModule* pScMod = SC_MOD();	472	ScModule* pScMod = SC_MOD();
474		473
475	if ( pScMod->IsFormulaMode() )	474	if ( !pScMod->IsFormulaMode() )
476	{
477	ScInputHandler* pHdl = pScMod->GetInputHdl();
478	String aString = pHdl->GetEditString();
479
480	if ( !pHdl->GetSelIsRef() && aString.Len() > 1 &&
481	( aString.GetChar(0) == '+' \|\| aString.GetChar(0) == '-' ) )
482	{
483	ScViewData* pViewData = GetViewData();
484	ScDocument* pDoc = pViewData->GetDocument();
485	ScAddress aPos( pViewData->GetCurPos() );
486	ScCompiler aComp( pDoc, aPos );
487	aComp.SetCloseBrackets( false );
488	ScTokenArray* pArr = aComp.CompileString( aString );
489	if ( pArr->MayReferenceFollow() )
490	{
491	bRefInputMode = true;
492	}
493	}
494	else
495	{
496	bRefInputMode = true;
497	}
498	}
499
500	if ( !bRefInputMode )
501	{	475	{
502	pScMod->InputEnterHandler();	476	pScMod->InputEnterHandler();
503	}	477	}