User: vg      
Date: 2008-02-12 13:24:29+0000
Modified:
   dba/dbaccess/source/filter/xml/xmlfilter.cxx

Log:
 INTEGRATION: CWS dba24g_SRC680 (1.17.52); FILE MERGED
 2008/01/31 07:40:19 oj 1.17.52.1: import of odf12 for db files

File Changes:

Directory: /dba/dbaccess/source/filter/xml/
===========================================

File [changed]: xmlfilter.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.17&r2=1.18
Delta lines:  +4 -4
-------------------
--- xmlfilter.cxx       2007-11-09 08:18:54+0000        1.17
+++ xmlfilter.cxx       2008-02-12 13:24:26+0000        1.18
@@ -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);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to