strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS xmlfilter04 (1.2.12); FILE MERGED

Browse source 
2008/04/01 07:52:51 hbrinkm 1.2.12.4: resolved conflict the wrong way
2008/03/19 16:26:18 hbrinkm 1.2.12.3: RESYNC: (1.2-1.3); FILE MERGED
2008/02/27 14:40:07 dr 1.2.12.2: add setters to Color class, add gamma to a:scrgbClr
2008/02/21 12:42:00 hbrinkm 1.2.12.1: joined changes from xmlfilter03
This commit is contained in:
Rüdiger Timm 2008-04-18 13:13:34 +00:00
parent 0c7a6a4fc3
commit 7b40fab9f2
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
oox/source/drawingml/lineproperties.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: lineproperties.cxx,v $
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* This file is part of OpenOffice.org.
*
@ -228,20 +228,16 @@ void LineProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBas
const Reference < XPropertySet >& xPropSet ) const
{
PropertySet aPropSet( xPropSet );
Sequence< OUString > aNames;
Sequence< Any > aValues;
maLineProperties.makeSequence( aNames, aValues );
aPropSet.setProperties( aNames, aValues );
aPropSet.setProperties( maLineProperties );
if ( maLineColor->isUsed() )
{
const rtl::OUString sLineColor( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "LineColor" ) ) );
xPropSet->setPropertyValue( sLineColor, Any( maLineColor->getColor( rFilterBase ) ) );
aPropSet.setProperty( sLineColor, maLineColor->getColor( rFilterBase ) );
if ( maLineColor->hasAlpha() )
if ( maLineColor->hasTransparence() )
{
const rtl::OUString sLineTransparence( OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "LineTransparence" ) ) );
xPropSet->setPropertyValue( sLineTransparence, Any( static_cast< sal_Int16 >( ( 100000 - maLineColor->getAlpha() ) / 1000 ) ) );
aPropSet.setProperty( sLineTransparence, maLineColor->getTransparence() );
}
}
if ( moLineWidth )