diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/xml/xmlfmte.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltbli.hxx | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index d13df377e6e9..6f92051f3fee 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -253,7 +253,6 @@ class SwXMLAutoStylePoolP : public SvXMLAutoStylePoolP SvXMLExport& rExport; const OUString sListStyleName; const OUString sMasterPageName; - const OUString sCDATA; protected: @@ -329,8 +328,7 @@ SwXMLAutoStylePoolP::SwXMLAutoStylePoolP(SvXMLExport& rExp ) : SvXMLAutoStylePoolP( rExp ), rExport( rExp ), sListStyleName( GetXMLToken( XML_LIST_STYLE_NAME ) ), - sMasterPageName( GetXMLToken( XML_MASTER_PAGE_NAME ) ), - sCDATA( GetXMLToken( XML_CDATA ) ) + sMasterPageName( GetXMLToken( XML_MASTER_PAGE_NAME ) ) { } diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 3aa355b1722d..fdc0bbc0c045 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -643,7 +643,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext( { SwXMLTableContext *pTblContext = new SwXMLTableContext( GetSwImport(), nPrefix, rLocalName, - xAttrList, GetTable(), sXmlId ); + xAttrList, GetTable() ); pContext = pTblContext; if( GetTable()->IsValid() ) InsertContent( pTblContext ); @@ -1418,10 +1418,8 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > &, - SwXMLTableContext *pTable, - OUString const & i_rXmlId ) : + SwXMLTableContext *pTable ) : XMLTextTableContext( rImport, nPrfx, rLName ), - mXmlId( i_rXmlId ), pColumnDefaultCellStyleNames( 0 ), pRows( new SwXMLTableRows_Impl ), pTableNode( pTable->pTableNode ), diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index c69fbf4b0d1c..9aff5f9e40c3 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -50,8 +50,6 @@ class SwXMLTableContext : public XMLTextTableContext { OUString aStyleName; OUString aDfltCellStyleName; - /// NB: this contains the xml:id only if this table is a subtable! - OUString mXmlId; //! Holds basic information about a column's width. struct ColumnWidthInfo { @@ -142,8 +140,7 @@ public: const OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, - SwXMLTableContext *pTable, - const OUString& i_rXmlId ); + SwXMLTableContext *pTable ); virtual ~SwXMLTableContext(); |