CWS-TOOLING: integrate CWS aw059

2008-12-16 16:15:40 +0100 aw  r265557 : #i95645# avoid expensive tries to stream in graphic data when stream is at end anyways
2008-12-15 16:49:58 +0100 wg  r265512 : i97278
2008-12-12 16:02:15 +0100 aw  r265427 : #i95645# new formulation was wrong in two places; thanks go to THB. Thanks!
2008-12-12 15:49:06 +0100 aw  r265425 : #i95645# refined formulation of AA on/off constraints for VCLCanvas
2008-12-12 14:51:26 +0100 aw  r265420 : #i95645# workaround for DrawTransparent of button hilighting when remote displayed; somehow GDI+ does bad dithering in that case
2008-12-12 13:23:00 +0100 aw  r265414 : removed temporary build hack; it made it's way in using the rebase; with SVN the rebase is not based on pure checkouts, but uses local changes.
2008-12-11 19:35:59 +0100 aw  r265352 : #i95645# need to switch off AA for WNT and UNX, the VCLCanvas is currently not able to handle AA correctly
2008-12-11 16:05:17 +0100 thb  r265327 : #i95645# Changed defaults to on; as for the while svx dialog is not changed
2008-12-10 13:40:38 +0100 aw  r265180 : #i95645# changed pixel snap to basegfx::fround
2008-12-10 13:25:45 +0100 aw  r265177 : corrected linux warning
2008-12-10 12:28:02 +0100 aw  r265167 : #i95645# added support for pixel snap/linux resp. no AA for mac (also pixel snap) when AA is switched off to the basegfx::B2DPolyPolygon painting VCL methods; needed for e.g. selection in SC and SW
2008-12-09 18:44:39 +0100 aw  r265136 : #i95645# corrected filled path construction
2008-12-09 18:12:40 +0100 aw  r265133 : #i95645# added support for non-AAd transparent paints
2008-12-09 18:11:58 +0100 aw  r265132 : #i95645# forced selection without AA
2008-12-09 18:11:29 +0100 aw  r265131 : #i88893# smoothed/corrected SW selection rects for transparent selection, forced selection without AA
2008-12-09 15:21:39 +0100 aw  r265094 : #i95645# corrected FormControl full drag
2008-12-09 15:11:26 +0100 aw  r265093 : #i95645# make gdiplus usages more safe when no line or fill color is selected
2008-12-09 14:30:09 +0100 aw  r265085 : #i95645# added GDIPlus support
2008-12-09 13:41:06 +0100 aw  r265081 : #i95645# added simple AA using GDIPlis to VCL
2008-12-09 13:40:46 +0100 aw  r265080 : #i95645# added simple AA using GDIPlis to VCL
2008-12-09 13:40:29 +0100 aw  r265079 : #i95645# added simple AA using GDIPlis to VCL
2008-12-09 13:33:16 +0100 aw  r265078 : #i95645# changes to requirements, discussed with FPE
2008-12-08 14:11:39 +0100 aw  r264995 : #i95646# added missing extra-wireframe for SdrDragObjOwn implementations when object has no border
2008-12-08 14:11:00 +0100 aw  r264994 : #i95646# corrected RenderMarkerArrayPrimitive2D OutDev usage in VclProcessor2D
2008-12-08 12:15:10 +0100 ufi  r264987 : aw059
2008-12-08 12:14:40 +0100 ufi  r264986 : aw059
2008-12-05 13:16:18 +0100 aw  r264905 : CWS-TOOLING: rebase CWS aw059 to trunk@264807 (milestone: DEV300:m37)
2008-12-04 11:29:48 +0100 aw  r264827 : #i95645# corrected warning
2008-12-03 14:43:39 +0100 aw  r264783 : #i95645# simplified overlay manager and objects to stl vector; added stuff to render some more overlay to primitive renderer to get AA support for WIN32
2008-12-03 14:42:43 +0100 aw  r264782 : #i95645# added test for WIN32 for AA if cairo canvas is available
2008-12-03 14:42:13 +0100 aw  r264781 : #i95645# removed unused options for writer selection overlay
2008-12-03 14:41:51 +0100 aw  r264780 : #i95645# removed unused options for calc overlay
2008-12-03 14:41:21 +0100 aw  r264779 : #i95645# small corrections in canvas renderer
2008-12-02 18:32:31 +0100 aw  r264730 : #i95646# merged cairo version from THB's CWS cairosource01
2008-12-02 15:25:45 +0100 aw  r264705 : #i95645# added helpers for the MarkerArrayPrimitive2D change which support buffered creation of the most used markers
2008-12-02 12:50:01 +0100 aw  r264690 : #i95645# added a non-saved method IsAAPossibleOnThisSystem to SvtOptionsDrawinglayer to quickly test if AA can be offered on the system, added buffering of that check.
2008-12-02 12:48:51 +0100 aw  r264689 : #i95645# unified MarkerArrayPrimitive2D to work bitmap-orientated, adapted usages. Added buffered preparation for needed markers. Minor adaptions for AA
2008-12-02 12:47:53 +0100 aw  r264688 : #i95645# unified MarkerArrayPrimitive2D to no longer work on a enum and types of markers, but to use a BitmapEx (or any other Bitmap object) which will be displayed centerd and in discrete coordinates at positions. Adapted decomposition and all usages. Corrected minor stuff with grid primitive
2008-11-28 17:11:12 +0100 thb  r264565 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-28 17:03:27 +0100 thb  r264563 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-28 17:00:07 +0100 thb  r264562 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-28 16:59:51 +0100 thb  r264561 : #i95645# Added two more lists to config; to be able to differentiate canvas capabilities
2008-11-27 19:13:42 +0100 aw  r264519 : #i95646# optimized getLength() a little bit
2008-11-27 19:12:50 +0100 aw  r264518 : #i95646# corrected AA expansion of invalidate frame; buffered discrete distance at OM
2008-11-27 18:50:05 +0100 aw  r264516 : #i95646# corrected fit to frame texts for WIN32
2008-11-27 15:32:15 +0100 aw  r264496 : #i95646# helplines corrected
2008-11-27 15:32:05 +0100 aw  r264495 : #i95646# helplines corrected
2008-11-27 15:01:30 +0100 aw  r264492 : #i95646# enable AA support for old polygons, especially to get support for MetaFile output
2008-11-27 14:33:28 +0100 aw  r264489 : #i95646# AA support for wireframe overlays
2008-11-27 13:40:54 +0100 aw  r264485 : #i95646# added full repaint when AA option changes
2008-11-27 13:29:19 +0100 aw  r264482 : #i95646# corrected handling of bSolidDragging config entries
2008-11-27 13:29:08 +0100 aw  r264481 : #i95646# corrected handling of bSolidDragging config entries
2008-11-27 11:30:12 +0100 aw  r264469 : #i95646# corrected IsAAPossibleOnThisSystem implementation
2008-11-26 16:33:04 +0100 aw  r264420 : #i95646# adapted OfaViewTabPage to use disable mechanism for AA and HWAccel
2008-11-26 15:49:19 +0100 aw  r264406 : #i95646# added DlgEdObj::getFullDragClone() to create specialized simple SdrUnoObj clones for solid dragging
2008-11-26 15:48:11 +0100 aw  r264405 : #i95646# changed derivation of ViewObjectContactOfUnoControl to get a valid isPrimitiveVisible() implementation
2008-11-26 14:11:37 +0100 aw  r264385 : #i88893# added new look for selection in sw
2008-11-26 11:32:33 +0100 aw  r264360 : corrected compiler warning
2008-11-25 18:46:29 +0100 aw  r264328 : #i95646# snapshot with FullDrag clones
2008-11-25 18:46:07 +0100 aw  r264327 : #i95646# snapshot with FullDrag clones
2008-11-25 18:45:43 +0100 aw  r264326 : #i95646# snapshot with FullDrag clones
2008-11-25 18:19:04 +0100 thb  r264324 : #i96585# Added missing inline specifier
2008-11-25 13:16:25 +0100 aw  r264285 : #i95646# next snapshot
2008-11-25 13:15:33 +0100 aw  r264284 : #i95646# next snapshot
2008-11-25 13:15:12 +0100 aw  r264283 : #i95646# next snapshot
2008-11-25 13:14:51 +0100 aw  r264282 : #i95646# next snapshot
2008-11-20 13:40:49 +0100 aw  r264045 : #i95646# stable snapshot
2008-11-20 13:40:29 +0100 aw  r264044 : #i95646# stable snapshot
2008-11-20 13:40:06 +0100 aw  r264043 : #i95646# stable snapshot
2008-11-20 13:39:45 +0100 aw  r264042 : #i95646# stable snapshot
2008-11-18 11:53:39 +0100 aw  r263758 : #i95646# snapshot for linux test build
2008-11-18 11:52:54 +0100 aw  r263757 : #i95646# snapshot for linux test build
2008-11-18 11:52:02 +0100 aw  r263756 : #i95646# snapshot for linux test build
2008-11-14 18:17:49 +0100 aw  r263692 : #i95646# snapshot with most stuff working
2008-11-14 18:14:26 +0100 aw  r263691 : #i95646# snapshot with most stuff working
2008-11-14 18:12:50 +0100 aw  r263690 : #i95646# snapshot with most stuff working
2008-11-14 18:12:16 +0100 aw  r263689 : #i95646# snapshot with most stuff working
2008-11-14 18:11:41 +0100 aw  r263688 : #i95646# snapshot with most stuff working
2008-11-07 18:44:22 +0100 aw  r263479 : #i95968# better support PrefMapMode; special for MAP_PIXEL was missing
2008-11-05 17:39:15 +0100 aw  r263356 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment
2008-11-05 17:39:02 +0100 aw  r263355 : #i95644# #i95645# #i95646# bigger change done, saving for another experiment
2008-11-05 12:28:32 +0100 aw  r263350 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:27:51 +0100 aw  r263349 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:26:58 +0100 aw  r263348 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:26:17 +0100 aw  r263347 : #i95644# #i95645# #i95646# in-between state before bigger change
2008-11-05 12:25:55 +0100 aw  r263346 : #i95644# #i95645# #i95646# in-between state before bigger change

