summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-01-22 20:13:36 +0100
committerEike Rathke <erack@redhat.com>2012-01-22 20:20:31 +0100
commitd180de79b82d1a73cfd914dd9a1524109c5e78ee (patch)
treeb22238f1b59988087341de64ba437f215fa25a97
parent7afa76599cf0c9256e2dc85709f8cb2f1ac76282 (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.
-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 af34e4003c30..d66cb0d7fff4 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -876,11 +876,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
}