diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-12-18 19:07:15 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-12-18 19:07:15 -0800 |
commit | 4d456fcb7a0070c101fb3d2247417c9cfead26eb (patch) | |
tree | a3273b51d3039f3e62fc17a931792627f4f32fc1 /sw/source/filter/xml/xmlexp.hxx | |
parent | b2447c13296d919caff594fde5e9bd4f8ee4fb87 (diff) |
Remove DECLARE_LIST( SwXMLTableLinesCache_Impl, SwXMLTableLinesPtr )
The list is only used in SwXMLExport. ExportTableLinesAutoStyles() adds
entries; while ExportTableLines(). It might be posiable to destroy the
object with ot deleting the entries; so, I added a call to the destructor
to make sure pTableLines is clean before leaving.
Diffstat (limited to 'sw/source/filter/xml/xmlexp.hxx')
-rw-r--r-- | sw/source/filter/xml/xmlexp.hxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 7b081378236a..66e1efef3d23 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -33,6 +33,7 @@ #include "xmlitmap.hxx" #include <xmloff/uniref.hxx> #include <xmloff/xmltoken.hxx> +#include <vector> class SwPaM; class SwFmt; @@ -45,12 +46,14 @@ class SwTableLines; class SwTableBox; class SwXMLTableColumn_Impl; class SwXMLTableLines_Impl; -class SwXMLTableLinesCache_Impl; class SwXMLTableColumnsSortByWidth_Impl; class SwXMLTableFrmFmtsSort_Impl; class SwXMLTableInfo_Impl; class SwTableNode; class XMLPropertySetMapper; +class SwXMLTableLines_Impl; + +typedef ::std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl; class SwXMLExport : public SvXMLExport { @@ -61,10 +64,9 @@ class SwXMLExport : public SvXMLExport SwPaM *pOrigPaM; // the original PaM #endif - SvXMLUnitConverter *pTwipUnitConv; - - SvXMLExportItemMapper *pTableItemMapper; - SwXMLTableLinesCache_Impl *pTableLines; + SvXMLUnitConverter* pTwipUnitConv; + SvXMLExportItemMapper* pTableItemMapper; + SwXMLTableLinesCache_Impl* pTableLines; SvXMLItemMapEntriesRef xTableItemMap; SvXMLItemMapEntriesRef xTableRowItemMap; @@ -124,7 +126,8 @@ class SwXMLExport : public SvXMLExport const ::rtl::OUString sCell; void setBlockMode(); - +private: + void DeleteTableLines(); protected: virtual XMLTextParagraphExport* CreateTextParagraphExport(); |