diff options
author | Sascha Ballach <sab@openoffice.org> | 2001-02-09 17:25:14 +0000 |
---|---|---|
committer | Sascha Ballach <sab@openoffice.org> | 2001-02-09 17:25:14 +0000 |
commit | f25bd4ffa0539ebf0070b25b077154b08bea4131 (patch) | |
tree | 84addb549c006e907d94f808ce92ac833f297443 | |
parent | 37d897b715c34c16f3f45aa343422c15046a51ae (diff) |
did the required changes (the XMLShapeImportHelper constructor gets one mor parameter)
-rw-r--r-- | sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 17 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLTableShapeImportHelper.hxx | 6 |
2 files changed, 10 insertions, 13 deletions
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index b79e238dcd15..e580f78e38f9 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableShapeImportHelper.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: sab $ $Date: 2001-02-01 17:36:04 $ + * last change: $Author: sab $ $Date: 2001-02-09 18:25:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,8 +106,7 @@ using namespace ::com::sun::star; XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : - XMLShapeImportHelper( rImp.GetModel(), pImpMapper ), - rImport( rImp ) + XMLShapeImportHelper(rImp, rImp.GetModel(), pImpMapper ) { } @@ -134,19 +133,19 @@ void XMLTableShapeImportHelper::finishShape( rtl::OUString aLocalName; sal_uInt16 nPrefix = - rImport.GetNamespaceMap().GetKeyByAttrName( rAttrName, + static_cast<ScXMLImport&>(mrImporter).GetNamespaceMap().GetKeyByAttrName( rAttrName, &aLocalName ); if(nPrefix = XML_NAMESPACE_TABLE) { if (aLocalName.compareToAscii(sXML_end_cell_address) == 0) { sal_Int32 nOffset(0); - ScXMLConverter::GetAddressFromString(aEndCell, rValue, rImport.GetDocument(), nOffset); + ScXMLConverter::GetAddressFromString(aEndCell, rValue, static_cast<ScXMLImport&>(mrImporter).GetDocument(), nOffset); } else if (aLocalName.compareToAscii(sXML_end_x) == 0) - rImport.GetMM100UnitConverter().convertMeasure(X, rValue); + static_cast<ScXMLImport&>(mrImporter).GetMM100UnitConverter().convertMeasure(X, rValue); else if (aLocalName.compareToAscii(sXML_end_y) == 0) - rImport.GetMM100UnitConverter().convertMeasure(Y, rValue); + static_cast<ScXMLImport&>(mrImporter).GetMM100UnitConverter().convertMeasure(Y, rValue); else if (aLocalName.compareToAscii(sXML_table_background) == 0) if (rValue.compareToAscii(sXML_true) == 0) bBackground = sal_True; @@ -167,7 +166,7 @@ void XMLTableShapeImportHelper::finishShape( if (!bOnTable) { if (X >= 0 && Y >= 0) - rImport.GetTables().AddShape(rShape, aStartCell, aEndCell, X, Y); + static_cast<ScXMLImport&>(mrImporter).GetTables().AddShape(rShape, aStartCell, aEndCell, X, Y); SvxShape* pShapeImp = SvxShape::getImplementation(rShape); if (pShapeImp) { diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index 7027cd47daa2..052e02435318 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableShapeImportHelper.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-01-04 14:18:30 $ + * last change: $Author: sab $ $Date: 2001-02-09 18:25:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,8 +73,6 @@ class ScXMLImport; class XMLTableShapeImportHelper : public XMLShapeImportHelper { - ScXMLImport& rImport; - ::com::sun::star::table::CellAddress aStartCell; sal_Bool bOnTable; public: |