1 files changed, 29 insertions, 25 deletions

diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 504f4e95168f..9abf4e483649 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -119,7 +119,7 @@ E3dDragMethod::E3dDragMethod (
 |*
 \************************************************************************/
 
-void E3dDragMethod::TakeComment(XubString& /*rStr*/) const
+void E3dDragMethod::TakeSdrDragComment(XubString& /*rStr*/) const
 {
 }
 
@@ -129,7 +129,7 @@ void E3dDragMethod::TakeComment(XubString& /*rStr*/) const
 |*
 \************************************************************************/
 
-FASTBOOL E3dDragMethod::Beg()
+bool E3dDragMethod::BeginSdrDrag()
 {
     if(E3DDRAG_CONSTR_Z == meConstraint)
     {
@@ -162,7 +162,7 @@ FASTBOOL E3dDragMethod::Beg()
 |*
 \************************************************************************/
 
-FASTBOOL E3dDragMethod::End(FASTBOOL /*bCopy*/)
+bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
 {
     const sal_uInt32 nCnt(maGrp.size());
 
@@ -175,7 +175,7 @@ FASTBOOL E3dDragMethod::End(FASTBOOL /*bCopy*/)
     // Alle Transformationen anwenden und UnDo's anlegen
     if(mbMovedAtAll)
     {
-        rView.BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_ROTATE));
+        getSdrDragView().BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_ROTATE));
         sal_uInt32 nOb(0);
 
         for(nOb=0;nOb<nCnt;nOb++)
@@ -183,11 +183,11 @@ FASTBOOL E3dDragMethod::End(FASTBOOL /*bCopy*/)
             E3dDragMethodUnit& rCandidate = maGrp[nOb];
             E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
             rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
-            rView.AddUndo(new E3dRotateUndoAction(rCandidate.mp3DObj->GetModel(),
+            getSdrDragView().AddUndo(new E3dRotateUndoAction(rCandidate.mp3DObj->GetModel(),
                 rCandidate.mp3DObj, rCandidate.maInitTransform,
                 rCandidate.maTransform));
         }
-        rView.EndUndo();
+        getSdrDragView().EndUndo();
     }
 
     return TRUE;
@@ -199,7 +199,7 @@ FASTBOOL E3dDragMethod::End(FASTBOOL /*bCopy*/)
 |*
 \************************************************************************/
 
-void E3dDragMethod::Brk()
+void E3dDragMethod::CancelSdrDrag()
 {
     if(mbMoveFull)
     {
@@ -211,6 +211,7 @@ void E3dDragMethod::Brk()
             {
                 // Transformation restaurieren
                 E3dDragMethodUnit& rCandidate = maGrp[nOb];
+                E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
                 rCandidate.mp3DObj->SetTransform(rCandidate.maInitTransform);
             }
         }
@@ -224,11 +225,11 @@ void E3dDragMethod::Brk()
 
 /*************************************************************************
 |*
-|* Gemeinsames Mov()
+|* Gemeinsames MoveSdrDrag()
 |*
 \************************************************************************/
 
-void E3dDragMethod::Mov(const Point& /*rPnt*/)
+void E3dDragMethod::MoveSdrDrag(const Point& /*rPnt*/)
 {
     mbMovedAtAll = true;
 }
@@ -240,7 +241,7 @@ void E3dDragMethod::Mov(const Point& /*rPnt*/)
 \************************************************************************/
 
 // for migration from XOR to overlay
-void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager, ::sdr::overlay::OverlayObjectList& rOverlayList)
+void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverlayManager)
 {
     const sal_uInt32 nCnt(maGrp.size());
     basegfx::B2DPolyPolygon aResult;
@@ -248,7 +249,7 @@ void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverl
     for(sal_uInt32 nOb(0); nOb < nCnt; nOb++)
     {
         E3dDragMethodUnit& rCandidate = maGrp[nOb];
-        SdrPageView* pPV = rView.GetSdrPageView();
+        SdrPageView* pPV = getSdrDragView().GetSdrPageView();
 
         if(pPV && pPV->HasMarkedObjPageView())
         {
@@ -277,7 +278,7 @@ void E3dDragMethod::CreateOverlayGeometry(::sdr::overlay::OverlayManager& rOverl
     {
         ::sdr::overlay::OverlayPolyPolygonStriped* pNew = new ::sdr::overlay::OverlayPolyPolygonStriped(aResult);
         rOverlayManager.add(*pNew);
-        rOverlayList.append(*pNew);
+        addToOverlayObjectList(*pNew);
     }
 }
 
@@ -351,18 +352,18 @@ E3dDragRotate::E3dDragRotate(SdrDragView &_rView,
 |*
 \************************************************************************/
 
-void E3dDragRotate::Mov(const Point& rPnt)
+void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
 {
     // call parent
-    E3dDragMethod::Mov(rPnt);
+    E3dDragMethod::MoveSdrDrag(rPnt);
 
     if(DragStat().CheckMinMoved(rPnt))
     {
         // Modifier holen
         sal_uInt16 nModifier = 0;
-        if(rView.ISA(E3dView))
+        if(getSdrDragView().ISA(E3dView))
         {
-            const MouseEvent& rLastMouse = ((E3dView&)rView).GetMouseEvent();
+            const MouseEvent& rLastMouse = ((E3dView&)getSdrDragView()).GetMouseEvent();
             nModifier = rLastMouse.GetModifier();
         }
 
@@ -392,7 +393,7 @@ void E3dDragRotate::Mov(const Point& rPnt)
             }
             long nSnap = 0;
 
-            if(!rView.IsRotateAllowed(FALSE))
+            if(!getSdrDragView().IsRotateAllowed(FALSE))
                 nSnap = 90;
 
             if(nSnap != 0)
@@ -446,6 +447,7 @@ void E3dDragRotate::Mov(const Point& rPnt)
 
             if(mbMoveFull)
             {
+                E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
                 rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
             }
             else
@@ -464,7 +466,7 @@ void E3dDragRotate::Mov(const Point& rPnt)
 |*
 \************************************************************************/
 
-Pointer E3dDragRotate::GetPointer() const
+Pointer E3dDragRotate::GetSdrDragPointer() const
 {
     return Pointer(POINTER_ROTATE);
 }
@@ -520,7 +522,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView,
     }
 
     // Override wenn IsResizeAtCenter()
-    if(rView.IsResizeAtCenter())
+    if(getSdrDragView().IsResizeAtCenter())
     {
         meWhatDragHdl = HDL_USER;
         maScaleFixPos = maFullBound.Center();
@@ -533,10 +535,10 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView,
 |*
 \************************************************************************/
 
-void E3dDragMove::Mov(const Point& rPnt)
+void E3dDragMove::MoveSdrDrag(const Point& rPnt)
 {
     // call parent
-    E3dDragMethod::Mov(rPnt);
+    E3dDragMethod::MoveSdrDrag(rPnt);
 
     if(DragStat().CheckMinMoved(rPnt))
     {
@@ -551,9 +553,9 @@ void E3dDragMove::Mov(const Point& rPnt)
             // Modifier holen
             sal_uInt16 nModifier(0);
 
-            if(rView.ISA(E3dView))
+            if(getSdrDragView().ISA(E3dView))
             {
-                const MouseEvent& rLastMouse = ((E3dView&)rView).GetMouseEvent();
+                const MouseEvent& rLastMouse = ((E3dView&)getSdrDragView()).GetMouseEvent();
                 nModifier = rLastMouse.GetModifier();
             }
 
@@ -610,6 +612,7 @@ void E3dDragMove::Mov(const Point& rPnt)
 
                 if(mbMoveFull)
                 {
+                    E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
                     rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
                 }
                 else
@@ -696,7 +699,7 @@ void E3dDragMove::Mov(const Point& rPnt)
                 }
 
                 // SHIFT-key used?
-                if(rView.IsOrtho())
+                if(getSdrDragView().IsOrtho())
                 {
                     if(fabs(aScaleVec.getX()) > fabs(aScaleVec.getY()))
                     {
@@ -728,6 +731,7 @@ void E3dDragMove::Mov(const Point& rPnt)
 
                 if(mbMoveFull)
                 {
+                    E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
                     rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
                 }
                 else
@@ -749,7 +753,7 @@ void E3dDragMove::Mov(const Point& rPnt)
 |*
 \************************************************************************/
 
-Pointer E3dDragMove::GetPointer() const
+Pointer E3dDragMove::GetSdrDragPointer() const
 {
     return Pointer(POINTER_MOVE);
 }