← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/sd-pptx-crash-fix.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2009-05-26 18:00:00 UTC
  • Revision ID: james.westby@ubuntu.com-20090526180000-t5otxzhj1rru5ovt
Tags: 1:3.1.0-3ubuntu2
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Correct path to splitgsi in convert2po.
* Disable gsi-export for Rosetta due to bug in localize.pl.
* Reenable building on sparc.
* Switch boost to 1.38.
* Resynchronise with ooo-build-3-1 (271b85e5ce6b601d75d0693b9c937d1eabd069dc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/dev300/sd-pptx-crash-fix.diff
 
1
Author: sj
 
2
Date: Wed May 13 12:59:08 2009
 
3
New Revision: 271862
 
4
 
 
5
Log:
 
6
#i101563# fixed crash when loading pptx document
 
7
 
 
8
Modified:
 
9
   cws/impress171/sd/source/ui/unoidl/unopback.cxx
 
10
 
 
11
Modified: cws/impress171/sd/source/ui/unoidl/unopback.cxx
 
12
==============================================================================
 
13
--- sd/source/ui/unoidl/unopback.cxx    Wed May 13 12:39:35 2009        (r271861)
 
14
+++ sd/source/ui/unoidl/unopback.cxx    Wed May 13 12:59:08 2009        (r271862)
 
15
@@ -140,22 +140,56 @@
 
16
                                if( pAny )
 
17
                                {
 
18
                                        OUString aPropertyName( OUString::createFromAscii(pMap->pName));
 
19
-                                       if ( pMap->nWID == XATTR_FILLBITMAP )
 
20
+                                       switch( pMap->nWID )
 
21
                                        {
 
22
-                                               if ( ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) ) ||
 
23
-                                                               ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >*)0) ) ) &&
 
24
-                                                               ( pMap->nMemberId == MID_BITMAP ) )
 
25
+                                               case XATTR_FILLFLOATTRANSPARENCE :
 
26
+                                               case XATTR_FILLGRADIENT :
 
27
                                                {
 
28
-                                                       setPropertyValue( aPropertyName, *pAny );
 
29
+                                                       if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::awt::Gradient*)0) )
 
30
+                                                               && ( pMap->nMemberId == MID_FILLGRADIENT ) )
 
31
+                                                       {
 
32
+                                                               setPropertyValue( aPropertyName, *pAny );
 
33
+                                                       }
 
34
+                                                       else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
 
35
+                                                                               ( pMap->nMemberId == MID_NAME ) )
 
36
+                                                       {
 
37
+                                                               setPropertyValue( aPropertyName, *pAny );
 
38
+                                                       }
 
39
                                                }
 
40
-                                               else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
 
41
-                                                                       ( ( pMap->nMemberId == MID_NAME ) || ( pMap->nMemberId == MID_GRAFURL ) ) )
 
42
+                                               break;
 
43
+                                               case XATTR_FILLHATCH :
 
44
                                                {
 
45
-                                                       setPropertyValue( aPropertyName, *pAny );
 
46
+                                                       if ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::drawing::Hatch*)0) )
 
47
+                                                               && ( pMap->nMemberId == MID_FILLHATCH ) )
 
48
+                                                       {
 
49
+                                                               setPropertyValue( aPropertyName, *pAny );
 
50
+                                                       }
 
51
+                                                       else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
 
52
+                                                                               ( pMap->nMemberId == MID_NAME ) )
 
53
+                                                       {
 
54
+                                                               setPropertyValue( aPropertyName, *pAny );
 
55
+                                                       }
 
56
                                                }
 
57
-                                       }
 
58
-                                       else
 
59
-                                               setPropertyValue( aPropertyName, *pAny );
 
60
+                                               break;
 
61
+                                               case XATTR_FILLBITMAP :
 
62
+                                               {
 
63
+                                                       if ( ( ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0) ) ||
 
64
+                                                                       ( pAny->getValueType() == ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >*)0) ) ) &&
 
65
+                                                                       ( pMap->nMemberId == MID_BITMAP ) )
 
66
+                                                       {
 
67
+                                                               setPropertyValue( aPropertyName, *pAny );
 
68
+                                                       }
 
69
+                                                       else if ( ( pAny->getValueType() == ::getCppuType((const ::rtl::OUString*)0) ) &&
 
70
+                                                                               ( ( pMap->nMemberId == MID_NAME ) || ( pMap->nMemberId == MID_GRAFURL ) ) )
 
71
+                                                       {
 
72
+                                                               setPropertyValue( aPropertyName, *pAny );
 
73
+                                                       }
 
74
+                                               }
 
75
+                                               break;
 
76
+
 
77
+                                               default:
 
78
+                                                       setPropertyValue( aPropertyName, *pAny );
 
79
+                                       }                                       
 
80
                                }
 
81
                                pMap++;
 
82
                        }
 
83
 
 
84
---------------------------------------------------------------------
 
85
To unsubscribe, e-mail: allsvn-unsubscribe@openoffice.org
 
86
For additional commands, e-mail: allsvn-help@openoffice.org
 
87