[Libreoffice-commits] .: 4 commits - binfilter/bf_sw

Jan Holesovsky kendy at kemper.freedesktop.org
Wed Oct 13 05:41:29 PDT 2010


 binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3a57c556c248445025047574bc33172c81d4a7c6
Merge: c43c079... 0d47b39...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 13 14:38:15 2010 +0200

    Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/filters

commit c43c0796f7d3c9096ae2a0e1d7137c5d22f9563e
Merge: 4e258c4... 0975085...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 13 11:30:57 2010 +0200

    Merge commit 'ooo/OOO330_m10'

commit 0975085ee0237894b1011001fe513090e974babc
Merge: 6dd15e6... 3bf1d26...
Author: obo <obo at openoffice.org>
Date:   Fri Oct 8 08:45:29 2010 +0200

    CWS-TOOLING: integrate CWS hb22

commit 3bf1d26b7070cacb6fd50d360d8c1a9c8b489612
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date:   Mon Sep 20 16:52:57 2010 +0200

    #b6986082# InsBoxen: Do not insert a new cell beyond the end

diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
index 52faa91..f89938a 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx
@@ -273,7 +273,13 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
         SwEndNode* pEndNd = new SwEndNode( aEndIdx, *pSttNd );
 
         pPrvBox = new SwTableBox( pBoxFmt, *pSttNd, pLine );
-        pLine->GetTabBoxes().C40_INSERT( SwTableBox, pPrvBox, nInsPos + n );
+        
+        SwTableBoxes & rTabBoxes = pLine->GetTabBoxes();
+        USHORT nRealInsPos = nInsPos + n;        
+        if (nRealInsPos > rTabBoxes.Count())
+            nRealInsPos = rTabBoxes.Count();
+
+        rTabBoxes.C40_INSERT( SwTableBox, pPrvBox, nRealInsPos );
 
         if( NO_NUMBERING == pTxtColl->GetOutlineLevel()
  //FEATURE::CONDCOLL


More information about the Libreoffice-commits mailing list