diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-02 21:34:14 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-07-08 11:34:38 +0100 |
| commit | deba57d90339fa6083a54495aa410872ffa5e15e (patch) | |
| tree | 7633bb9953dcbf80c3c1bcfc983152d81751a789 | |
| parent | b00c51c9fb1a69431248e3bfa3d8e9265e69a83c (diff) | |
Resolves: fdo#34023 hang on load of .doc
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
| -rw-r--r-- | sw/source/filter/ww8/ww8toolbar.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx index 0f4a644989..20bfcf380e 100644 --- a/sw/source/filter/ww8/ww8toolbar.cxx +++ b/sw/source/filter/ww8/ww8toolbar.cxx @@ -906,12 +906,13 @@ bool Tcg255::Read(SvStream *pS) { OSL_TRACE("Tcg255::Read() stream pos 0x%x", pS->Tell() ); nOffSet = pS->Tell(); - sal_uInt8 nId = 0; // + sal_uInt8 nId = 0x40; *pS >> nId; while ( nId != 0x40 ) { if ( !processSubStruct( nId, pS ) ) return false; + nId = 0x40; *pS >> nId; } return true; @@ -948,9 +949,10 @@ bool Tcg255SubStruct::Read(SvStream *pS) return true; } -PlfMcd::PlfMcd( bool bReadId ): Tcg255SubStruct( bReadId ), rgmcd( NULL ) +PlfMcd::PlfMcd( bool bReadId ): Tcg255SubStruct( bReadId ), iMac(0), rgmcd( NULL ) { } + PlfMcd::~PlfMcd() { if ( rgmcd ) |