[ooo-build-commit] .: patches/dev300

[Cédric Bosdonnat]

 patches/dev300/field-patch.diff |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 90b8d10df3f94b7d512028f3ab4a9e4e96131a18
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Mar 30 10:43:05 2010 +0200

    Fixed a crash in field-patch
    
    * patches/dev300/field-patch.diff:

diff --git a/patches/dev300/field-patch.diff b/patches/dev300/field-patch.diff
index 1ffd526..faf6f53 100644
--- a/patches/dev300/field-patch.diff
+++ b/patches/dev300/field-patch.diff
@@ -294,7 +294,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/inc/unoobj.hxx sw/inc/u
 diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/crsr/bookmrk.cxx sw/source/core/crsr/bookmrk.cxx
 --- sw/source/core/crsr/bookmrk.cxx	2009-10-07 17:44:56.000000000 +0200
 +++ sw/source/core/crsr/bookmrk.cxx	2009-10-09 10:57:57.000000000 +0200
-@@ -77,20 +77,20 @@
+@@ -77,20 +77,21 @@
          const sal_Unicode aStartMark,
          const sal_Unicode aEndMark)
      {
@@ -305,7 +305,9 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/crsr/bookmr
          SwTxtNode const * const pStartTxtNode = io_pDoc->GetNodes()[rStart.nNode]->GetTxtNode();
          SwTxtNode const * const pEndTxtNode = io_pDoc->GetNodes()[rEnd.nNode]->GetTxtNode();
          const sal_Unicode ch_start=pStartTxtNode->GetTxt().GetChar(rStart.nContent.GetIndex());
-         const sal_Unicode ch_end=pEndTxtNode->GetTxt().GetChar(rEnd.nContent.GetIndex()-1);
+-        const sal_Unicode ch_end=pEndTxtNode->GetTxt().GetChar(rEnd.nContent.GetIndex()-1);
++        xub_StrLen nEndPos = rEnd.nContent.GetIndex() == 0 ? 0 : rEnd.nContent.GetIndex() - 1;
++        const sal_Unicode ch_end=pEndTxtNode->GetTxt().GetChar( nEndPos );
 -        const SwPaM aStartPaM(rStart);
 -        const SwPaM aEndPaM(rEnd);
 +        SwPaM aStartPaM(rStart);
@@ -320,7 +322,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/crsr/bookmr
          {
              io_pDoc->InsertString(aEndPaM, aEndMark);
          }
-@@ -114,6 +114,11 @@
+@@ -114,6 +115,11 @@
          }
      }
  
@@ -332,7 +334,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/crsr/bookmr
      void MarkBase::SetMarkPos(const SwPosition& rNewPos)
      {
          ::boost::scoped_ptr<SwPosition>(new SwPosition(rNewPos)).swap(m_pPos1);
-@@ -126,6 +131,17 @@
+@@ -126,6 +132,17 @@
          //lcl_FixPosition(*m_pPos2);
      }
  
@@ -350,7 +352,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/crsr/bookmr
      MarkBase::~MarkBase()
      { }
  
-@@ -267,6 +283,96 @@
+@@ -267,6 +284,96 @@
          if(!IsExpanded())
              SetOtherMarkPos(GetMarkPos());
      }
@@ -447,7 +449,7 @@ diff -urN '--exclude=unxlngi6.pro' '--exclude=*.orig' sw/source/core/crsr/bookmr
  
      const ::rtl::OUString Fieldmark::our_sNamePrefix = ::rtl::OUString::createFromAscii("__Fieldmark__");
  
-@@ -285,7 +391,11 @@
+@@ -285,7 +392,11 @@
  
      void CheckboxFieldmark::InitDoc(SwDoc* const io_pDoc)
      {