ooo-build r11259 - in trunk: . patches/src680

[hub svn gnome org]

Author: hub
Date: Mon Jan 14 22:37:11 2008
New Revision: 11259
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11259&view=rev

Log:
	* patches/src680/svx-text-move-fix-i59061.diff: fix move paragraph
	bug in case of a selection i#59061. Needed for n#352330.


Added:
   trunk/patches/src680/svx-text-move-fix-i59061.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Jan 14 22:37:11 2008
@@ -342,8 +342,9 @@
 # default formatting PPT export bug n#285959
 sd-default-format-n285959.diff, i#81395, n#285959, hub
 
-# add some shortcuts to Impotr. bug n#352330
-sd-text-shortcut-n352330.diff, n#352330, hub
+# add some shortcuts to Impress + needed fixes. bug n#352330
+sd-text-shortcut-n352330.diff, i#85247, n#352330, hub
+svx-text-move-fix-i59061.diff, i#59061, hub
 
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael

Added: trunk/patches/src680/svx-text-move-fix-i59061.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/svx-text-move-fix-i59061.diff	Mon Jan 14 22:37:11 2008
@@ -0,0 +1,23 @@
+Index: svx/source/editeng/editview.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/editeng/editview.cxx,v
+retrieving revision 1.49
+diff -u -r1.49 editview.cxx
+--- svx/source/editeng/editview.cxx	23 Nov 2007 16:43:08 -0000	1.49
++++ svx/source/editeng/editview.cxx	14 Jan 2008 20:36:52 -0000
+@@ -745,12 +745,12 @@
+ 	DBG_CHKTHIS( EditView, 0 );
+ 	DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 );
+     ESelection aSel = GetSelection();
+-    long nDest = aSel.nStartPara + nDiff;
++    Range aRange( aSel.nStartPara, aSel.nEndPara );
++    long nDest = ( nDiff > 0  ? aRange.Max() : aRange.Min() ) + nDiff;
+     if ( nDiff > 0 )
+         nDest++;
+     DBG_ASSERT( ( nDest >= 0 ) && ( nDest <= pImpEditView->pEditEngine->GetParagraphCount() ), "MoveParagraphs - wrong Parameters!" );
+-    MoveParagraphs(
+-        Range( aSel.nStartPara, aSel.nEndPara ),
++    MoveParagraphs( aRange,
+         sal::static_int_cast< USHORT >( nDest ) );
+ }
+