viewfun7.cxx (b3f79822) viewfun7.cxx (70d3707a)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 22 unchanged lines hidden (view full) ---

31
32#include <svx/svditer.hxx>
33#include <svx/svdograf.hxx>
34#include <svx/svdoole2.hxx>
35#include <svx/svdouno.hxx>
36#include <svx/svdpage.hxx>
37#include <svx/svdpagv.hxx>
38#include <svx/svdundo.hxx>
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 22 unchanged lines hidden (view full) ---

31
32#include <svx/svditer.hxx>
33#include <svx/svdograf.hxx>
34#include <svx/svdoole2.hxx>
35#include <svx/svdouno.hxx>
36#include <svx/svdpage.hxx>
37#include <svx/svdpagv.hxx>
38#include <svx/svdundo.hxx>
39#include <svx/xbitmap.hxx>
40#include <svx/xbtmpit.hxx>
41#include <svx/xoutbmp.hxx>
42#include <sfx2/objsh.hxx>
43#include <sfx2/viewfrm.hxx>
44#include <toolkit/helper/vclunohelper.hxx>
45#include <com/sun/star/embed/Aspects.hpp>
46
47#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw

--- 414 unchanged lines hidden (view full) ---

462
463 bRet = sal_True;
464 }
465 else if (pPickObj->IsClosedObj() && !pPickObj->ISA(SdrOle2Obj))
466 {
467 /******************************************************************
468 * Das Objekt wird mit der Graphik gefuellt
469 ******************************************************************/
39#include <svx/xbtmpit.hxx>
40#include <svx/xoutbmp.hxx>
41#include <sfx2/objsh.hxx>
42#include <sfx2/viewfrm.hxx>
43#include <toolkit/helper/vclunohelper.hxx>
44#include <com/sun/star/embed/Aspects.hpp>
45
46#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw

--- 414 unchanged lines hidden (view full) ---

461
462 bRet = sal_True;
463 }
464 else if (pPickObj->IsClosedObj() && !pPickObj->ISA(SdrOle2Obj))
465 {
466 /******************************************************************
467 * Das Objekt wird mit der Graphik gefuellt
468 ******************************************************************/
470 //pScDrawView->BegUndo(ScGlobal::GetRscString(STR_UNDO_DRAGDROP));
471 pScDrawView->AddUndo(new SdrUndoAttrObj(*pPickObj));
469 pScDrawView->AddUndo(new SdrUndoAttrObj(*pPickObj));
472 //pScDrawView->EndUndo();
473
470
474 XOBitmap aXOBitmap( rGraphic.GetBitmap() );
475 SfxItemSet aSet( pScDrawView->GetModel()->GetItemPool(),
476 XATTR_FILLSTYLE, XATTR_FILLBITMAP );
477 aSet.Put(XFillStyleItem(XFILL_BITMAP));
471 SfxItemSet aSet( pScDrawView->GetModel()->GetItemPool(),
472 XATTR_FILLSTYLE, XATTR_FILLBITMAP );
473 aSet.Put(XFillStyleItem(XFILL_BITMAP));
478 aSet.Put(XFillBitmapItem(String(), aXOBitmap));
474 aSet.Put(XFillBitmapItem(String(), rGraphic));
479
480 pPickObj->SetMergedItemSetAndBroadcast(aSet);
481
482 bRet = sal_True;
483 }
484 }
485 return bRet;
486}
487
488
475
476 pPickObj->SetMergedItemSetAndBroadcast(aSet);
477
478 bRet = sal_True;
479 }
480 }
481 return bRet;
482}
483
484