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 [1/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
Author: alg
Date: Wed May  2 14:47:40 2012
New Revision: 1333067

URL: http://svn.apache.org/viewvc?rev=1333067&view=rev
Log:
aw080: objectlist handling cleanups, Anchorpos, ItemPool, Broadcaster and ranges, transparency, more adaptions to double

Removed:
    incubator/ooo/branches/alg/aw080/main/sc/inc/drawattr.hxx
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/drawattr.cxx
Modified:
    incubator/ooo/branches/alg/aw080/main/basctl/source/dlged/dlged.cxx
    incubator/ooo/branches/alg/aw080/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
    incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx
    incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx
    incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/defaultprocessor3d.cxx
    incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx
    incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptObject.hxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptPage.hxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptObject.cxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ReportSection.cxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/dlgedfac.cxx
    incubator/ooo/branches/alg/aw080/main/sc/inc/drwlayer.hxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/drwlayer.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/postit.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/detfunc.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/filter/rtf/eeimpars.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/filter/starcalc/scfobj.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/drwtrans.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fuins2.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/unoobj/chartuno.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/tabview5.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx
    incubator/ooo/branches/alg/aw080/main/sd/inc/sdpage.hxx
    incubator/ooo/branches/alg/aw080/main/sd/source/core/sdpage.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/sdxfer.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/animobjs.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/copydlg.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fucon3d.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsfil.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fumorph.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/table/tablefunction.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/DocumentRenderer.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews1.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/drviews8.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview2.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview3.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/sdview4.cxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/fmpage.hxx
    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/scene3d.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdhdl.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmrkv.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdograf.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdopath.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdpage.hxx
    incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape3d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/dialog/contwnd.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/dialog/dlgctl3d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/dialog/imapwnd.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/scene3d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/view3d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/form/fmpage.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/form/fmvwimp.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/gallery2/galtheme.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv2.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmrkv.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxtr.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpage.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdpoev.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdundo.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdxcgv.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/table/tablecontroller.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/unoshap3.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/unoshape.cxx
    incubator/ooo/branches/alg/aw080/main/sw/inc/anchoreddrawobject.hxx
    incubator/ooo/branches/alg/aw080/main/sw/inc/dcontact.hxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/docdraw.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/doc/doclay.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/draw/dcontact.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/fefly1.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/frmedt/feshview.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/anchoreddrawobject.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/fly.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/flylay.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/layout/frmtool.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/unattr.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/undo/undraw.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/unocore/unoframe.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/filter/html/htmldraw.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/filter/rtf/swparrtf.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8graf2.cxx

Modified: incubator/ooo/branches/alg/aw080/main/basctl/source/dlged/dlged.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/basctl/source/dlged/dlged.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/basctl/source/dlged/dlged.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/basctl/source/dlged/dlged.cxx Wed May  2 14:47:40 2012
@@ -399,7 +399,7 @@ void DlgEditor::SetDialog( uno::Referenc
 	pDlgEdForm->SetUnoControlModel(xDlgMod);
 	pDlgEdForm->SetDlgEditor( this );
 	((DlgEdPage*)GetModel()->GetPage(0))->SetDlgEdForm( pDlgEdForm );
-	GetModel()->GetPage(0)->InsertObjectToSdrObjList( pDlgEdForm );
+	GetModel()->GetPage(0)->InsertObjectToSdrObjList(*pDlgEdForm);
     AdjustPageSize();
 	pDlgEdForm->SetRectFromProps();
 	pDlgEdForm->UpdateTabIndices();		// for backward compatibility
@@ -443,7 +443,7 @@ void DlgEditor::SetDialog( uno::Referenc
             pCtrlObj->SetUnoControlModel( xCtrlModel );
             pCtrlObj->SetDlgEdForm( pDlgEdForm );
             pDlgEdForm->AddChild( pCtrlObj );
-            GetModel()->GetPage(0)->InsertObjectToSdrObjList( pCtrlObj );
+            GetModel()->GetPage(0)->InsertObjectToSdrObjList(*pCtrlObj);
             pCtrlObj->SetRectFromProps();
             pCtrlObj->UpdateStep();
             pCtrlObj->StartListening();           
@@ -1081,7 +1081,7 @@ void DlgEditor::Paste()
 						m_xUnoControlDialogModel->insertByName( aOUniqueName , aCtrlModel );
 
 						// insert object into drawing page
-						GetModel()->GetPage(0)->InsertObjectToSdrObjList( pCtrlObj );
+						GetModel()->GetPage(0)->InsertObjectToSdrObjList(*pCtrlObj);
 						pCtrlObj->SetRectFromProps();
 						pCtrlObj->UpdateStep();
                         pDlgEdForm->UpdateTabOrderAndGroups();              // #110559#

Modified: incubator/ooo/branches/alg/aw080/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx Wed May  2 14:47:40 2012
@@ -185,7 +185,7 @@ Graphic ViewElementListProvider::GetSymb
 	pView->ShowSdrPage(*pPage);
 
     pObj = pObj->CloneSdrObject();
-	pPage->InsertObjectToSdrObjList(pObj);
+	pPage->InsertObjectToSdrObjList(*pObj);
 	pView->MarkObj(*pObj);
     if( pSymbolShapeProperties )
         pObj->SetMergedItemSet(*pSymbolShapeProperties);

Modified: incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/chart2/source/controller/main/ChartController_Tools.cxx Wed May  2 14:47:40 2012
@@ -443,9 +443,6 @@ void ChartController::impl_PasteShapes( 
                     SdrObject* pNewObj = ( pObj ? pObj->CloneSdrObject() : NULL );
                     if ( pNewObj )
                     {
-                        //pNewObj->SetModel( &pDrawModelWrapper->getSdrModel() );
-                        //pNewObj->SetPage( pDestPage );
-
                         // set position
                         Reference< drawing::XShape > xShape( pNewObj->getUnoShape(), uno::UNO_QUERY );
                         if ( xShape.is() )
@@ -453,7 +450,7 @@ void ChartController::impl_PasteShapes( 
                             xShape->setPosition( awt::Point( 0, 0 ) );
                         }
 
-                        pDestPage->InsertObjectToSdrObjList( pNewObj );
+                        pDestPage->InsertObjectToSdrObjList(*pNewObj);
                         m_pDrawViewWrapper->AddUndo( new SdrUndoInsertObj( *pNewObj ) );
                         xSelShape = xShape;
                     }

Modified: incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/cui/source/tabpages/tpline.cxx Wed May  2 14:47:40 2012
@@ -1031,7 +1031,7 @@ void SvxLineTabPage::Reset( const SfxIte
 				if(pObj)
 				{
 					pObj = pObj->CloneSdrObject();
-					pPage->InsertObjectToSdrObjList(pObj);
+					pPage->InsertObjectToSdrObjList(*pObj);
 					pView->MarkObj(*pObj);
 					if(pSymbolAttr)
 					{
@@ -1746,11 +1746,9 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl
             if(pObj==NULL)
                 break;
 			pObj = pObj->CloneSdrObject();
-			//const String* pGrfName = (const String*)aGrfNames.GetObject(i);
-			String *pStr=new String();//String(i));
+			String *pStr=new String();
 			aGrfNames.Insert(pStr,LIST_APPEND);
-			//Rectangle aRect(pObj->GetLogicRect());
-			pPage->InsertObjectToSdrObjList(pObj);
+			pPage->InsertObjectToSdrObjList(*pObj);
 			pView->MarkObj(*pObj);
 			if(pSymbolAttr)
 			{

Modified: incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/defaultprocessor3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/defaultprocessor3d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/defaultprocessor3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/drawinglayer/source/processor3d/defaultprocessor3d.cxx Wed May  2 14:47:40 2012
@@ -371,22 +371,32 @@ namespace drawinglayer
 						const sal_uInt16 nSpecularIntensity(rPrimitive.getMaterial().getSpecularIntensity());
 
 						// solve color model for each normal vector, set colors at points. Clear normals.
-						for(sal_uInt32 a(0L); a < aFill.count(); a++)
+						for(sal_uInt32 a(0); a < aFill.count(); a++)
 						{
 							basegfx::B3DPolygon aPartFill(aFill.getB3DPolygon(a));
 							
-							for(sal_uInt32 b(0L); b < aPartFill.count(); b++)
+							for(sal_uInt32 b(0); b < aPartFill.count(); b++)
 							{
 								// solve color model. Transform normal to eye coor
 								const basegfx::B3DVector aNormal(aPartFill.getNormal(b));
 								const basegfx::BColor aSolvedColor(getSdrLightingAttribute().solveColorModel(aNormal, aColor, rSpecular, rEmission, nSpecularIntensity));
-								aPartFill.setBColor(b, aSolvedColor);
+
+                                aPartFill.setBColor(b, aSolvedColor);
 							}
 
 							// clear normals on this part polygon and write it back
 							aPartFill.clearNormals();
 							aFill.setB3DPolygon(a, aPartFill);
 						}
+                        
+                        // if no colors are used after solving the color model for
+                        // all normals, all calculated colors were black (0.0, 0.0, 0.0).
+                        // To represent this 'unused' state, set object color to black 
+                        // which will be used in this case
+                        if(!aFill.areBColorsUsed())
+                        {
+                            aObjectColor = ::basegfx::BColor::getEmptyBColor();
+                        }
 						break;
 					}
 					case ::com::sun::star::drawing::ShadeMode_FLAT:

Modified: incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/msdffimp.cxx Wed May  2 14:47:40 2012
@@ -4189,7 +4189,7 @@ SdrObject* SvxMSDffManager::ImportGroup(
 					SdrObject* pTmp = ImportGroup( aRecHd2, rSt, pClientData, aGroupClientAnchor, aGroupChildAnchor, nCalledByGroup + 1, &nShapeId );
 					if ( pTmp && pRet->getChildrenOfSdrObject() )
 					{
-						pRet->getChildrenOfSdrObject()->InsertObjectToSdrObjList( pTmp );
+						pRet->getChildrenOfSdrObject()->InsertObjectToSdrObjList(*pTmp);
 						if( nShapeId )
 							insertShapeId( nShapeId, pTmp );
 					}
@@ -4201,7 +4201,7 @@ SdrObject* SvxMSDffManager::ImportGroup(
 					SdrObject* pTmp = ImportShape( aRecHd2, rSt, pClientData, aClientRect, aGlobalChildRect, nCalledByGroup + 1, &nShapeId );
 					if ( pTmp && pRet->getChildrenOfSdrObject() )
 					{
-						pRet->getChildrenOfSdrObject()->InsertObjectToSdrObjList( pTmp );
+						pRet->getChildrenOfSdrObject()->InsertObjectToSdrObjList(*pTmp);
 						if( nShapeId )
 							insertShapeId( nShapeId, pTmp );
 					}
@@ -5411,8 +5411,8 @@ SdrObject* SvxMSDffManager::ProcessObj(
 				if( pTextObj != pObj )
 				{
 					SdrObjGroup* pGroup = new SdrObjGroup(*GetModel());
-					pGroup->InsertObjectToSdrObjList( pObj );
-					pGroup->InsertObjectToSdrObjList( pTextObj );
+					pGroup->InsertObjectToSdrObjList(*pObj);
+					pGroup->InsertObjectToSdrObjList(*pTextObj);
                     if (pOrgObj == pObj)
                         pOrgObj = pGroup;
                     else

Modified: incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/svdfppt.cxx Wed May  2 14:47:40 2012
@@ -1313,8 +1313,8 @@ SdrObject* SdrEscherImport::ProcessObj( 
 					if ( pRet )
 					{
 						SdrObjGroup* pGroup = new SdrObjGroup(*pSdrModel);
-						pGroup->InsertObjectToSdrObjList( pRet );
-						pGroup->InsertObjectToSdrObjList( pTObj );
+						pGroup->InsertObjectToSdrObjList(*pRet);
+						pGroup->InsertObjectToSdrObjList(*pTObj);
 						pRet = pGroup;
 					}
 					else
@@ -3129,7 +3129,7 @@ void SdrPowerPointImport::ImportPage( Sd
 													if ( aProcessData.pTableRowProperties )
 														pObj = CreateTable( pObj, aProcessData.pTableRowProperties, aProcessData.rPersistEntry.pSolverContainer );
 
-													pRet->InsertObjectToSdrObjList( pObj );
+													pRet->InsertObjectToSdrObjList(*pObj);
 
 													if( nShapeId )
 														insertShapeId( nShapeId, pObj );

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptObject.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptObject.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptObject.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptObject.hxx Wed May  2 14:47:40 2012
@@ -145,12 +145,7 @@ class REPORTDESIGN_DLLPUBLIC OCustomShap
     friend class DlgEdFactory;
 
 public:
-    static OCustomShape* Create( 
-		SdrModel& rSdrModel,
-		const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent )
-    {
-        return new OCustomShape( rSdrModel, _xComponent );
-    }
+    static OCustomShape* Create(SdrModel& rSdrModel, const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent);
 
 	/// create a copy, evtl. with a different target model (if given)
 	virtual SdrObject* CloneSdrObject(SdrModel* pTargetModel = 0) const;
@@ -217,14 +212,7 @@ protected:
 public:
 	/// create a copy, evtl. with a different target model (if given)
 	virtual SdrObject* CloneSdrObject(SdrModel* pTargetModel = 0) const;
-
-	static OOle2Obj* Create( 
-		SdrModel& rSdrModel,
-		const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent, 
-		sal_uInt16 _nType)
-    {
-        return new OOle2Obj( rSdrModel, _xComponent, _nType );
-    }
+	static OOle2Obj* Create(SdrModel& rSdrModel, const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent, sal_uInt16 _nType);
 	
 	virtual sal_Int32	GetStep() const;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptPage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptPage.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptPage.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/inc/RptPage.hxx Wed May  2 14:47:40 2012
@@ -67,7 +67,7 @@ public:
                 ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
                 ,bool bMasterPage = false );
 
-    virtual void InsertObjectToSdrObjList(SdrObject* pObj, sal_uInt32 nPos = CONTAINER_APPEND);
+    virtual void InsertObjectToSdrObjList(SdrObject& rObj, sal_uInt32 nPos = CONTAINER_APPEND);
     virtual SdrObject* RemoveObjectFromSdrObjList(sal_uInt32 nObjNum);
 
 	/** returns the index inside the object list which belongs to the report component.

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptObject.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptObject.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptObject.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptObject.cxx Wed May  2 14:47:40 2012
@@ -127,8 +127,9 @@ SdrObject* OObjectBase::createObject(Sdr
 			    OUnoObject* pUnoObj = new OUnoObject( 
 					*pTargetModel,
 					_xComponent 
-                                    ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) 
-                                    ,OBJ_DLG_FIXEDTEXT);
+                    ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) 
+                    ,OBJ_DLG_FIXEDTEXT);
+                SetUnoShapeAtSdrObjectFromSvxShape(*pUnoObj, _xComponent);
                 pNewObj = pUnoObj;
             
                 uno::Reference<beans::XPropertySet> xControlModel(pUnoObj->GetUnoControlModel(),uno::UNO_QUERY);
@@ -140,23 +141,26 @@ SdrObject* OObjectBase::createObject(Sdr
 			pNewObj = new OUnoObject(
 				*pTargetModel,
 				_xComponent
-									,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) 
-								    ,OBJ_DLG_IMAGECONTROL);
+				,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) 
+				,OBJ_DLG_IMAGECONTROL);
+            SetUnoShapeAtSdrObjectFromSvxShape(*pNewObj, _xComponent);
 			break;
 		case OBJ_DLG_FORMATTEDFIELD:
 			pNewObj = new OUnoObject(
 				*pTargetModel,
 				_xComponent
-									,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) 
-									,OBJ_DLG_FORMATTEDFIELD);
+				,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) 
+				,OBJ_DLG_FORMATTEDFIELD);
+            SetUnoShapeAtSdrObjectFromSvxShape(*pNewObj, _xComponent);
 			break;
         case OBJ_DLG_HFIXEDLINE:
         case OBJ_DLG_VFIXEDLINE:
 			pNewObj = new OUnoObject(
 				*pTargetModel,
 				_xComponent
-									,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) 
-									,nType);
+				,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) 
+				,nType);
+            SetUnoShapeAtSdrObjectFromSvxShape(*pNewObj, _xComponent);
 			break;
         case OBJ_CUSTOMSHAPE:
             pNewObj = OCustomShape::Create(
@@ -494,19 +498,17 @@ uno::Reference< uno::XInterface > OObjec
 
 //----------------------------------------------------------------------------
 DBG_NAME( rpt_OCustomShape );
-OCustomShape::OCustomShape(SdrModel& rSdrModel, const uno::Reference< report::XReportComponent>& _xComponent
-                           )
-		  :SdrObjCustomShape(rSdrModel)
-		  ,OObjectBase(_xComponent)
+OCustomShape::OCustomShape(SdrModel& rSdrModel, const uno::Reference< report::XReportComponent>& _xComponent)
+    :SdrObjCustomShape(rSdrModel)
+    ,OObjectBase(_xComponent)
 {
 	DBG_CTOR( rpt_OCustomShape, NULL);
-    impl_setUnoShape( uno::Reference< uno::XInterface >(_xComponent,uno::UNO_QUERY) );
     m_bIsListening = sal_True;
 }
 //----------------------------------------------------------------------------
 OCustomShape::OCustomShape(SdrModel& rSdrModel, const ::rtl::OUString& _sComponentName)
-		  :SdrObjCustomShape(rSdrModel)
-		  ,OObjectBase(_sComponentName)
+    :SdrObjCustomShape(rSdrModel)
+    ,OObjectBase(_sComponentName)
 {
 	DBG_CTOR( rpt_OCustomShape, NULL);
     m_bIsListening = sal_True;
@@ -549,6 +551,15 @@ SdrObject* OCustomShape::CloneSdrObject(
 	return pClone;
 }
 
+OCustomShape* OCustomShape::Create(SdrModel& rSdrModel, const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent)
+{
+    OCustomShape* pNew = new OCustomShape( rSdrModel, _xComponent );
+	OSL_ENSURE(pNew, "Create error (!)");
+    SetUnoShapeAtSdrObjectFromSvxShape(*pNew, _xComponent);
+
+    return pNew;
+}
+
 // -----------------------------------------------------------------------------
 sal_uInt16 OCustomShape::GetObjIdentifier() const
 {
@@ -670,7 +681,6 @@ OUnoObject::OUnoObject(SdrModel& rSdrMod
           ,m_nObjectType(_nObjectType)
 {
 	DBG_CTOR( rpt_OUnoObject, NULL);
-    impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) );
 
     if ( rModelName.getLength() )
         impl_initializeModel_nothrow();
@@ -718,6 +728,7 @@ SdrObject* OUnoObject::CloneSdrObject(Sd
 		getReportComponent(),
 		String(),
 		GetObjIdentifier());
+    SetUnoShapeAtSdrObjectFromSvxShape(*pClone, getReportComponent());
 	OSL_ENSURE(pClone, "CloneSdrObject error (!)");
 	pClone->copyDataFromSdrObject(*this);
 
@@ -989,8 +1000,6 @@ OOle2Obj::OOle2Obj(
           ,m_bOnlyOnce(true)
 {
 	DBG_CTOR( rpt_OOle2Obj, NULL);
-
-    impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) );
     m_bIsListening = sal_True;
 }
 //----------------------------------------------------------------------------
@@ -1161,9 +1170,9 @@ void OOle2Obj::copyDataFromSdrObject(con
 			uno::Reference< chart2::data::XDatabaseDataProvider > xSource( lcl_getDataProvider(pSource->GetObjRef()) );
 			uno::Reference< chart2::data::XDatabaseDataProvider > xDest( lcl_getDataProvider(GetObjRef()) );
     
-    if ( xSource.is() && xDest.is() )
+            if ( xSource.is() && xDest.is() )
 			{
-        comphelper::copyProperties(xSource.get(),xDest.get());
+                comphelper::copyProperties(xSource.get(),xDest.get());
 			}
 
 			initializeChart(rRptModel.getReportDefinition().get());
@@ -1179,14 +1188,27 @@ SdrObject* OOle2Obj::CloneSdrObject(SdrM
 {
 	OOle2Obj* pClone = new OOle2Obj(
 		pTargetModel ? *pTargetModel : getSdrModelFromSdrObject(),
-		getReportComponent(),
+        getReportComponent(),
 		GetObjIdentifier());
 	OSL_ENSURE(pClone, "CloneSdrObject error (!)");
+    SetUnoShapeAtSdrObjectFromSvxShape(*pClone, getReportComponent());
 	pClone->copyDataFromSdrObject(*this);
 
 	return pClone;
 }
 // -----------------------------------------------------------------------------
+OOle2Obj* OOle2Obj::Create( 
+	SdrModel& rSdrModel,
+	const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xComponent, 
+	sal_uInt16 _nType)
+{
+    OOle2Obj* pNew = new OOle2Obj( rSdrModel, _xComponent, _nType );
+	OSL_ENSURE(pNew, "Create error (!)");
+    SetUnoShapeAtSdrObjectFromSvxShape(*pNew, _xComponent);
+    
+    return pNew;
+}
+// -----------------------------------------------------------------------------
 void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< frame::XModel>& _xModel)
 {
     try

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx Wed May  2 14:47:40 2012
@@ -229,14 +229,14 @@ void OReportPage::resetSpecialMode()
     m_bSpecialInsertMode = false;
 }
 // -----------------------------------------------------------------------------
-void OReportPage::InsertObjectToSdrObjList(SdrObject* pObj, sal_uLong nPos)
+void OReportPage::InsertObjectToSdrObjList(SdrObject& rObj, sal_uLong nPos)
 {
-    SdrPage::InsertObjectToSdrObjList(pObj, nPos);
+    SdrPage::InsertObjectToSdrObjList(rObj, nPos);
 
-    OUnoObject* pUnoObj = dynamic_cast< OUnoObject* >( pObj );
+    OUnoObject* pUnoObj = dynamic_cast< OUnoObject* >( &rObj );
     if (getSpecialMode())
     {
-        m_aTemporaryObjectList.push_back(pObj);
+        m_aTemporaryObjectList.push_back(&rObj);
         return;
     }
     
@@ -250,7 +250,7 @@ void OReportPage::InsertObjectToSdrObjLi
 
     // this code is evil, but what else shall I do
     reportdesign::OSection* pSection = reportdesign::OSection::getImplementation(m_xSection);
-    uno::Reference< drawing::XShape> xShape(pObj->getUnoShape(),uno::UNO_QUERY);
+    uno::Reference< drawing::XShape> xShape(rObj.getUnoShape(),uno::UNO_QUERY);
     pSection->notifyElementAdded(xShape);
 
     //// check if we are a shape
@@ -263,7 +263,7 @@ void OReportPage::InsertObjectToSdrObjLi
 
     // now that the shape is inserted into its structures, we can allow the OObjectBase
     // to release the reference to it
-    OObjectBase* pObjectBase = dynamic_cast< OObjectBase* >( pObj );
+    OObjectBase* pObjectBase = dynamic_cast< OObjectBase* >( &rObj );
     OSL_ENSURE( pObjectBase, "OReportPage::InsertObjectToSdrObjList: what is being inserted here?" );
     if ( pObjectBase )
         pObjectBase->releaseUnoShape();

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ReportSection.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ReportSection.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ReportSection.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ReportSection.cxx Wed May  2 14:47:40 2012
@@ -283,10 +283,7 @@ void OReportSection::Paste(const uno::Se
 						if ( pObject )
 						{   
                             SdrObject* pNeuObj = pObject->CloneSdrObject();
-
-                            //pNeuObj->SetPage( m_pPage );
-							//pNeuObj->SetModel( m_pModel.get() );
-			                m_pPage->InsertObjectToSdrObjList(pNeuObj,CONTAINER_APPEND);
+			                m_pPage->InsertObjectToSdrObjList(*pNeuObj);
 
 							const awt::Point aWorkPos((*pCopiesIter)->getPosition());
 							const awt::Size aWorkSize((*pCopiesIter)->getSize());

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/ViewsWindow.cxx Wed May  2 14:47:40 2012
@@ -782,7 +782,15 @@ void OViewsWindow::collectBoundResizeRec
 				}
 			    else 
 				{
-                    _rBound.Union(aRectIter->second.second->getMarkedObjectSnapRect());
+                    const basegfx::B2DRange aSnapRange(aRectIter->second.second->getMarkedObjectSnapRange());
+
+                    if(!aSnapRange.isEmpty())
+                    {
+			            _rBound.Union(
+                            Rectangle(
+					            (sal_Int32)floor(aSnapRange.getMinX()), (sal_Int32)floor(aSnapRange.getMinY()),
+					            (sal_Int32)ceil(aSnapRange.getMaxX()), (sal_Int32)ceil(aSnapRange.getMaxY())));
+                    }
 				}
 		    }
 	    }
@@ -1073,8 +1081,6 @@ void OViewsWindow::BegDragObj_createInvi
         
         if ( &rView != &_rSection )
         {
-//            SdrRectObj *pNewObj = new SdrRectObj(OBJ_RECT, _aRange);
-// 			SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Temp Label")));
 			SdrObject *pNewObj = new SdrUnoObj(
 				rView.getSdrModelFromSdrView(),
 				::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")));
@@ -1082,12 +1088,9 @@ void OViewsWindow::BegDragObj_createInvi
 			if (pNewObj)
 			{
                 sdr::legacy::SetLogicRange(*pNewObj, _aRange);
-                // pNewObj->SetSize(_aRange.GetSize());
-                // pNewObj->Move(Size(_aRange.Left(), _aRange.Top()));
-
 				sdr::legacy::MoveSdrObject(*pNewObj, Size(0, aNewPos.Y()));
                 sal_Bool bChanged = rView.getSdrModelFromSdrView().IsChanged();
-	            rReportSection.getPage()->InsertObjectToSdrObjList(pNewObj);
+	            rReportSection.getPage()->InsertObjectToSdrObjList(*pNewObj);
                 rView.getSdrModelFromSdrView().SetChanged(bChanged);
                 m_aBegDragTempList.push_back(pNewObj);
                 const Rectangle aRect(sdr::legacy::GetLogicRect(*pNewObj));

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/dlgedfac.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/dlgedfac.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/dlgedfac.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/source/ui/report/dlgedfac.cxx Wed May  2 14:47:40 2012
@@ -64,8 +64,8 @@ IMPL_LINK( DlgEdFactory, MakeObject, Sdr
 				pObjFactory->mpNewObj = new OUnoObject( 
 					*pObjFactory->mpTargetModel,
 					SERVICE_FIXEDTEXT
-													    ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) 
-													    ,OBJ_DLG_FIXEDTEXT);
+					,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) 
+					,OBJ_DLG_FIXEDTEXT);
 				    break;
 			}
 		    case OBJ_DLG_IMAGECONTROL:
@@ -73,8 +73,8 @@ IMPL_LINK( DlgEdFactory, MakeObject, Sdr
 				pObjFactory->mpNewObj = new OUnoObject( 
 					*pObjFactory->mpTargetModel,
 					SERVICE_IMAGECONTROL
-													    ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) 
-														,OBJ_DLG_IMAGECONTROL);
+					,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) 
+					,OBJ_DLG_IMAGECONTROL);
 				    break;
 			}
 		    case OBJ_DLG_FORMATTEDFIELD:
@@ -82,24 +82,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, Sdr
 				pObjFactory->mpNewObj = new OUnoObject( 
 					*pObjFactory->mpTargetModel,
 					SERVICE_FORMATTEDFIELD
-													    ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) 
-														,OBJ_DLG_FORMATTEDFIELD);
+					,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) 
+					,OBJ_DLG_FORMATTEDFIELD);
 				    break;
 			}
             case OBJ_DLG_VFIXEDLINE:
             case OBJ_DLG_HFIXEDLINE:
-                {
+            {
                 OUnoObject* pObj = new OUnoObject( 
 					*pObjFactory->mpTargetModel,
 					SERVICE_FIXEDLINE
-													    ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) 
+                    ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) 
 					,pObjFactory->mnIdentifier);
                 pObjFactory->mpNewObj = pObj;
                 if ( pObjFactory->mnIdentifier == OBJ_DLG_HFIXEDLINE )
-                    {
-                        uno::Reference<beans::XPropertySet> xProp = pObj->getAwtComponent();
-                        xProp->setPropertyValue( PROPERTY_ORIENTATION, uno::makeAny(sal_Int32(0)) );
-                    }
+                {
+                    uno::Reference<beans::XPropertySet> xProp = pObj->getAwtComponent();
+                    xProp->setPropertyValue( PROPERTY_ORIENTATION, uno::makeAny(sal_Int32(0)) );
+                }
                 break;
             }
             case OBJ_CUSTOMSHAPE:
@@ -129,9 +129,9 @@ IMPL_LINK( DlgEdFactory, MakeObject, Sdr
             {
 			    OSL_ENSURE(0,"Unknown object id");
 			    break;
+	        }
 	    }
 	}
-	}
 
 	return 0;
 }

Modified: incubator/ooo/branches/alg/aw080/main/sc/inc/drwlayer.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/inc/drwlayer.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/inc/drwlayer.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/inc/drwlayer.hxx Wed May  2 14:47:40 2012
@@ -176,7 +176,6 @@ public:
     /** Returns the rectangle for the passed cell address in 1/100 mm.
         @param bMergedCell  True = regards merged cells. False = use single column/row size. */
     static Rectangle GetCellRect( ScDocument& rDoc, const ScAddress& rPos, bool bMergedCell );
-	// TTTT: GetCellRectmay be no longer needed
     static basegfx::B2DRange GetCellRange(ScDocument& rDoc, const ScAddress& rPos, bool bMergedCell);
 
 					//	GetVisibleName: name for navigator etc: GetPersistName or GetName

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx Wed May  2 14:47:40 2012
@@ -114,7 +114,7 @@ void ScDocument::TransferDrawPage(ScDocu
                     // #116235#
 					SdrObject* pNewObject = pOldObject->CloneSdrObject();
 
-					pNewPage->InsertObjectToSdrObjList( pNewObject );
+					pNewPage->InsertObjectToSdrObjList(*pNewObject);
                     if (pDrawLayer->IsRecording())
                         pDrawLayer->AddCalcUndo( new SdrUndoInsertObj( *pNewObject ) );
                 }
@@ -337,81 +337,29 @@ void ScDocument::StartAnimations( SCTAB 
 {
 	if (!pDrawLayer)
 		return;
-	SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
+
+    SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
 	DBG_ASSERT(pPage,"Page ?");
-	if (!pPage)
+	
+    if (!pPage)
 		return;
 
 	SdrObjListIter aIter( *pPage, IM_FLAT );
 	SdrObject* pObject = aIter.Next();
-	while (pObject)
+	
+    while (pObject)
 	{
 		SdrGrafObj* pGrafObj = dynamic_cast< SdrGrafObj* >(pObject);
 		
-		if (pGrafObj)
+		if(pGrafObj && pGrafObj->IsAnimated() )
 		{
-			if ( pGrafObj->IsAnimated() )
-			{
-				const Rectangle aRect = sdr::legacy::GetBoundRect(*pGrafObj);
-				pGrafObj->StartAnimation( pWin, aRect.TopLeft(), aRect.GetSize() );
-			}
+            pGrafObj->SetGrafAnimationAllowed(true);
 		}
-		pObject = aIter.Next();
+	
+        pObject = aIter.Next();
 	}
 }
 
-//UNUSED2008-05  void ScDocument::RefreshNoteFlags()
-//UNUSED2008-05  {
-//UNUSED2008-05      if (!pDrawLayer)
-//UNUSED2008-05          return;
-//UNUSED2008-05
-//UNUSED2008-05      sal_Bool bAnyIntObj = sal_False;
-//UNUSED2008-05      SCTAB nTab;
-//UNUSED2008-05      ScPostIt aNote(this);
-//UNUSED2008-05      for (nTab=0; nTab<=MAXTAB && pTab[nTab]; nTab++)
-//UNUSED2008-05      {
-//UNUSED2008-05          SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab));
-//UNUSED2008-05          DBG_ASSERT(pPage,"Page ?");
-//UNUSED2008-05          if (pPage)
-//UNUSED2008-05          {
-//UNUSED2008-05              SdrObjListIter aIter( *pPage, IM_FLAT );
-//UNUSED2008-05              SdrObject* pObject = aIter.Next();
-//UNUSED2008-05              while (pObject)
-//UNUSED2008-05              {
-//UNUSED2008-05                  if ( pObject->GetLayer() == SC_LAYER_INTERN )
-//UNUSED2008-05                  {
-//UNUSED2008-05                      bAnyIntObj = sal_True;  // for all internal objects, including detective
-//UNUSED2008-05
-//UNUSED2008-05                      if ( dynamic_cast< SdrCaptionObj* >(pObject) )
-//UNUSED2008-05                      {
-//UNUSED2008-05                          ScDrawObjData* pData = ScDrawLayer::GetObjData( pObject );
-//UNUSED2008-05                          if ( pData )
-//UNUSED2008-05                          {
-//UNUSED2008-05                              if ( GetNote( pData->aStt.Col(), pData->aStt.Row(), nTab, aNote))
-//UNUSED2008-05                                  if ( !aNote.IsShown() )
-//UNUSED2008-05                                  {
-//UNUSED2008-05                                      aNote.SetShown(sal_True);
-//UNUSED2008-05                                      SetNote( pData->aStt.Col(), pData->aStt.Row(), nTab, aNote);
-//UNUSED2008-05                                  }
-//UNUSED2008-05                          }
-//UNUSED2008-05                      }
-//UNUSED2008-05                  }
-//UNUSED2008-05                  pObject = aIter.Next();
-//UNUSED2008-05              }
-//UNUSED2008-05          }
-//UNUSED2008-05      }
-//UNUSED2008-05
-//UNUSED2008-05      if (bAnyIntObj)
-//UNUSED2008-05      {
-//UNUSED2008-05          //  update attributes for all note objects and the colors of detective objects
-//UNUSED2008-05          //  (we don't know with which settings the file was created)
-//UNUSED2008-05
-//UNUSED2008-05          ScDetectiveFunc aFunc( this, 0 );
-//UNUSED2008-05          aFunc.UpdateAllComments();
-//UNUSED2008-05          aFunc.UpdateAllArrowColors();
-//UNUSED2008-05      }
-//UNUSED2008-05  }
-
 sal_Bool ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect )
 {
 	//	Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect

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=1333067&r1=1333066&r2=1333067&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 Wed May  2 14:47:40 2012
@@ -426,7 +426,7 @@ void ScDrawLayer::ScCopyPage( sal_uInt16
                 // #116235#
 				SdrObject* pNewObject = pOldObject->CloneSdrObject();
 
-				pNewPage->InsertObjectToSdrObjList( pNewObject );
+				pNewPage->InsertObjectToSdrObjList(*pNewObject);
                 if (bRecording)
                     AddCalcUndo( new SdrUndoInsertObj( *pNewObject ) );
             }
@@ -1430,19 +1430,9 @@ void ScDrawLayer::CopyToClip( ScDocument
 				DBG_ASSERT( pDestPage, "no page" );
 				if (pDestPage)
 				{
-					// #116235#
 					SdrObject* pNewObject = pOldObject->CloneSdrObject();
-					//SdrObject* pNewObject = pOldObject->Clone( pDestPage, pDestModel );
-					//pNewObject->SetModel(pDestModel);
-					//pNewObject->SetPage(pDestPage);
-
                     uno::Reference< chart2::XChartDocument > xOldChart( ScChartHelper::GetChartFromSdrObject( pOldObject ) );
-					// taken out: move is relative, so this will do nothing. Maybe it was intended to
-					// move to (0,0), but that needs to be done differently
-                    //if(!xOldChart.is())//#i110034# do not move charts as they loose all their data references otherwise
-					//	sdr::legacy::MoveSdrObject(*pNewObject, Size(0,0));
-					pDestPage->InsertObjectToSdrObjList( pNewObject );
-
+					pDestPage->InsertObjectToSdrObjList(*pNewObject);
 					//	no undo needed in clipboard document
 					//	charts are not updated
 				}
@@ -1598,12 +1588,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLa
         // do not copy internal objects (detective) and note captions
         if ( rSourceRange.IsInside( aObjRect ) && (pOldObject->GetLayer() != SC_LAYER_INTERN) && !IsNoteCaption( *pOldObject ) )
 		{
-			// #116235#
 			SdrObject* pNewObject = pOldObject->CloneSdrObject();
-			//SdrObject* pNewObject = pOldObject->Clone( pDestPage, this );
-			//pNewObject->SetModel(this);
-			//pNewObject->SetPage(pDestPage);
-
 			if ( bMirrorObj )
 				MirrorRTL( pNewObject );		// first mirror, then move
 
@@ -1611,12 +1596,10 @@ void ScDrawLayer::CopyFromClip( ScDrawLa
 			if ( bResize )
 				sdr::legacy::ResizeSdrObject(*pNewObject, aRefPos, aHorFract, aVerFract );
 
-			pDestPage->InsertObjectToSdrObjList( pNewObject );
+			pDestPage->InsertObjectToSdrObjList(*pNewObject);
 			if (bRecording)
 				AddCalcUndo( new SdrUndoInsertObj( *pNewObject ) );
 
-			//#i110034#	handle chart data references (after InsertObjectToSdrObjList)
-
 			if ( pNewObject->GetObjIdentifier() == OBJ_OLE2 )
 			{
 				uno::Reference< embed::XEmbeddedObject > xIPObj = ((SdrOle2Obj*)pNewObject)->GetObjRef();

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/postit.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/postit.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/postit.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/postit.cxx Wed May  2 14:47:40 2012
@@ -442,7 +442,7 @@ ScNoteCaptionCreator::ScNoteCaptionCreat
             // store note position in user data of caption object
             ScCaptionUtil::SetCaptionUserData( *rNoteData.mpCaption, rPos );
             // insert object into draw page
-            pDrawPage->InsertObjectToSdrObjList( rNoteData.mpCaption );
+            pDrawPage->InsertObjectToSdrObjList(*rNoteData.mpCaption);
         }
     }
 }
@@ -816,7 +816,7 @@ SdrCaptionObj* ScNoteUtil::CreateTempCap
     SdrCaptionObj* pCaption = aCreator.GetCaption();
 
     // insert caption into page (needed to set caption text)
-    rDrawPage.InsertObjectToSdrObjList( pCaption );
+    rDrawPage.InsertObjectToSdrObjList(*pCaption);
 
     // clone the edit text object, unless user text is present, then set this text
     if( pNoteCaption && (rUserText.getLength() == 0) )

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/detfunc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/detfunc.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/detfunc.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/detfunc.cxx Wed May  2 14:47:40 2012
@@ -503,7 +503,7 @@ sal_Bool ScDetectiveFunc::InsertArrow( S
 
 		ScDrawLayer::SetAnchor( pBox, SCA_CELL );
 		pBox->SetLayer( SC_LAYER_INTERN );
-		pPage->InsertObjectToSdrObjList( pBox );
+		pPage->InsertObjectToSdrObjList(*pBox);
 		pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
 
 		ScDrawObjData* pData = ScDrawLayer::GetObjData( *pBox, sal_True );
@@ -547,7 +547,7 @@ sal_Bool ScDetectiveFunc::InsertArrow( S
 
 	ScDrawLayer::SetAnchor( pArrow, SCA_CELL );
 	pArrow->SetLayer( SC_LAYER_INTERN );
-	pPage->InsertObjectToSdrObjList( pArrow );
+	pPage->InsertObjectToSdrObjList(*pArrow);
 	pModel->AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
 
 	ScDrawObjData* pData = ScDrawLayer::GetObjData( *pArrow, sal_True );
@@ -583,7 +583,7 @@ sal_Bool ScDetectiveFunc::InsertToOtherT
 
 		ScDrawLayer::SetAnchor( pBox, SCA_CELL );
 		pBox->SetLayer( SC_LAYER_INTERN );
-		pPage->InsertObjectToSdrObjList( pBox );
+		pPage->InsertObjectToSdrObjList(*pBox);
 		pModel->AddCalcUndo( new SdrUndoInsertObj( *pBox ) );
 
 		ScDrawObjData* pData = ScDrawLayer::GetObjData( *pBox, sal_True );
@@ -615,13 +615,11 @@ sal_Bool ScDetectiveFunc::InsertToOtherT
 		*pModel,
 		OBJ_LINE, 
 		basegfx::B2DPolyPolygon(aTempPoly));
-	// pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos));	//! noetig ??? // TTT: ditto
 
 	pArrow->SetMergedItemSetAndBroadcast(rAttrSet);
-
 	ScDrawLayer::SetAnchor( pArrow, SCA_CELL );
 	pArrow->SetLayer( SC_LAYER_INTERN );
-	pPage->InsertObjectToSdrObjList( pArrow );
+	pPage->InsertObjectToSdrObjList(*pArrow);
 	pModel->AddCalcUndo( new SdrUndoInsertObj( *pArrow ) );
 
 	ScDrawObjData* pData = ScDrawLayer::GetObjData( *pArrow, sal_True );
@@ -692,10 +690,9 @@ void ScDetectiveFunc::DrawCircle( SCCOL 
 	SfxItemSet& rAttrSet = rData.GetCircleSet();
 
 	pCircle->SetMergedItemSetAndBroadcast(rAttrSet);
-
 	ScDrawLayer::SetAnchor( pCircle, SCA_CELL );
 	pCircle->SetLayer( SC_LAYER_INTERN );
-	pPage->InsertObjectToSdrObjList( pCircle );
+	pPage->InsertObjectToSdrObjList(*pCircle);
 	pModel->AddCalcUndo( new SdrUndoInsertObj( *pCircle ) );
 
 	ScDrawObjData* pData = ScDrawLayer::GetObjData( *pCircle, sal_True );

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx Wed May  2 14:47:40 2012
@@ -3642,7 +3642,7 @@ void XclImpDffConverter::InsertSdrObject
     SdrObjectPtr xSdrObj( pSdrObj );
     if( xSdrObj.is() && rDrawObj.IsInsertSdrObj() )
     {
-        rObjList.InsertObjectToSdrObjList( xSdrObj.release() );
+        rObjList.InsertObjectToSdrObjList(*xSdrObj.release());
         // callback to drawing manager for e.g. tracking of used sheet area
         rConvData.mrDrawing.OnObjectInserted( rDrawObj );
         // callback to drawing object for post processing (use pSdrObj, xSdrObj already released)

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/rtf/eeimpars.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/rtf/eeimpars.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/rtf/eeimpars.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/rtf/eeimpars.cxx Wed May  2 14:47:40 2012
@@ -572,7 +572,7 @@ void ScEEImport::InsertGraphic( SCCOL nC
 
             // #118522# calling SetGraphicLink here doesn't work
 			pObj->SetName( pI->aURL );
-			pPage->InsertObjectToSdrObjList( pObj );
+			pPage->InsertObjectToSdrObjList(*pObj);
 
             // #118522# SetGraphicLink has to be used after inserting the object,
             // otherwise an empty graphic is swapped in and the contact stuff crashes.

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/starcalc/scfobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/starcalc/scfobj.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/starcalc/scfobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/starcalc/scfobj.cxx Wed May  2 14:47:40 2012
@@ -85,7 +85,7 @@ void Sc10InsertObject::InsertChart( ScDo
 
 		SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nDestTab));
 		DBG_ASSERT(pPage,"Page ?");
-		pPage->InsertObjectToSdrObjList(pSdrOle2Obj);
+		pPage->InsertObjectToSdrObjList(*pSdrOle2Obj);
 
         awt::Size aSz;
         aSz.Width = rRect.GetSize().Width();

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/drwtrans.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/drwtrans.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/drwtrans.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/app/drwtrans.cxx Wed May  2 14:47:40 2012
@@ -214,12 +214,12 @@ ScDrawTransferObj::ScDrawTransferObj( Sd
     //
 
 	// #i71538# use complete SdrViews
-    // SdrExchangeView aView(pModel);
 	OSL_ENSURE(pModel, "ScDrawTransferObj without SdrModel (!)");
     SdrView aView(*pModel);
     aView.ShowSdrPage(*aView.getSdrModelFromSdrView().GetPage(0));
     aView.MarkAllObj();
-    aSrcSize = aView.getMarkedObjectSnapRect().GetSize();
+    const basegfx::B2DRange aAllRange(aView.getMarkedObjectSnapRange());
+    aSrcSize = Size(basegfx::fround(aAllRange.getWidth()), basegfx::fround(aAllRange.getHeight()));
 
     if ( bOleObj )              // single OLE object
     {

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fuins2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fuins2.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fuins2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/drawfunc/fuins2.cxx Wed May  2 14:47:40 2012
@@ -691,137 +691,134 @@ FuInsertChart::FuInsertChart(ScTabViewSh
 
 		if(pPV)
 		{
-
-//        pView->InsertObjectAtView(pObj, *pPV);//this call leads to an immidiate redraw and asks the chart for a visual representation
-
-        // use the page instead of the view to insert, so no undo action is created yet
+            // use the page instead of the view to insert, so no undo action is created yet
 			SdrPage& rInsPage = pPV->getSdrPageFromSdrPageView();
-			rInsPage.InsertObjectToSdrObjList( pObj );
-        pView->UnmarkAllObj();
+			rInsPage.InsertObjectToSdrObjList(*pObj);
+            pView->UnmarkAllObj();
 			pView->MarkObj( *pObj );
-        bool bAddUndo = true;               // add undo action later, unless the dialog is canceled
+            bool bAddUndo = true;               // add undo action later, unless the dialog is canceled
 
-        if (rReq.IsAPI())
-        {
-            if( xChartModel.is() )
-                xChartModel->unlockControllers();
-        }
-        else
-        {
-            //the controller will be unlocked by the dialog when the dialog is told to do so
-
-            // only activate object if not called via API (e.g. macro)
-            pViewShell->ActivateObject( (SdrOle2Obj*) pObj, SVVERB_SHOW );
-
-            //open wizard
-            //@todo get context from calc if that has one
-            uno::Reference< uno::XComponentContext > xContext(
-                ::cppu::defaultBootstrap_InitialComponentContext() );
-            if(xContext.is())
+            if (rReq.IsAPI())
             {
-                uno::Reference< lang::XMultiComponentFactory > xMCF( xContext->getServiceManager() );
-                if(xMCF.is())
+                if( xChartModel.is() )
+                    xChartModel->unlockControllers();
+            }
+            else
+            {
+                //the controller will be unlocked by the dialog when the dialog is told to do so
+
+                // only activate object if not called via API (e.g. macro)
+                pViewShell->ActivateObject( (SdrOle2Obj*) pObj, SVVERB_SHOW );
+
+                //open wizard
+                //@todo get context from calc if that has one
+                uno::Reference< uno::XComponentContext > xContext(
+                    ::cppu::defaultBootstrap_InitialComponentContext() );
+                if(xContext.is())
                 {
-                    uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
-                        xMCF->createInstanceWithContext(
-                            rtl::OUString::createFromAscii("com.sun.star.comp.chart2.WizardDialog")
-                            , xContext), uno::UNO_QUERY);
-                    uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
-                    if( xChartModel.is() && xInit.is() )
+                    uno::Reference< lang::XMultiComponentFactory > xMCF( xContext->getServiceManager() );
+                    if(xMCF.is())
                     {
-                        uno::Reference< awt::XWindow > xDialogParentWindow(0);
-                        //	initialize dialog
-                        uno::Sequence<uno::Any> aSeq(2);
-                        uno::Any* pArray = aSeq.getArray();
-                        beans::PropertyValue aParam1;
-                        aParam1.Name = rtl::OUString::createFromAscii("ParentWindow");
-                        aParam1.Value <<= uno::makeAny(xDialogParentWindow);
-                        beans::PropertyValue aParam2;
-                        aParam2.Name = rtl::OUString::createFromAscii("ChartModel");
-                        aParam2.Value <<= uno::makeAny(xChartModel);
-                        pArray[0] <<= uno::makeAny(aParam1);
-                        pArray[1] <<= uno::makeAny(aParam2);
-                        xInit->initialize( aSeq );
-
-                        // try to set the dialog's position so it doesn't hide the chart
-                        uno::Reference < beans::XPropertySet > xDialogProps( xDialog, uno::UNO_QUERY );
-                        if ( xDialogProps.is() )
+                        uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
+                            xMCF->createInstanceWithContext(
+                                rtl::OUString::createFromAscii("com.sun.star.comp.chart2.WizardDialog")
+                                , xContext), uno::UNO_QUERY);
+                        uno::Reference< lang::XInitialization > xInit( xDialog, uno::UNO_QUERY );
+                        if( xChartModel.is() && xInit.is() )
                         {
-                            try
+                            uno::Reference< awt::XWindow > xDialogParentWindow(0);
+                            //	initialize dialog
+                            uno::Sequence<uno::Any> aSeq(2);
+                            uno::Any* pArray = aSeq.getArray();
+                            beans::PropertyValue aParam1;
+                            aParam1.Name = rtl::OUString::createFromAscii("ParentWindow");
+                            aParam1.Value <<= uno::makeAny(xDialogParentWindow);
+                            beans::PropertyValue aParam2;
+                            aParam2.Name = rtl::OUString::createFromAscii("ChartModel");
+                            aParam2.Value <<= uno::makeAny(xChartModel);
+                            pArray[0] <<= uno::makeAny(aParam1);
+                            pArray[1] <<= uno::makeAny(aParam2);
+                            xInit->initialize( aSeq );
+
+                            // try to set the dialog's position so it doesn't hide the chart
+                            uno::Reference < beans::XPropertySet > xDialogProps( xDialog, uno::UNO_QUERY );
+                            if ( xDialogProps.is() )
                             {
-                                //get dialog size:
-                                awt::Size aDialogAWTSize;
-                                if( xDialogProps->getPropertyValue( ::rtl::OUString::createFromAscii("Size") )
-                                    >>= aDialogAWTSize )
+                                try
                                 {
-									const basegfx::B2DVector aDialogScale(aDialogAWTSize.Width, aDialogAWTSize.Height);
-
-									if( aDialogScale.getX() > 0 && aDialogScale.getY() > 0 )
+                                    //get dialog size:
+                                    awt::Size aDialogAWTSize;
+                                    if( xDialogProps->getPropertyValue( ::rtl::OUString::createFromAscii("Size") )
+                                        >>= aDialogAWTSize )
                                     {
-                                        //calculate and set new position
-										const basegfx::B2DRange aOldObjRange(sdr::legacy::GetLogicRange(*pObj));
-										const basegfx::B2DPoint aDialogPos(pViewShell->GetChartDialogPos(aDialogScale, aOldObjRange));
+									    const basegfx::B2DVector aDialogScale(aDialogAWTSize.Width, aDialogAWTSize.Height);
+
+									    if( aDialogScale.getX() > 0 && aDialogScale.getY() > 0 )
+                                        {
+                                            //calculate and set new position
+										    const basegfx::B2DRange aOldObjRange(sdr::legacy::GetLogicRange(*pObj));
+										    const basegfx::B2DPoint aDialogPos(pViewShell->GetChartDialogPos(aDialogScale, aOldObjRange));
                                         
-                                        xDialogProps->setPropertyValue( ::rtl::OUString::createFromAscii("Position"),
-												uno::makeAny( 
-													awt::Point(
-														basegfx::fround(aDialogPos.getX()), 
-														basegfx::fround(aDialogPos.getY())) ) );
+                                            xDialogProps->setPropertyValue( ::rtl::OUString::createFromAscii("Position"),
+												    uno::makeAny( 
+													    awt::Point(
+														    basegfx::fround(aDialogPos.getX()), 
+														    basegfx::fround(aDialogPos.getY())) ) );
+                                        }
                                     }
-                                }
-                                //tell the dialog to unlock controller
-                                xDialogProps->setPropertyValue( ::rtl::OUString::createFromAscii("UnlockControllersOnExecute"),
-                                            uno::makeAny( sal_True ) );
+                                    //tell the dialog to unlock controller
+                                    xDialogProps->setPropertyValue( ::rtl::OUString::createFromAscii("UnlockControllersOnExecute"),
+                                                uno::makeAny( sal_True ) );
 
+                                }
+                                catch( uno::Exception& )
+		                        {
+			                        OSL_ASSERT( "Chart wizard couldn't be positioned automatically\n" );
+		                        }
                             }
-                            catch( uno::Exception& )
-		                    {
-			                    OSL_ASSERT( "Chart wizard couldn't be positioned automatically\n" );
-		                    }
-                        }
 
-                        sal_Int16 nDialogRet = xDialog->execute();
-                        if( nDialogRet == ui::dialogs::ExecutableDialogResults::CANCEL )
-                        {
-                            // leave OLE inplace mode and unmark
-                            OSL_ASSERT( pViewShell );
-                            OSL_ASSERT( pView );
-                            pViewShell->DeactivateOle();
-                            pView->UnmarkAll();
-
-                            // old page view pointer is invalid after switching sheets
-                            pPV = pView->GetSdrPageView();
-
-                            // remove the chart
-                            OSL_ASSERT( pPV );
-								SdrPage& rPage = pPV->getSdrPageFromSdrPageView();
-                            OSL_ASSERT( pObj );
-								rPage.RemoveObjectFromSdrObjList(pObj->GetNavigationPosition());
+                            sal_Int16 nDialogRet = xDialog->execute();
+                            if( nDialogRet == ui::dialogs::ExecutableDialogResults::CANCEL )
+                            {
+                                // leave OLE inplace mode and unmark
+                                OSL_ASSERT( pViewShell );
+                                OSL_ASSERT( pView );
+                                pViewShell->DeactivateOle();
+                                pView->UnmarkAll();
+
+                                // old page view pointer is invalid after switching sheets
+                                pPV = pView->GetSdrPageView();
+
+                                // remove the chart
+                                OSL_ASSERT( pPV );
+								    SdrPage& rPage = pPV->getSdrPageFromSdrPageView();
+                                OSL_ASSERT( pObj );
+								    rPage.RemoveObjectFromSdrObjList(pObj->GetNavigationPosition());
 
-                            bAddUndo = false;       // don't create the undo action for inserting
+                                bAddUndo = false;       // don't create the undo action for inserting
 
-                            // leave the draw shell
-                            pViewShell->SetDrawShell( sal_False );
-                        }
-                        else
-                        {
-                            OSL_ASSERT( nDialogRet == ui::dialogs::ExecutableDialogResults::OK );
-                            //@todo maybe move chart to different table
+                                // leave the draw shell
+                                pViewShell->SetDrawShell( sal_False );
+                            }
+                            else
+                            {
+                                OSL_ASSERT( nDialogRet == ui::dialogs::ExecutableDialogResults::OK );
+                                //@todo maybe move chart to different table
+                            }
                         }
+                        uno::Reference< lang::XComponent > xComponent( xDialog, uno::UNO_QUERY );
+                        if( xComponent.is())
+                            xComponent->dispose();
                     }
-                    uno::Reference< lang::XComponent > xComponent( xDialog, uno::UNO_QUERY );
-                    if( xComponent.is())
-                        xComponent->dispose();
                 }
             }
-        }
 
-        if ( bAddUndo )
-        {
-            // add undo action the same way as in SdrEditView::InsertObjectAtView
-            // (using UndoActionHdl etc.)
-            pView->AddUndo(pDoc->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
-        }
+            if ( bAddUndo )
+            {
+                // add undo action the same way as in SdrEditView::InsertObjectAtView
+                // (using UndoActionHdl etc.)
+                pView->AddUndo(pDoc->GetSdrUndoFactory().CreateUndoNewObject(*pObj));
+            }
 		}
 
         // BM/IHA --

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/unoobj/chartuno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/unoobj/chartuno.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/unoobj/chartuno.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/unoobj/chartuno.cxx Wed May  2 14:47:40 2012
@@ -299,7 +299,7 @@ void SAL_CALL ScChartsObj::addNewByName(
         if( xObj.is())
             xObj->setVisualAreaSize( nAspect, aSz );
 
-		pPage->InsertObjectToSdrObjList( pObj );
+		pPage->InsertObjectToSdrObjList(*pObj);
         pModel->AddUndo( new SdrUndoNewObj( *pObj ) );
 
 		// Dies veranlaesst Chart zum sofortigen Update

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/tabview5.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/tabview5.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/tabview5.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/tabview5.cxx Wed May  2 14:47:40 2012
@@ -533,7 +533,6 @@ void ScTabView::DrawMarkRange( const bas
 
 void ScTabView::DrawEnableAnim(sal_Bool bSet)
 {
-	sal_uInt16 i;
 	if ( pDrawView )
 	{
 		//	#71040# dont start animations if display of graphics is disabled
@@ -542,13 +541,18 @@ void ScTabView::DrawEnableAnim(sal_Bool 
 		{
 			if ( !pDrawView->IsAnimationEnabled() )
 			{
-				pDrawView->SetAnimationEnabled(sal_True);
+				pDrawView->SetAnimationEnabled(true);
 
 				//	Animierte GIFs muessen wieder gestartet werden:
 				ScDocument* pDoc = aViewData.GetDocument();
-				for (i=0; i<4; i++)
-					if ( pGridWin[i] && pGridWin[i]->IsVisible() )
-						pDoc->StartAnimations( aViewData.GetTabNo(), pGridWin[i] );
+
+                for(sal_uInt16 i(0); i < 4; i++)
+                {
+					if(pGridWin[i] && pGridWin[i]->IsVisible())
+                    {
+						pDoc->StartAnimations(aViewData.GetTabNo(), pGridWin[i]);
+                    }
+                }
 			}
 		}
 		else

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewfun7.cxx Wed May  2 14:47:40 2012
@@ -180,7 +180,7 @@ void ScViewFunc::PasteDraw( const basegf
 
 					if ( !aDiff.equalZero())
 						sdr::legacy::transformSdrObject(*pNeuObj, basegfx::tools::createTranslateB2DHomMatrix(aDiff));
-					pDestPage->InsertObjectToSdrObjList( pNeuObj );
+					pDestPage->InsertObjectToSdrObjList(*pNeuObj);
 					pScDrawView->AddUndo(new SdrUndoInsertObj( *pNeuObj ));
 
 					//	Chart braucht nicht mehr getrennt behandelt zu werden,

Modified: incubator/ooo/branches/alg/aw080/main/sd/inc/sdpage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/inc/sdpage.hxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/inc/sdpage.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/inc/sdpage.hxx Wed May  2 14:47:40 2012
@@ -221,12 +221,6 @@ public:
 	// react on content change
 	virtual void handleContentChange(const SfxHint& rHint);
 
-	// virtual void       InsertObjectToSdrObjList(SdrObject* pObj, sal_uInt32 nPos = CONTAINER_APPEND);
-	//virtual SdrObject* NbcRemoveObject(sal_uInt32 nObjNum);
-	/// virtual SdrObject* RemoveObject(sal_uInt32 nObjNum);
-	// #95876# Also overload ReplaceObject methods to realize when
-	// objects are removed with this mechanism instead of RemoveObject
-
 	virtual void SetLinkData(const String& rLinkName, const String& rLinkData);
 
 	void		SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eObjKind, const String& rStr );
@@ -283,7 +277,7 @@ public:
 	virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
     // 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);
 
 	void			SetLayoutName(String aName);
 	virtual String	GetLayoutName() const		{ return maLayoutName; }

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/sdpage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/sdpage.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/sdpage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/sdpage.cxx Wed May  2 14:47:40 2012
@@ -527,8 +527,7 @@ SdrObject* SdPage::CreatePresObj(PresObj
 	{
 		pSdrObj->SetEmptyPresObj(bEmptyPresObj);
 		sdr::legacy::SetLogicRange(*pSdrObj, rRange);
-
-		InsertObjectToSdrObjList(pSdrObj);
+		InsertObjectToSdrObjList(*pSdrObj);
 		SdrTextObj* pSdrTextObj = dynamic_cast< SdrTextObj* >(pSdrObj);
 
 		if ( pSdrTextObj )
@@ -823,41 +822,14 @@ void SdPage::Notify(SfxBroadcaster& /*rB
 
         if(pObj)
         {
-            const basegfx::B2DRange& rLast(pSdrBaseHint->GetSdrHintLastBound());
-            SdrHintKind eHint(pSdrBaseHint->GetSdrHintKind());
-
-            if((HINT_OBJCHG_RESIZE == eHint || HINT_OBJCHG_MOVE == eHint) && !rLast.isEmpty())
-            {
-                const basegfx::B2DRange& rCurrent = pObj->getObjectRange(0);
-
-                if(!rCurrent.isEmpty())
-                {
-                    if(HINT_OBJCHG_RESIZE == eHint
-                        && rLast.getWidth() == rCurrent.getWidth() 
-                        && rLast.getHeight() == rCurrent.getHeight())
-                    {
-                        // degrade eHint to HINT_OBJCHG_MOVE when not really resized
-                        eHint = HINT_OBJCHG_MOVE;
-                    }
-
-                    if(HINT_OBJCHG_MOVE == eHint
-                        && rLast.getMinimum() == rCurrent.getMinimum())
-                    {
-                        // degrade eHint to HINT_OBJCHG_ATTR when not really moved
-                        eHint = HINT_OBJCHG_ATTR;
-                    }
-                }
-            }
-
-            HandleChanged(*pObj, eHint, rLast);
+            HandleChanged(*pObj, pSdrBaseHint->GetSdrHintKind());
         }
     }
 }
 
 void SdPage::HandleChanged(
     const SdrObject& rObj,
-    SdrHintKind eHint,
-    const basegfx::B2DRange& /*rOldObjectRange*/)
+    SdrHintKind eHint)
 {
 	if (!maLockAutoLayoutArrangement.isLocked())
 	{

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/grf/sdgrffilter.cxx Wed May  2 14:47:40 2012
@@ -254,13 +254,13 @@ sal_Bool SdGRFFilter::Import()
 			aPos.X() = ( ( aPagSize.Width() - aGrfSize.Width() ) >> 1 ) + pPage->GetLeftPageBorder();
 			aPos.Y() = ( ( aPagSize.Height() - aGrfSize.Height() ) >> 1 )  + pPage->GetTopPageBorder();
 
-			pPage->InsertObjectToSdrObjList(
-				new SdrGrafObj( 
+			SdrGrafObj* pNewSdrGraf = new SdrGrafObj( 
 					pPage->getSdrModelFromSdrPage(),
 					aGraphic, 
 					basegfx::tools::createScaleTranslateB2DHomMatrix(
 						aGrfSize.getWidth(), aGrfSize.getHeight(),
-						aPos.X(), aPos.Y())));
+						aPos.X(), aPos.Y()));
+			pPage->InsertObjectToSdrObjList(*pNewSdrGraf);
 			bRet = sal_True;
 		}
 	}

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/ppt/pptin.cxx Wed May  2 14:47:40 2012
@@ -760,7 +760,7 @@ sal_Bool ImplSdPPTImport::Import()
 				}
 				SdrObject* pObj = ImportPageBackgroundObject( *pMPage, pE->nBackgroundOffset, true );	// import background
 				if ( pObj )
-					pMPage->InsertObjectToSdrObjList( pObj );
+					pMPage->InsertObjectToSdrObjList(*pObj);
 
 				sal_Bool bNewAnimationsUsed = sal_False;
 				ProcessData aProcessData( *(*pList)[ nAktPageNum ], (SdPage*)pMPage );
@@ -806,7 +806,7 @@ sal_Bool ImplSdPPTImport::Import()
 														if ( pImpObj )
 														{
 															pImpObj->SetLayer( mnBackgroundObjectsLayerID );
-															pMPage->InsertObjectToSdrObjList( pImpObj );
+															pMPage->InsertObjectToSdrObjList(*pImpObj);
 														}
 													}
 												}
@@ -1448,7 +1448,7 @@ void ImplSdPPTImport::SetHeaderFooterPag
 					ProcessData aProcessData( rSlidePersist, (SdPage*)pPage );
 					SdrObject* pObj = ImportObj( rStCtrl, (void*)&aProcessData, aEmpty, aEmpty );
 					if ( pObj )
-						pPage->InsertObjectToSdrObjList( pObj, 0 );
+						pPage->InsertObjectToSdrObjList(*pObj, 0);
 				}
 			}
 			String aPlaceHolderString;

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/sdxfer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/sdxfer.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/sdxfer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/app/sdxfer.cxx Wed May  2 14:47:40 2012
@@ -348,25 +348,31 @@ void SdTransferable::CreateData()
 	{
 		SdPage*	pPage = mpSdDrawDocumentIntern->GetSdPage( 0, PK_STANDARD );
 
-		if( 1 == mpSdDrawDocumentIntern->GetPageCount() )
+		if(1 == mpSdDrawDocumentIntern->GetPageCount())
 		{
-			Point	aOrigin( ( maVisArea = mpSdViewIntern->getMarkedObjectSnapRect() ).TopLeft() );
-			Size	aVector( -aOrigin.X(), -aOrigin.Y() );
+            const basegfx::B2DRange aAllRange(mpSdViewIntern->getMarkedObjectSnapRange());
+            const basegfx::B2DHomMatrix aTranslate(
+                basegfx::tools::createTranslateB2DHomMatrix(
+                    -aAllRange.getMinimum()));
 
-			for( sal_uLong nObj = 0, nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++ )
+			for(sal_uInt32 nObj(0), nObjCount = pPage->GetObjCount(); nObj < nObjCount; nObj++)
 			{
-				SdrObject* pObj = pPage->GetObj( nObj );
-				sdr::legacy::MoveSdrObject(*pObj, aVector );
+				SdrObject* pObj = pPage->GetObj(nObj);
+
+                sdr::legacy::transformSdrObject(*pObj, aTranslate);
 			}
+
+            maVisArea.SetSize(Size(basegfx::fround(aAllRange.getWidth()), basegfx::fround(aAllRange.getHeight())));
 		}
 		else
 		{
 			const basegfx::B2DVector& rPageScale = pPage->GetPageScale();
-			maVisArea.SetSize(Size(basegfx::fround(rPageScale.getX()), basegfx::fround(rPageScale.getY())));
+
+            maVisArea.SetSize(Size(basegfx::fround(rPageScale.getX()), basegfx::fround(rPageScale.getY())));
 		}
 
 		// Die Ausgabe soll am Nullpunkt erfolgen
-		maVisArea.SetPos( Point() );
+		maVisArea.SetPos(Point());
 	}
 }
 

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/animobjs.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/animobjs.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/animobjs.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/animobjs.cxx Wed May  2 14:47:40 2012
@@ -962,7 +962,7 @@ void AnimationWindow::AddObj (::sd::View
 					    aTimeList.Insert( pTime, aBmpExList.GetCurPos() + 1 );
 
 					    // Clone
-					    pPage->InsertObjectToSdrObjList( pSnapShot->CloneSdrObject(), aBmpExList.GetCurPos() + 1 );
+					    pPage->InsertObjectToSdrObjList(*pSnapShot->CloneSdrObject(), aBmpExList.GetCurPos() + 1);
 					
                         // Weiterschalten der BitmapListe
 					    aBmpExList.Next();
@@ -986,7 +986,7 @@ void AnimationWindow::AddObj (::sd::View
 		// ein einzelnes Objekt
 		if( 1 == aSelection.size() && !bAnimObj )
 		{
-			pPage->InsertObjectToSdrObjList(aSelection[0]->CloneSdrObject(), aBmpExList.GetCurPos() + 1);
+			pPage->InsertObjectToSdrObjList(*aSelection[0]->CloneSdrObject(), aBmpExList.GetCurPos() + 1);
 		}
 		else if (aSelection.size() > 1)
 		{
@@ -1006,7 +1006,7 @@ void AnimationWindow::AddObj (::sd::View
 					Time* pTime = new Time( aTimeField.GetTime() );
 					aTimeList.Insert( pTime, aBmpExList.GetCurPos() + 1 );
 
-					pPage->InsertObjectToSdrObjList( pObject->CloneSdrObject(), aBmpExList.GetCurPos() + 1 );
+					pPage->InsertObjectToSdrObjList(*pObject->CloneSdrObject(), aBmpExList.GetCurPos() + 1 );
 
 					aBmpExList.Next();
 				}
@@ -1018,10 +1018,10 @@ void AnimationWindow::AddObj (::sd::View
 
 				for (sal_uInt32 nObject(0); nObject < aSelection.size(); nObject++)
 				{
-					pCloneGroup->InsertObjectToSdrObjList(aSelection[nObject]->CloneSdrObject(), LIST_APPEND);
+					pCloneGroup->InsertObjectToSdrObjList(*aSelection[nObject]->CloneSdrObject());
 				}
 
-				pPage->InsertObjectToSdrObjList(pCloneGroup, aBmpExList.GetCurPos() + 1);
+				pPage->InsertObjectToSdrObjList(*pCloneGroup, aBmpExList.GetCurPos() + 1);
 			}
 		}
 
@@ -1238,8 +1238,7 @@ void AnimationWindow::CreateAnimObj (::s
 			// des Clones
 			pClone = pPage->GetObj(i);
 			SdrObject* pCloneOfClone = pClone->CloneSdrObject();
-			//SdrObject* pCloneOfClone = pPage->GetObj(i)->Clone();
-			pGroup->InsertObjectToSdrObjList(pCloneOfClone, LIST_APPEND);
+			pGroup->InsertObjectToSdrObjList(*pCloneOfClone);
 		}
 
 		// bis jetzt liegt die linke obere Ecke der Gruppe in der Fenstermitte;

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/copydlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/copydlg.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/copydlg.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/dlg/copydlg.cxx Wed May  2 14:47:40 2012
@@ -302,12 +302,10 @@ IMPL_LINK( CopyDlg, SelectColorHdl, void
 
 IMPL_LINK( CopyDlg, SetViewData, void*, EMPTYARG )
 {
-	const Rectangle aRect(mpView->getMarkedObjectSnapRect());
+    const basegfx::B2DRange aAllRange(mpView->getMarkedObjectSnapRange());
 
-	SetMetricValue( maMtrFldMoveX, Fraction( aRect.GetWidth() ) /
-									maUIScale, SFX_MAPUNIT_100TH_MM);
-	SetMetricValue( maMtrFldMoveY, Fraction( aRect.GetHeight() ) /
-									maUIScale, SFX_MAPUNIT_100TH_MM);
+    SetMetricValue(maMtrFldMoveX, Fraction(aAllRange.getWidth() / double(maUIScale)), SFX_MAPUNIT_100TH_MM);
+    SetMetricValue(maMtrFldMoveY, Fraction(aAllRange.getHeight() / double(maUIScale)), SFX_MAPUNIT_100TH_MM);
 
 	// Farb-Attribut setzen
 	const SfxPoolItem*	pPoolItem = NULL;

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fucon3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fucon3d.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fucon3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fucon3d.cxx Wed May  2 14:47:40 2012
@@ -509,7 +509,7 @@ SdrObject* FuConstruct3dObject::CreateDe
 	aCam.SetDefaults(::basegfx::B3DPoint(0.0, 0.0, fDefaultCamPosZ), aLookAt, mpView->GetDefaultCamFocal());
 	pScene->SetCamera(aCam);
 	
-	pScene->Insert3DObj(p3DObj);
+	pScene->Insert3DObj(*p3DObj);
 	sdr::legacy::SetSnapRect(*pScene, a3DRect);
 	// pScene->SetModel(mpDoc);
 		

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsfil.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsfil.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsfil.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fuinsfil.cxx Wed May  2 14:47:40 2012
@@ -592,7 +592,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(
 					mpView->BegUndo(String(SdResId(STR_UNDO_INSERT_TEXTFRAME)));
 				}
 
-				pPage->InsertObjectToSdrObjList(pTO);
+				pPage->InsertObjectToSdrObjList(*pTO);
 
 				// limit object size
 				const Size aSize(pOutliner->CalcTextSize());

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fumorph.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fumorph.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fumorph.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/func/fumorph.cxx Wed May  2 14:47:40 2012
@@ -429,13 +429,13 @@ void FuMorph::ImpInsertPolygons(List& rP
 
 		pNewObj->SetMergedItemSetAndBroadcast(aSet);
 
-    	pObjGroup->InsertObjectToSdrObjList( pNewObj, LIST_APPEND );
+    	pObjGroup->InsertObjectToSdrObjList(*pNewObj);
 	}
 
 	if ( nCount )
 	{
-	    pObjGroup->InsertObjectToSdrObjList( pObj1->CloneSdrObject(), 0 );
-		pObjGroup->InsertObjectToSdrObjList( pObj2->CloneSdrObject(), LIST_APPEND );
+	    pObjGroup->InsertObjectToSdrObjList(*pObj1->CloneSdrObject(), 0 );
+		pObjGroup->InsertObjectToSdrObjList(*pObj2->CloneSdrObject());
 		mpView->DeleteMarked();
 		mpView->InsertObjectAtView( *pObjGroup, SDRINSERT_SETDEFLAYER );
 	}

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx Wed May  2 14:47:40 2012
@@ -221,8 +221,8 @@ void PageObjectPainter::PaintBackground 
     SdPage* pPage = rpDescriptor->GetPage();
     if (pPage != NULL)
     {
-        rDevice.SetFillColor(pPage->GetPageBackgroundColor(NULL));
-        rDevice.SetLineColor(pPage->GetPageBackgroundColor(NULL));
+        rDevice.SetFillColor(pPage->GetPageBackgroundColor());
+        rDevice.SetLineColor(pPage->GetPageBackgroundColor());
         const Rectangle aPreviewBox (mpPageObjectLayouter->GetBoundingBox(
             rpDescriptor,
             PageObjectLayouter::Preview,

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/table/tablefunction.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/table/tablefunction.cxx?rev=1333067&r1=1333066&r2=1333067&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/table/tablefunction.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/table/tablefunction.cxx Wed May  2 14:47:40 2012
@@ -269,7 +269,7 @@ void CreateTableFromRTF( SvStream& rStre
 		OUString sTableStyle;
 		apply_table_style( pObj, &rModel, sTableStyle );
 
-		pPage->InsertObjectToSdrObjList( pObj );
+		pPage->InsertObjectToSdrObjList(*pObj);
 
 		sdr::table::SdrTableObj::ImportAsRTF( rStream, *pObj );
 	}



Mime
View raw message