[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                                 |    5 ----
 patches/dev300/vcl-outputdevice-lost-mpGraphics.diff |   23 -------------------
 2 files changed, 28 deletions(-)

New commits:
commit 327e8a37bfdd7384c868f1881dc693c0cdf3102d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 15:30:40 2011 +0200

    bin obsolete vcl-outputdevice-lost-mpGraphics.diff
    
    it was jsut a workaround; the root of the problem should have been fixed
    OOo-3.3 (i#108914)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b717db2..806d436 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -261,11 +261,6 @@ sfx-check-real-help-path.diff, i#81139, pmladek
 
 localize-pl-cygwin-paths.diff, tml
 
-# make sure that we have mpGraphics
-# it might get lost when calling ImplNewFont()
-# fixes ReportBuilder crasher
-vcl-outputdevice-lost-mpGraphics.diff, i#108914, n#575698, pmladek
-
 # fix erroneous element exists exception while defining new toolbar/menu
 # buried in cws-vbasupportdev300
 #fix-uiconfiguration-insert.diff, i#105154, noelpwer
diff --git a/patches/dev300/vcl-outputdevice-lost-mpGraphics.diff b/patches/dev300/vcl-outputdevice-lost-mpGraphics.diff
deleted file mode 100644
index 6069679..0000000
--- a/patches/dev300/vcl-outputdevice-lost-mpGraphics.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- vcl/source/gdi/outdev3.cxx |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git vcl/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
-index 92235e7..4c9fb8c 100644
---- vcl/source/gdi/outdev3.cxx
-+++ vcl/source/gdi/outdev3.cxx
-@@ -5924,6 +5924,11 @@ SalLayout* OutputDevice::ImplLayout( const String& rOrigStr,
-     if( mbInitFont )
-         ImplInitFont();
- 
-+    // we need a graphics
-+    if( !mpGraphics )
-+        if( !ImplGetGraphics() )
-+            return NULL;
-+
-     // check string index and length
-     if( (unsigned)nMinIndex + nLen > rOrigStr.Len() )
-     {
--- 
-1.7.0.1
-