[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                 |    5 +++++
 patches/dev300/vcl-outputdevice-lost-mpGraphics.diff |   14 ++++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit 79a1c9132149f550380012c0d2eea090ec3167a8
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Feb 3 18:41:05 2010 +0100

    ReportBuilder crasher (i#108914, bnc#575698)
    
    * patches/dev300/vcl-outputdevice-lost-mpGraphics.diff:
    * patches/dev300/apply: # make sure that we have mpGraphics; it might get lost
      when calling ImplNewFont(); fixes ReportBuilder crasher (i#108914, bnc#575698)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 150640f..87ef996 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -524,6 +524,11 @@ customunittext-percent.diff, i#80784, atimar
 # fix by Caolan
 bridges-testcppu-x86_64-fixes.diff, i#98028, n#575704, pmladek
 
+# 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
+
 # make "Table Data View" and "Bibliography" localisable
 i93000.diff, i#93000, atimar
 
diff --git a/patches/dev300/vcl-outputdevice-lost-mpGraphics.diff b/patches/dev300/vcl-outputdevice-lost-mpGraphics.diff
new file mode 100644
index 0000000..1b4ccba
--- /dev/null
+++ b/patches/dev300/vcl-outputdevice-lost-mpGraphics.diff
@@ -0,0 +1,14 @@
+--- vcl/source/gdi/outdev3.cxx.old	2010-01-27 21:32:30.000000000 +0100
++++ vcl/source/gdi/outdev3.cxx	2010-02-02 17:27:52.000000000 +0100
+@@ -6444,6 +6444,11 @@ SalLayout* OutputDevice::ImplLayout( con
+     if( mbInitFont )
+         ImplInitFont();
+ 
++    // we need a graphics
++    if( !mpGraphics )
++        if( !ImplGetGraphics() )
++            return NULL;
++
+     // check string index and length
+     String aStr = rOrigStr;
+     if( (ULONG)nMinIndex + nLen >= aStr.Len() )