[Libreoffice-commits] .: 3 commits - chart2/uiconfig sc/uiconfig

[René Engelhard]

 chart2/uiconfig/menubar/menubar.xml   |    1 +
 sc/uiconfig/scalc/menubar/menubar.xml |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit f856a9c1b548c58faac0dedc0c40f081430c1b95
Merge: e3cfc3a... 5e643c1...
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Nov 26 17:50:29 2010 +0100

    Merge branch 'libreoffice-3-3'

commit 5e643c11ece034c6d1f0a7174fc63b1a9fa1e5d3
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Nov 25 22:30:37 2010 +0100

    Put show credits entry into all app ui configs

diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index 134fb28..7da1336 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -149,6 +149,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 539bee7..d66671c 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -449,6 +449,7 @@
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
         </menu:menupopup>
     </menu:menu>
commit c9b21c9580204dc3b5541900f613dc13be1ae5f9
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Thu Nov 25 14:34:41 2010 +0100

    Fixed crash in xls export caused by off-by-one iterator
    
    (this is for bnc#653533 and fdo#31141)

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index df1273f..7a636df 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2105,7 +2105,6 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm )
     for (itr = itrBeg; itr != itrEnd; ++itr)
     {
         // find end of row block
-        ++itrBlkEnd;
         while( (itrBlkEnd != itrEnd) && (itrBlkEnd->second->GetXclRow() - nStartXclRow < EXC_ROW_ROWBLOCKSIZE) )
             ++itrBlkEnd;
 
@@ -2118,7 +2117,7 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm )
         for( itRow = itrBlkStart; itRow != itrBlkEnd; ++itRow )
              itRow->second->WriteCellList( rStrm );
 
-        itrBlkStart = itrBlkEnd;
+        itrBlkStart = (itrBlkEnd == itrEnd) ? itrBlkEnd : itrBlkEnd++;
         nStartXclRow += EXC_ROW_ROWBLOCKSIZE;
     }
 }