Attachment #78243 for issue #119532

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

Lines 870-875 Link Here

(-)filter/inc/filter/msfilter/svdfppt.hxx (+8 lines)
870		870
871	struct PPTCharPropSet	871	struct PPTCharPropSet
872	{	872	{
		873	//when the bullet text has more than two color,next the text following with bullet has been set hyperlink.
		874	//now,the bullet color should be set original hyperlink text's color
		875	//so "mbHardHylinkOrigColor" hold the original hyperlink text's color.
		876	sal_uInt32 mnHylinkOrigColor;
		877	//the bullet text weather has a hyperlink.
		878	sal_Bool mbIsHyperlink;
		879	//the hyperlink text weather has a custom color.
		880	sal_Bool mbHardHylinkOrigColor;
873		881
874	sal_uInt32 mnOriginalTextPos;	882	sal_uInt32 mnOriginalTextPos;
875	sal_uInt32 mnParagraph;	883	sal_uInt32 mnParagraph;

Lines 4638-4648 Link Here

(-)filter/source/msfilter/svdfppt.cxx (-1 / +28 lines)
4638	mpFieldItem ( NULL ),	4638	mpFieldItem ( NULL ),
4639	pCharSet ( new ImplPPTCharPropSet )	4639	pCharSet ( new ImplPPTCharPropSet )
4640	{	4640	{
		4641	mnHylinkOrigColor = 0;
		4642	mbIsHyperlink = 0;
		4643	mbHardHylinkOrigColor = 0;
4641	mnLanguage[ 0 ] = mnLanguage[ 1 ] = mnLanguage[ 2 ] = 0;	4644	mnLanguage[ 0 ] = mnLanguage[ 1 ] = mnLanguage[ 2 ] = 0;
4642	}	4645	}
4643		4646
4644	PPTCharPropSet::PPTCharPropSet( PPTCharPropSet& rCharPropSet )	4647	PPTCharPropSet::PPTCharPropSet( PPTCharPropSet& rCharPropSet )
4645	{	4648	{
		4649	mnHylinkOrigColor = rCharPropSet.mnHylinkOrigColor;
		4650	mbIsHyperlink = rCharPropSet.mbIsHyperlink;
		4651	mbHardHylinkOrigColor = rCharPropSet.mbHardHylinkOrigColor;
4646	pCharSet = rCharPropSet.pCharSet;	4652	pCharSet = rCharPropSet.pCharSet;
4647	pCharSet->mnRefCount++;	4653	pCharSet->mnRefCount++;
4648		4654
Lines 4659-4664 Link Here
4659	{	4665	{
4660	pCharSet = rCharPropSet.pCharSet;	4666	pCharSet = rCharPropSet.pCharSet;
4661	pCharSet->mnRefCount++;	4667	pCharSet->mnRefCount++;
		4668
		4669	mnHylinkOrigColor = rCharPropSet.mnHylinkOrigColor;
		4670	mbIsHyperlink = rCharPropSet.mbIsHyperlink;
		4671	mbHardHylinkOrigColor = rCharPropSet.mbHardHylinkOrigColor;
4662		4672
4663	mnParagraph = nParagraph;	4673	mnParagraph = nParagraph;
4664	mnOriginalTextPos = rCharPropSet.mnOriginalTextPos;	4674	mnOriginalTextPos = rCharPropSet.mnOriginalTextPos;
Lines 6182-6188 Link Here
6182	{	6192	{
6183	PPTPortionObj* pPortion = mpPortionList[ 0 ];	6193	PPTPortionObj* pPortion = mpPortionList[ 0 ];
6184	if ( pPortion )	6194	if ( pPortion )
6185	bIsHardAttribute = pPortion->GetAttrib( PPT_CharAttr_FontColor, nRetValue, nDestinationInstance );	6195	{
		6196	if (pPortion->mbIsHyperlink )
		6197	{
		6198	if( pPortion->mbHardHylinkOrigColor )
		6199	nRetValue = pPortion->mnHylinkOrigColor;
		6200	else
		6201	nRetValue = mrStyleSheet.mpCharSheet[ mnInstance ]->maCharLevel[ pParaSet->mnDepth ].mnFontColor;
		6202	bIsHardAttribute = 1;
		6203	}
		6204	else
		6205	{
		6206	bIsHardAttribute = pPortion->GetAttrib( PPT_CharAttr_FontColor, nRetValue, nDestinationInstance );
		6207	}
		6208	}
6186	}	6209	}
6187	else	6210	else
6188	{	6211	{
Lines 7128-7133 Link Here
7128		7151
7129	const SvxURLField* pField = (const SvxURLField*)pFE->pField1->GetField();	7152	const SvxURLField* pField = (const SvxURLField*)pFE->pField1->GetField();
7130		7153
		7154	pCurrent->mbIsHyperlink=1;
		7155	pCurrent->mnHylinkOrigColor=pCurrent->pCharSet->mnColor;
		7156	pCurrent->mbHardHylinkOrigColor= ( ( pCurrent->pCharSet->mnAttrSet >>PPT_CharAttr_FontColor ) & 1)>0;
		7157
7131	if ( pCurrent->mpFieldItem )	7158	if ( pCurrent->mpFieldItem )
7132	{	7159	{
7133	pCurrent->SetColor( PPT_COLSCHEME_A_UND_HYPERLINK );	7160	pCurrent->SetColor( PPT_COLSCHEME_A_UND_HYPERLINK );

Return to issue 119532