diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:03:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-11-24 16:03:46 +0000 |
| commit | 528e37d7f88ac6e54857128073cc4b2eeba61641 (patch) | |
| tree | 1443aa6785f5e31603868e68669d3037ed2f2a95 /svx/source/unodraw/unoshap3.cxx | |
| parent | 66c910af6d5f51856cb3f5dcc6a24459a3068756 (diff) | |
INTEGRATION: CWS aw003 (1.19.42); FILE MERGED
2003/11/04 16:53:00 aw 1.19.42.2: RESYNC: (1.19-1.20); FILE MERGED
2003/06/06 12:59:51 aw 1.19.42.1: #109820#
2nd run of changes for ItemSet isolation
Diffstat (limited to 'svx/source/unodraw/unoshap3.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshap3.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 93a944eb2d68..b9b9afb3f841 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unoshap3.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2003-10-27 13:27:55 $ + * last change: $Author: rt $ $Date: 2003-11-24 17:03:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -425,10 +425,12 @@ void SAL_CALL Svx3DSceneObject::setPropertyValue( const OUString& aPropertyName, const Volume3D& rVolume = pScene->GetBoundVolume(); double fW = rVolume.GetWidth(); double fH = rVolume.GetHeight(); + + const SfxItemSet& rSceneSet = pScene->GetMergedItemSet(); double fCamPosZ = - (double)((const SfxUInt32Item&)pScene->GetItem(SDRATTR_3DSCENE_DISTANCE)).GetValue(); + (double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue(); double fCamFocal = - (double)((const SfxUInt32Item&)pScene->GetItem(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); + (double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); aCam.SetAutoAdjustProjection(FALSE); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); @@ -879,7 +881,7 @@ void SAL_CALL Svx3DLatheObject::setPropertyValue( const OUString& aPropertyName, if(nPrevVerticalSegs != nPostVerticalSegs) { // restore the vertical segment count - ((E3dLatheObj*)pObj)->SetItem(Svx3DVerticalSegmentsItem(nPrevVerticalSegs)); + ((E3dLatheObj*)pObj)->SetMergedItem(Svx3DVerticalSegmentsItem(nPrevVerticalSegs)); } } else |