Attachment #16496 for issue #19664

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

Lines 579-586 Link Here

(-)source/filter/excel/excform.cxx (-2 / +2 lines)
579	DBG_ERROR(	579	DBG_ERROR(
580	"-ExcelToSc::Convert(): Ein wenig vergesslich, was?" );	580	"-ExcelToSc::Convert(): Ein wenig vergesslich, was?" );
581	}	581	}
582	const XclImpName* pName = pExcRoot->pIR->GetNameBuffer().GetNameFromIndex(nUINT16);	582	const XclImpName* pName = pExcRoot->pIR->GetNameBuffer().GetNameFromIndex(nUINT16);
583	if(pName)	583	if(pName && !pName->GetScRangeData())
584	aStack << aPool.Store( ocMacro, pName->GetXclName() );	584	aStack << aPool.Store( ocMacro, pName->GetXclName() );
585	else	585	else
586	aStack << aPool.Store( nUINT16 );	586	aStack << aPool.Store( nUINT16 );




				aIn.Ignore( 2 );
				//Determine if this is a user-defined Macro name.
				const XclImpName* pName = pExcRoot->pIR->GetNameBuffer().GetNameFromIndex(nUINT16);
				if(pName && !pName->GetScRangeData())
				    aStack << aPool.Store( ocMacro, pName->GetXclName() );
				else
				    aStack << aPool.Store( nUINT16 );

                    switch( pExtName->GetType() )
                    {
                        case xlExtName:
                        case xlExtAddIn:
                        {
                            aStack << aPool.Store( ocNoName, pExtName->GetName() );
                            pExcRoot->pIR->GetTracer().TraceFormulaExtName();
                        }
                        break;

                        case xlExtAddIn:
                        {
                            aStack << aPool.Store( ocExternal, pExtName->GetName() );
                        }
                        break;


Return to issue 19664

Lines 473-479 Link Here

(-)source/filter/excel/excform8.cxx (-4 / +8 lines)
473	aIn.Ignore( 2 );	473	aIn.Ignore( 2 );
474	//Determine if this is a user-defined Macro name.	474	//Determine if this is a user-defined Macro name.
475	const XclImpName* pName = pExcRoot->pIR->GetNameBuffer().GetNameFromIndex(nUINT16);	475	const XclImpName* pName = pExcRoot->pIR->GetNameBuffer().GetNameFromIndex(nUINT16);
476	if(pName)	476	if(pName && !pName->GetScRangeData())
477	aStack << aPool.Store( ocMacro, pName->GetXclName() );	477	aStack << aPool.Store( ocMacro, pName->GetXclName() );
478	else	478	else
479	aStack << aPool.Store( nUINT16 );	479	aStack << aPool.Store( nUINT16 );
Lines 664-674 Link Here
664	switch( pExtName->GetType() )	664	switch( pExtName->GetType() )
665	{	665	{
666	case xlExtName:	666	case xlExtName:
667	case xlExtAddIn:
668	{	667	{
669	aStack << aPool.Store( ocNoName, pExtName->GetName() );	668	aStack << aPool.Store( ocNoName, pExtName->GetName() );
670	if( pExtName->GetType() == xlExtName )	669	pExcRoot->pIR->GetTracer().TraceFormulaExtName();
671	pExcRoot->pIR->GetTracer().TraceFormulaExtName();	670	}
		671	break;
		672
		673	case xlExtAddIn:
		674	{
		675	aStack << aPool.Store( ocExternal, pExtName->GetName() );
672	}	676	}
673	break;	677	break;
674		678