[ooo-build-commit] patches/dev300

[Cédric Bosdonnat]

 patches/dev300/field-patch.diff |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit cd9d8a9376cd73c8a3677b5a4da80864920728c8
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Fri Oct 9 20:05:50 2009 +0200

    missing bits in field-patch.diff
    
    * patches/dev300/field-patch.diff:

diff --git a/patches/dev300/field-patch.diff b/patches/dev300/field-patch.diff
index c873915..06cae96 100644
--- a/patches/dev300/field-patch.diff
+++ b/patches/dev300/field-patch.diff
@@ -1765,7 +1765,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/filter/ww8/ww8pa
              // set field data here...
          }
      }
-@@ -306,24 +257,74 @@
+@@ -306,24 +257,75 @@
      if (0x01 == rStr.GetChar(writer_cast<xub_StrLen>(pF->nLCode-1)))
          ImportFormulaControl(aFormula,pF->nSCode+pF->nLCode-1, WW8_CT_DROPDOWN);
  
@@ -1795,6 +1795,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/filter/ww8/ww8pa
 -    if (!aFormula.maListEntries.empty())
 +        rDoc.InsertPoolItem(*pPaM, SwFmtFld(aFld), 0);
 +        return FLD_OK;
++    }
 +    else
      {
 -        aFld.SetItems(aFormula.maListEntries);
@@ -1853,7 +1854,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/filter/ww8/ww8pa
  }
  
  void SwWW8ImplReader::DeleteFormImpl()
-@@ -2140,11 +2141,18 @@
+@@ -2140,11 +2142,18 @@
  
      if((aPic.lcb > 0x3A) && !pDataStream->GetError() )
      {