incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1341478 - in /incubator/ooo/branches/alg/aw080/main: sc/source/core/data/ sd/source/core/ sd/source/filter/eppt/ sd/source/ui/func/ svx/inc/svx/ svx/source/engine3d/ svx/source/sdr/contact/ svx/source/svdraw/ svx/source/table/ svx/source/u...
Date Tue, 22 May 2012 13:47:45 GMT
Author: alg
Date: Tue May 22 13:47:44 2012
New Revision: 1341478

URL: http://svn.apache.org/viewvc?rev=1341478&view=rev
Log:
aw080: further corrections, removals

Modified:
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/drwlayer.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconarc.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconstr.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdotext.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshtxt.hxx
    incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.hxx
    incubator/ooo/branches/alg/aw080/main/svx/source/table/viewcontactoftableobj.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopage.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap2.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshtxt.cxx
    incubator/ooo/branches/alg/aw080/main/sw/inc/swtable.hxx

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/drwlayer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/drwlayer.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/drwlayer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/drwlayer.cxx Tue May 22 13:47:44
2012
@@ -1990,43 +1990,17 @@ IMapObject*	ScDrawLayer::GetHitIMapObjec
 
 		if ( pGrafObj  ) // einfaches Grafik-Objekt
 		{
-			const Graphic&		rGraphic = pGrafObj->GetGraphic();
-			basegfx::B2DVector aScale;
-			basegfx::B2DPoint aTranslate;
-			double fRotate, fShearX;
-			pGrafObj->getSdrObjectTransformation().decompose(aScale, aTranslate, fRotate, fShearX);
+            // remove shear, mirror and rotation; so just absolute scale and translation
get applied
+        	basegfx::B2DHomMatrix aJustAbsScaleTranslate(pGrafObj->getSdrObjectTransformation());
 
-			// Drehung rueckgaengig
-			if(!basegfx::fTools::equalZero(fRotate))
-			{
-				basegfx::B2DHomMatrix aTrans;
-
-				aTrans.translate(-aLogRange.getMinimum());
-				aTrans.rotate(-fRotate);
-				aTrans.translate(aLogRange.getMinimum());
-
-				aRelPoint = aTrans * aRelPoint;
-			}
+            aJustAbsScaleTranslate.invert();
+            aJustAbsScaleTranslate.scale(basegfx::absolute(pGrafObj->getSdrObjectScale()));
+            aJustAbsScaleTranslate.translate(pGrafObj->getSdrObjectTranslate());
+            aRelPoint = aJustAbsScaleTranslate * aRelPoint;
 
-			// Spiegelung rueckgaengig
-			if(basegfx::fTools::less(aScale.getX(), 0.0))
-			{
-				aRelPoint.setX(aLogRange.getMaxX() + aLogRange.getMinX() - aRelPoint.getX());
-			}
-
-			// ggf. Unshear:
-			if(!basegfx::fTools::equalZero(fShearX))
-			{
-				basegfx::B2DHomMatrix aTrans;
-
-				aTrans.translate(-aLogRange.getMinimum());
-				aTrans.shearX(-fShearX);
-				aTrans.translate(aLogRange.getMinimum());
-
-				aRelPoint = aTrans * aRelPoint;
-			}
+			const Graphic& rGraphic = pGrafObj->GetGraphic();
 
-			if ( rGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL )
+            if ( rGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL )
 			{
 				aGraphSize = rCmpWnd.PixelToLogic( rGraphic.GetPrefSize(), MapMode( MAP_100TH_MM ) );
 			}

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx Tue May 22 13:47:44
2012
@@ -1163,39 +1163,13 @@ IMapObject* SdDrawDocument::GetHitIMapOb
 		
 		if ( pGrafObj  ) // einfaches Grafik-Objekt
 		{
-			basegfx::B2DVector aScale;
-			basegfx::B2DPoint aTranslate;
-			double fRotate, fShearX;
-			pGrafObj->getSdrObjectTransformation().decompose(aScale, aTranslate, fRotate, fShearX);
+            // remove shear, mirror and rotation; so just absolute scale and translation
get applied
+        	basegfx::B2DHomMatrix aJustAbsScaleTranslate(pGrafObj->getSdrObjectTransformation());
 
-			if(!basegfx::fTools::equalZero(fRotate))
-		{
-				basegfx::B2DHomMatrix aTrans;
-
-				aTrans.translate(-aLogicRange.getMinimum());
-				aTrans.rotate(-fRotate);
-				aTrans.translate(aLogicRange.getMinimum());
-
-				aRelPoint = aTrans * aRelPoint;
-			}
-
-			// Spiegelung rueckgaengig
-			if(basegfx::fTools::less(aScale.getX(), 0.0))
-			{
-				aRelPoint.setX(aLogicRange.getMaxX() + aLogicRange.getMinX() - aRelPoint.getX());
-			}
-
-			// ggf. Unshear:
-			if(!basegfx::fTools::equalZero(fShearX))
-			{
-				basegfx::B2DHomMatrix aTrans;
-
-				aTrans.translate(-aLogicRange.getMinimum());
-				aTrans.shearX(-fShearX);
-				aTrans.translate(aLogicRange.getMinimum());
-
-				aRelPoint = aTrans * aRelPoint;
-			}
+            aJustAbsScaleTranslate.invert();
+            aJustAbsScaleTranslate.scale(basegfx::absolute(pGrafObj->getSdrObjectScale()));
+            aJustAbsScaleTranslate.translate(pGrafObj->getSdrObjectTranslate());
+            aRelPoint = aJustAbsScaleTranslate * aRelPoint;
 
 			if ( pGrafObj->GetGrafPrefMapMode().GetMapUnit() == MAP_PIXEL )
 				aGraphSize = Application::GetDefaultDevice()->PixelToLogic( pGrafObj->GetGrafPrefSize(),
aMap100 );

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx Tue May 22 13:47:44
2012
@@ -4637,6 +4637,14 @@ void PPTWriter::ImplWritePage( const PHL
             {
                 ::com::sun::star::awt::Rectangle aNewRect;
                 aPropOpt.CreatePolygonProperties( mXPropSet, ESCHER_CREATEPOLYGON_LINE, sal_False,
aNewRect, NULL );
+
+                // remember hor/ver mirror; it is part of aNewRect since it gets created
+                // from the two single points of the line. It's needed for thr flags below.
+                // If the flags are not set the line gets also exported correctly, but start
+                // and end point may be exchanged.
+                const bool bMirrorX(aNewRect.Width < 0);
+                const bool bMirrorY(aNewRect.Height < 0);
+
                 maRange = ImplMapRectangle( aNewRect );
                 maPosition = ::com::sun::star::awt::Point(basegfx::fround(maRange.getMinX()),
basegfx::fround(maRange.getMinY()));
                 maSize = ::com::sun::star::awt::Size(basegfx::fround(maRange.getWidth()),
basegfx::fround(maRange.getHeight()));
@@ -4648,14 +4656,17 @@ void PPTWriter::ImplWritePage( const PHL
                     mpPptEscherEx->EnterGroup( &maRange,0 );
                 }
                 mpPptEscherEx->OpenContainer( ESCHER_SpContainer );
-				// TTTT: Here, mirroring will NO LONGER be part of maRange since Top() being
-				// more than Bottom() is not possible with basegfx::B2DRange (!!!)
-				// Seems to be still in aNewRect ?!?
                 sal_uInt32 nFlags = 0xa00;                                  // Flags: Connector
| HasSpt
-                if ( maRange.getMinX() > maRange.getMaxX() )
+                
+                if(bMirrorX)
+                {
                     nFlags |= 0x80;                                         // Flags: VertMirror
-                if ( maRange.getMinX() > maRange.getMaxX() )
+                }
+
+                if(bMirrorY)
+                {
                     nFlags |= 0x40;                                         // Flags: HorzMirror
+                }
 
                 ImplCreateShape( ESCHER_ShpInst_Line, nFlags, aSolverContainer );
                 aPropOpt.AddOpt( ESCHER_Prop_shapePath, ESCHER_ShapeComplex );

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconarc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconarc.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconarc.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconarc.cxx Tue May 22 13:47:44
2012
@@ -98,9 +98,10 @@ void FuConstructArc::DoExecute( SfxReque
 			basegfx::tools::createScaleTranslateB2DHomMatrix(
 				nWidth, nHeight,
 				pCenterX->GetValue() - (nWidth / 2), pCenterY->GetValue() - (nHeight / 2)));
-		// TTTT needs check
-		const double fStart((((1800 - pPhiStart->GetValue()) % 1800) * F_PI) / 1800.0);
-		const double fEnd((((1800 - pPhiEnd->GetValue()) % 1800) * F_PI) / 1800.0);
+
+        // could not check, found to case to trigger this
+        const double fStart((1800 - pPhiStart->GetValue()) * F_PI1800);
+        const double fEnd((1800 - pPhiEnd->GetValue()) * F_PI1800);
 
 		// sets aObjKind
 		Activate();
@@ -313,6 +314,13 @@ SdrObject* FuConstructArc::CreateDefault
 
 			sdr::legacy::SetLogicRange(*pSdrCircObj, aRange);
 
+            if(SID_DRAW_ARC != nID || SID_DRAW_CIRCLEARC != nID)
+            {
+                // no full circle, set angles to gat a 3/4 circle
+				pSdrCircObj->SetStartAngle(M_PI + M_PI_2); // was: 9000
+				pSdrCircObj->SetEndAngle(0.0); // was: 0
+            }
+
 			if(SID_DRAW_PIE_NOFILL == nID ||
 				SID_DRAW_CIRCLEPIE_NOFILL == nID ||
 				SID_DRAW_ELLIPSECUT_NOFILL == nID ||

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconstr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconstr.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconstr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuconstr.cxx Tue May 22 13:47:44
2012
@@ -98,6 +98,7 @@ bool FuConstruct::MouseButtonDown(const 
 
 	const basegfx::B2DPoint aPixelPos(rMEvt.GetPosPixel().X(), rMEvt.GetPosPixel().Y());
 	aMDPos = mpWindow->GetInverseViewTransformation() * aPixelPos;
+    // TTTT: evtl. unify fHitLog/fDrgLog/fHitTol at SdrView?
 	const double fHitLog(basegfx::B2DVector(mpWindow->GetInverseViewTransformation() * basegfx::B2DVector(HITPIX,
0.0)).getLength());
 
 	if (rMEvt.IsLeft() && mpView->IsExtendedMouseEventDispatcherEnabled())

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fusel.cxx Tue May 22 13:47:44
2012
@@ -525,7 +525,7 @@ bool FuSelection::MouseButtonDown(const 
 						// pending change and a new one will be created. Need to force
 						// that change to get the new created pHdl to not continue
 						// processing on the dying one
-						if(mpView->isSelectionChangePending())
+						if(mpView->isSelectionChangePending()) // TTTT: Check again: Is this needed?
 						{
 							mpView->forceSelectionChange();
 							pHdl = mpView->PickHandle(aMDPos);

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/globaldrawitempool.hxx Tue May 22 13:47:44
2012
@@ -30,7 +30,6 @@
 // global DRawItemPool vor various usages, mostly UNO API implementations
 // which need an ItemPool which lives independent from DrawModels and
 // DrawObjects
-// TTTT: Needed at all?
 
 SVX_DLLPUBLIC void FreeGlobalDrawObjectItemPool();
 SVX_DLLPUBLIC SdrItemPool& GetGlobalDrawObjectItemPool();

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/obj3d.hxx Tue May 22 13:47:44 2012
@@ -83,7 +83,7 @@ public:
 class SVX_DLLPUBLIC E3dObject : public SdrAttrObj
 {
 private:
- protected:
+protected:
 	virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
 
 	basegfx::B3DRange			maLocalBoundVol;	// umschliessendes Volumen des Objekts (aus geometrieerzeugung)

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdotext.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdotext.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdotext.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdotext.hxx Tue May 22 13:47:44 2012
@@ -228,6 +228,7 @@ protected:
 	// ist durch ein SdrRectObj mit bTextFrame=true realisiert.
 	bool						bTextFrame : 1;
 	bool						bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
+    // TTTT: These maybe obsolete
 	bool						bNoShear : 1;            // Obj darf nicht gesheart werden   (->Graf+Ole+TextFrame)
 	bool						bNoRotate : 1;           // Obj darf nicht gedreht werden    (->Ole)
 	bool						bNoMirror : 1;           // Obj darf nicht gespiegelt werden (->Ole,TextFrame)

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx Tue May 22 13:47:44 2012
@@ -94,7 +94,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public
 
 	// Internals
 	SdrPage* GetSdrPage() const { return mpPage; }
-	void ChangeModel( SdrModel* pNewModel );
+//CMCX	void ChangeModel( SdrModel* pNewModel );
 
 	// Erzeugen eines SdrObjects und Einfugen in die SdrPage
 	SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape
>& xShape ) throw();

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx Tue May 22 13:47:44 2012
@@ -183,7 +183,7 @@ public:
     void TakeSdrObjectOwnership();
     bool HasSdrObjectOwnership() const;
 
-	void ChangeModel( SdrModel* pNewModel );
+//CMCX	void ChangeModel( SdrModel* pNewModel );
 
 	void InvalidateSdrObject() { mpObj.reset( NULL ); };
 	const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; }

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshtxt.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshtxt.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshtxt.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshtxt.hxx Tue May 22 13:47:44 2012
@@ -84,7 +84,7 @@ public:
     virtual Point		LogicToPixel( const Point&, const MapMode& ) const;
     virtual Point		PixelToLogic( const Point&, const MapMode& ) const;
 
-	void ChangeModel( SdrModel* pNewModel );
+//CMCX	void ChangeModel( SdrModel* pNewModel );
 
     void UpdateOutliner();
 

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx Tue May 22 13:47:44
2012
@@ -217,7 +217,8 @@ sal_uInt32 E3dObject::GetObjInventor() c
 
 sal_uInt16 E3dObject::GetObjIdentifier() const
 {
-	return E3D_OBJECT_ID;
+    OSL_ENSURE(false, "E3dObject is a helper class, it should never be incarnated (!)");
+    return SdrAttrObj::GetObjIdentifier();
 }
 
 /*************************************************************************
@@ -712,7 +713,8 @@ void E3dCompoundObject::AddToHdlList(Sdr
 
 sal_uInt16 E3dCompoundObject::GetObjIdentifier() const
 {
-	return E3D_COMPOUNDOBJ_ID;
+    OSL_ENSURE(false, "E3dCompoundObject is a helper class, it should never be incarnated
(!)");
+    return SdrAttrObj::GetObjIdentifier();
 }
 
 /*************************************************************************

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
(original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
Tue May 22 13:47:44 2012
@@ -139,14 +139,10 @@ namespace sdr
 				}
 			}
 
-			// get and decompose object matrix
-			basegfx::B2DVector aScale;
-			basegfx::B2DPoint aTranslate;
-			double fRotate, fShearX;
-			GetCustomShapeObj().getSdrObjectTransformation().decompose(aScale, aTranslate, fRotate,
fShearX);
-
 			// build unrotated object range
-            const basegfx::B2DRange aObjectRange(aTranslate, aTranslate + aScale);
+            const basegfx::B2DRange aObjectRange(
+                GetCustomShapeObj().getSdrObjectTranslate(), 
+                GetCustomShapeObj().getSdrObjectTranslate() + GetCustomShapeObj().getSdrObjectScale());
 
 			if(bHasText || xGroup.hasElements())
 			{
@@ -157,7 +153,11 @@ namespace sdr
 				if(bHasText)
 				{
                     // #i101684# get the text range unrotated and absolute to the object
range
-                    const basegfx::B2DRange aTextRange(getCorrectedTextBoundRect(aObjectRange,
fRotate, fShearX));
+                    const basegfx::B2DRange aTextRange(
+                        getCorrectedTextBoundRect(
+                            aObjectRange, 
+                            GetCustomShapeObj().getSdrObjectRotate(), 
+                            GetCustomShapeObj().getSdrObjectShearX()));
 
 					// give text object a size
                     aTextBoxMatrix.scale(aTextRange.getWidth(), aTextRange.getHeight());
@@ -165,9 +165,9 @@ namespace sdr
                     // check if we have a rotation/shear at all to take care of
 					const double fExtraTextRotation(GetCustomShapeObj().GetExtraTextRotation());
 
-                    if(!basegfx::fTools::equalZero(fShearX)
-						|| !basegfx::fTools::equalZero(fRotate)
-						|| !basegfx::fTools::equalZero(fExtraTextRotation))
+                    if(GetCustomShapeObj().isSheared() 
+                        || GetCustomShapeObj().isRotated() 
+                        || !basegfx::fTools::equalZero(fExtraTextRotation))
 					{
                         if(aObjectRange != aTextRange)
                         {
@@ -185,14 +185,14 @@ namespace sdr
 							aTextBoxMatrix.translate( aTranslation );
 						}
 
-						if(!basegfx::fTools::equalZero(fShearX))
+						if(GetCustomShapeObj().isSheared())
 						{
-							aTextBoxMatrix.shearX(fShearX);
+							aTextBoxMatrix.shearX(GetCustomShapeObj().getSdrObjectShearX());
 						}
 
-						if(!basegfx::fTools::equalZero(fRotate))
+						if(GetCustomShapeObj().isRotated())
 						{
-							aTextBoxMatrix.rotate(fRotate);
+							aTextBoxMatrix.rotate(GetCustomShapeObj().getSdrObjectRotate());
 						}
 
 						// give text it's target position

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx Tue May 22 13:47:44
2012
@@ -2349,15 +2349,17 @@ void SdrEditView::DoImportMarkedMtf(SvdP
 	if(areSdrObjectsSelected()) 
 	{
 		const bool bUndo(IsUndoEnabled());
+		const SdrObjectVector aSelection(getSelectedSdrObjectVectorFromSdrMarkView());
+		SdrObjectVector aNewMarked;
 
-	    if( bUndo )
+	    if(bUndo)
 	    {
-		    BegUndo(String(), String(), SDRREPFUNC_OBJ_IMPORTMTF);
+		    BegUndo(
+                ImpGetResStr(STR_EditImportMtf), 
+                getSelectionDescription(aSelection), 
+                SDRREPFUNC_OBJ_IMPORTMTF);
 	    }
 
-		SdrObjectVector aForTheDescription;
-		const SdrObjectVector aSelection(getSelectedSdrObjectVectorFromSdrMarkView());
-		SdrObjectVector aNewMarked;
 		clearSdrObjectSelection();
 
 		for(sal_uInt32 nm(aSelection.size()); nm > 0;)
@@ -2434,8 +2436,6 @@ void SdrEditView::DoImportMarkedMtf(SvdP
 					aNewMarked.push_back(pCandidate);
 			    }
 
-				aForTheDescription.push_back(pObj);
-
     			if(bUndo)
 				{
 					AddUndo(getSdrModelFromSdrView().GetSdrUndoFactory().CreateUndoDeleteObject(*pObj));
@@ -2464,9 +2464,6 @@ void SdrEditView::DoImportMarkedMtf(SvdP
 
 	    if(bUndo)
 	    {
-			SetUndoComment(
-				ImpGetResStr(STR_EditImportMtf),
-				getSelectionDescription(aForTheDescription));
     		EndUndo();
 	    }
     }

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx Tue May 22 13:47:44
2012
@@ -675,7 +675,7 @@ sal_uInt32 SdrObject::GetObjInventor()  
 
 sal_uInt16 SdrObject::GetObjIdentifier() const
 {
-	return sal_uInt16(OBJ_NONE);
+	return static_cast< sal_uInt16 >(OBJ_NONE);
 }
 
 void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx Tue May 22 13:47:44
2012
@@ -521,7 +521,7 @@ const Graphic& SdrGrafObj::GetGraphic() 
 
 // -----------------------------------------------------------------------------
 
-Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
+Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const // TTTT needed?
 {
     // #107947# Refactored most of the code to GraphicObject, where
     // everybody can use e.g. the cropping functionality

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.cxx Tue May 22 13:47:44
2012
@@ -157,7 +157,7 @@ public:
 
     DECL_LINK( NotifyHdl, EENotify* );
 
-	void ChangeModel( SdrModel* pNewModel );
+//CMCX	void ChangeModel( SdrModel* pNewModel );
 };
 
 //------------------------------------------------------------------------
@@ -256,43 +256,43 @@ void SAL_CALL CellEditSourceImpl::releas
 		delete this;
 }	
 
-void CellEditSourceImpl::ChangeModel( SdrModel* pNewModel )
-{
-	if( mpModel != pNewModel )
-	{
-		if( mpOutliner )
-		{
-			if( mpModel )
-				mpModel->disposeOutliner( mpOutliner );
-			else
-				delete mpOutliner;
-			mpOutliner = 0;
-		}
-
-		if( mpView )
-		{
-			EndListening( *mpView );
-			mpView = 0;
-		}
-
-		mpWindow = 0;
-		mxLinguServiceManager.clear();
-
-		mpModel = pNewModel;
-
-		if( mpTextForwarder )
-		{
-	        delete mpTextForwarder;
-		    mpTextForwarder = 0;
-		}
-
-		if( mpViewForwarder )
-		{
-			delete mpViewForwarder;
-			mpViewForwarder = 0;
-		}
-	}
-}
+//CMCXvoid CellEditSourceImpl::ChangeModel( SdrModel* pNewModel )
+//CMCX{
+//CMCX	if( mpModel != pNewModel )
+//CMCX	{
+//CMCX		if( mpOutliner )
+//CMCX		{
+//CMCX			if( mpModel )
+//CMCX				mpModel->disposeOutliner( mpOutliner );
+//CMCX			else
+//CMCX				delete mpOutliner;
+//CMCX			mpOutliner = 0;
+//CMCX		}
+//CMCX
+//CMCX		if( mpView )
+//CMCX		{
+//CMCX			EndListening( *mpView );
+//CMCX			mpView = 0;
+//CMCX		}
+//CMCX
+//CMCX		mpWindow = 0;
+//CMCX		mxLinguServiceManager.clear();
+//CMCX
+//CMCX		mpModel = pNewModel;
+//CMCX
+//CMCX		if( mpTextForwarder )
+//CMCX		{
+//CMCX	        delete mpTextForwarder;
+//CMCX		    mpTextForwarder = 0;
+//CMCX		}
+//CMCX
+//CMCX		if( mpViewForwarder )
+//CMCX		{
+//CMCX			delete mpViewForwarder;
+//CMCX			mpViewForwarder = 0;
+//CMCX		}
+//CMCX	}
+//CMCX}
 
 //------------------------------------------------------------------------
 
@@ -1044,10 +1044,10 @@ const SvxUnoTextRangeBaseList& CellEditS
 
 //------------------------------------------------------------------------
 
-void CellEditSource::ChangeModel( SdrModel* pNewModel )
-{
-	mpImpl->ChangeModel( pNewModel );
-}
+//CMCXvoid CellEditSource::ChangeModel( SdrModel* pNewModel )
+//CMCX{
+//CMCX	mpImpl->ChangeModel( pNewModel );
+//CMCX}
 
 //------------------------------------------------------------------------
 

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/table/celleditsource.hxx Tue May 22 13:47:44
2012
@@ -72,7 +72,7 @@ public:
     virtual Point		LogicToPixel( const Point&, const MapMode& ) const;
     virtual Point		PixelToLogic( const Point&, const MapMode& ) const;
 
-	void ChangeModel( SdrModel* pNewModel );
+//CMCX	void ChangeModel( SdrModel* pNewModel );
 
 private:
 	CellEditSource( CellEditSourceImpl* pImpl );

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/table/viewcontactoftableobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/table/viewcontactoftableobj.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/table/viewcontactoftableobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/table/viewcontactoftableobj.cxx Tue May
22 13:47:44 2012
@@ -631,19 +631,13 @@ namespace sdr
 					xRetval = xCellSequence;
 					drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, xBorderSequence);
 
-					// get and decompose object matrix
-					basegfx::B2DVector aScale;
-					basegfx::B2DPoint aTranslate;
-					double fRotate, fShearX;
-					rTableObj.getSdrObjectTransformation().decompose(aScale, aTranslate, fRotate, fShearX);
-
 					// embed whole visualisation into oebjct matrix, but without scale which is already
 					// included into the single cell and border objects
 					const basegfx::B2DHomMatrix aObjNoScale(
 						basegfx::tools::createShearXRotateTranslateB2DHomMatrix(
-							fShearX,
-							fRotate,
-							aTranslate));
+							rTableObj.getSdrObjectShearX(),
+							rTableObj.getSdrObjectRotate(),
+							rTableObj.getSdrObjectTranslate()));
 					const drawinglayer::primitive2d::Primitive2DReference xTransRef(
 						new drawinglayer::primitive2d::TransformPrimitive2D(
 							aObjNoScale,

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopage.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unopage.cxx Tue May 22 13:47:44
2012
@@ -925,30 +925,30 @@ SvxShape* CreateSvxShapeByTypeAndInvento
 	return SvxDrawPage::CreateShapeByTypeAndInventor( nType, nInventor );
 }
 
-void SvxDrawPage::ChangeModel( SdrModel* pNewModel )
-{
-	if( pNewModel != mpModel )
-	{
-		if( mpModel )
-			EndListening( *mpModel );
-
-		if( pNewModel )
-			StartListening( *pNewModel );
-
-		mpModel = pNewModel;
-
-        if( mpView )
-        {
-            delete mpView;
-	
-			if(mpModel)
-		        mpView = new SdrView( *mpModel );
-	        
-	        if( mpView )
-		        mpView->SetDesignMode(true);
-        }
-	}
-}
+//CMCXvoid SvxDrawPage::ChangeModel( SdrModel* pNewModel )
+//CMCX{
+//CMCX	if( pNewModel != mpModel )
+//CMCX	{
+//CMCX		if( mpModel )
+//CMCX			EndListening( *mpModel );
+//CMCX
+//CMCX		if( pNewModel )
+//CMCX			StartListening( *pNewModel );
+//CMCX
+//CMCX		mpModel = pNewModel;
+//CMCX
+//CMCX        if( mpView )
+//CMCX        {
+//CMCX            delete mpView;
+//CMCX	
+//CMCX			if(mpModel)
+//CMCX		        mpView = new SdrView( *mpModel );
+//CMCX	        
+//CMCX	        if( mpView )
+//CMCX		        mpView->SetDesignMode(true);
+//CMCX        }
+//CMCX	}
+//CMCX}
 
 /** returns a StarOffice API wrapper for the given SdrPage */
 uno::Reference< drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) throw
()

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap2.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap2.cxx Tue May 22 13:47:44
2012
@@ -1138,17 +1138,11 @@ bool SvxShapePolyPolygon::setPropertyVal
 
                         // BaseGeometry means the polygon is just scaled, but has no position,
shear
                         // or rotation. Apply these current values from the object
-			            basegfx::B2DTuple aScale;
-			            basegfx::B2DTuple aTranslate;
-			            double fRotate, fShearX;
-            			
-			            mpObj->getSdrObjectTransformation().decompose(aScale, aTranslate, fRotate,
fShearX);
-				        
                         const basegfx::B2DHomMatrix aNoScaleTrans(
                             basegfx::tools::createShearXRotateTranslateB2DHomMatrix(
-					            fShearX,
-					            fRotate,
-					            aTranslate));
+					            mpObj->getSdrObjectShearX(),
+					            mpObj->getSdrObjectRotate(),
+					            mpObj->getSdrObjectTranslate()));
 
                         aNewPolyPolygon.transform(aNoScaleTrans);
 
@@ -1417,17 +1411,11 @@ bool SvxShapePolyPolygonBezier::setPrope
 
                         // BaseGeometry means the polygon is just scaled, but has no position,
shear
                         // or rotation. Apply these current values from the object
-			            basegfx::B2DTuple aScale;
-			            basegfx::B2DTuple aTranslate;
-			            double fRotate, fShearX;
-
-			            mpObj->getSdrObjectTransformation().decompose(aScale, aTranslate, fRotate,
fShearX);
-
                         const basegfx::B2DHomMatrix aNoScaleTrans(
                             basegfx::tools::createShearXRotateTranslateB2DHomMatrix(
-					            fShearX,
-					            fRotate,
-					            aTranslate));
+					            mpObj->getSdrObjectShearX(),
+					            mpObj->getSdrObjectRotate(),
+					            mpObj->getSdrObjectTranslate()));
 
                         aNewPolyPolygon.transform(aNoScaleTrans);
 
@@ -1932,7 +1920,7 @@ OUString SAL_CALL SvxCustomShape::getSha
 
 //------------------------------------------------------------------1----
 
-Polygon Rect2Poly(const Rectangle& rRect, long aOldRotation, long aOldShear)
+Polygon Rect2Poly(const Rectangle& rRect, long aOldRotation, long aOldShear) // TTTT
needed?
 {
 	Polygon aPol(5);
 	aPol[0]=rRect.TopLeft();
@@ -1950,7 +1938,7 @@ Polygon Rect2Poly(const Rectangle& rRect
 	return aPol;
 }
 
-void Poly2Rect(const Polygon& rPol, Rectangle& rRect, long& rRotation, long&
rShear)
+void Poly2Rect(const Polygon& rPol, Rectangle& rRect, long& rRotation, long&
rShear) // TTTT needed?
 {
 	rRotation=GetAngle(rPol[1]-rPol[0]);
 	rShear=NormAngle360(rRotation);

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx Tue May 22 13:47:44
2012
@@ -528,38 +528,38 @@ void SvxShape::Create( SdrObject* pNewOb
 
 //----------------------------------------------------------------------
 
-void SvxShape::ChangeModel( SdrModel* pNewModel ) // TTTT: Needed anymore?
-{
-    DBG_TESTSOLARMUTEX();
-	if( mpObj.is() )
-	{
-		if( &mpObj->getSdrModelFromSdrObject() != pNewModel )
-		{
-			EndListening( mpObj->getSdrModelFromSdrObject() );
-		}
-	}
-
-    // --> CL, OD 2005-07-19 #i52126# - always listen to new model
-    if( pNewModel )
-    {
-        StartListening( *pNewModel );
-    }
-    // <--
-
-	// HACK #i53696# ChangeModel should be virtual, but it isn't. can't change that for 2.0.1
-	SvxShapeText* pShapeText = dynamic_cast< SvxShapeText* >( this );
-	if( pShapeText )
-	{
-		SvxTextEditSource* pTextEditSource = dynamic_cast< SvxTextEditSource* >( pShapeText->GetEditSource()
);
-		if( pTextEditSource )
-			pTextEditSource->ChangeModel( pNewModel );
-	}
-
-	mpModel = pNewModel;
-
-	if( mpImpl->mpMaster )
-		mpImpl->mpMaster->modelChanged( pNewModel );
-}
+//CMCXvoid SvxShape::ChangeModel( SdrModel* pNewModel ) // TTTT: Needed anymore?
+//CMCX{
+//CMCX    DBG_TESTSOLARMUTEX();
+//CMCX	if( mpObj.is() )
+//CMCX	{
+//CMCX		if( &mpObj->getSdrModelFromSdrObject() != pNewModel )
+//CMCX		{
+//CMCX			EndListening( mpObj->getSdrModelFromSdrObject() );
+//CMCX		}
+//CMCX	}
+//CMCX
+//CMCX    // --> CL, OD 2005-07-19 #i52126# - always listen to new model
+//CMCX    if( pNewModel )
+//CMCX    {
+//CMCX        StartListening( *pNewModel );
+//CMCX    }
+//CMCX    // <--
+//CMCX
+//CMCX	// HACK #i53696# ChangeModel should be virtual, but it isn't. can't change that for
2.0.1
+//CMCX	SvxShapeText* pShapeText = dynamic_cast< SvxShapeText* >( this );
+//CMCX	if( pShapeText )
+//CMCX	{
+//CMCX		SvxTextEditSource* pTextEditSource = dynamic_cast< SvxTextEditSource* >( pShapeText->GetEditSource()
);
+//CMCX		if( pTextEditSource )
+//CMCX			pTextEditSource->ChangeModel( pNewModel );
+//CMCX	}
+//CMCX
+//CMCX	mpModel = pNewModel;
+//CMCX
+//CMCX	if( mpImpl->mpMaster )
+//CMCX		mpImpl->mpMaster->modelChanged( pNewModel );
+//CMCX}
 
 //----------------------------------------------------------------------
 
@@ -1316,7 +1316,7 @@ static basegfx::B2DRange svx_getLogicRan
 
 //----------------------------------------------------------------------
 
-static void svx_setLogicRangeHack( SdrObject* pObj, const basegfx::B2DRange& rRange )
+static void svx_setLogicRangeHack( SdrObject* pObj, const basegfx::B2DRange& rRange )
// TTTT needed?
 {
 	if(svx_needLogicRangeHack(pObj))
 	{

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshtxt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshtxt.cxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshtxt.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshtxt.cxx Tue May 22 13:47:44
2012
@@ -162,7 +162,7 @@ public:
 
     DECL_LINK( NotifyHdl, EENotify* );
 
-	void ChangeModel( SdrModel* pNewModel );
+//CMCX	void ChangeModel( SdrModel* pNewModel );
 
     void                    UpdateOutliner();
 };
@@ -310,50 +310,50 @@ void SAL_CALL SvxTextEditSourceImpl::rel
 		delete this;
 }	
 
-void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel )
-{
-	if( mpModel != pNewModel )
-	{
-		if( mpModel )
-			EndListening( *mpModel );
-
-		if( mpOutliner )
-		{
-			if( mpModel )
-				mpModel->disposeOutliner( mpOutliner );
-			else
-				delete mpOutliner;
-			mpOutliner = 0;
-		}
-
-		if( mpView )
-		{
-			EndListening( *mpView );
-			mpView = 0;
-		}
-
-		mpWindow = 0;
-		m_xLinguServiceManager.clear();
-		mpOwner = 0;
-
-		mpModel = pNewModel;
-
-		if( mpTextForwarder )
-		{
-	        delete mpTextForwarder;
-		    mpTextForwarder = 0;
-		}
-
-		if( mpViewForwarder )
-		{
-			delete mpViewForwarder;
-			mpViewForwarder = 0;
-		}
-
-		if( mpModel )
-			StartListening( *mpModel );
-	}
-}
+//CMCXvoid SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel )
+//CMCX{
+//CMCX	if( mpModel != pNewModel )
+//CMCX	{
+//CMCX		if( mpModel )
+//CMCX			EndListening( *mpModel );
+//CMCX
+//CMCX		if( mpOutliner )
+//CMCX		{
+//CMCX			if( mpModel )
+//CMCX				mpModel->disposeOutliner( mpOutliner );
+//CMCX			else
+//CMCX				delete mpOutliner;
+//CMCX			mpOutliner = 0;
+//CMCX		}
+//CMCX
+//CMCX		if( mpView )
+//CMCX		{
+//CMCX			EndListening( *mpView );
+//CMCX			mpView = 0;
+//CMCX		}
+//CMCX
+//CMCX		mpWindow = 0;
+//CMCX		m_xLinguServiceManager.clear();
+//CMCX		mpOwner = 0;
+//CMCX
+//CMCX		mpModel = pNewModel;
+//CMCX
+//CMCX		if( mpTextForwarder )
+//CMCX		{
+//CMCX	        delete mpTextForwarder;
+//CMCX		    mpTextForwarder = 0;
+//CMCX		}
+//CMCX
+//CMCX		if( mpViewForwarder )
+//CMCX		{
+//CMCX			delete mpViewForwarder;
+//CMCX			mpViewForwarder = 0;
+//CMCX		}
+//CMCX
+//CMCX		if( mpModel )
+//CMCX			StartListening( *mpModel );
+//CMCX	}
+//CMCX}
 
 //------------------------------------------------------------------------
 
@@ -1163,10 +1163,10 @@ const SvxUnoTextRangeBaseList& SvxTextEd
 	return mpImpl->getRanges();
 }
 
-void SvxTextEditSource::ChangeModel( SdrModel* pNewModel )
-{
-	mpImpl->ChangeModel( pNewModel );
-}
+//CMCXvoid SvxTextEditSource::ChangeModel( SdrModel* pNewModel )
+//CMCX{
+//CMCX	mpImpl->ChangeModel( pNewModel );
+//CMCX}
 
 void SvxTextEditSource::UpdateOutliner()
 {

Modified: incubator/ooo/branches/alg/aw080/main/sw/inc/swtable.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/inc/swtable.hxx?rev=1341478&r1=1341477&r2=1341478&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/inc/swtable.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/inc/swtable.hxx Tue May 22 13:47:44 2012
@@ -105,9 +105,6 @@ protected:
 
 	sal_Bool		bModifyLocked	:1;
     sal_Bool        bNewModel       :1; // sal_False: old SubTableModel; sal_True: new RowSpanModel
-#ifdef DBG_UTIL
-    bool bDontChangeModel;  // This is set by functions (like Merge()) to forbid a laet model
change
-#endif
 
 	sal_Bool IsModifyLocked(){ return bModifyLocked;}
 
@@ -203,18 +200,12 @@ public:
 	sal_Bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
 				SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
     {
-#ifdef DBG_UTIL
-        bDontChangeModel = true;
-#endif
         return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) :
                            OldMerge( pDoc, rBoxes, pMergeBox, pUndo );
     }
     sal_Bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1,
                    sal_Bool bSameHeight = sal_False )
     {
-#ifdef DBG_UTIL
-        bDontChangeModel = true;
-#endif
         return bNewModel ? NewSplitRow( pDoc, rBoxes, nCnt, bSameHeight ) :
                            OldSplitRow( pDoc, rBoxes, nCnt, bSameHeight );
     }



Mime
View raw message