summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-08-02 11:49:57 +0100
committerNoel Power <noel.power@novell.com>2012-08-02 11:52:41 +0100
commit6068f2f7cf5d66c68241b3831851b413b2e0b3ba (patch)
tree54e01a4729cd047d2b0473153dd7a09c616f72aa /sc
parentb6e6ea341d1bd1577f5219ef08403fad58887715 (diff)
fix fdo#52998 xls(x) comment export problems
Change-Id: Ie290199d3b03f6599429d56275eb54661af4a51c
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xetable.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index d611077744fb..20bff222851f 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 )