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

[rodo svn gnome org]

Author: rodo
Date: Thu Jan 31 12:31:31 2008
New Revision: 11479
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11479&view=rev

Log:
2008-01-31  Radek Doulik  <rodo novell com>

	* build/ooh680-m3/svx/source/editeng/impedit.cxx (ShowCursor):
	check whether cursor is in valid paragraph, fixes the problem
	introduced with n#305205 fix, fixes n#347355



Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/svx-sdrobjeditview-update-edit-area.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Jan 31 12:31:31 2008
@@ -2013,7 +2013,7 @@
 debian-system-jfreereport.diff
 
 [ Fixes ]
-svx-sdrobjeditview-update-edit-area.diff, n#305205, rodo
+svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 cairocanvas-image-borders.diff, n#340142, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
 

Modified: trunk/patches/src680/svx-sdrobjeditview-update-edit-area.diff
==============================================================================
--- trunk/patches/src680/svx-sdrobjeditview-update-edit-area.diff	(original)
+++ trunk/patches/src680/svx-sdrobjeditview-update-edit-area.diff	Thu Jan 31 12:31:31 2008
@@ -11,3 +11,16 @@
      ImpInvalidateOutlinerView(*pOutlView);
      return pOutlView;
  }
+--- svx/source/editeng-orig/impedit.cxx	2008-01-30 11:46:56.000000000 +0100
++++ svx/source/editeng/impedit.cxx	2008-01-31 13:27:15.000000000 +0100
+@@ -710,6 +710,10 @@
+ 
+     USHORT nTextPortionStart = 0;
+     USHORT nPara = pEditEngine->pImpEditEngine->aEditDoc.GetPos( aPaM.GetNode() );
++
++    if( nPara == USHRT_MAX )
++        return;
++
+     ParaPortion* pParaPortion = pEditEngine->pImpEditEngine->GetParaPortions().GetObject( nPara );
+ 
+     nShowCursorFlags |= nExtraCursorFlags;