CWS-TOOLING: integrate CWS aw057

3 files changed, 10 insertions, 23 deletions

diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 14a2ba23f7..0171d424ba 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unopage.cxx,v $
- * $Revision: 1.50 $
+ * $Revision: 1.50.18.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -618,7 +618,6 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
                 pScene->SetCamera(aCam);
 
                 pScene->SetRectsDirty();
-                pScene->InitTransformationSet();
             }
             else if(pNewObj->ISA(E3dExtrudeObj))
             {
@@ -627,10 +626,6 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
                 aNewPolygon.append(basegfx::B2DPoint(0.0, 0.0));
                 aNewPolygon.append(basegfx::B2DPoint(0.0, 1.0));
                 aNewPolygon.append(basegfx::B2DPoint(1.0, 0.0));
-
-                // #87922#
-                // To avoid that CreateGeometry(...) sets the DoubleSided
-                // item at once, use a closed poylgon.
                 aNewPolygon.setClosed(true);
                 pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon));
 
@@ -644,10 +639,6 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
                 aNewPolygon.append(basegfx::B2DPoint(0.0, 0.0));
                 aNewPolygon.append(basegfx::B2DPoint(0.0, 1.0));
                 aNewPolygon.append(basegfx::B2DPoint(1.0, 0.0));
-
-                // #87922#
-                // To avoid that CreateGeometry(...) sets the DoubleSided
-                // item at once, use a closed poylgon.
                 aNewPolygon.setClosed(true);
                 pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon));
 
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 30120e6542..cefb0054b4 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoshap3.cxx,v $
- * $Revision: 1.32 $
+ * $Revision: 1.32.226.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -378,15 +378,15 @@ bool Svx3DSceneObject::setPropertyValueImpl( const SfxItemPropertyMap* pProperty
             while(aIter.IsMore())
             {
                 E3dObject* p3DObj = (E3dObject*)aIter.Next();
-                p3DObj->NbcResetTransform();
+                p3DObj->NbcSetTransform(basegfx::B3DHomMatrix());
             }
 
             // reset scene transformation and make a complete recalc
-            pScene->NbcResetTransform();
+            pScene->NbcSetTransform(basegfx::B3DHomMatrix());
 
             // fill old camera from new parameters
             Camera3D aCam(pScene->GetCamera());
-            const Volume3D& rVolume = pScene->GetBoundVolume();
+            const basegfx::B3DRange& rVolume = pScene->GetBoundVolume();
             double fW = rVolume.getWidth();
             double fH = rVolume.getHeight();
 
@@ -431,12 +431,8 @@ bool Svx3DSceneObject::setPropertyValueImpl( const SfxItemPropertyMap* pProperty
 
             // set scene transformation again at scene
             pScene->NbcSetTransform(aSceneTAR.maMat);
-            pScene->FitSnapRectToBoundVol();
             pScene->NbcSetSnapRect(aSceneTAR.maRect);
 
-            // #86559# init transformation set to allow correct
-            // calculation of BoundRect
-            pScene->InitTransformationSet();
             return true;
         }
         break;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index c98137c1ac..e0981d8f7b 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: unoshape.cxx,v $
- * $Revision: 1.178 $
+ * $Revision: 1.178.104.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -2292,8 +2292,8 @@ bool SvxShape::setPropertyValueImpl( const SfxItemPropertyMap* pProperty, const
             basegfx::B2DHomMatrix aNewHomogenMatrix;
             mpObj->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
 
-            aVclPoint.X() += FRound(aNewHomogenMatrix.get(0, 2));
-            aVclPoint.Y() += FRound(aNewHomogenMatrix.get(1, 2));
+            aVclPoint.X() += basegfx::fround(aNewHomogenMatrix.get(0, 2));
+            aVclPoint.Y() += basegfx::fround(aNewHomogenMatrix.get(1, 2));
 
             // #88657# metric of pool maybe twips (writer)
             ForceMetricToItemPoolMetric(aVclPoint);
@@ -2716,8 +2716,8 @@ bool SvxShape::getPropertyValueImpl( const SfxItemPropertyMap* pProperty, ::com:
         basegfx::B2DHomMatrix aNewHomogenMatrix;
         mpObj->TRGetBaseGeometry(aNewHomogenMatrix, aNewPolyPolygon);
         
-        aVclPoint.X() -= FRound(aNewHomogenMatrix.get(0, 2));
-        aVclPoint.Y() -= FRound(aNewHomogenMatrix.get(1, 2));
+        aVclPoint.X() -= basegfx::fround(aNewHomogenMatrix.get(0, 2));
+        aVclPoint.Y() -= basegfx::fround(aNewHomogenMatrix.get(1, 2));
 
         awt::Point aPnt( aVclPoint.X(), aVclPoint.Y() );
         rValue <<= aPnt;