Attachment #63004 for issue #102797

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




	/*const sal_Int32* pDefData =*/ ApplyShapeAttributes( rGeometryItem );
	switch( eSpType )
	{
		case mso_sptCan :						nColorData = 0x20400000; break;
		case mso_sptCube :						nColorData = 0x302e0000; break;
		case mso_sptActionButtonBlank :			nColorData = 0x502ce400; break;
		case mso_sptActionButtonHome :			nColorData = 0x702ce4ce; break;
		case mso_sptActionButtonHelp :			nColorData = 0x602ce4c0; break;
		case mso_sptActionButtonInformation :	nColorData = 0x702ce4c5; break;
		case mso_sptActionButtonBackPrevious :	nColorData = 0x602ce4c0; break;
		case mso_sptActionButtonForwardNext :	nColorData = 0x602ce4c0; break;
		case mso_sptActionButtonBeginning :		nColorData = 0x602ce4c0; break;
		case mso_sptActionButtonEnd :			nColorData = 0x602ce4c0; break;
		case mso_sptActionButtonReturn :		nColorData = 0x602ce4c0; break;
		case mso_sptActionButtonDocument :		nColorData = 0x702ce4ec; break;
		case mso_sptActionButtonSound :			nColorData = 0x602ce4c0; break;
		case mso_sptActionButtonMovie :			nColorData = 0x602ce4c0; break;
		case mso_sptBevel :						nColorData = 0x502ce400; break;
		case mso_sptFoldedCorner :				nColorData = 0x20e00000; break;
		case mso_sptSmileyFace :				nColorData = 0x20e00000; break;
        case mso_sptNil :
        {
            if( sShapeType.getLength() > 4 &&

		}
		break;
		case mso_sptCurvedDownArrow :			nFlags |= DFF_CUSTOMSHAPE_EXCH; break;
		case mso_sptRibbon2 :					nColorData = 0x30ee0000; break;
		case mso_sptRibbon :
		{
			if ( ( seqAdjustmentValues.getLength() > 1 ) && ( seqAdjustmentValues[ 1 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) )

				seqAdjustmentValues[ 1 ].Value <<= fValue;
			}
			nFlags |= DFF_CUSTOMSHAPE_FLIP_V;
			nColorData = 0x30ee0000;
		}
		break;
		case mso_sptEllipseRibbon2 :			nColorData = 0x30ee0000; break;
		case mso_sptEllipseRibbon :				// !!!!!!!!!!
		{
			if ( ( seqAdjustmentValues.getLength() > 1 ) && ( seqAdjustmentValues[ 1 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) )

				seqAdjustmentValues[ 1 ].Value <<= fValue;
			}
			nFlags |= DFF_CUSTOMSHAPE_FLIP_V;
			nColorData = 0x30ee0000;
		}
		break;
		case mso_sptVerticalScroll :			nColorData = 0x30ee0000; break;
		case mso_sptHorizontalScroll :			nColorData = 0x30ee0000; break;
		default:
			break;
	}




			XGradientStyle eGrad = XGRAD_LINEAR;
			sal_Int32 nChgColors = 0;

			if ( nFocus < 0 )		// Bei negativem Focus sind die Farben zu tauschen
				nChgColors ^= 1;

			if ( !nFocus )
				nChgColors ^= 1;
			else if ( nFocus < 0 )		// Bei negativem Focus sind die Farben zu tauschen
			{
				nFocus =- nFocus;
				nChgColors ^= 1;

			if( nFocus > 40 && nFocus < 60 )
			{
				eGrad = XGRAD_AXIAL;	// Besser gehts leider nicht
				nChgColors ^= 1;
			}

			USHORT nFocusX = (USHORT)nFocus;
			USHORT nFocusY = (USHORT)nFocus;


Return to issue 102797

Lines 1668-1679 void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co Link Here

(-)svx/source/msfilter/msdffimp.cxx (-7 / +2 lines)
1668	XGradientStyle eGrad = XGRAD_LINEAR;	1668	XGradientStyle eGrad = XGRAD_LINEAR;
1669	sal_Int32 nChgColors = 0;	1669	sal_Int32 nChgColors = 0;
1670		1670
1671	if ( !nAngle )	1671	if ( nFocus < 0 ) // Bei negativem Focus sind die Farben zu tauschen
1672	nChgColors ^= 1;
1673
1674	if ( !nFocus )
1675	nChgColors ^= 1;
1676	else if ( nFocus < 0 ) // Bei negativem Focus sind die Farben zu tauschen
1677	{	1672	{
1678	nFocus =- nFocus;	1673	nFocus =- nFocus;
1679	nChgColors ^= 1;	1674	nChgColors ^= 1;
Lines 1681-1688 void DffPropertyReader::ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, co Link Here
1681	if( nFocus > 40 && nFocus < 60 )	1676	if( nFocus > 40 && nFocus < 60 )
1682	{	1677	{
1683	eGrad = XGRAD_AXIAL; // Besser gehts leider nicht	1678	eGrad = XGRAD_AXIAL; // Besser gehts leider nicht
1684	nChgColors ^= 1;
1685	}	1679	}
		1680
1686	USHORT nFocusX = (USHORT)nFocus;	1681	USHORT nFocusX = (USHORT)nFocus;
1687	USHORT nFocusY = (USHORT)nFocus;	1682	USHORT nFocusY = (USHORT)nFocus;
1688		1683

Lines 724-746 EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : Link Here

(-)svx/source/customshapes/EnhancedCustomShape2d.cxx (-23 / +23 lines)
724	/const sal_Int32 pDefData =*/ ApplyShapeAttributes( rGeometryItem );	731	/const sal_Int32 pDefData =*/ ApplyShapeAttributes( rGeometryItem );
725	switch( eSpType )	732	switch( eSpType )
726	{	733	{
727	case mso_sptCan : nColorData = 0x20200000; break;	734	case mso_sptCan : nColorData = 0x20400000; break;
728	case mso_sptCube : nColorData = 0x302d0000; break;	735	case mso_sptCube : nColorData = 0x302e0000; break;
729	case mso_sptActionButtonBlank : nColorData = 0x502ad400; break;	736	case mso_sptActionButtonBlank : nColorData = 0x502ce400; break;
730	case mso_sptActionButtonHome : nColorData = 0x702ad4ad; break;	737	case mso_sptActionButtonHome : nColorData = 0x702ce4ce; break;
731	case mso_sptActionButtonHelp : nColorData = 0x602ad4a0; break;	738	case mso_sptActionButtonHelp : nColorData = 0x602ce4c0; break;
732	case mso_sptActionButtonInformation : nColorData = 0x702ad4a5; break;	739	case mso_sptActionButtonInformation : nColorData = 0x702ce4c5; break;
733	case mso_sptActionButtonBackPrevious : nColorData = 0x602ad4a0; break;	740	case mso_sptActionButtonBackPrevious : nColorData = 0x602ce4c0; break;
734	case mso_sptActionButtonForwardNext : nColorData = 0x602ad4a0; break;	741	case mso_sptActionButtonForwardNext : nColorData = 0x602ce4c0; break;
735	case mso_sptActionButtonBeginning : nColorData = 0x602ad4a0; break;	742	case mso_sptActionButtonBeginning : nColorData = 0x602ce4c0; break;
736	case mso_sptActionButtonEnd : nColorData = 0x602ad4a0; break;	743	case mso_sptActionButtonEnd : nColorData = 0x602ce4c0; break;
737	case mso_sptActionButtonReturn : nColorData = 0x602ad4a0; break;	744	case mso_sptActionButtonReturn : nColorData = 0x602ce4c0; break;
738	case mso_sptActionButtonDocument : nColorData = 0x702ad4da; break;	745	case mso_sptActionButtonDocument : nColorData = 0x702ce4ec; break;
739	case mso_sptActionButtonSound : nColorData = 0x602ad4a0; break;	746	case mso_sptActionButtonSound : nColorData = 0x602ce4c0; break;
740	case mso_sptActionButtonMovie : nColorData = 0x602ad4a0; break;	747	case mso_sptActionButtonMovie : nColorData = 0x602ce4c0; break;
741	case mso_sptBevel : nColorData = 0x502ad400; break;	748	case mso_sptBevel : nColorData = 0x502ce400; break;
742	case mso_sptFoldedCorner : nColorData = 0x20d00000; break;	749	case mso_sptFoldedCorner : nColorData = 0x20e00000; break;
743	case mso_sptSmileyFace : nColorData = 0x20d00000; break;	750	case mso_sptSmileyFace : nColorData = 0x20e00000; break;
744	case mso_sptNil :	751	case mso_sptNil :
745	{	752	{
746	if( sShapeType.getLength() > 4 &&	753	if( sShapeType.getLength() > 4 &&
Lines 775-781 EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : Link Here
775	}	782	}
776	break;	783	break;
777	case mso_sptCurvedDownArrow : nFlags \|= DFF_CUSTOMSHAPE_EXCH; break;	784	case mso_sptCurvedDownArrow : nFlags \|= DFF_CUSTOMSHAPE_EXCH; break;
778	case mso_sptRibbon2 : nColorData = 0x30dd0000; break;	785	case mso_sptRibbon2 : nColorData = 0x30ee0000; break;
779	case mso_sptRibbon :	786	case mso_sptRibbon :
780	{	787	{
781	if ( ( seqAdjustmentValues.getLength() > 1 ) && ( seqAdjustmentValues[ 1 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) )	788	if ( ( seqAdjustmentValues.getLength() > 1 ) && ( seqAdjustmentValues[ 1 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) )
Lines 786-795 EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : Link Here
786	seqAdjustmentValues[ 1 ].Value <<= fValue;	793	seqAdjustmentValues[ 1 ].Value <<= fValue;
787	}	794	}
788	nFlags \|= DFF_CUSTOMSHAPE_FLIP_V;	795	nFlags \|= DFF_CUSTOMSHAPE_FLIP_V;
789	nColorData = 0x30dd0000;	796	nColorData = 0x30ee0000;
790	}	797	}
791	break;	798	break;
792	case mso_sptEllipseRibbon2 : nColorData = 0x30dd0000; break;	799	case mso_sptEllipseRibbon2 : nColorData = 0x30ee0000; break;
793	case mso_sptEllipseRibbon : // !!!!!!!!!!	800	case mso_sptEllipseRibbon : // !!!!!!!!!!
794	{	801	{
795	if ( ( seqAdjustmentValues.getLength() > 1 ) && ( seqAdjustmentValues[ 1 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) )	802	if ( ( seqAdjustmentValues.getLength() > 1 ) && ( seqAdjustmentValues[ 1 ].State == com::sun::star::beans::PropertyState_DIRECT_VALUE ) )
Lines 800-810 EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) : Link Here
800	seqAdjustmentValues[ 1 ].Value <<= fValue;	807	seqAdjustmentValues[ 1 ].Value <<= fValue;
801	}	808	}
802	nFlags \|= DFF_CUSTOMSHAPE_FLIP_V;	809	nFlags \|= DFF_CUSTOMSHAPE_FLIP_V;
803	nColorData = 0x30dd0000;	810	nColorData = 0x30ee0000;
804	}	811	}
805	break;	812	break;
806	case mso_sptVerticalScroll : nColorData = 0x30dd0000; break;	813	case mso_sptVerticalScroll : nColorData = 0x30ee0000; break;
807	case mso_sptHorizontalScroll : nColorData = 0x30dd0000; break;	814	case mso_sptHorizontalScroll : nColorData = 0x30ee0000; break;
808	default:	815	default:
809	break;	816	break;
810	}	817	}