sdview3.cxx (0415cdef) | sdview3.cxx (17e8bc19) |
---|---|
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 --- 5 unchanged lines hidden (view full) --- 14 * software distributed under the License is distributed on an 15 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 16 * KIND, either express or implied. See the License for the 17 * specific language governing permissions and limitations 18 * under the License. 19 * 20 *************************************************************/ 21 | 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 --- 5 unchanged lines hidden (view full) --- 14 * software distributed under the License is distributed on an 15 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 16 * KIND, either express or implied. See the License for the 17 * specific language governing permissions and limitations 18 * under the License. 19 * 20 *************************************************************/ 21 |
22 23 | |
24// MARKER(update_precomp.py): autogen include statement, do not remove 25#include "precompiled_sd.hxx" 26 27#include "View.hxx" 28#include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp> 29#include <com/sun/star/embed/NoVisualAreaSizeException.hpp> 30#include <com/sun/star/lang/XComponent.hpp> 31#include <sot/filelist.hxx> --- 23 unchanged lines hidden (view full) --- 55#include <svx/obj3d.hxx> 56#include <svx/e3dundo.hxx> 57#include <svx/dbexch.hrc> 58#include <svx/unomodel.hxx> 59#include <unotools/streamwrap.hxx> 60#include <vcl/metaact.hxx> 61#include <svx/svxids.hrc> 62#include <toolkit/helper/vclunohelper.hxx> | 22// MARKER(update_precomp.py): autogen include statement, do not remove 23#include "precompiled_sd.hxx" 24 25#include "View.hxx" 26#include <com/sun/star/embed/XEmbedObjectClipboardCreator.hpp> 27#include <com/sun/star/embed/NoVisualAreaSizeException.hpp> 28#include <com/sun/star/lang/XComponent.hpp> 29#include <sot/filelist.hxx> --- 23 unchanged lines hidden (view full) --- 53#include <svx/obj3d.hxx> 54#include <svx/e3dundo.hxx> 55#include <svx/dbexch.hrc> 56#include <svx/unomodel.hxx> 57#include <unotools/streamwrap.hxx> 58#include <vcl/metaact.hxx> 59#include <svx/svxids.hrc> 60#include <toolkit/helper/vclunohelper.hxx> |
63 | |
64#include "DrawDocShell.hxx" 65#include "fupoor.hxx" 66#include "Window.hxx" 67#include "sdxfer.hxx" 68#include "sdpage.hxx" 69#include "DrawViewShell.hxx" 70#include "drawdoc.hxx" 71#include "sdresid.hxx" 72#include "strings.hrc" 73#include "imapinfo.hxx" 74#include "SlideSorterViewShell.hxx" 75#include "strmname.h" 76#include "unomodel.hxx" 77#include "ViewClipboard.hxx" | 61#include "DrawDocShell.hxx" 62#include "fupoor.hxx" 63#include "Window.hxx" 64#include "sdxfer.hxx" 65#include "sdpage.hxx" 66#include "DrawViewShell.hxx" 67#include "drawdoc.hxx" 68#include "sdresid.hxx" 69#include "strings.hrc" 70#include "imapinfo.hxx" 71#include "SlideSorterViewShell.hxx" 72#include "strmname.h" 73#include "unomodel.hxx" 74#include "ViewClipboard.hxx" |
78 | |
79#include <sfx2/ipclient.hxx> 80#include <comphelper/storagehelper.hxx> 81#include <comphelper/processfactory.hxx> 82#include <tools/stream.hxx> 83#include <vcl/cvtgrf.hxx> 84#include <svx/sdrhittesthelper.hxx> | 75#include <sfx2/ipclient.hxx> 76#include <comphelper/storagehelper.hxx> 77#include <comphelper/processfactory.hxx> 78#include <tools/stream.hxx> 79#include <vcl/cvtgrf.hxx> 80#include <svx/sdrhittesthelper.hxx> |
81#include <svx/xbtmpit.hxx> |
|
85 86// -------------- 87// - Namespaces - 88// -------------- 89 90using namespace ::com::sun::star; 91using namespace ::com::sun::star::lang; 92using namespace ::com::sun::star::uno; --- 666 unchanged lines hidden (view full) --- 759 760 // set new attributes to object 761 const bool bUndo = IsUndoEnabled(); 762 if( bUndo ) 763 { 764 BegUndo( String( SdResId( STR_UNDO_DRAGDROP ) ) ); 765 AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pPickObj ) ); 766 } | 82 83// -------------- 84// - Namespaces - 85// -------------- 86 87using namespace ::com::sun::star; 88using namespace ::com::sun::star::lang; 89using namespace ::com::sun::star::uno; --- 666 unchanged lines hidden (view full) --- 756 757 // set new attributes to object 758 const bool bUndo = IsUndoEnabled(); 759 if( bUndo ) 760 { 761 BegUndo( String( SdResId( STR_UNDO_DRAGDROP ) ) ); 762 AddUndo( mpDoc->GetSdrUndoFactory().CreateUndoAttrObject( *pPickObj ) ); 763 } |
764 |
|
767 aSet.Put( pObj->GetMergedItemSet() ); 768 769 // Eckenradius soll nicht uebernommen werden. 770 // In der Gallery stehen Farbverlauefe (Rechtecke) 771 // welche den Eckenradius == 0 haben. Dieser soll 772 // nicht auf das Objekt uebertragen werden. 773 aSet.ClearItem( SDRATTR_ECKENRADIUS ); 774 | 765 aSet.Put( pObj->GetMergedItemSet() ); 766 767 // Eckenradius soll nicht uebernommen werden. 768 // In der Gallery stehen Farbverlauefe (Rechtecke) 769 // welche den Eckenradius == 0 haben. Dieser soll 770 // nicht auf das Objekt uebertragen werden. 771 aSet.ClearItem( SDRATTR_ECKENRADIUS ); 772 |
775 pPickObj->SetMergedItemSetAndBroadcast( aSet ); | 773 const SdrGrafObj* pSdrGrafObj = dynamic_cast< const SdrGrafObj* >(pObj); |
776 | 774 |
775 if(pSdrGrafObj) 776 { 777 // If we have a graphic as source object, use it's graphic 778 // content as fill style 779 aSet.Put(XFillStyleItem(XFILL_BITMAP)); 780 aSet.Put(XFillBitmapItem(&mpDoc->GetPool(), pSdrGrafObj->GetGraphic())); 781 } 782 783 pPickObj->SetMergedItemSetAndBroadcast( aSet ); 784 |
|
777 if( pPickObj->ISA( E3dObject ) && pObj->ISA( E3dObject ) ) 778 { 779 // Zusaetzlich 3D Attribute handeln 780 SfxItemSet aNewSet( mpDoc->GetPool(), SID_ATTR_3D_START, SID_ATTR_3D_END, 0 ); 781 SfxItemSet aOldSet( mpDoc->GetPool(), SID_ATTR_3D_START, SID_ATTR_3D_END, 0 ); 782 783 aOldSet.Put(pPickObj->GetMergedItemSet()); 784 aNewSet.Put( pObj->GetMergedItemSet() ); --- 718 unchanged lines hidden --- | 785 if( pPickObj->ISA( E3dObject ) && pObj->ISA( E3dObject ) ) 786 { 787 // Zusaetzlich 3D Attribute handeln 788 SfxItemSet aNewSet( mpDoc->GetPool(), SID_ATTR_3D_START, SID_ATTR_3D_END, 0 ); 789 SfxItemSet aOldSet( mpDoc->GetPool(), SID_ATTR_3D_START, SID_ATTR_3D_END, 0 ); 790 791 aOldSet.Put(pPickObj->GetMergedItemSet()); 792 aNewSet.Put( pObj->GetMergedItemSet() ); --- 718 unchanged lines hidden --- |