[Libreoffice-commits] .: sc/source

[Noel Power]

 sc/source/filter/excel/xetable.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6068f2f7cf5d66c68241b3831851b413b2e0b3ba
Author: Noel Power <noel.power at novell.com>
Date:   Thu Aug 2 11:49:57 2012 +0100

    fix fdo#52998 xls(x) comment export problems
    
    Change-Id: Ie290199d3b03f6599429d56275eb54661af4a51c

diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index d611077..20bff22 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -41,6 +41,7 @@
 #include "xehelper.hxx"
 #include "xecontent.hxx"
 #include "xeescher.hxx"
+#include "postit.hxx"
 
 using namespace ::oox;
 
@@ -2355,8 +2356,10 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
         if( xCell )
             maRowBfr.AppendCell( xCell, bIsMergedBase );
 
-        if ( aAddNoteText.Len()  )
-            mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, NULL, aAddNoteText ) );
+        ScNotes* pNotes = rDoc.GetNotes( nScTab );
+        const ScPostIt* pScNote = pNotes ? pNotes->findByAddress( aScPos ) : NULL;
+        if ( aAddNoteText.Len() || pScNote )
+            mxNoteList->AppendNewRecord( new XclExpNote( GetRoot(), aScPos, pScNote, aAddNoteText ) );
 
         // other sheet contents
         if( pPattern )