incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1333067 [3/3] - in /incubator/ooo/branches/alg/aw080/main: basctl/source/dlged/ chart2/source/controller/drawinglayer/ chart2/source/controller/main/ cui/source/tabpages/ drawinglayer/source/processor3d/ filter/source/msfilter/ reportdesig...
Date Wed, 02 May 2012 14:47:44 GMT
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpage.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpage.cxx Wed May  2 14:47:40 2012
@@ -144,7 +144,7 @@ void SdrObjList::copyDataFromSdrObjList(
 
 		if(pDO) 
 		{
-			InsertObjectToSdrObjList(pDO, CONTAINER_APPEND);
+			InsertObjectToSdrObjList(*pDO);
 		}
 		else 
 		{
@@ -274,47 +274,40 @@ void SdrObjList::handleContentChange(con
 	// default has nothing to do
 }
 
-void SdrObjList::InsertObjectToSdrObjList(SdrObject* pObj, sal_uInt32 nPos)
+void SdrObjList::InsertObjectToSdrObjList(SdrObject& rObj, sal_uInt32 nPos)
 {
-	if(pObj)
-    {
-		SdrObject* pOwningGroupObject = getSdrObjectFromSdrObjList();
+	SdrObject* pOwningGroupObject = getSdrObjectFromSdrObjList();
 
-		// if anchor is used, reset it before grouping (for SW)
-		if(pOwningGroupObject)
-		{
-			pObj->SetAnchorPos(basegfx::B2DPoint());
-		}
+	// if anchor is used, reset it before grouping (for SW)
+	if(pOwningGroupObject)
+	{
+		rObj.SetAnchorPos(basegfx::B2DPoint());
+	}
 
-		OSL_ENSURE(!pObj->IsObjectInserted(), "Object already has Inserted-State (!)");
-		InsertObjectIntoContainer(*pObj, nPos);
-		SetParentAtSdrObjectFromSdrObjList(*pObj, this);
+	OSL_ENSURE(!rObj.IsObjectInserted(), "Object already has Inserted-State (!)");
+	InsertObjectIntoContainer(rObj, nPos);
+	SetParentAtSdrObjectFromSdrObjList(rObj, this);
 
-		{
-			// broadcast after insert
-			const SdrObjectChangeBroadcaster aSdrObjectChangeBroadcaster(*pObj, HINT_OBJINSERTED);
-		}
+	{
+		// broadcast after insert
+		const SdrObjectChangeBroadcaster aSdrObjectChangeBroadcaster(rObj, HINT_OBJINSERTED);
+	}
 
-		// inform visible parents
-		sdr::contact::ViewContact* pParent = pObj->GetViewContact().GetParentContact();
+	// inform visible parents
+	sdr::contact::ViewContact* pParent = rObj.GetViewContact().GetParentContact();
 	
-		if(pParent)
-		{
-			pParent->ActionChildInserted(pObj->GetViewContact());
-		}
-    
-		if(pOwningGroupObject)
-		{
-			// repaint needed
-			pOwningGroupObject->ActionChanged();
-		}
-
-		getSdrModelFromSdrObjList().SetChanged();
+	if(pParent)
+	{
+		pParent->ActionChildInserted(rObj.GetViewContact());
 	}
-	else
+    
+	if(pOwningGroupObject)
 	{
-		OSL_ENSURE(false, "SdrObjList::InsertObjectToSdrObjList(0)");
+		// repaint needed
+		pOwningGroupObject->ActionChanged();
 	}
+
+	getSdrModelFromSdrObjList().SetChanged();
 }
 
 SdrObject* SdrObjList::RemoveObjectFromSdrObjList(sal_uInt32 nObjNum)
@@ -368,7 +361,7 @@ SdrObject* SdrObjList::ReplaceObjectInSd
 {
 	OSL_ENSURE(nObjNum < maList.size(), "SdrObjList::ReplaceObjectInSdrObjList with invalid index (!)");
 	SdrObject* pRetval = RemoveObjectFromSdrObjList(nObjNum);
-	InsertObjectToSdrObjList(&rNewObj, nObjNum);
+	InsertObjectToSdrObjList(rNewObj, nObjNum);
 
 	return pRetval;
 }
@@ -471,7 +464,7 @@ void SdrObjList::UnGroupObj(sal_uInt32 n
 		for(sal_uInt32 i(0); i < nAnz; i++)
 		{
 			SdrObject* pObj = pUngroupObj->RemoveObjectFromSdrObjList(0);
-			InsertObjectToSdrObjList(pObj, nInsertPos);
+			InsertObjectToSdrObjList(*pObj, nInsertPos);
 			nInsertPos++;
 		}
 
@@ -1298,21 +1291,6 @@ SfxStyleSheet* SdrPage::GetTextStyleShee
 	return pObj->GetStyleSheet();
 }
 
-bool SdrPage::HasTransparentObjects( bool bCheckForAlphaChannel ) const
-{
-	SdrObjListIter aIter(*this, IM_DEEPNOGROUPS);
-
-	for(SdrObject* pO = aIter.Next(); pO; pO = aIter.Next())
-	{
-		if(pO->IsTransparent(bCheckForAlphaChannel))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
 /** returns an averaged background color of this page */
 // #i75566# GetBackgroundColor -> GetPageBackgroundColor and bScreenDisplay hint value
 Color SdrPage::GetPageBackgroundColor( SdrPageView* pView, bool bScreenDisplay ) const
@@ -1344,13 +1322,6 @@ Color SdrPage::GetPageBackgroundColor( S
 	return aColor;
 }
 
-/** *deprecated, use GetBackgroundColor with SdrPageView */
-Color SdrPage::GetPageBackgroundColor() const
-// #i75566# GetBackgroundColor -> GetPageBackgroundColor
-{
-	return GetPageBackgroundColor( 0, true );
-}
-
 /** this method returns true if the object from the ViewObjectContact should
 	be visible on this page while rendering.
 	bEdit selects if visibility test is for an editing view or a final render,

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpoev.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpoev.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpoev.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpoev.cxx Wed May  2 14:47:40 2012
@@ -423,7 +423,9 @@ void SdrPolyEditView::RipUpAtMarkedPoint
 					if(pNeuObj) 
 					{
 						bInsAny = true;
-						GetSdrPageView()->GetCurrentObjectList()->InsertObjectToSdrObjList(pNeuObj, pObj->GetNavigationPosition() + 1);
+						GetSdrPageView()->GetCurrentObjectList()->InsertObjectToSdrObjList(
+                            *pNeuObj, 
+                            pObj->GetNavigationPosition() + 1);
 
 						if( bUndo )
 						{

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx Wed May  2 14:47:40 2012
@@ -767,7 +767,7 @@ void SdrUndoRemoveObj::Undo()
 		}
 
 			E3DModifySceneSnapRectUpdater aUpdater(pOwner);
-			mpObjList->InsertObjectToSdrObjList(&mrSdrObject, mnOrdNum);
+			mpObjList->InsertObjectToSdrObjList(mrSdrObject, mnOrdNum);
 		}
 
 		// #i11426#
@@ -830,7 +830,7 @@ void SdrUndoInsertObj::Redo()
 				aAnchorPos = mrSdrObject.GetAnchorPos();
             }
 
-			mpObjList->InsertObjectToSdrObjList(&mrSdrObject, mnOrdNum);
+			mpObjList->InsertObjectToSdrObjList(mrSdrObject, mnOrdNum);
 		}
 
         if ( !aAnchorPos.equalZero() )

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx Wed May  2 14:47:40 2012
@@ -551,7 +551,7 @@ bool SdrExchangeView::Paste(const SdrMod
 					pNeuObj->SetLayer(nLayer);
 				}
 
-				pDstLst->InsertObjectToSdrObjList(pNeuObj, CONTAINER_APPEND);
+				pDstLst->InsertObjectToSdrObjList(*pNeuObj);
 
 				if( bUndo )
 				{
@@ -637,7 +637,7 @@ void SdrExchangeView::ImpPasteObject(Sdr
 			aScale,
 			rCenter - (aScale * 0.5)));
 
-	rLst.InsertObjectToSdrObjList(pObj, CONTAINER_APPEND);
+	rLst.InsertObjectToSdrObjList(*pObj);
 
 	if(IsUndoEnabled())
 	{
@@ -892,7 +892,7 @@ SdrModel* SdrExchangeView::GetMarkedObjM
 
 				if( pNeuObj )
 				{
-					pNeuPag->InsertObjectToSdrObjList(pNeuObj, CONTAINER_APPEND);
+					pNeuPag->InsertObjectToSdrObjList(*pNeuObj);
 
 					// #i13033#
 					aCloneList.AddPair(pObj, pNeuObj);

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/table/tablecontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/table/tablecontroller.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/table/tablecontroller.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/table/tablecontroller.cxx Wed May  2 14:47:40 2012
@@ -2411,9 +2411,7 @@ bool SvxTableController::GetMarkedObjMod
 
 		SdrTableObj* pNewTableObj = rTableObj.CloneRange( aStart, aEnd );
 
-		//pNewTableObj->SetPage( pNewPage );
-		//pNewTableObj->SetModel( pNewPage->GetModel() );
-		pNewPage->InsertObjectToSdrObjList(pNewTableObj,CONTAINER_APPEND);
+        pNewPage->InsertObjectToSdrObjList(*pNewTableObj);
 		
 		return true;
 	}

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=1333067&r1=1333066&r2=1333067&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 Wed May  2 14:47:40 2012
@@ -321,8 +321,7 @@ void SAL_CALL SvxDrawPage::add( const un
 	}
 	else if ( !pObj->IsObjectInserted() )
 	{
-		//pObj->SetModel(mpModel);
-		mpPage->InsertObjectToSdrObjList( pObj );
+		mpPage->InsertObjectToSdrObjList(*pObj);
 	}
 
 	pShape->Create( pObj, this );
@@ -895,7 +894,7 @@ SdrObject *SvxDrawPage::CreateSdrObject(
 {
 	SdrObject* pObj = _CreateSdrObject( xShape );
 	if( pObj && !pObj->IsObjectInserted() )
-		mpPage->InsertObjectToSdrObjList( pObj );
+		mpPage->InsertObjectToSdrObjList(*pObj);
 
 	return pObj;
 }

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=1333067&r1=1333066&r2=1333067&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 Wed May  2 14:47:40 2012
@@ -244,8 +244,7 @@ void SAL_CALL SvxShapeGroup::add( const 
 		if( pSdrShape->IsObjectInserted() )
 			pSdrShape->getParentOfSdrObject()->RemoveObjectFromSdrObjList( pSdrShape->GetNavigationPosition() );
 
-		mpObj->getChildrenOfSdrObject()->InsertObjectToSdrObjList( pSdrShape );
-		//pSdrShape->SetModel(mpObj->GetModel());
+		mpObj->getChildrenOfSdrObject()->InsertObjectToSdrObjList(*pSdrShape);
 
 		// #85922# It makes no sense to set the layer asked
 		// from the group object since these is an iteration

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap3.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshap3.cxx Wed May  2 14:47:40 2012
@@ -162,7 +162,7 @@ void SAL_CALL Svx3DSceneObject::add( con
 
 	if( pSdrShape && pSdrShape->getChildrenOfSdrObject() )
 	{
-		mpObj->getChildrenOfSdrObject()->InsertObjectToSdrObjList( pSdrShape );
+		mpObj->getChildrenOfSdrObject()->InsertObjectToSdrObjList(*pSdrShape);
 
 		if(pShape)
 			pShape->Create( pSdrShape, mxPage.get()  );

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=1333067&r1=1333066&r2=1333067&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 Wed May  2 14:47:40 2012
@@ -253,7 +253,9 @@ SvxShape::~SvxShape() throw()
 		mpImpl->mpMaster->dispose();
 
     if ( mpObj.is() )
-        mpObj->setUnoShape( NULL, SdrObject::GrantXShapeAccess() );
+    {
+        SetUnoShapeAtSdrObjectFromSvxShape(*mpObj.get(), 0);
+    }
 
 	if( HasSdrObjectOwnership() && mpObj.is() )
 	{
@@ -402,7 +404,7 @@ void SvxShape::impl_initFromSdrObject()
 
     osl_incrementInterlockedCount( &m_refCount );
 	{
-		mpObj->setUnoShape( *this, SdrObject::GrantXShapeAccess() );
+        SetUnoShapeAtSdrObjectFromSvxShape(*mpObj.get(), *this);
 	}
 	osl_decrementInterlockedCount( &m_refCount );
 
@@ -1532,7 +1534,7 @@ void SAL_CALL SvxShape::dispose() throw(
 		    }
 	    }
 
-        mpObj->setUnoShape( NULL, SdrObject::GrantXShapeAccess() );
+        SetUnoShapeAtSdrObjectFromSvxShape(*mpObj.get(), 0);
 
         if ( bFreeSdrObject )
         {

Modified: incubator/ooo/branches/alg/aw080/main/sw/inc/anchoreddrawobject.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/inc/anchoreddrawobject.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/inc/anchoreddrawobject.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/inc/anchoreddrawobject.hxx Wed May  2 14:47:40 2012
@@ -40,8 +40,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject 
         bool mbValidPos;
 
         // rectangle, keeping the last object rectangle after the postioning
-        // --> OD 2004-09-29 #i34748# - change <maLastObjRect> to a pointer
-        Rectangle* mpLastObjRect;
+        Rectangle maLastObjRect;
 
         // boolean, indicating that anchored drawing object hasn't been attached
         // to a anchor frame yet. Once, it is attached to a anchor frame the
@@ -154,13 +153,8 @@ class SW_DLLPUBLIC SwAnchoredDrawObject 
 
         // accessors to the object area and its position
         virtual const SwRect GetObjRect() const;
-        // --> OD 2004-09-29 #i34748# - change return type to a pointer.
-        // Return value can be NULL.
-        const Rectangle* GetLastObjRect() const;
-        // <--
-        // --> OD 2004-09-29 #i34748# - change method
-        void SetLastObjRect( const Rectangle& _rNewObjRect );
-        // <--
+        const Rectangle& GetLastObjRect() const;
+        void SetLastObjRect(const Rectangle& _rNewObjRect);
 
         /** adjust positioning and alignment attributes for new anchor frame
 

Modified: incubator/ooo/branches/alg/aw080/main/sw/inc/dcontact.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/inc/dcontact.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/inc/dcontact.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/inc/dcontact.hxx Wed May  2 14:47:40 2012
@@ -418,6 +418,7 @@ class SwDrawContact : public SwContact
         // Needed data for handling of nested <SfxBroadcaster/Listener/Notify> events in
         // method <_Changed(..)>
         bool mbNotifyActive : 1;
+        
         // event type, which is handled for <mpSdrObjHandledByCurrentUserCall>.
         // Note: value only valid, if <mbNotifyActive> is true.
         SdrHintKind meEventTypeOfCurrentUserCall;
@@ -532,7 +533,7 @@ class SwDrawContact : public SwContact
         SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm );
 
         // new central SdrObject change handler, called from Notify
-        void HandleChanged(const SdrObject& rObj, SdrHintKind eHint, const basegfx::B2DRange& rOldObjectRange);
+        void HandleChanged(const SdrObject& rObj, SdrHintKind eHint);
 
         // virtual method from SfxListener
 		virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
@@ -542,7 +543,6 @@ class SwDrawContact : public SwContact
         void _Changed(
 			const SdrObject& rObj, 
 			SdrHintKind eHint,
-			const Rectangle* pOldBoundRect, 
 			bool bGroupHierarchy);
 
         //Moved alle SW-Verbindungen zu dem neuen Master.

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docdraw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docdraw.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docdraw.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docdraw.cxx Wed May  2 14:47:40 2012
@@ -205,8 +205,8 @@ void lcl_AdjustPositioningAttr( SwDrawFr
         
 		if ( pAnchoredDrawObj )
         {
-            const SwRect aObjRect(sdr::legacy::GetSnapRect(_rSdrObj));
-            const_cast< SwAnchoredDrawObject* >(pAnchoredDrawObj)->SetLastObjRect( aObjRect.SVRect() );
+            const Rectangle aObjRect(sdr::legacy::GetSnapRect(_rSdrObj));
+            const_cast< SwAnchoredDrawObject* >(pAnchoredDrawObj)->SetLastObjRect(aObjRect);
         }
     }
     // <--
@@ -218,105 +218,105 @@ SwDrawContact* SwDoc::GroupSelection( Sd
 
 	if(rDrawView.areSdrObjectsSelected())
 	{
-    // OD 30.06.2003 #108784# - replace marked 'virtual' drawing objects by
-    // the corresponding 'master' drawing objects.
-    SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView );
+        // OD 30.06.2003 #108784# - replace marked 'virtual' drawing objects by
+        // the corresponding 'master' drawing objects.
+        SwDrawView::ReplaceMarkedDrawVirtObjs( rDrawView );
+
+	    const SdrObjectVector aSelection(rDrawView.getSelectedSdrObjectVectorFromSdrMarkView());
+	    SwDrawFrmFmt *pFmt = 0L;
+	    SdrObject *pObj = aSelection[0];
+	    sal_Bool bNoGroup = ( 0 == pObj->GetParentSdrObject() );
+	    if( bNoGroup )
+	    {
+		    //Ankerattribut aufheben.
+			    SwDrawContact *pMyContact = (SwDrawContact*)findConnectionToSdrObject(pObj);
+		    const SwFmtAnchor aAnch( pMyContact->GetFmt()->GetAnchor() );
+
+            SwUndoDrawGroup *const pUndo = (!GetIDocumentUndoRedo().DoesUndo())
+                                     ? 0
+									     : new SwUndoDrawGroup( (sal_uInt16)aSelection.size() );
 
-		const SdrObjectVector aSelection(rDrawView.getSelectedSdrObjectVectorFromSdrMarkView());
-	SwDrawFrmFmt *pFmt = 0L;
-		SdrObject *pObj = aSelection[0];
-		sal_Bool bNoGroup = ( 0 == pObj->GetParentSdrObject() );
-	if( bNoGroup )
-	{
-		//Ankerattribut aufheben.
-			SwDrawContact *pMyContact = (SwDrawContact*)findConnectionToSdrObject(pObj);
-		const SwFmtAnchor aAnch( pMyContact->GetFmt()->GetAnchor() );
-
-        SwUndoDrawGroup *const pUndo = (!GetIDocumentUndoRedo().DoesUndo())
-                                 ? 0
-									 : new SwUndoDrawGroup( (sal_uInt16)aSelection.size() );
-
-        // --> OD 2005-08-16 #i53320#
-        bool bGroupMembersNotPositioned( false );
-        {
-            SwAnchoredDrawObject* pAnchoredDrawObj =
-                static_cast<SwAnchoredDrawObject*>(pMyContact->GetAnchoredObj( pObj ));
-            bGroupMembersNotPositioned = pAnchoredDrawObj->NotYetPositioned();
-        }
-        // <--
-		//ContactObjekte und Formate vernichten.
+            // --> OD 2005-08-16 #i53320#
+            bool bGroupMembersNotPositioned( false );
+            {
+                SwAnchoredDrawObject* pAnchoredDrawObj =
+                    static_cast<SwAnchoredDrawObject*>(pMyContact->GetAnchoredObj( pObj ));
+                bGroupMembersNotPositioned = pAnchoredDrawObj->NotYetPositioned();
+            }
+            // <--
+		    //ContactObjekte und Formate vernichten.
 			for( sal_uInt32 i(0); i < aSelection.size(); ++i )
-		{
+    		{
 				pObj = aSelection[i];
 				SwDrawContact *pContact = (SwDrawContact*)findConnectionToSdrObject(pObj);
 
-            // --> OD 2005-08-16 #i53320#
+                // --> OD 2005-08-16 #i53320#
 #ifdef DBG_UTIL
-            SwAnchoredDrawObject* pAnchoredDrawObj =
-                static_cast<SwAnchoredDrawObject*>(pContact->GetAnchoredObj( pObj ));
-            ASSERT( bGroupMembersNotPositioned == pAnchoredDrawObj->NotYetPositioned(),
-                    "<SwDoc::GroupSelection(..)> - group members have different positioning status!" );
+                SwAnchoredDrawObject* pAnchoredDrawObj =
+                    static_cast<SwAnchoredDrawObject*>(pContact->GetAnchoredObj( pObj ));
+                ASSERT( bGroupMembersNotPositioned == pAnchoredDrawObj->NotYetPositioned(),
+                        "<SwDoc::GroupSelection(..)> - group members have different positioning status!" );
 #endif
-            // <--
+                // <--
 
-            pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
-			//loescht sich selbst!
-				pContact->HandleChanged(*pObj, HINT_SDROBJECTDYING, pObj->getObjectRange(&rDrawView) );
+                pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
+			    //loescht sich selbst!
+				pContact->HandleChanged(*pObj, HINT_SDROBJECTDYING);
 				resetConnectionToSdrObject(pObj);
 
-			if( pUndo )
-				pUndo->AddObj( i, pFmt, pObj );
-			else
-				DelFrmFmt( pFmt );
-
-            // --> OD 2005-05-10 #i45952# - re-introduce position
-            // normalization of group member objects, because its anchor position
-            // is cleared, when they are grouped.
+			    if( pUndo )
+				    pUndo->AddObj( i, pFmt, pObj );
+			    else
+				    DelFrmFmt( pFmt );
+
+                // --> OD 2005-05-10 #i45952# - re-introduce position
+                // normalization of group member objects, because its anchor position
+                // is cleared, when they are grouped.
 				// AW: NbcMove no longer needed, just reset anchor
 				pObj->SetAnchorPos( basegfx::B2DPoint() );
-        }
+            }
 
-		pFmt = MakeDrawFrmFmt( String::CreateFromAscii(
-								RTL_CONSTASCII_STRINGPARAM( "DrawObject" )),
-								GetDfltFrmFmt() );
-        pFmt->SetFmtAttr( aAnch );
-        // --> OD 2004-10-25 #i36010# - set layout direction of the position
-        pFmt->SetPositionLayoutDir(
-            text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
-        // <--
-
-        rDrawView.GroupMarked();
-			SdrObject* pNewGroupObj = rDrawView.getSelectedIfSingle();
-			ASSERT( pNewGroupObj, "GroupMarked more or none groups." );
-
-        pNewContact = new SwDrawContact( pFmt, pNewGroupObj );
-        // --> OD 2004-11-22 #i35635#
-        pNewContact->MoveObjToVisibleLayer( pNewGroupObj );
-        // <--
-        pNewContact->ConnectToLayout();
-        // --> OD 2005-08-16 #i53320# - No adjustment of the positioning and
-        // alignment attributes, if group members aren't positioned yet.
-        if ( !bGroupMembersNotPositioned )
-        {
-            // OD 2004-04-01 #i26791# - Adjust positioning and alignment attributes.
-            lcl_AdjustPositioningAttr( pFmt, *pNewGroupObj );
-        }
-        // <--
+		    pFmt = MakeDrawFrmFmt( String::CreateFromAscii(
+								    RTL_CONSTASCII_STRINGPARAM( "DrawObject" )),
+								    GetDfltFrmFmt() );
+            pFmt->SetFmtAttr( aAnch );
+            // --> OD 2004-10-25 #i36010# - set layout direction of the position
+            pFmt->SetPositionLayoutDir(
+                text::PositionLayoutDir::PositionInLayoutDirOfAnchor );
+            // <--
 
-        if( pUndo )
-		{
-			pUndo->SetGroupFmt( pFmt );
-            GetIDocumentUndoRedo().AppendUndo( pUndo );
+            rDrawView.GroupMarked();
+			    SdrObject* pNewGroupObj = rDrawView.getSelectedIfSingle();
+			    ASSERT( pNewGroupObj, "GroupMarked more or none groups." );
+
+            pNewContact = new SwDrawContact( pFmt, pNewGroupObj );
+            // --> OD 2004-11-22 #i35635#
+            pNewContact->MoveObjToVisibleLayer( pNewGroupObj );
+            // <--
+            pNewContact->ConnectToLayout();
+            // --> OD 2005-08-16 #i53320# - No adjustment of the positioning and
+            // alignment attributes, if group members aren't positioned yet.
+            if ( !bGroupMembersNotPositioned )
+            {
+                // OD 2004-04-01 #i26791# - Adjust positioning and alignment attributes.
+                lcl_AdjustPositioningAttr( pFmt, *pNewGroupObj );
+            }
+            // <--
+
+            if( pUndo )
+		    {
+			    pUndo->SetGroupFmt( pFmt );
+                GetIDocumentUndoRedo().AppendUndo( pUndo );
+            }
         }
-    }
-    else
-    {
-        if (GetIDocumentUndoRedo().DoesUndo())
+        else
         {
-            GetIDocumentUndoRedo().ClearRedo();
-        }
+            if (GetIDocumentUndoRedo().DoesUndo())
+            {
+                GetIDocumentUndoRedo().ClearRedo();
+            }
 
-        rDrawView.GroupMarked();
+            rDrawView.GroupMarked();
 			ASSERT( rDrawView.getSelectedIfSingle(), "GroupMarked more or none groups." );
 		}
     }
@@ -515,7 +515,7 @@ sal_Bool SwDoc::DeleteSelection( SwDrawV
 								ASSERT( false, "<SwDrawVirtObj> is still marked for delete. application will crash!" );
 				            }
 					        //loescht sich selbst!
-							pContact->HandleChanged(*pObj, HINT_SDROBJECTDYING, pObj->getObjectRange(&rDrawView) );
+							pContact->HandleChanged(*pObj, HINT_SDROBJECTDYING);
 							resetConnectionToSdrObject(pObj);
 
 							if( pUndo )

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/doclay.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/doclay.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/doclay.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/doclay.cxx Wed May  2 14:47:40 2012
@@ -576,12 +576,12 @@ SdrObject* SwDoc::CloneSdrObj( const Sdr
 		if( xSet.is() )
 			aVal = xSet->getPropertyValue( sName );
 		if( bInsInPage )
-			pPg->InsertObjectToSdrObjList( pObj );
+			pPg->InsertObjectToSdrObjList(*pObj);
 		if( xSet.is() )
 			xSet->setPropertyValue( sName, aVal );
 	}
 	else if( bInsInPage )
-		pPg->InsertObjectToSdrObjList( pObj );
+		pPg->InsertObjectToSdrObjList(*pObj);
 
     // OD 02.07.2003 #108784# - for drawing objects: set layer of cloned object
     // to invisible layer

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx Wed May  2 14:47:40 2012
@@ -742,14 +742,9 @@ SwDrawContact::SwDrawContact( SwFrmFmt* 
     SwContact( pToRegisterIn ),
     maAnchoredDrawObj(),
     mbMasterObjCleared( false ),
-    // OD 10.10.2003 #112299#
     mbDisconnectInProgress( false ),
-    // --> OD 2006-01-18 #129959#
     mbNotifyActive( false ),
-    // Note: value of <meEventTypeOfCurrentUserCall> isn't of relevance, because
-    //       <mbUserCallActive> is sal_False.
     meEventTypeOfCurrentUserCall(HINT_OBJCHG_MOVE)
-    // <--
 {
     // clear list containing 'virtual' drawing objects.
     maDrawVirtObjs.clear();
@@ -759,7 +754,7 @@ SwDrawContact::SwDrawContact( SwFrmFmt* 
     if ( !pObj->IsObjectInserted() )
     {
         pToRegisterIn->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
-                                InsertObjectToSdrObjList( pObj, pObj->GetNavigationPosition() );
+            InsertObjectToSdrObjList(*pObj, pObj->GetNavigationPosition() );
     }
     // <--
 
@@ -1216,8 +1211,7 @@ void lcl_NotifyBackgroundOfObj( SwDrawCo
 
 void SwDrawContact::HandleChanged(
     const SdrObject& rObj,
-    SdrHintKind eHint,
-    const basegfx::B2DRange& rOldObjectRange)
+    SdrHintKind eHint)
 {
     // OD 2004-06-01 #i26791# - no event handling, if existing <ViewShell>
     // is in contruction
@@ -1264,16 +1258,13 @@ void SwDrawContact::HandleChanged(
 		pGroup = dynamic_cast< const SdrObjGroup* >(rObj.getParentOfSdrObject()->getSdrObjectFromSdrObjList());
 	}
 
-	const Rectangle rOldObjectRect(
-			(sal_Int32)floor(rOldObjectRange.getMinX()), (sal_Int32)floor(rOldObjectRange.getMinY()),
-			(sal_Int32)ceil(rOldObjectRange.getMaxX()), (sal_Int32)ceil(rOldObjectRange.getMaxY()));
-	_Changed( rObj, eHint, &rOldObjectRect, false );    //Achtung, ggf. Suizid!
+	_Changed( rObj, eHint, false );    //Achtung, ggf. Suizid!
 
 	while(pGroup)
 	{
 		if(findConnectionToSdrObjectDirect(pGroup) && findConnectionToSdrObjectDirect(pGroup) == this)
 		{
-			_Changed( *pGroup, eHint, &rOldObjectRect, true );
+			_Changed( *pGroup, eHint, true );
 		}
 
 		SdrObjGroup* pUpGroup = 0;
@@ -1305,10 +1296,7 @@ void SwDrawContact::Notify(SfxBroadcaste
 
         if(pObj)
         {
-		    const SdrHintKind eHint(pSdrBaseHint->GetSdrHintKind());
-		    const basegfx::B2DRange& rOldBoundRect = pSdrBaseHint->GetSdrHintLastBound();
-
-            HandleChanged(*pObj, eHint, rOldBoundRect);
+            HandleChanged(*pObj, pSdrBaseHint->GetSdrHintKind());
         }
 	}
 }
@@ -1386,7 +1374,6 @@ class NestedUserCallHdl
 void SwDrawContact::_Changed(
 	const SdrObject& rObj,
 	SdrHintKind eHint,
-	const Rectangle* pOldBoundRect,
 	bool bGroupHierarchy)
 {
     // --> OD 2006-01-18 #129959#
@@ -1408,200 +1395,193 @@ void SwDrawContact::_Changed(
     const bool bNotify = !(GetFmt()->GetDoc()->IsInDtor()) &&
                          ( SURROUND_THROUGHT != GetFmt()->GetSurround().GetSurround() ) &&
                          !bAnchoredAsChar;
+    const SwAnchoredDrawObject* pAnchoredDrawObj =
+        static_cast<const SwAnchoredDrawObject*>( GetAnchoredObj( &rObj ) );
+    const Rectangle aOldObjRect = pAnchoredDrawObj ? pAnchoredDrawObj->GetLastObjRect() : Rectangle();
 
     if(bGroupHierarchy
         || HINT_OBJCHG_MOVE == eHint
         || HINT_OBJCHG_RESIZE == eHint)
+    {
+        // OD 2004-04-06 #i26791# - adjust positioning and alignment attributes,
+        // if positioning of drawing object isn't in progress.
+        // --> OD 2005-08-15 #i53320# - no adjust of positioning attributes,
+        // if drawing object isn't positioned.
+        if ( !pAnchoredDrawObj->IsPositioningInProgress() &&
+                !pAnchoredDrawObj->NotYetPositioned() )
+        // <--
         {
-            // --> OD 2004-08-04 #i31698# - improvement:
-            // get instance <SwAnchoredDrawObject> only once
-            const SwAnchoredDrawObject* pAnchoredDrawObj =
-                static_cast<const SwAnchoredDrawObject*>( GetAnchoredObj( &rObj ) );
-            // <--
-            // OD 2004-04-06 #i26791# - adjust positioning and alignment attributes,
-            // if positioning of drawing object isn't in progress.
-            // --> OD 2005-08-15 #i53320# - no adjust of positioning attributes,
-            // if drawing object isn't positioned.
-            if ( !pAnchoredDrawObj->IsPositioningInProgress() &&
-                 !pAnchoredDrawObj->NotYetPositioned() )
+            // --> OD 2008-02-18 #i79400#
+            // always invalidate object rectangle inclusive spaces
+            pAnchoredDrawObj->InvalidateObjRectWithSpaces();
             // <--
+            // --> OD 2005-01-28 #i41324# - notify background before
+            // adjusting position
+            if ( bNotify )
             {
-                // --> OD 2004-09-29 #i34748# - If no last object rectangle is
-                // provided by the anchored object, use parameter <pOldBoundRect>.
-                const Rectangle& aOldObjRect = pAnchoredDrawObj->GetLastObjRect()
-                                               ? *(pAnchoredDrawObj->GetLastObjRect())
-                                               : *(pOldBoundRect);
-                // <--
-                // --> OD 2008-02-18 #i79400#
-                // always invalidate object rectangle inclusive spaces
-                pAnchoredDrawObj->InvalidateObjRectWithSpaces();
-                // <--
-                // --> OD 2005-01-28 #i41324# - notify background before
-                // adjusting position
-                if ( bNotify )
-                {
-                    // --> OD 2004-07-20 #i31573# - correction: Only invalidate
-                    // background of given drawing object.
-                    lcl_NotifyBackgroundOfObj( *this, rObj, &aOldObjRect );
-                }
-                // <--
-                // --> OD 2004-08-04 #i31698# - determine layout direction
-                // via draw frame format.
-                SwFrmFmt::tLayoutDir eLayoutDir =
-                                pAnchoredDrawObj->GetFrmFmt().GetLayoutDir();
-                // <--
-                // use geometry of drawing object
-            SwRect aObjRect( sdr::legacy::GetSnapRect(rObj) );
-                // If drawing object is a member of a group, the adjustment
-                // of the positioning and the alignment attributes has to
-                // be done for the top group object.
+                // --> OD 2004-07-20 #i31573# - correction: Only invalidate
+                // background of given drawing object.
+                lcl_NotifyBackgroundOfObj( *this, rObj, &aOldObjRect );
+            }
+            // <--
+            // --> OD 2004-08-04 #i31698# - determine layout direction
+            // via draw frame format.
+            SwFrmFmt::tLayoutDir eLayoutDir =
+                            pAnchoredDrawObj->GetFrmFmt().GetLayoutDir();
+            // <--
+            // use geometry of drawing object
+            Rectangle aObjRect(sdr::legacy::GetSnapRect(rObj));
+            // If drawing object is a member of a group, the adjustment
+            // of the positioning and the alignment attributes has to
+            // be done for the top group object.
             if ( rObj.GetParentSdrObject() )
-                {
+            {
                 const SdrObject* pGroupObj = rObj.GetParentSdrObject();
                 while ( pGroupObj->GetParentSdrObject() )
-                    {
+                {
                     pGroupObj = pGroupObj->GetParentSdrObject();
-                    }
-                    // use geometry of drawing object
+                }
+                // use geometry of drawing object
                 aObjRect = sdr::legacy::GetSnapRect(*pGroupObj);
+            }
+            SwTwips nXPosDiff(0L);
+            SwTwips nYPosDiff(0L);
+            switch ( eLayoutDir )
+            {
+                case SwFrmFmt::HORI_L2R:
+                {
+                    nXPosDiff = aObjRect.Left() - aOldObjRect.Left();
+                    nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
                 }
-                SwTwips nXPosDiff(0L);
-                SwTwips nYPosDiff(0L);
-                switch ( eLayoutDir )
+                break;
+                case SwFrmFmt::HORI_R2L:
                 {
-                    case SwFrmFmt::HORI_L2R:
-                    {
-                        nXPosDiff = aObjRect.Left() - aOldObjRect.Left();
-                        nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
-                    }
-                    break;
-                    case SwFrmFmt::HORI_R2L:
-                    {
-                        nXPosDiff = aOldObjRect.Right() - aObjRect.Right();
-                        nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
-                    }
-                    break;
-                    case SwFrmFmt::VERT_R2L:
-                    {
-                        nXPosDiff = aObjRect.Top() - aOldObjRect.Top();
-                        nYPosDiff = aOldObjRect.Right() - aObjRect.Right();
-                    }
-                    break;
-                    default:
-                    {
-                        ASSERT( false,
-                                "<SwDrawContact::_Changed(..)> - unsupported layout direction" );
-                    }
+                    nXPosDiff = aOldObjRect.Right() - aObjRect.Right();
+                    nYPosDiff = aObjRect.Top() - aOldObjRect.Top();
                 }
-                SfxItemSet aSet( GetFmt()->GetDoc()->GetAttrPool(),
-                                 RES_VERT_ORIENT, RES_HORI_ORIENT, 0 );
-                const SwFmtVertOrient& rVert = GetFmt()->GetVertOrient();
-                if ( nYPosDiff != 0 )
+                break;
+                case SwFrmFmt::VERT_R2L:
                 {
-
-                    if ( rVert.GetRelationOrient() == text::RelOrientation::CHAR ||
-                         rVert.GetRelationOrient() == text::RelOrientation::TEXT_LINE )
-                    {
-                        nYPosDiff = -nYPosDiff;
-                    }
-                    aSet.Put( SwFmtVertOrient( rVert.GetPos()+nYPosDiff,
-                                               text::VertOrientation::NONE,
-                                               rVert.GetRelationOrient() ) );
+                    nXPosDiff = aObjRect.Top() - aOldObjRect.Top();
+                    nYPosDiff = aOldObjRect.Right() - aObjRect.Right();
                 }
-
-                const SwFmtHoriOrient& rHori = GetFmt()->GetHoriOrient();
-                if ( !bAnchoredAsChar && nXPosDiff != 0 )
+                break;
+                default:
                 {
-                    aSet.Put( SwFmtHoriOrient( rHori.GetPos()+nXPosDiff,
-                                               text::HoriOrientation::NONE,
-                                               rHori.GetRelationOrient() ) );
+                    ASSERT( false,
+                            "<SwDrawContact::_Changed(..)> - unsupported layout direction" );
                 }
+            }
+            SfxItemSet aSet( GetFmt()->GetDoc()->GetAttrPool(),
+                                RES_VERT_ORIENT, RES_HORI_ORIENT, 0 );
+            const SwFmtVertOrient& rVert = GetFmt()->GetVertOrient();
+            if ( nYPosDiff != 0 )
+            {
 
-                if ( nYPosDiff ||
-                     ( !bAnchoredAsChar && nXPosDiff != 0 ) )
+                if ( rVert.GetRelationOrient() == text::RelOrientation::CHAR ||
+                        rVert.GetRelationOrient() == text::RelOrientation::TEXT_LINE )
                 {
-                    GetFmt()->GetDoc()->SetFlyFrmAttr( *(GetFmt()), aSet );
-                    // keep new object rectangle, to avoid multiple
-                    // changes of the attributes by multiple event from
-                    // the drawing layer - e.g. group objects and its members
-                    // --> OD 2004-09-29 #i34748# - use new method
-                    // <SwAnchoredDrawObject::SetLastObjRect(..)>.
-                    const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)
-                                    ->SetLastObjRect( aObjRect.SVRect() );
+                    nYPosDiff = -nYPosDiff;
                 }
-                else if ( aObjRect.SSize() != aOldObjRect.GetSize() )
+                aSet.Put( SwFmtVertOrient( rVert.GetPos()+nYPosDiff,
+                                            text::VertOrientation::NONE,
+                                            rVert.GetRelationOrient() ) );
+            }
+
+            const SwFmtHoriOrient& rHori = GetFmt()->GetHoriOrient();
+            if ( !bAnchoredAsChar && nXPosDiff != 0 )
+            {
+                aSet.Put( SwFmtHoriOrient( rHori.GetPos()+nXPosDiff,
+                                            text::HoriOrientation::NONE,
+                                            rHori.GetRelationOrient() ) );
+            }
+
+            if ( nYPosDiff ||
+                    ( !bAnchoredAsChar && nXPosDiff != 0 ) )
+            {
+                GetFmt()->GetDoc()->SetFlyFrmAttr( *(GetFmt()), aSet );
+                // keep new object rectangle, to avoid multiple
+                // changes of the attributes by multiple event from
+                // the drawing layer - e.g. group objects and its members
+                // --> OD 2004-09-29 #i34748# - use new method
+                // <SwAnchoredDrawObject::SetLastObjRect(..)>.
+                const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)->SetLastObjRect(aObjRect);
+            }
+            else if(aObjRect.GetSize() != aOldObjRect.GetSize())
+            {
+                _InvalidateObjs();
+                // --> OD 2004-11-11 #i35007# - notify anchor frame
+                // of as-character anchored object
+                if ( bAnchoredAsChar )
                 {
-                    _InvalidateObjs();
-                    // --> OD 2004-11-11 #i35007# - notify anchor frame
-                    // of as-character anchored object
-                    if ( bAnchoredAsChar )
-                    {
-                        const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)
-                            ->AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
-                    }
-                    // <--
+                    const_cast<SwAnchoredDrawObject*>(pAnchoredDrawObj)
+                        ->AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
                 }
+                // <--
             }
+        }
     }
     else
     {
         switch(eHint)
         {
 		    case HINT_SDROBJECTDYING:
-			    {
-                    if ( bNotify )
-                    {
-                        lcl_NotifyBackgroundOfObj( *this, rObj, pOldBoundRect );
-                        // --> OD 2004-10-27 #i36181# - background of 'virtual'
-                        // drawing objects have also been notified.
-                        NotifyBackgrdOfAllVirtObjs( pOldBoundRect );
-            // <--
-                    }
-                    DisconnectFromLayout( false );
-				    SetMaster( NULL );
-				    delete this;
-                    // --> FME 2006-07-12 #i65784# Prevent memory corruption
-                    aNestedUserCallHdl.DrawContactDeleted();
+			{
+                if ( bNotify )
+                {
+                    lcl_NotifyBackgroundOfObj( *this, rObj, &aOldObjRect );
+                    // --> OD 2004-10-27 #i36181# - background of 'virtual'
+                    // drawing objects have also been notified.
+                    NotifyBackgrdOfAllVirtObjs( &aOldObjRect );
                     // <--
-        break;
-			    }
+                }
+                DisconnectFromLayout( false );
+				SetMaster( NULL );
+				delete this;
+                // --> FME 2006-07-12 #i65784# Prevent memory corruption
+                aNestedUserCallHdl.DrawContactDeleted();
+                // <--
+                break;
+	   	    }
 		    case HINT_OBJINSERTED:
-			    {
-                    // OD 10.10.2003 #112299#
-                    if ( mbDisconnectInProgress )
-                    {
-                        ASSERT( false,
-                                "<SwDrawContact::_Changed(..)> - Insert event during disconnection from layout is invalid." );
-                    }
-                    else
-                    {
-                        ConnectToLayout();
-                        if ( bNotify )
-                        {
-                            lcl_NotifyBackgroundOfObj( *this, rObj, pOldBoundRect );
-                        }
-                    }
-				    break;
-			    }
-		    case HINT_OBJREMOVED:
-			    {
+			{
+                // OD 10.10.2003 #112299#
+                if ( mbDisconnectInProgress )
+                {
+                    ASSERT( false,
+                            "<SwDrawContact::_Changed(..)> - Insert event during disconnection from layout is invalid." );
+                }
+                else
+                {
+                    ConnectToLayout();
                     if ( bNotify )
                     {
-                        lcl_NotifyBackgroundOfObj( *this, rObj, pOldBoundRect );
+                        lcl_NotifyBackgroundOfObj( *this, rObj, &aOldObjRect);
                     }
-                    DisconnectFromLayout( false );
-				    break;
-			    }
+                }
+				break;
+			}
+		    case HINT_OBJREMOVED:
+			{
+                if ( bNotify )
+                {
+                    lcl_NotifyBackgroundOfObj(*this, rObj, &aOldObjRect);
+                }
+                DisconnectFromLayout( false );
+				break;
+			}
 		    case HINT_OBJCHG_ATTR:
-            if ( bNotify )
             {
-                lcl_NotifyBackgroundOfObj( *this, rObj, pOldBoundRect );
+                if ( bNotify )
+                {
+                    lcl_NotifyBackgroundOfObj(*this, rObj, &aOldObjRect);
+                }
+			    break;
             }
-			break;
-        default:
-            break;
-	}
-}
+            default:
+                break;
+	    }
+    }
 }
 
 namespace
@@ -2133,7 +2113,7 @@ void SwDrawContact::InsertMasterIntoDraw
     if ( !GetMaster()->IsObjectInserted() )
     {
         GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)
-                ->InsertObjectToSdrObjList( GetMaster(), GetMaster()->GetNavigationPosition() );
+            ->InsertObjectToSdrObjList(*GetMaster(), GetMaster()->GetNavigationPosition() );
     }
 
     establishConnectionToSdrObject(GetMaster(), this);
@@ -2532,7 +2512,7 @@ void SwDrawVirtObj::AddToDrawingPage()
     if ( 0 != ( pDrawPg = pOrgMasterSdrObj->getSdrPageFromSdrObject() ) )
     {
         // --> OD 2004-08-16 #i27030# - apply order number of referenced object
-        pDrawPg->InsertObjectToSdrObjList( this, GetReferencedObj().GetNavigationPosition() );
+        pDrawPg->InsertObjectToSdrObjList(*this, GetReferencedObj().GetNavigationPosition() );
     }
     else
     {

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/fefly1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/fefly1.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/fefly1.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/fefly1.cxx Wed May  2 14:47:40 2012
@@ -1421,12 +1421,18 @@ SwRect SwFEShell::GetFlyRect() const
 SwRect SwFEShell::GetObjRect() const
 {
 	if( Imp()->HasDrawView() )
-		return Imp()->GetDrawView()->getMarkedObjectSnapRect();
-	else
-	{
-		SwRect aRect;
-		return aRect;
-	}
+    {
+        const basegfx::B2DRange aAllRange(Imp()->GetDrawView()->getMarkedObjectSnapRange());
+
+        if(!aAllRange.isEmpty())
+        {
+			return Rectangle(
+				(sal_Int32)floor(aAllRange.getMinX()), (sal_Int32)floor(aAllRange.getMinY()),
+				(sal_Int32)ceil(aAllRange.getMaxX()), (sal_Int32)ceil(aAllRange.getMaxY()));
+        }
+    }
+
+    return SwRect();
 }
 
 void SwFEShell::SetObjRect( const SwRect& rRect )
@@ -1434,7 +1440,11 @@ void SwFEShell::SetObjRect( const SwRect
 	if ( Imp()->HasDrawView() )
 	{
 		const Rectangle aRectangle(rRect.SVRect());
-		Imp()->GetDrawView()->SetMarkedObjSnapRange(basegfx::B2DRange(aRectangle.Left(), aRectangle.Top(), aRectangle.Right(), aRectangle.Bottom()));
+
+        Imp()->GetDrawView()->SetMarkedObjSnapRange(
+            basegfx::B2DRange(
+                aRectangle.Left(), aRectangle.Top(), 
+                aRectangle.Right(), aRectangle.Bottom()));
 		CallChgLnk();	// rufe das AttrChangeNotify auf der UI-Seite.
 	}
 }

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/feshview.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/feshview.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/feshview.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/feshview.cxx Wed May  2 14:47:40 2012
@@ -131,7 +131,10 @@ extern sal_Bool bNoInterrupt;		// in swa
         pSh->KillPams();
         pSh->ClearMark();
         // <--
-		pSh->SetCrsr( pSh->Imp()->GetDrawView()->getMarkedObjectSnapRect().TopLeft(), true);
+		
+        const basegfx::B2DRange aAllRange(pSh->Imp()->GetDrawView()->getMarkedObjectSnapRange());
+
+        pSh->SetCrsr(Point(basegfx::fround(aAllRange.getMinX()), basegfx::fround(aAllRange.getMinY())), true);
     }
 }
 
@@ -159,7 +162,8 @@ sal_Bool SwFEShell::SelectObj( const Poi
     const sal_Bool bAddSelect = 0 != (SW_ADD_SELECT & nFlag);
     const sal_Bool bEnterGroup = 0 != (SW_ENTER_GROUP & nFlag);
 	SwFlyFrm* pOldSelFly = 0;
-	const Point aOldPos( pDView->getMarkedObjectSnapRect().TopLeft() );
+    const basegfx::B2DRange aAllRange(pDView->getMarkedObjectSnapRange());
+	const Point aOldPos(Point(basegfx::fround(aAllRange.getMinX()), basegfx::fround(aAllRange.getMinY())));
 
 	if( bHadSelection )
 	{
@@ -1054,7 +1058,7 @@ void SwFEShell::EndTextEdit()
         SdrObject *pTmp = pSwDrawContact->GetMaster();
         if( !pTmp )
             pTmp = pObj;
-        pSwDrawContact->HandleChanged( *pTmp, HINT_OBJCHG_RESIZE, pTmp->getObjectRange(pView) );
+        pSwDrawContact->HandleChanged(*pTmp, HINT_OBJCHG_RESIZE);
 	}
 	if ( !pObj->GetParentSdrObject() )
 	{

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/anchoreddrawobject.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/anchoreddrawobject.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/anchoreddrawobject.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/anchoreddrawobject.cxx Wed May  2 14:47:40 2012
@@ -224,9 +224,7 @@ bool SwObjPosOscillationControl::Oscilla
 SwAnchoredDrawObject::SwAnchoredDrawObject() :
     SwAnchoredObject(),
     mbValidPos( false ),
-    // --> OD 2004-09-29 #i34748#
-    mpLastObjRect( 0L ),
-    // <--
+    maLastObjRect(),
     mbNotYetAttachedToAnchorFrame( true ),
     // --> OD 2004-08-09 #i28749#
     mbNotYetPositioned( true ),
@@ -239,9 +237,6 @@ SwAnchoredDrawObject::SwAnchoredDrawObje
 
 SwAnchoredDrawObject::~SwAnchoredDrawObject()
 {
-    // --> OD 2004-11-03 - follow-up of #i34748#
-    delete mpLastObjRect;
-    // <--
 }
 
 // --> OD 2006-03-17 #i62875#
@@ -760,24 +755,22 @@ void SwAnchoredDrawObject::AdjustPositio
     GetFrmFmt().SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) );
 }
 
-// --> OD 2004-09-29 #i34748# - change return type
-const Rectangle* SwAnchoredDrawObject::GetLastObjRect() const
+const Rectangle& SwAnchoredDrawObject::GetLastObjRect() const
 {
-    return mpLastObjRect;
+    return maLastObjRect;
 }
-// <--
 
-// --> OD 2004-09-29 #i34748# - change return type.
-// If member <mpLastObjRect> is NULL, create one.
-void SwAnchoredDrawObject::SetLastObjRect( const Rectangle& _rNewLastRect )
+void SwAnchoredDrawObject::SetLastObjRect(const Rectangle& _rNewLastRect)
 {
-    if ( !mpLastObjRect )
+    if(maLastObjRect.IsEmpty())
     {
-        mpLastObjRect = new Rectangle;
+        maLastObjRect = _rNewLastRect;
+    }
+    else if(maLastObjRect != _rNewLastRect)
+    {
+        maLastObjRect = _rNewLastRect;
     }
-    *(mpLastObjRect) = _rNewLastRect;
 }
-// <--
 
 void SwAnchoredDrawObject::ObjectAttachedToAnchorFrame()
 {

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/fly.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/fly.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/fly.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/fly.cxx Wed May  2 14:47:40 2012
@@ -439,7 +439,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef
     else
     {
         pContact->GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 )->
-			InsertObjectToSdrObjList( pDrawObj, _GetOrdNumForNewRef( pContact ) );
+			InsertObjectToSdrObjList(*pDrawObj, _GetOrdNumForNewRef( pContact ) );
     }
     // <--
     // --> OD 2004-12-13 #i38889# - assure, that new <SwVirtFlyDrawObj> instance

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx Wed May  2 14:47:40 2012
@@ -645,7 +645,7 @@ void SwPageFrm::AppendFlyToPage( SwFlyFr
 {
 	if ( !pNew->GetVirtDrawObj()->IsObjectInserted() )
 		getRootFrm()->GetDrawPage()->InsertObjectToSdrObjList(
-				(SdrObject*)pNew->GetVirtDrawObj(),
+				*pNew->GetVirtDrawObj(),
 				pNew->GetVirtDrawObj()->GetReferencedObj().GetNavigationPosition() );
 
 	InvalidateSpelling();

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx Wed May  2 14:47:40 2012
@@ -1091,7 +1091,7 @@ void AppendObjs( const SwSpzFrmFmts *pTb
 					if ( !pSdrObj->getSdrPageFromSdrObject() )
                     {
                         pFmt->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage(0)->
-								InsertObjectToSdrObjList(pSdrObj, pSdrObj->GetNavigationPosition());
+                            InsertObjectToSdrObjList(*pSdrObj, pSdrObj->GetNavigationPosition());
                     }
 
                     SwDrawContact* pNew =

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/unattr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/unattr.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/unattr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/unattr.cxx Wed May  2 14:47:40 2012
@@ -589,7 +589,7 @@ bool SwUndoFmtAttr::RestoreFlyAnchor(::s
         if( pCont->GetAnchorFrm() && !pObj->IsObjectInserted() )
 		{
 			ASSERT( pDoc->GetDrawModel(), "RestoreFlyAnchor without DrawModel" );
-			pDoc->GetDrawModel()->GetPage( 0 )->InsertObjectToSdrObjList( pObj );
+			pDoc->GetDrawModel()->GetPage(0)->InsertObjectToSdrObjList(*pObj);
 		}
 
         // #i108739#

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/undraw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/undraw.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/undraw.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/undraw.cxx Wed May  2 14:47:40 2012
@@ -228,7 +228,7 @@ void SwUndoDrawGroup::UndoImpl(::sw::Und
 	pObjArr->pObj = pObj;
 
 	// object will destroy itself
-	pDrawContact->HandleChanged( *pObj, HINT_SDROBJECTDYING, pObj->getObjectRange(0) );
+	pDrawContact->HandleChanged(*pObj, HINT_SDROBJECTDYING);
     resetConnectionToSdrObject(pObj);
 
 	::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
@@ -282,7 +282,7 @@ void SwUndoDrawGroup::RedoImpl(::sw::Und
 		SwDrawContact *pContact = (SwDrawContact*)findConnectionToSdrObject(pObj);
 
 	    // object will destroy itself
-		pContact->HandleChanged( *pObj, HINT_SDROBJECTDYING, pObj->getObjectRange(0) );
+		pContact->HandleChanged(*pObj, HINT_SDROBJECTDYING);
         resetConnectionToSdrObject(pObj);
 
 		::lcl_SaveAnchor( rSave.pFmt, rSave.nNodeIdx );
@@ -348,7 +348,7 @@ SwUndoDrawUnGroup::SwUndoDrawUnGroup( Sd
 	pObjArr->pFmt = pFmt;
 
     // object will destroy itself
-	pContact->HandleChanged( *pObj, HINT_SDROBJECTDYING, pObj->getObjectRange(0) );
+	pContact->HandleChanged(*pObj, HINT_SDROBJECTDYING);
 	resetConnectionToSdrObject(pObj);
 
 	::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
@@ -421,7 +421,7 @@ void SwUndoDrawUnGroup::RedoImpl(::sw::U
 	SwDrawContact* pContact = (SwDrawContact*)pFmt->FindContactObj();
 
 	    // object will destroy itself
-	pContact->HandleChanged( *pObjArr->pObj, HINT_SDROBJECTDYING, pObjArr->pObj->getObjectRange(0) );
+	pContact->HandleChanged(*pObjArr->pObj, HINT_SDROBJECTDYING);
     resetConnectionToSdrObject(pObjArr->pObj);
 
 	::lcl_SaveAnchor( pFmt, pObjArr->nNodeIdx );
@@ -480,7 +480,7 @@ SwUndoDrawUnGroupConnectToLayout::UndoIm
         {
             // deletion of instance <pDrawContact> and thus disconnection from
             // the Writer layout.
-            pDrawContact->HandleChanged( *pObj, HINT_SDROBJECTDYING, pObj->getObjectRange(0) );
+            pDrawContact->HandleChanged(*pObj, HINT_SDROBJECTDYING);
             resetConnectionToSdrObject(pObj);
         }
     }
@@ -542,7 +542,7 @@ void SwUndoDrawDelete::UndoImpl(::sw::Un
 		rFlyFmts.Insert( rSave.pFmt, rFlyFmts.Count() );
 		SdrObject *pObj = rSave.pObj;
 		SwDrawContact *pContact = new SwDrawContact( rSave.pFmt, pObj );
-		pContact->_Changed( *pObj, HINT_OBJCHG_RESIZE, NULL, false );
+		pContact->_Changed( *pObj, HINT_OBJCHG_RESIZE, false );
         // #i45718# - follow-up of #i35635# move object to visible layer
         pContact->MoveObjToVisibleLayer( pObj );
         // #i45952# - notify that position attributes are already set
@@ -568,7 +568,7 @@ void SwUndoDrawDelete::RedoImpl(::sw::Un
 		SwDrawContact *pContact = (SwDrawContact*)findConnectionToSdrObject(pObj);
 		SwDrawFrmFmt *pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
 		// object will destroy itself
-		pContact->HandleChanged( *pObj, HINT_SDROBJECTDYING, pObj->getObjectRange(0) );
+		pContact->HandleChanged(*pObj, HINT_SDROBJECTDYING);
         resetConnectionToSdrObject(pObj);
 
        	// notify UNO objects to decouple

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx Wed May  2 14:47:40 2012
@@ -905,7 +905,7 @@ SdrObject *SwXFrame::GetOrCreateSdrObjec
 			  !pFmt->GetOpaque().GetValue() ) ? pDoc->GetHellId()
 											 : pDoc->GetHeavenId() );
 
-		pDrawModel->GetPage(0)->InsertObjectToSdrObjList( pObject );
+		pDrawModel->GetPage(0)->InsertObjectToSdrObjList(*pObject);
 	}
 
 	return pObject;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/html/htmldraw.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/html/htmldraw.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/html/htmldraw.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/html/htmldraw.cxx Wed May  2 14:47:40 2012
@@ -409,7 +409,7 @@ void SwHTMLParser::NewMarquee( HTMLTable
 	if( !pMarquee )
 		return;
 
-	pPg->InsertObjectToSdrObjList( pMarquee );
+	pPg->InsertObjectToSdrObjList(*pMarquee);
 
 	if( aId.Len() )
 		InsertBookmark( aId );

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/rtf/swparrtf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/rtf/swparrtf.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/rtf/swparrtf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/rtf/swparrtf.cxx Wed May  2 14:47:40 2012
@@ -1302,7 +1302,7 @@ void SwRTFParser::ReadDrawingObject()
         aFlySet.Put( aVert );
 
         SdrPage* pDrawPg = pDrawModel->GetPage(0);
-        pDrawPg->InsertObjectToSdrObjList(pStroke, 0);
+        pDrawPg->InsertObjectToSdrObjList(*pStroke, 0);
 
         sdr::legacy::SetSnapRect(*pStroke, aRect);
 
@@ -1336,7 +1336,7 @@ void SwRTFParser::InsertShpObject(SdrObj
         pDoc->GetOrCreateDrawModel();
         SdrModel* pDrawModel  = pDoc->GetDrawModel();
         SdrPage* pDrawPg = pDrawModel->GetPage(0);
-        pDrawPg->InsertObjectToSdrObjList(pStroke);
+        pDrawPg->InsertObjectToSdrObjList(*pStroke);
         pDrawPg->SetNavigationPosition(pStroke->GetNavigationPosition(), _nZOrder);
         /* SwFrmFmt* pRetFrmFmt = */pDoc->Insert(*pPam, *pStroke, &aFlySet, NULL);
 }

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx Wed May  2 14:47:40 2012
@@ -1354,7 +1354,7 @@ SdrObject *SwWW8ImplReader::ReadGroup( W
         if (SdrObject *pObject = ReadGrafPrimitive(nLeft, pDo, aSet))
         {
 			// first add and then set ItemSet
-            pSdrObjGroup->InsertObjectToSdrObjList(pObject, 0);
+            pSdrObjGroup->InsertObjectToSdrObjList(*pObject, 0);
             pObject->SetMergedItemSetAndBroadcast(aSet);
         }
     }
@@ -2927,7 +2927,7 @@ SwFrmFmt* SwWW8ImplReader::MungeTextInto
         }
 
         pSdrTextObj->SetLayer(pThisGroup->GetLayer());
-        pThisGroup->InsertObjectToSdrObjList(pSdrTextObj);
+        pThisGroup->InsertObjectToSdrObjList(*pSdrTextObj);
     }
     else
         pSdrTextObj = dynamic_cast< SdrTextObj* >( pRecord->pObj);

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf2.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf2.cxx Wed May  2 14:47:40 2012
@@ -242,7 +242,7 @@ bool wwZOrderer::InsertObject(SdrObject*
 {
     if (!pObject->IsObjectInserted())
     {
-        mpDrawPg->InsertObjectToSdrObjList(pObject, nPos);
+        mpDrawPg->InsertObjectToSdrObjList(*pObject, nPos);
         return true;
     }
     return false;
@@ -366,7 +366,7 @@ void SwWW8ImplReader::ReplaceObj(const S
         SdrObjList* pObjectList = pGroupObject->getChildrenOfSdrObject();
 
         // copy transformation and layer
-        rSubObj->setSdrObjectTransformation(rReplaceObj->getSdrObjectTransformation());
+        rSubObj.setSdrObjectTransformation(rReplaceObj.getSdrObjectTransformation());
         rSubObj.SetLayer(rReplaceObj.GetLayer());
 
         // altes Objekt raus aus Gruppen-Liste und neues rein



Mime
View raw message