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

(-)oox/inc/oox/drawingml/color.hxx (+3 lines)
Lines 93-98 Link Here
93
    /** Returns the transparency of the color (0 = opaque, 100 = full transparent). */
93
    /** Returns the transparency of the color (0 = opaque, 100 = full transparent). */
94
    sal_Int16           getTransparency() const;
94
    sal_Int16           getTransparency() const;
95
95
96
	/** Returns the scheme token*/
97
	sal_Int32			getSchemeColor( const GraphicHelper& rGraphicHelper ) const;
98
96
private:
99
private:
97
    /** Internal helper for getColor(). */
100
    /** Internal helper for getColor(). */
98
    void                setResolvedRgb( sal_Int32 nRgb ) const;
101
    void                setResolvedRgb( sal_Int32 nRgb ) const;
(-)oox/inc/oox/drawingml/fillproperties.hxx (-1 / +2 lines)
Lines 123-129 Link Here
123
                            ShapePropertyMap& rPropMap,
123
                            ShapePropertyMap& rPropMap,
124
                            const GraphicHelper& rGraphicHelper,
124
                            const GraphicHelper& rGraphicHelper,
125
                            sal_Int32 nShapeRotation = 0,
125
                            sal_Int32 nShapeRotation = 0,
126
                            sal_Int32 nPhClr = API_RGB_TRANSPARENT ) const;
126
							sal_Int32 nPhClr = API_RGB_TRANSPARENT,
127
							bool bTransformed = true) const;
127
};
128
};
128
129
129
// ============================================================================
130
// ============================================================================
(-)oox/source/drawingml/color.cxx (+5 lines)
Lines 346-351 Link Here
346
    mnAlpha = MAX_PERCENT;
346
    mnAlpha = MAX_PERCENT;
