ooo-build r14735 - in trunk: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Dec  4 00:40:11 2008
New Revision: 14735
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14735&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/canvas-directx-lostdevice-fix.diff:
    Fix a misbehaviour in DirectX canvas when the device is lost:
    certain classes of resources need to be generated from scratch
    then. n#445628.

    * patches/dev300/apply:
    * patches/dev300/svx-ppt-textstyle-fix.diff:
    Fix a regression from 2.4.1, where PPT import sometimes yields
    wrong text color and alignment. n#443127.



Added:
   trunk/patches/dev300/canvas-directx-lostdevice-fix.diff
   trunk/patches/dev300/svx-ppt-textstyle-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec  4 00:40:11 2008
@@ -2716,6 +2716,8 @@
 cws-impress162-slideshow.diff, i#94193, thorsten
 slideshow-blink-text-fix.diff, i#96047, thorsten
 basegfx-missing-inline-fix.diff, i#96585, thorsten
+svx-ppt-textstyle-fix.diff, n#443127, thorsten
+canvas-directx-lostdevice-fix.diff, thorsten
 
 [ MinGW ]
 SectionOwner => jholesov

Added: trunk/patches/dev300/canvas-directx-lostdevice-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/canvas-directx-lostdevice-fix.diff	Thu Dec  4 00:40:11 2008
@@ -0,0 +1,36 @@
+diff -u -p -r1.5 dx_9rm.cxx
+--- canvas/source/directx/dx_9rm.cxx	24 Jun 2008 10:30:05 -0000	1.5
++++ canvas/source/directx/dx_9rm.cxx	4 Dec 2008 00:20:35 -0000
+@@ -956,11 +956,32 @@ namespace dxcanvas
+ 			{
+ 				if(hr != D3DERR_DEVICELOST)
+ 					return false;
++
++                mpVertexBuffer.reset();
+ 				hr = mpDevice->Reset(&mad3dpp);
+ 				if(SUCCEEDED(hr))
++                {
++                    IDirect3DVertexBuffer9 *pVB(NULL);
++                    DWORD aFVF(D3DFVF_XYZRHW|D3DFVF_DIFFUSE|D3DFVF_TEX1);
++                    if( FAILED(mpDevice->CreateVertexBuffer(sizeof(dxvertex)*maNumVertices,
++                                                            D3DUSAGE_DYNAMIC|D3DUSAGE_WRITEONLY,
++                                                            aFVF,
++                                                            D3DPOOL_DEFAULT,
++                                                            &pVB,
++                                                            NULL)) )
++                    {
++                        throw lang::NoSupportException(
++                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
++                                                 "Could not create DirectX device - out of memory!")),NULL);
++                    }
++                    mpVertexBuffer=COMReference<IDirect3DVertexBuffer9>(pVB);
++
+ 					return true;
++                }
++
+ 				if(hr == D3DERR_DEVICELOST)
+ 					return true;
++
+ 				return false;
+ 			}
+ 

Added: trunk/patches/dev300/svx-ppt-textstyle-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/svx-ppt-textstyle-fix.diff	Thu Dec  4 00:40:11 2008
@@ -0,0 +1,26 @@
+--- svx/source/svdraw/svdfppt.cxx~	2008-12-03 00:43:00.000000000 +0100
++++ svx/source/svdraw/svdfppt.cxx	2008-12-03 09:24:43.000000000 +0100
+@@ -5245,11 +5245,6 @@
+ 					rIn >> aSet.mnFontHeight;
+ 					aSet.mnAttrSet |= 1 << PPT_CharAttr_FontHeight;
+ 				}
+-				if ( nMask & 0x80000 )	// cfPosition
+-				{
+-					rIn >> aSet.mnEscapement;
+-					aSet.mnAttrSet |= 1 << PPT_CharAttr_Escapement;
+-				}
+ 				if ( nMask & 0x40000 )	// cfColor
+ 				{
+ 					sal_uInt32 nVal;
+@@ -5259,6 +5254,11 @@
+ 					aSet.mnColor = nVal;
+ 					aSet.mnAttrSet |= 1 << PPT_CharAttr_FontColor;
+ 				}
++				if ( nMask & 0x80000 )	// cfPosition
++				{
++					rIn >> aSet.mnEscapement;
++					aSet.mnAttrSet |= 1 << PPT_CharAttr_Escapement;
++				}
+ 				if ( nExtParaPos )
+ 				{
+ 					sal_uInt32 nExtBuInd = nMask & 0x3c00;