sdview4.cxx (79aad27f) sdview4.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

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

161 ******************************************************************/
162 if( IsUndoEnabled() )
163 {
164 BegUndo(String(SdResId(STR_UNDO_DRAGDROP)));
165 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pPickObj));
166 EndUndo();
167 }
168
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

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

161 ******************************************************************/
162 if( IsUndoEnabled() )
163 {
164 BegUndo(String(SdResId(STR_UNDO_DRAGDROP)));
165 AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pPickObj));
166 EndUndo();
167 }
168
169 XOBitmap aXOBitmap( rGraphic.GetBitmap() );
170 SfxItemSet aSet(mpDocSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
171 aSet.Put(XFillStyleItem(XFILL_BITMAP));
169 SfxItemSet aSet(mpDocSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP);
170 aSet.Put(XFillStyleItem(XFILL_BITMAP));
172 aSet.Put(XFillBitmapItem(&mpDocSh->GetPool(), aXOBitmap));
171 aSet.Put(XFillBitmapItem(&mpDocSh->GetPool(), rGraphic));
173 pPickObj->SetMergedItemSetAndBroadcast(aSet);
174 }
175 }
176 else if ( pPV )
177 {
178 // create new object
179 Size aSize;
180

--- 456 unchanged lines hidden --- 		172 pPickObj->SetMergedItemSetAndBroadcast(aSet);
173 }
174 }
175 else if ( pPV )
176 {
177 // create new object
178 Size aSize;
179

--- 456 unchanged lines hidden ---