CWS-TOOLING: integrate CWS aw057

9 files changed, 32 insertions, 68 deletions

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 538e8d792eba..5ade98d5ad87 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: precompiled_sd.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -410,7 +410,6 @@
 #include "cppuhelper/weakref.hxx"
 
 
-#include "goodies/base3d.hxx"
 #include "goodies/grfmgr.hxx"
 
 #include "helper/simplereferencecomponent.hxx"
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 689b4c94124d..f66c1d130564 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: docshell.cxx,v $
- * $Revision: 1.48 $
+ * $Revision: 1.48.54.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -50,7 +50,6 @@
 #ifndef _SFX_DOCFILE_HXX //autogen
 #include <sfx2/docfile.hxx>
 #endif
-#include "goodies/base3d.hxx"
 #include <svx/drawitem.hxx>
 #include <svx/flstitem.hxx>
 #include <svx/drawitem.hxx>
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index b85ebdc684d4..e9654a21bcee 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fucon3d.cxx,v $
- * $Revision: 1.23 $
+ * $Revision: 1.23.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -269,22 +269,23 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
     Camera3D &aCamera  = (Camera3D&) pScene->GetCamera ();
 
     // get transformed BoundVolume of the new object
-    Volume3D aBoundVol;
-    const Volume3D& rObjVol = p3DObj->GetBoundVolume();
-    const ::basegfx::B3DHomMatrix& rObjTrans  = p3DObj->GetTransform();
-    aBoundVol.expand(rObjVol.GetTransformVolume(rObjTrans));
+    basegfx::B3DRange aBoundVol;
+    basegfx::B3DRange aObjVol(p3DObj->GetBoundVolume());
+    aObjVol.transform(p3DObj->GetTransform());
+    aBoundVol.expand(aObjVol);
     double fDeepth(aBoundVol.getDepth());
 
     aCamera.SetPRP(::basegfx::B3DPoint(0.0, 0.0, 1000.0));
     aCamera.SetPosition(::basegfx::B3DPoint(0.0, 0.0, mpView->GetDefaultCamPosZ() + fDeepth / 2));
     aCamera.SetFocalLength(mpView->GetDefaultCamFocal());
     pScene->SetCamera(aCamera);
+    basegfx::B3DHomMatrix aTransformation;
 
     switch (nSlotId)
     {
         case SID_3D_CUBE:
         {
-            pScene->RotateX(DEG2RAD(20));
+            aTransformation.rotate(DEG2RAD(20), 0.0, 0.0);
         }
         break;
 
@@ -297,7 +298,7 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
         case SID_3D_SHELL:
         case SID_3D_HALF_SPHERE:
         {
-            pScene->RotateX(DEG2RAD(200));
+            aTransformation.rotate(DEG2RAD(200), 0.0, 0.0);
         }
         break;
 
@@ -312,7 +313,7 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
         case SID_3D_TORUS:
         {
 //              pScene->RotateX(DEG2RAD(15));
-            pScene->RotateX(DEG2RAD(90));
+            aTransformation.rotate(DEG2RAD(90), 0.0, 0.0);
         }
         break;
 
@@ -322,7 +323,7 @@ void FuConstruct3dObject::ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dS
         break;
     }
 
-    pScene->FitSnapRectToBoundVol();
+    pScene->SetTransform(aTransformation * pScene->GetTransform());
 
     SfxItemSet aAttr (mpViewShell->GetPool());
     pScene->SetMergedItemSetAndBroadcast(aAttr);
@@ -458,9 +459,9 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
 
     // E3dView::SetCurrent3DObj part
     // get transformed BoundVolume of the object
-    const Volume3D& rObjVol = p3DObj->GetBoundVolume();
-    const ::basegfx::B3DHomMatrix& rObjTrans = p3DObj->GetTransform();
-    Volume3D aVolume(rObjVol.GetTransformVolume(rObjTrans));
+    basegfx::B3DRange aObjVol(p3DObj->GetBoundVolume());
+    aObjVol.transform(p3DObj->GetTransform());
+    basegfx::B3DRange aVolume(aObjVol);
     double fW(aVolume.getWidth());
     double fH(aVolume.getHeight());
     Rectangle a3DRect(0, 0, (long)fW, (long)fH);
