summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-01-22 20:13:36 +0100
committerKohei Yoshida <kohei.yoshida@suse.com>2012-01-23 10:56:42 -0500
commit531b11d98d5fedd575d5e1564a937ac109d6bdf5 (patch)
tree1d8ccd774218438fb1619d0baaa8b8f3c7582994 /sc
parent48c33e89fe7398c05f2af6c49c75fa2bedf36859 (diff)
resolved fdo#45032 Calc export to HTML with graphics failed
Fixed a misconception in transition from List to to ptr_vector of commit db599f64e63a3141159b7f0e59783197c39b3e02, List::Next() returned NULL when at end of list, mimic that. Signed-off-by: Kohei Yoshida <kohei.yoshida@suse.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/html/htmlexp.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 1f36f9dc8285..0e8fee9350ce 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -883,11 +883,14 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
size_t ListSize = aGraphList.size();
for ( size_t i = 0; i < ListSize; ++i )
{
- pGraphEntry = &aGraphList[ i ];
- if ( pGraphEntry->bInCell && pGraphEntry->aRange.In( aPos ) )
+ ScHTMLGraphEntry* pE = &aGraphList[ i ];
+ if ( pE->bInCell && pE->aRange.In( aPos ) )
{
- if ( pGraphEntry->aRange.aStart == aPos )
+ if ( pE->aRange.aStart == aPos )
+ {
+ pGraphEntry = pE;
break; // for
+ }
else
return ; // ist ein Col/RowSpan, Overlapped
}