Tag: cws_ooh680_dba24g User: oj Date: 2008-01-31 07:40:22+0000 Modified: dba/dbaccess/source/filter/xml/dbloader2.cxx dba/dbaccess/source/filter/xml/xmlfilter.cxx dba/dbaccess/source/filter/xml/xmlfilter.hxx
Log: import of odf12 for db files File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.31&r2=1.31.52.1 Delta lines: +4 -4 ------------------- --- dbloader2.cxx 2007-11-21 15:42:43+0000 1.31 +++ dbloader2.cxx 2008-01-31 07:40:19+0000 1.31.52.1 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader2.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.31.52.1 $ * - * last change: $Author: ihi $ $Date: 2007/11/21 15:42:43 $ + * last change: $Author: oj $ $Date: 2008/01/31 07:40:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -171,7 +171,7 @@ { ::rtl::OUString sMediaType; xProp->getPropertyValue( INFO_MEDIATYPE ) >>= sMediaType; - if ( sMediaType.equalsAscii(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) ) + if ( sMediaType.equalsAscii(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) || sMediaType.equalsAscii("application/vnd.oasis.opendocument.base") ) return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBase")); ::comphelper::disposeComponent(xProp); } File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.17&r2=1.17.52.1 Delta lines: +7 -7 ------------------- --- xmlfilter.cxx 2007-11-09 08:18:54+0000 1.17 +++ xmlfilter.cxx 2008-01-31 07:40:19+0000 1.17.52.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.17.52.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:18:54 $ + * last change: $Author: oj $ $Date: 2008/01/31 07:40:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -473,11 +473,11 @@ break; case XML_TOK_DOC_STYLES: GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = CreateStylesContext( rLocalName, xAttrList, sal_False); + pContext = CreateStylesContext( nPrefix,rLocalName, xAttrList, sal_False); break; case XML_TOK_DOC_AUTOSTYLES: GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = CreateStylesContext( rLocalName, xAttrList, sal_True); + pContext = CreateStylesContext(nPrefix, rLocalName, xAttrList, sal_True); break; } @@ -769,13 +769,13 @@ return *m_pColumnElemTokenMap; } // ----------------------------------------------------------------------------- -SvXMLImportContext* ODBFilter::CreateStylesContext(const ::rtl::OUString& rLocalName, +SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const ::rtl::OUString& rLocalName, const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ) { SvXMLImportContext *pContext = NULL; if (!pContext) { - pContext = new OTableStylesContext(*this, XML_NAMESPACE_OOO, rLocalName, xAttrList, bIsAutoStyle); + pContext = new OTableStylesContext(*this, _nPrefix, rLocalName, xAttrList, bIsAutoStyle); if (bIsAutoStyle) //xAutoStyles = pContext; SetAutoStyles((SvXMLStylesContext*)pContext); File [changed]: xmlfilter.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.hxx?r1=1.6&r2=1.6.52.1 Delta lines: +4 -4 ------------------- --- xmlfilter.hxx 2007-11-09 08:19:11+0000 1.6 +++ xmlfilter.hxx 2008-01-31 07:40:19+0000 1.6.52.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlfilter.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.6.52.1 $ * - * last change: $Author: rt $ $Date: 2007/11/09 08:19:11 $ + * last change: $Author: oj $ $Date: 2008/01/31 07:40:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -149,7 +149,7 @@ */ void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); - SvXMLImportContext* CreateStylesContext(const ::rtl::OUString& rLocalName, + SvXMLImportContext* CreateStylesContext(sal_uInt16 nPrefix,const ::rtl::OUString& rLocalName, const Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ); protected: // SvXMLImport --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
