Attachment #59583 for issue #98318

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

Lines 884-890 Link Here

(-)source/core/data/global.cxx (-1 / +1 lines)
884	while (p < pStop)	884	while (p < pStop)
885	{	885	{
886	if (*p == cChar && !bQuoted)	886	if (*p == cChar && !bQuoted)
887	return p - pStart;	887	return xub_StrLen(p - pStart);
888	else if (*p == cQuote)	888	else if (*p == cQuote)
889	{	889	{
890	if (!bQuoted)	890	if (!bQuoted)

Lines 1207-1213 Link Here

(-)source/core/tool/token.cxx (-1 / +1 lines)
1207	lcl_ExternalRefToCalc( aComplRef.Ref1, aApiCRef.Reference1 );	1207	lcl_ExternalRefToCalc( aComplRef.Ref1, aApiCRef.Reference1 );
1208	lcl_ExternalRefToCalc( aComplRef.Ref2, aApiCRef.Reference2 );	1208	lcl_ExternalRefToCalc( aComplRef.Ref2, aApiCRef.Reference2 );
1209	// NOTE: This assumes that cached sheets are in consecutive order!	1209	// NOTE: This assumes that cached sheets are in consecutive order!
1210	aComplRef.Ref2.nTab = aComplRef.Ref1.nTab + (aApiCRef.Reference2.Sheet - aApiCRef.Reference1.Sheet);	1210	aComplRef.Ref2.nTab = aComplRef.Ref1.nTab + SCsTAB(aApiCRef.Reference2.Sheet - aApiCRef.Reference1.Sheet);
1211	AddExternalDoubleReference( nFileId, aTabName, aComplRef );	1211	AddExternalDoubleReference( nFileId, aTabName, aComplRef );
1212	}	1212	}
1213	else	1213	else




                        if( ppFDesc->getFunctionName().getLength() )
                        {
                            nArgPos = aHelper.GetArgStart( aSelText, nNextFStart, 0 );
                            nArgs = (USHORT)ppFDesc->getParameterCount();

                            USHORT nActive = 0;
                            USHORT nCount = 0;

                            {
                                for( USHORT i=0; i < nArgs; i++ )
                                {
                                    xub_StrLen nLength= (USHORT)aArgs[i].getLength();
                                    if( nArgPos <= aSelText.Len()-1 )
                                    {
                                        nActive = i+1;

                {
                    {
                        nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 );
                        nArgs = (USHORT)ppFDesc->getParameterCount();

                        USHORT nActive = 0;
                        USHORT nCount = 0;

                        {
                            for( USHORT i=0; i < nArgs; i++ )
                            {
                                xub_StrLen nLength= (USHORT)aArgs[i].getLength();
                                if( nArgPos <= aFormula.Len()-1 )
                                {
                                    nActive = i+1;

Lines 70-75 Link Here

(-)source/ui/formdlg/formula.cxx (-1 / +2 lines)
70	#include "sc.hrc"	70	#include "sc.hrc"
71	#include "servuno.hxx"	71	#include "servuno.hxx"
72	#include "unonames.hxx"	72	#include "unonames.hxx"
		73	#include "externalrefmgr.hxx"
73		74
74	#include <com/sun/star/table/CellAddress.hpp>	75	#include <com/sun/star/table/CellAddress.hpp>
75		76
Lines 659-665 Link Here
659	::std::auto_ptr<formula::FormulaTokenArray> ScFormulaDlg::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList)	660	::std::auto_ptr<formula::FormulaTokenArray> ScFormulaDlg::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList)
660	{	661	{
661	::std::auto_ptr<formula::FormulaTokenArray> pArray(new ScTokenArray());	662	::std::auto_ptr<formula::FormulaTokenArray> pArray(new ScTokenArray());
662	pArray->Fill(_aTokenList);	663	pArray->Fill(_aTokenList,pDoc->GetExternalRefManager());
663	return pArray;	664	return pArray;
664	}	665	}
665		666

Lines 622-628 Link Here

(-)source/ui/docshell/externalrefmgr.cxx (-1 / +1 lines)
622		622
623	size_t nStartDist = ::std::distance( itrBeg, itrStartTab);	623	size_t nStartDist = ::std::distance( itrBeg, itrStartTab);
624	size_t nEndDist = ::std::distance( itrBeg, itrEndTab);	624	size_t nEndDist = ::std::distance( itrBeg, itrEndTab);
625	return nStartDist <= nEndDist ? nEndDist - nStartDist + 1 : -(nStartDist - nEndDist + 1);	625	return nStartDist <= nEndDist ? (SCsTAB)(nEndDist - nStartDist + 1) : -(SCsTAB)(nStartDist - nEndDist + 1);
626	}	626	}
627		627
628	void ScExternalRefCache::getAllNumberFormats(vector<sal_uInt32>& rNumFmts) const	628	void ScExternalRefCache::getAllNumberFormats(vector<sal_uInt32>& rNumFmts) const

Return to issue 98318

Lines 739-745 Link Here

(-)source/ui/app/inputhdl.cxx (-4 / +4 lines)
739	if( ppFDesc->getFunctionName().getLength() )	739	if( ppFDesc->getFunctionName().getLength() )
740	{	740	{
741	nArgPos = aHelper.GetArgStart( aSelText, nNextFStart, 0 );	741	nArgPos = aHelper.GetArgStart( aSelText, nNextFStart, 0 );
742	nArgs = ppFDesc->getParameterCount();	742	nArgs = (USHORT)ppFDesc->getParameterCount();
743		743
744	USHORT nActive = 0;	744	USHORT nActive = 0;
745	USHORT nCount = 0;	745	USHORT nCount = 0;
Lines 754-760 Link Here
754	{	754	{
755	for( USHORT i=0; i < nArgs; i++ )	755	for( USHORT i=0; i < nArgs; i++ )
756	{	756	{
757	xub_StrLen nLength=aArgs[i].getLength();	757	xub_StrLen nLength= (USHORT)aArgs[i].getLength();
758	if( nArgPos <= aSelText.Len()-1 )	758	if( nArgPos <= aSelText.Len()-1 )
759	{	759	{
760	nActive = i+1;	760	nActive = i+1;
Lines 977-983 Link Here
977	{	977	{
978	{	978	{
979	nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 );	979	nArgPos = aHelper.GetArgStart( aFormula, nNextFStart, 0 );
980	nArgs = ppFDesc->getParameterCount();	980	nArgs = (USHORT)ppFDesc->getParameterCount();
981		981
982	USHORT nActive = 0;	982	USHORT nActive = 0;
983	USHORT nCount = 0;	983	USHORT nCount = 0;
Lines 992-998 Link Here
992	{	992	{
993	for( USHORT i=0; i < nArgs; i++ )	993	for( USHORT i=0; i < nArgs; i++ )
994	{	994	{
995	xub_StrLen nLength=aArgs[i].getLength();	995	xub_StrLen nLength= (USHORT)aArgs[i].getLength();
996	if( nArgPos <= aFormula.Len()-1 )	996	if( nArgPos <= aFormula.Len()-1 )
997	{	997	{
998	nActive = i+1;	998	nActive = i+1;