[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Eike Rathke]

 sc/source/filter/excel/excdoc.cxx |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a59370800d91d7fd150a914341d5ad1ede6e072d
Author: Noel Power <noel.power at novell.com>
Date:   Thu Aug 2 19:24:00 2012 +0100

    new fix for fdo#52998
    
    Change-Id: Icc5e90ac40056430bfbe36d8da1aaad8716cfee9
    (cherry picked from commit 00f1a3ed8ec17b8274a7bf3ee8f5d394a8a16bab)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx
index 9b11a18..964d6b1 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -514,7 +514,7 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
     }
 
     // list of NOTE records, generated by the cell table
-    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_NOTE ) );
+    aRecList.AppendRecord( mxNoteList );
 
     // sheet view settings: WINDOW2, SCL, PANE, SELECTION
     aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab ) );
@@ -593,10 +593,8 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
     aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) );
 
     // list of NOTE records, generated by the cell table
-    XclExpRecordRef xNotes = mxCellTable->CreateRecord( EXC_ID_NOTE );
-    XclExpRecordList< XclExpNote >* xNoteList = dynamic_cast< XclExpRecordList< XclExpNote >* >( xNotes.get() );
-    if( xNoteList != NULL && !xNoteList->IsEmpty() )
-        aRecList.AppendNewRecord( new XclExpComments( mnScTab, *xNoteList ) );
+    if( mxNoteList != NULL && !mxNoteList->IsEmpty() )
+        aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) );
 
     // web queries
     Add( new XclExpWebQueryBuffer( GetRoot() ) );