strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw024 (1.21.10); FILE MERGED

Browse source 
2006/11/10 06:45:04 aw 1.21.10.8: RESYNC: (1.26-1.27); FILE MERGED
2006/08/03 19:37:08 aw 1.21.10.7: RESYNC: (1.24-1.26); FILE MERGED
2006/07/07 16:06:03 aw 1.21.10.6: adaptions after resync SRC680m171->SRC680m174
2006/05/13 00:10:26 aw 1.21.10.5: RESYNC: (1.22-1.23); FILE MERGED
2005/09/20 04:02:35 aw 1.21.10.4: RESYNC: (1.21-1.22); FILE MERGED
2005/05/26 11:16:21 aw 1.21.10.3: #i39531#
2005/05/19 12:08:19 aw 1.21.10.2: #i39529#
2005/05/12 16:44:11 aw 1.21.10.1: #i39529#
This commit is contained in:
Ivo Hinkelmann 2006-11-14 15:00:57 +00:00
parent 5c5438b35f
commit c87db2146b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sc/source/ui/view/viewfun7.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: viewfun7.cxx,v $
*
* $Revision: 1.27 $
* $Revision: 1.28 $
*
* last change: $Author: obo $ $Date: 2006-10-13 11:37:44 $
* last change: $Author: ihi $ $Date: 2006-11-14 16:00:57 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -154,8 +154,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
// innerhalb einer Page verschieben?
if ( bPasteIsMove &&
pDrawView->GetPageViewPvNum(0)->GetPage() ==
pDragEditView->GetPageViewPvNum(0)->GetPage() )
pDrawView->GetSdrPageView()->GetPage() ==
pDragEditView->GetSdrPageView()->GetPage() )
{
if ( nDiffX != 0 || nDiffY != 0 )
pDragEditView->MoveAllMarked(Size(nDiffX,nDiffY), FALSE);
@ -205,7 +205,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
bPasteIsMove = FALSE; // kein internes Verschieben passiert
SdrMarkView aView(pModel);
SdrPageView* pPv = aView.ShowPagePgNum(0,Point());
SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0));
aView.MarkAllObj(pPv);
Size aSize = aView.GetAllMarkedRect().GetSize();
lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
@ -342,7 +342,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X
ScDrawView* pDrView = GetScDrawView();
SdrOle2Obj* pSdrObj = new SdrOle2Obj( aObjRef, aName, aRect );
SdrPageView* pPV = pDrView->GetPageViewPvNum(0);
SdrPageView* pPV = pDrView->GetSdrPageView();
pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole
GetViewData()->GetViewShell()->SetDrawShell( TRUE );
return TRUE;
@ -405,7 +405,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
pGrafObj->SetName(aName);
// nicht markieren wenn Ole
pDrawView->InsertObjectSafe(pGrafObj, *pDrawView->GetPageViewPvNum(0));
pDrawView->InsertObjectSafe(pGrafObj, *pDrawView->GetSdrPageView());
// #118522# SetGraphicLink has to be used after inserting the object,
// otherwise an empty graphic is swapped in and the contact stuff crashes.
@ -427,7 +427,7 @@ BOOL ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& rGrap
/**********************************************************************
* Objekt neu attributieren
**********************************************************************/
SdrPageView* pPV = pDrawView->GetPageViewPvNum(0);
SdrPageView* pPV = pDrawView->GetSdrPageView();
if (pPickObj->ISA(SdrGrafObj))
{
/******************************************************************
@ -437,7 +437,7 @@ BOOL ScViewFunc::ApplyGraphicToObject( SdrObject* pPickObj, const Graphic& rGrap
pNewGrafObj->SetGraphic(rGraphic);
pDrawView->BegUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
pDrawView->ReplaceObject(pPickObj, *pPV, pNewGrafObj);
pDrawView->ReplaceObjectAtView(pPickObj, *pPV, pNewGrafObj);
pDrawView->EndUndo();
bRet = TRUE;