diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-01 16:16:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-01 16:16:49 +0200 |
| commit | e5d6ae0c2efcf8edb224faa294be6b0baa636137 (patch) | |
| tree | e17f5136b0d854fcb08ca92ebaef2e1350e5c301 /svx/source/customshapes/EnhancedCustomShape3d.cxx | |
| parent | d19609e118ee0bfb823945582e823d02bdaa7134 (diff) | |
Consistency around SvxColorItem in svx/svx3ditems.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."
Change-Id: If26ab3229871d2d6a7e4e7e8f79f4cb927b96930
Diffstat (limited to 'svx/source/customshapes/EnhancedCustomShape3d.cxx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index fbaf0b43a063..eac5e63211a2 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -679,14 +679,14 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con if ( nAmbientColor > 255 ) nAmbientColor = 255; Color aGlobalAmbientColor( (sal_uInt8)nAmbientColor, (sal_uInt8)nAmbientColor, (sal_uInt8)nAmbientColor ); - pScene->GetProperties().SetObjectItem( Svx3DAmbientcolorItem( aGlobalAmbientColor ) ); + pScene->GetProperties().SetObjectItem( makeSvx3DAmbientcolorItem( aGlobalAmbientColor ) ); sal_uInt8 nSpotLight1 = (sal_uInt8)( fLightIntensity * 255.0 ); basegfx::B3DVector aSpotLight1( aFirstLightDirection.DirectionX, - ( aFirstLightDirection.DirectionY ), -( aFirstLightDirection.DirectionZ ) ); aSpotLight1.normalize(); pScene->GetProperties().SetObjectItem( makeSvx3DLightOnOff1Item( true ) ); Color aAmbientSpot1Color( nSpotLight1, nSpotLight1, nSpotLight1 ); - pScene->GetProperties().SetObjectItem( Svx3DLightcolor1Item( aAmbientSpot1Color ) ); + pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor1Item( aAmbientSpot1Color ) ); pScene->GetProperties().SetObjectItem( Svx3DLightDirection1Item( aSpotLight1 ) ); sal_uInt8 nSpotLight2 = (sal_uInt8)( fLight2Intensity * 255.0 ); @@ -694,14 +694,14 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con aSpotLight2.normalize(); pScene->GetProperties().SetObjectItem( makeSvx3DLightOnOff2Item( true ) ); Color aAmbientSpot2Color( nSpotLight2, nSpotLight2, nSpotLight2 ); - pScene->GetProperties().SetObjectItem( Svx3DLightcolor2Item( aAmbientSpot2Color ) ); + pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor2Item( aAmbientSpot2Color ) ); pScene->GetProperties().SetObjectItem( Svx3DLightDirection2Item( aSpotLight2 ) ); sal_uInt8 nSpotLight3 = 70; basegfx::B3DVector aSpotLight3( 0.0, 0.0, 1.0 ); pScene->GetProperties().SetObjectItem( makeSvx3DLightOnOff3Item( true ) ); Color aAmbientSpot3Color( nSpotLight3, nSpotLight3, nSpotLight3 ); - pScene->GetProperties().SetObjectItem( Svx3DLightcolor3Item( aAmbientSpot3Color ) ); + pScene->GetProperties().SetObjectItem( makeSvx3DLightcolor3Item( aAmbientSpot3Color ) ); pScene->GetProperties().SetObjectItem( Svx3DLightDirection3Item( aSpotLight3 ) ); double fSpecular = GetDouble( rGeometryItem, "Specularity", 0, NULL ) / 100; @@ -719,7 +719,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con else if ( nIntensity < 0 ) nIntensity = 0; nIntensity = 100 - nIntensity; - pScene->GetProperties().SetObjectItem( Svx3DMaterialSpecularItem( aSpecularCol ) ); + pScene->GetProperties().SetObjectItem( makeSvx3DMaterialSpecularItem( aSpecularCol ) ); pScene->GetProperties().SetObjectItem( makeSvx3DMaterialSpecularIntensityItem( (sal_uInt16)nIntensity ) ); pScene->SetLogicRect( CalculateNewSnapRect( pCustomShape, aSnapRect, aBoundRect2d, pMap ) ); |