diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-03-12 20:13:16 +0100 |
| commit | 1c858f73a9994340b8735fdcd5cfd018115e01cd (patch) | |
| tree | 6435d9ff657e86301c9ba47ff90795950b8a6595 /sd/source/ui/view/sdview4.cxx | |
| parent | 9b03159e7030963753dcc7ff82f0b49207bd42b4 (diff) | |
| parent | 2b800723513199616bb04c6bb377b685c4bde218 (diff) | |
renaissance2: merge to m73
Diffstat (limited to 'sd/source/ui/view/sdview4.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index aeebb7d63f69..a980496cecf3 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdview4.cxx,v $ - * $Revision: 1.36 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -46,15 +43,12 @@ #include <svx/svdograf.hxx> #include <svx/svdomedia.hxx> #include <svx/svdoole2.hxx> -#ifndef _IMPGRF_HXX -#include <svx/impgrf.hxx> -#endif #include <sot/storage.hxx> #include <sfx2/app.hxx> #include <avmedia/mediawindow.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> - +#include <svtools/filter.hxx> #include "app.hrc" #include "Window.hxx" #include "DrawDocShell.hxx" @@ -391,7 +385,7 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) aURL = INetURLObject( aURLStr ); } - GraphicFilter* pGraphicFilter = GetGrfFilter(); + GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; aCurrentDropFile = aURL.GetMainURL( INetURLObject::NO_DECODE ); @@ -401,9 +395,10 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG ) if( !pGraphicFilter->ImportGraphic( aGraphic, aURL ) ) { sal_Int8 nTempAction = ( aIter == maDropFileVector.begin() ) ? mnAction : 0; + const bool bLink = ( ( nTempAction & DND_ACTION_LINK ) != 0 ); SdrGrafObj* pGrafObj = InsertGraphic( aGraphic, nTempAction, maDropPos, NULL, NULL ); - if( pGrafObj ) + if( pGrafObj && bLink ) pGrafObj->SetGraphicLink( aCurrentDropFile, String() ); // return action from first inserted graphic |