[openoffice.org/f14/master] fix up patch

[Caolan McNamara]

commit f99dfc2d601b417bbbab59ead176b4a90ed60f39
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 18 19:20:39 2010 +0000

    fix up patch

 ...p-and-don-t-bail-out-on-mislength-records.patch |   36 +------------------
 1 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch b/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
index b33daa4..7d8cc7a 100644
--- a/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
+++ b/0001-tidy-this-up-and-don-t-bail-out-on-mislength-records.patch
@@ -2,7 +2,7 @@ diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
 index 5720af2..7807371 100644
 --- a/sw/source/filter/ww8/ww8graf.cxx
 +++ b/sw/source/filter/ww8/ww8graf.cxx
-@@ -1052,7 +1052,7 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
+@@ -1052,7 +1052,7 @@
                                              Read_PicLoc(nAktId, pParams, 1);
                                          break;
                                  }
@@ -10,7 +10,7 @@ index 5720af2..7807371 100644
 +                                aSprmIter.advance();
                              }
  
-                             if( !nLoop )
+                             //if( bRead_Obj || bRead_PicLoc ) break;
 diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
 index 5b66561..65172b1 100644
 --- a/sw/source/filter/ww8/ww8par2.cxx
@@ -98,19 +98,6 @@ index cf6541f..af19986 100644
      const BYTE* GetSprms() const 
          { return ( pSprms && (0 < nRemLen) ) ? pSprms : 0; }
      const BYTE* GetAktParams() const { return pAktParams; }
-diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
-index 801cc2f..0df3331 100644
---- a/sw/source/filter/ww8/ww8par.cxx
-+++ b/sw/source/filter/ww8/ww8par.cxx
-@@ -3895,7 +3895,7 @@ void SwWW8ImplReader::ReadDocInfo()
-                         xDocProps->setTemplateURL( sTemplateURL );
-                 }
-             }
--            else // not a template
-+            else if (pWwFib->lcbSttbfAssoc) // not a template, and has a SttbfAssoc
-             {
-                 long nCur = pTableStream->Tell();
-                 Sttb aSttb;
 diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
 index 44f1f69..b1e0351 100644
 --- a/sw/source/filter/ww8/ww8scan.cxx
@@ -188,22 +175,3 @@ index 44f1f69..b1e0351 100644
      }
  
      //one more FC than grrpl entries
-diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
-index 81b73e5..daee39b 100644
---- a/filter/source/msfilter/mstoolbar.cxx
-+++ b/filter/source/msfilter/mstoolbar.cxx
-@@ -188,10 +188,11 @@ TBBase::indent_printf( FILE* fp, const char* format, ... )
- 
- rtl::OUString TBBase::readUnicodeString( SvStream* pS, sal_Int32 nChars )
- {
--    sal_Int32 nBufSize = nChars * 2;
-+    sal_Size nBufSize = nChars * 2;
-     boost::scoped_array< sal_uInt8 > pArray( new sal_uInt8[ nBufSize ] );
--    pS->Read( pArray.get(), nBufSize );
--    return svt::BinFilterUtils::CreateOUStringFromUniStringArray(  reinterpret_cast< const char* >( pArray.get() ), nBufSize );
-+    sal_Size nReadSize = pS->Read( pArray.get(), nBufSize );
-+    OSL_ASSERT(nReadSize == nBufSize);
-+    return svt::BinFilterUtils::CreateOUStringFromUniStringArray(  reinterpret_cast< const char* >( pArray.get() ), nReadSize );
- }
- 
- TBCHeader::TBCHeader() : bSignature( 0x3 )