@@ -493,7 +494,6 @@ SdrObject* FuConstruct3dObject::CreateDefaultObject(const sal_uInt16 nID, const
 
     // make object interactive at once
     pScene->SetRectsDirty();
-    pScene->InitTransformationSet();
 
     // Take care of restrictions for the rectangle
     Rectangle aRect(rRectangle);
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 0408880f3c86..83851db28cae 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fumorph.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.114.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,7 +49,6 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <goodies/b3dcolor.hxx>
 
 #include "strings.hrc"
 #include "sdresid.hxx"
@@ -59,6 +58,8 @@
 // #i48168#
 #include <svx/svditer.hxx>
 
+#include <basegfx/color/bcolor.hxx>
+
 namespace sd {
 
 #define  ITEMVALUE( ItemSet, Id, Cast ) ( ( (const Cast&) (ItemSet).Get( (Id) ) ).GetValue() )
@@ -229,7 +230,7 @@ void FuMorph::DoExecute( SfxRequest& )
             const double fLenA((fDestPos - fSrcPos) / fNextSrcLen);
             const ::basegfx::B2DPoint aOld1(rCandidate.getB2DPoint(nSrcPos));
             const ::basegfx::B2DPoint aOld2(rCandidate.getB2DPoint(nSrcPosNext));
-            ::basegfx::B2DPoint aNewPoint(::basegfx::interpolate(aOld1, aOld2, fLenA));
+            ::basegfx::B2DPoint aNewPoint(basegfx::interpolate(aOld1, aOld2, fLenA));
             aRetval.append(aNewPoint);
 
             // next step
@@ -407,19 +408,22 @@ void FuMorph::ImpInsertPolygons(List& rPolyPolyList3D, BOOL bAttributeFade,
         {
             const ::basegfx::B2DPolyPolygon& rPolyPoly3D = *(::basegfx::B2DPolyPolygon*)rPolyPolyList3D.GetObject(i);
             SdrPathObj* pNewObj = new SdrPathObj(OBJ_POLY, rPolyPoly3D);
-            B3dColor aLineCol, aFillCol;
-            aLineCol.CalcInBetween(aStartLineCol, aEndLineCol, fFactor);
-            aFillCol.CalcInBetween(aStartFillCol, aEndFillCol, fFactor);
 
             // Linienfarbe
             if ( bLineColor )
-                aSet.Put( XLineColorItem( aEmptyStr, aLineCol));
+            {
+                const basegfx::BColor aLineColor(basegfx::interpolate(aStartLineCol.getBColor(), aEndLineCol.getBColor(), fFactor));
+                aSet.Put( XLineColorItem( aEmptyStr, Color(aLineColor)));
+            }
             else if ( bIgnoreLine )
                 aSet.Put( XLineStyleItem( XLINE_NONE ) );
 
             // Fuellfarbe
             if ( bFillColor )
-                aSet.Put( XFillColorItem( aEmptyStr, aFillCol));
+            {
+                const basegfx::BColor aFillColor(basegfx::interpolate(aStartFillCol.getBColor(), aEndFillCol.getBColor(), fFactor));
+                aSet.Put( XFillColorItem( aEmptyStr, Color(aFillColor)));
+            }
             else if ( bIgnoreFill )
                 aSet.Put( XFillStyleItem( XFILL_NONE ) );
 
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index b1e4cb969825..b5db742f70b4 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: futransf.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.114.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -134,25 +134,6 @@ void FuTransform::DoExecute( SfxRequest& rReq )
 
             mpView->SetGeoAttrToMarked( *pArgs );
             mpView->SetAttributes( *pArgs );
-
-            /**********************************************************************
-            * An der E3dView muss demnaechst SetGeoAttrToMarked() mit folgendem
-            * Code ueberladen werden:
-            **********************************************************************/
-            const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
-            ULONG nCount = rMarkList.GetMarkCount();
-
-            for (ULONG nMark = 0; nMark < nCount; nMark++)
-            {
-                SdrObject* pObj = rMarkList.GetMark(nMark)->GetMarkedSdrObj();
-
-                if (pObj->ISA(E3dPolyScene))
-                {
-                    ((E3dPolyScene*) pObj)->FitSnapRectToBoundVol();
-                }
-            }
-            //********************************************************************
-
             mpView->EndUndo();
         }
     }
diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx
index f9ef5e927138..627075e607cf 100644
--- a/sd/source/ui/view/PrintManager.cxx
+++ b/sd/source/ui/view/PrintManager.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: PrintManager.cxx,v $
- * $Revision: 1.24 $
+ * $Revision: 1.24.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -67,8 +67,6 @@
 #include "strings.hrc"
 
 #include <svx/svdopath.hxx>
-#include <goodies/base3d.hxx>
-
 #include "sdabstdlg.hxx"
 #include "printdlg.hrc"
 #include "prntopts.hrc"
@@ -591,12 +589,6 @@ USHORT  PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p
 
         // Druckerschach wieder zuruecksetzen
         pPrinter->SetPaperBin( nOldPaperBin );
-
-        // 3D-Kontext wieder zerstoeren
-        Base3D *pBase3D = (Base3D*) pPrinter->Get3DContext();
-
-        if( pBase3D )
-            pBase3D->Destroy( pPrinter );
     }
 
     return 0;
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index e799d46342e5..bba2f08dee67 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: sdwindow.cxx,v $
- * $Revision: 1.38 $
+ * $Revision: 1.38.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,7 +32,6 @@
 #include "precompiled_sd.hxx"
 
 #include "Window.hxx"
-#include "goodies/base3d.hxx"
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index e92da034f4d8..046dfab9526e 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewshe3.cxx,v $
- * $Revision: 1.59 $
+ * $Revision: 1.59.38.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -91,7 +91,6 @@
 #ifndef _SVXIDS_HXX
 #include <svx/svxids.hrc>
 #endif
-#include "goodies/base3d.hxx"
 #include <sfx2/request.hxx>
 #include <svtools/aeitem.hxx>
 #include <basic/sbstar.hxx>
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index db678f7ae1e2..b923bcc67dc3 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewshel.cxx,v $
- * $Revision: 1.71 $
+ * $Revision: 1.71.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -53,7 +53,6 @@
 #ifndef _SVXIDS_HXX
 #include <svx/svxids.hrc>
 #endif
-#include "goodies/base3d.hxx"
 #include <svx/fmshell.hxx>
 #ifndef SD_WINDOW_UPDATER_HXX
 #include "WindowUpdater.hxx"
@@ -517,14 +516,6 @@ BOOL ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
         if (aKeyCode.IsMod1() && aKeyCode.IsShift()
             && aKeyCode.GetCode() == KEY_R)
         {
-            // 3D-Kontext wieder zerstoeren
-            Base3D* pBase3D = (Base3D*) GetActiveWindow()->Get3DContext();
-
-            if (pBase3D)
-            {
-                pBase3D->Destroy(GetActiveWindow());
-            }
-
             InvalidateWindows();
             bReturn = TRUE;
         }