diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-08-15 22:58:27 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-18 19:44:16 +0000 |
| commit | 33521dafcc71082ad11764ea38d0ae5f43eb041e (patch) | |
| tree | 93da65119a5c49c47dfd853aa99f8f6d57c2adea | |
| parent | ad5dc7d3c83ea8bbe1e8a019b35e9fb635276ed1 (diff) | |
Simplify a bit
Change-Id: Ia742718cebca57237145b16a8bf363a35a95f818
Reviewed-on: https://gerrit.libreoffice.org/5445
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 1564b0bd171c..541924cc513d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -759,25 +759,17 @@ void ScXMLExport::CollectShapesAutoStyles(const sal_Int32 nTableCount) ++aShapeItr; } } - const ScMyNoteShapeList* pNoteShapes = NULL; - ScMyNoteShapeList::const_iterator aNoteShapeItr; - ScMyNoteShapeList::const_iterator aNoteShapeEndItr; if (pSharedData->GetNoteShapes()) { - pNoteShapes = pSharedData->GetNoteShapes()->GetNotes(); + const ScMyNoteShapeList* pNoteShapes = pSharedData->GetNoteShapes()->GetNotes(); if (pNoteShapes) { - aNoteShapeItr = pNoteShapes->begin(); - aNoteShapeEndItr = pNoteShapes->end(); - } - } - if (pNoteShapes) - { - while (aNoteShapeItr != aNoteShapeEndItr) - { - if (static_cast<sal_Int32>(aNoteShapeItr->aPos.Tab()) == nTable) - GetShapeExport()->collectShapeAutoStyles(aNoteShapeItr->xShape); - ++aNoteShapeItr; + for (ScMyNoteShapeList::const_iterator aNoteShapeItr = pNoteShapes->begin(), aNoteShapeEndItr = pNoteShapes->end(); + aNoteShapeItr != aNoteShapeEndItr; ++aNoteShapeItr) + { + if (static_cast<sal_Int32>(aNoteShapeItr->aPos.Tab()) == nTable) + GetShapeExport()->collectShapeAutoStyles(aNoteShapeItr->xShape); + } } } } |