ooo-build r12948 - in branches/ooo-build-2-4-1: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jun 23 23:24:16 2008
New Revision: 12948
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12948&view=rev

Log:
	* patches/src680/apply:
	* patches/src680/linkwarn-sd-no-dnd-links.diff: made drag and drop
	add pictures to Draw/Impress by value, not by link.



Added:
   branches/ooo-build-2-4-1/patches/src680/linkwarn-sd-no-dnd-links.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Mon Jun 23 23:24:16 2008
@@ -2440,6 +2440,7 @@
 linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
 linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
 linkwarn-svx-warning-dlg.diff, n#348149, thorsten
+linkwarn-sd-no-dnd-links.diff, n#348149, thorsten
 
 [ InternalMesaHeaders ]
 internal-mesa-headers-config_office.diff, fridrich

Added: branches/ooo-build-2-4-1/patches/src680/linkwarn-sd-no-dnd-links.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/linkwarn-sd-no-dnd-links.diff	Mon Jun 23 23:24:16 2008
@@ -0,0 +1,17 @@
+ sd/source/ui/view/sdview4.cxx |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
+index ae54524..f45bd72 100644
+--- sd/source/ui/view/sdview4.cxx
++++ sd/source/ui/view/sdview4.cxx
+@@ -350,9 +350,6 @@ IMPL_LINK( View, DropInsertFileHdl, Timer*, EMPTYARG )
+ 				sal_Int8    nTempAction = ( aIter == maDropFileVector.begin() ) ? mnAction : 0;
+ 				SdrGrafObj* pGrafObj = InsertGraphic( aGraphic, nTempAction, maDropPos, NULL, NULL );
+ 
+-				if( pGrafObj )
+-					pGrafObj->SetGraphicLink( aCurrentDropFile, String() );
+-
+ 				// return action from first inserted graphic
+ 				if( aIter == maDropFileVector.begin() )
+ 					mnAction = nTempAction;