[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                    |    2 
 patches/dev300/sd-ppt-fix-document-summary-reading.diff |   38 ----------------
 2 files changed, 40 deletions(-)

New commits:
commit 480120c3b6bab379954fbf5105a8603e0a3b6633
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 29 16:54:31 2011 +0200

    pushed sd-ppt-fix-document-summary-reading.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 15ed857..4315e65 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1251,8 +1251,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 
 [ Fixes ]
 # FIXME dev300-m77 sd-print-fix-pageoffset.diff, n#537931, rodo # the code has moved to sd/source/ui/view/DocumentRenderer.cxx
-
-sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
 # FIXME ooo330-m2: does not apply: configure-fix-lpsolve-depends.diff, janneke
 
 [ DebianSidOnly ]
diff --git a/patches/dev300/sd-ppt-fix-document-summary-reading.diff b/patches/dev300/sd-ppt-fix-document-summary-reading.diff
deleted file mode 100644
index daebffa..0000000
--- a/patches/dev300/sd-ppt-fix-document-summary-reading.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- sd/source/filter/ppt/propread.cxx |   11 ++++++++---
- 1 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git sd/source/filter/ppt/propread.cxx sd/source/filter/ppt/propread.cxx
-index ae64ac4..7b9f508 100644
---- sd/source/filter/ppt/propread.cxx
-+++ sd/source/filter/ppt/propread.cxx
-@@ -468,11 +468,13 @@ void Section::Read( SvStorageStream *pStrm )
-                         nPropSize += ( nTemp + 4 );
-                     break;
- 
--                    case VT_LPWSTR :
-+                    case VT_LPWSTR : {
-                         *pStrm >> nTemp;
--                        nPropSize += ( nTemp << 1 ) + 4;
-+                        // looks like these are aligned to 4 bytes
-+                        sal_uInt32 nLength = nPropOfs + nSecOfs + nPropSize + ( nTemp << 1 ) + 4;
-+                        nPropSize += ( nTemp << 1 ) + 4 + (nLength % 4);
-                     break;
--
-+                    }
-                     case VT_BLOB_OBJECT :
-                     case VT_BLOB :
-                     case VT_CF :
-@@ -501,6 +503,9 @@ void Section::Read( SvStorageStream *pStrm )
-                     break;
-                 }
-                 pStrm->Seek( nPropOfs + nSecOfs );
-+                // make sure we don't overflow the section size
-+                if( nPropSize > nSecSize - nSecOfs )
-+                    nPropSize = nSecSize - nSecOfs;
-                 sal_uInt8* pBuf = new sal_uInt8[ nPropSize ];
-                 pStrm->Read( pBuf, nPropSize );
-                 AddProperty( nPropId, pBuf, nPropSize );
--- 
-1.7.0.1
-