#95346#; add clear() method to remove unneeded objects; rename the ScMyAnnotation struct to ScMyExportAnnotation

1 files changed, 8 insertions, 6 deletions

diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx
index 42e57c13f2e4..7a0e73ef3292 100644
--- a/sc/source/filter/xml/XMLExportIterator.hxx
+++ b/sc/source/filter/xml/XMLExportIterator.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLExportIterator.hxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: sab $ $Date: 2001-07-27 10:44:22 $
+ *  last change: $Author: sab $ $Date: 2001-12-04 18:29:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -367,21 +367,21 @@ struct ScMyCell
 
 //==============================================================================
 
-struct ScMyAnnotation
+struct ScMyExportAnnotation
 {
     com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation;
     com::sun::star::table::CellAddress      aCellAddress;
-    sal_Bool operator<(const ScMyAnnotation& rDetOp);
+    sal_Bool operator<(const ScMyExportAnnotation& rDetOp);
 };
 
-typedef ::std::list< ScMyAnnotation > ScMyAnnotationList;
+typedef ::std::list< ScMyExportAnnotation* > ScMyExportAnnotationList;
 
 class ScMyNotEmptyCellsIterator
 {
     com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet> xTable;
     com::sun::star::uno::Reference<com::sun::star::table::XCellRange> xCellRange;
     com::sun::star::table::CellAddress  aLastAddress;
-    ScMyAnnotationList                  aAnnotations;
+    ScMyExportAnnotationList            aAnnotations;
 
     ScMyShapesContainer*                pShapes;
     ScMyEmptyDatabaseRangesContainer*   pEmptyDatabaseRanges;
@@ -406,6 +406,8 @@ public:
                                 ScMyNotEmptyCellsIterator(ScXMLExport& rExport);
                                 ~ScMyNotEmptyCellsIterator();
 
+    void                        Clear();
+
     inline void                 SetShapes(ScMyShapesContainer* pNewShapes)
                                     { pShapes = pNewShapes; }
     inline void                 SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges)