[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                                    |    5 ---
 patches/dev300/sc-cellsuno-avoid-early-destruction.diff |   23 ----------------
 2 files changed, 28 deletions(-)

New commits:
commit 1df8365d2267c12d0fefd9f8645c690f9eaef8a9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 11:50:35 2011 +0200

    sc-cellsuno-avoid-early-destruction.diff: moved to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6f45576..5daf49b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -185,11 +185,6 @@ warning-return-values-stlport.diff, jholesov
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
 
-# avoid crash when calling the mono testcase from ooo-build/test/mono
-# the object "this" was destroyed after calling ScTableSheetObj::getImplementation
-# this hack make sure that the object lives a bit longer
-sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
-
 # don't let HelpLinker be miscompiled with g++ 4.3
 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 
diff --git a/patches/dev300/sc-cellsuno-avoid-early-destruction.diff b/patches/dev300/sc-cellsuno-avoid-early-destruction.diff
deleted file mode 100644
index eaedd68..0000000
--- a/patches/dev300/sc-cellsuno-avoid-early-destruction.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- sc/source/ui/unoobj/cellsuno.cxx |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
-index 6bcd1f8..daed766 100644
---- sc/source/ui/unoobj/cellsuno.cxx
-+++ sc/source/ui/unoobj/cellsuno.cxx
-@@ -1495,9 +1495,10 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
-         if ( aRanges.UpdateReference( rRef.GetMode(), pDoc, rRef.GetRange(),
-                                     rRef.GetDx(), rRef.GetDy(), rRef.GetDz() ) )
-         {
-+            uno::Reference<uno::XInterface> xInterface((cppu::OWeakObject*)this, uno::UNO_QUERY);
-             if (rRef.GetMode() == URM_INSDEL &&
-                 aRanges.Count() == 1 &&
--                ScTableSheetObj::getImplementation( (cppu::OWeakObject*)this ))
-+                ScTableSheetObj::getImplementation( xInterface ))
-             {
-                 // #101755#; the range size of a sheet does not change
-                 ScRange* pR = aRanges.First();
--- 
-1.7.0.1
-