347
}
347
}
348
348
349
sal_Int32 Color::getSchemeColor( const GraphicHelper& rGraphicHelper ) const
350
{
351
	return rGraphicHelper.getSchemeColor( mnC1 );
352
}
353
349
sal_Int32 Color::getColor( const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
354
sal_Int32 Color::getColor( const GraphicHelper& rGraphicHelper, sal_Int32 nPhClr ) const
350
{
355
{
351
    /*  Special handling for theme style list placeholder colors (state
356
    /*  Special handling for theme style list placeholder colors (state
(-)oox/source/drawingml/fillproperties.cxx (-2 / +6 lines)
Lines 184-190 Link Here
184
}
184
}
185
185
186
void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
186
void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
187
        const GraphicHelper& rGraphicHelper, sal_Int32 nShapeRotation, sal_Int32 nPhClr ) const
187
		const GraphicHelper& rGraphicHelper, sal_Int32 nShapeRotation, sal_Int32 nPhClr, bool bTransformed ) const
188
{
188
{
189
    if( moFillType.has() )
189
    if( moFillType.has() )
190
    {
190
    {
Lines 198-204 Link Here
198
            case XML_solidFill:
198
            case XML_solidFill:
199
                if( maFillColor.isUsed() )
199
                if( maFillColor.isUsed() )
200
                {
200
                {
201
                    rPropMap.setProperty( SHAPEPROP_FillColor, maFillColor.getColor( rGraphicHelper, nPhClr ) );
201
					if( bTransformed )
202
						rPropMap.setProperty( SHAPEPROP_FillColor, maFillColor.getColor( rGraphicHelper, nPhClr ) );
203
					else
204
						rPropMap.setProperty( SHAPEPROP_FillColor, maFillColor.getSchemeColor( rGraphicHelper) );
205
202
                    if( maFillColor.hasTransparency() )
206
                    if( maFillColor.hasTransparency() )
203
                        rPropMap.setProperty( SHAPEPROP_FillTransparency, maFillColor.getTransparency() );
207
                        rPropMap.setProperty( SHAPEPROP_FillTransparency, maFillColor.getTransparency() );
204
                    eFillStyle = FillStyle_SOLID;
208
                    eFillStyle = FillStyle_SOLID;
(-)oox/source/drawingml/table/tablecell.cxx (-6 / +18 lines)
Lines 180-185 Link Here
180
	oox::drawingml::LineProperties aLinePropertiesBottom;
180
	oox::drawingml::LineProperties aLinePropertiesBottom;
181
	oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight;
181
	oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight;
182
	oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight;
182
	oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight;
183
	ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
184
	bool bPropPushed = false;
183
185
184
	boost::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
186
	boost::shared_ptr< ::oox::drawingml::FillProperties >& rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
185
	if ( rBackgroundFillPropertiesPtr.get() )
187
	if ( rBackgroundFillPropertiesPtr.get() )
Lines 210-216 Link Here
210
			rTable.getFirstRow() );
212
			rTable.getFirstRow() );
211
       lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getFirstRow());
213
       lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getFirstRow());
212
	}
214
	}
213
	if ( rProperties.isLastRow() && ( nRow == nMaxRow ) )
215
	if ( rProperties.isLastRow() && ( nRow == nMaxRow -1 ) )
214
	{
216
	{
215
		applyTableStylePart( rFilterBase, rxCell, aFillProperties,
217
		applyTableStylePart( rFilterBase, rxCell, aFillProperties,
216
			aLinePropertiesLeft,
218
			aLinePropertiesLeft,
Lines 221-226 Link Here
221
			aLinePropertiesBottomLeftToTopRight,
223
			aLinePropertiesBottomLeftToTopRight,
222
			rTable.getLastRow() );
224
			rTable.getLastRow() );
223
		lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getLastRow());
225
		lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getLastRow());
226
227
		aFillProperties.assignUsed( maFillProperties );
228
		aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper(), false ); 
229
		bPropPushed =true;
224
	}
230
	}
225
	if ( rProperties.isFirstCol() && ( nColumn == 0 ) )
231
	if ( rProperties.isFirstCol() && ( nColumn == 0 ) )
226
	{
232
	{
Lines 234-240 Link Here
234
			rTable.getFirstCol() );
240
			rTable.getFirstCol() );
235
		lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getFirstCol());
241
		lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getFirstCol());
236
	}
242
	}
237
	if ( rProperties.isLastCol() && ( nColumn == nMaxColumn ) )
243
	if ( rProperties.isLastCol() && ( nColumn == nMaxColumn -1 ) )
238
	{
244
	{
239
		applyTableStylePart( rFilterBase, rxCell, aFillProperties,
245
		applyTableStylePart( rFilterBase, rxCell, aFillProperties,
240
			aLinePropertiesLeft,
246
			aLinePropertiesLeft,
Lines 245-250 Link Here
245
			aLinePropertiesBottomLeftToTopRight,
251
			aLinePropertiesBottomLeftToTopRight,
246
			rTable.getLastCol() );
252
			rTable.getLastCol() );
247
		lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getLastCol());
253
		lcl_getCharPropFromTblStylePart(aTextCharProps, rTable.getLastCol());
254
255
		aFillProperties.assignUsed( maFillProperties );
256
		aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper(), false ); 
257
		bPropPushed = true;
248
	}
258
	}
249
	if ( rProperties.isBandRow() )
259
	if ( rProperties.isBandRow() )
250
	{
260
	{
Lines 378-387 Link Here
378
    applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesTopLeftToBottomRight, PROP_DiagonalTLBR );
388
    applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesTopLeftToBottomRight, PROP_DiagonalTLBR );
379
    applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesBottomLeftToTopRight, PROP_DiagonalBLTR );
389
    applyLineAttributes( rFilterBase, xPropSet, aLinePropertiesBottomLeftToTopRight, PROP_DiagonalBLTR );
380
390
381
	aFillProperties.assignUsed( maFillProperties );
391
	if(!bPropPushed)
382
    ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
392
	{
383
    // TODO: phClr?
393
		aFillProperties.assignUsed( maFillProperties );  
384
    aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() );
394
		// TODO: phClr?
395
		aFillProperties.pushToPropMap( aPropMap, rFilterBase.getGraphicHelper() ); 
396
	}
385
    PropertySet( xPropSet ).setProperties( aPropMap );
397
    PropertySet( xPropSet ).setProperties( aPropMap );
386
398
387
    if ( getVertToken() == XML_eaVert )
399
    if ( getVertToken() == XML_eaVert )

Return to issue 119795