[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                          |    2 -
 patches/dev300/sd-pptin-slidepreview-fix.diff |   34 --------------------------
 2 files changed, 36 deletions(-)

New commits:
commit b78fb2d544c248aee0f39f67038f25ee5aab1e63
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:38:13 2009 +0300

    sd-pptin-slidepreview-fix.diff is upstream
    
    * patches/dev300/sd-pptin-slidepreview-fix.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6fd09de..a79b7ed 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2918,8 +2918,6 @@ sd-odf-relaxed-listlevel.diff, i#101269, thorsten
 sd-animation-ui-fix.diff, thorsten
 # mute sound on all but the first slideshow view
 slideshow-mute-sound.diff, thorsten
-# manually force page preview obj to PRESOBJ_PAGE
-sd-pptin-slidepreview-fix.diff, i#101051, thorsten
 
 # avoid subpixel clipping in cairocanvas
 canvas-nosubpixel-clip.diff, thorsten
diff --git a/patches/dev300/sd-pptin-slidepreview-fix.diff b/patches/dev300/sd-pptin-slidepreview-fix.diff
deleted file mode 100644
index 24cbb7c..0000000
--- a/patches/dev300/sd-pptin-slidepreview-fix.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Fix for the missing page preview in notes
-
-From: Thorsten Behrens <thb at openoffice.org>
-
-
----
-
- sd/source/filter/pptin.cxx |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-
-diff --git sd/source/filter/pptin.cxx sd/source/filter/pptin.cxx
-index 8b1a424..5f649ff 100644
---- sd/source/filter/pptin.cxx
-+++ sd/source/filter/pptin.cxx
-@@ -2587,9 +2587,17 @@ SdrObject* ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
- {
- 	SdrObject* pObj = SdrPowerPointImport::ProcessObj( rSt, rObjData, pData, rTextRect, pRet );
- 
--	// Animationseffekte des Objektes lesen
- 	if ( pObj )
- 	{
-+        // further setup placeholder objects
-+        if( pObj->ISA(SdrPageObj) && pData )
-+        {
-+            const ProcessData* pProcessData=(const ProcessData*)pData;
-+            if( pProcessData->pPage )
-+                pProcessData->pPage->InsertPresObj( pObj, PRESOBJ_PAGE );
-+        }
-+
-+        // Animationseffekte des Objektes lesen
- 		BOOL bInhabitanceChecked = FALSE;
- 		BOOL bAnimationInfoFound = FALSE;
- 		DffRecordHeader aMasterShapeHd;