sc/source/filter/xml/xmlexprt.cxx | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
New commits:
commit 33521dafcc71082ad11764ea38d0ae5f43eb041e
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Thu Aug 15 22:58:27 2013 +0200
Simplify a bit
Change-Id: Ia742718cebca57237145b16a8bf363a35a95f818
Reviewed-on: https://gerrit.libreoffice.org/5445
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 1564b0b..541924c 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);
+ }
}
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
