[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                            |    3 ---
 patches/dev300/selection-crash-svx-svdmrkv.diff |   22 ----------------------
 2 files changed, 25 deletions(-)

New commits:
commit 224cf5141770428d97e1f72982ef7688372a5fc7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 16:14:49 2011 +0200

    bin obsolete selection-crash-svx-svdmrkv.diff (i#76084, i#76084)
    
    better fix in git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6e2ad7e..ccdb48e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -144,9 +144,6 @@ makefile-idl-build.diff, noelpwer
 # (even bigger savings on 64bit, and with dicts like the Czech one)
 #FIXME oog680: hunspell-hashify.diff, i#50842, dkeskar/jholesov
 
-# for selection delete crash
-selection-crash-svx-svdmrkv.diff, i#76084, jianhua
-
 # temporary hack to avoid the warning about missing return values in gcc4
 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20624
 warning-return-values-stlport.diff, jholesov
diff --git a/patches/dev300/selection-crash-svx-svdmrkv.diff b/patches/dev300/selection-crash-svx-svdmrkv.diff
deleted file mode 100644
index f8488cc..0000000
--- a/patches/dev300/selection-crash-svx-svdmrkv.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- svx/source/svdraw/svdmrkv.cxx
-+++ svx/source/svdraw/svdmrkv.cxx
-@@ -227,6 +227,19 @@ void SdrMarkView::ModelHasChanged()
-     GetMarkedObjectListWriteAccess().SetUnsorted();
-     SortMarkedObjects();
-     bMrkPntDirty=sal_True;
-+    //remove empty maked SdrObject
-+    sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
-+    for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;)
-+    {
-+        nMarkNum--;
-+        SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
-+        const SdrObject* pObj=pM->GetMarkedSdrObj();
-+        if( pObj == NULL )
-+        {
-+            GetMarkedObjectListWriteAccess().DeleteMark(nMarkNum);
-+        }
-+    }
-+
-     UndirtyMrkPnt();
-     SdrView* pV=(SdrView*)this;
-     if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!!