diff options
| author | Niklas Nebel <nn@openoffice.org> | 2001-03-16 13:21:20 +0000 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2001-03-16 13:21:20 +0000 |
| commit | 54058524c0fe22824435568370018300705e40ae (patch) | |
| tree | 1dd230ad2bcbda8835830ea975c99d56e8496bef /sc/source/filter | |
| parent | d22ab4775bebe38e4bc8b90431efdebc259dde03 (diff) | |
changes for udk212
Diffstat (limited to 'sc/source/filter')
44 files changed, 426 insertions, 435 deletions
diff --git a/sc/source/filter/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index 77176ae13a3c..5e5c9a3f0ad2 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -2,9 +2,9 @@ * * $RCSfile: filt_pch.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2001-03-14 18:12:04 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:20:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,6 @@ #include <rtl/string.h> #include <rtl/ustring.h> #include <rtl/memory.h> -#include <rtl/macros.hxx> #include <rtl/ustring.hxx> #include <rtl/ustring> #include <rtl/locale.hxx> @@ -110,7 +109,6 @@ #include <tools/color.hxx> #include <filter.hxx> #include <rangelst.hxx> -#include <osl/types.h> #include <osl/mutex.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.h> @@ -125,7 +123,6 @@ #include <com/sun/star/uno/TypeClass.hdl> #include <com/sun/star/uno/Type.hxx> #include <osl/mutex.hxx> -#include <osl/macros.hxx> #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/XInterface.hpp> diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 31f7e6edbb46..49087d6d279c 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLCalculationSettingsContext.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2001-03-01 15:18:17 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,7 +109,7 @@ using namespace com::sun::star; ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -171,7 +171,7 @@ ScXMLCalculationSettingsContext::~ScXMLCalculationSettingsContext() } SvXMLImportContext *ScXMLCalculationSettingsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -224,7 +224,7 @@ void ScXMLCalculationSettingsContext::EndElement() ScXMLNullDateContext::ScXMLNullDateContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -257,7 +257,7 @@ ScXMLNullDateContext::~ScXMLNullDateContext() } SvXMLImportContext *ScXMLNullDateContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -272,7 +272,7 @@ void ScXMLNullDateContext::EndElement() ScXMLIterationContext::ScXMLIterationContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet) : @@ -315,7 +315,7 @@ ScXMLIterationContext::~ScXMLIterationContext() } SvXMLImportContext *ScXMLIterationContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index deffb959eac2..6f2b7b59c4cf 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLCalculationSettingsContext.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-03-01 15:18:17 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,14 +88,14 @@ class ScXMLCalculationSettingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCalculationSettingsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLCalculationSettingsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -112,14 +112,14 @@ class ScXMLNullDateContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLNullDateContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLNullDateContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -132,14 +132,14 @@ class ScXMLIterationContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLIterationContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLCalculationSettingsContext* pCalcSet); virtual ~ScXMLIterationContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 42663f9069b4..9fa7f0b66a19 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLDDELinksContext.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: aw $ $Date: 2001-02-27 14:19:14 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ using namespace com::sun::star; ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -113,7 +113,7 @@ ScXMLDDELinksContext::~ScXMLDDELinksContext() } SvXMLImportContext *ScXMLDDELinksContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -134,7 +134,7 @@ void ScXMLDDELinksContext::EndElement() ScXMLDDELinkContext::ScXMLDDELinkContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -156,7 +156,7 @@ ScXMLDDELinkContext::~ScXMLDDELinkContext() } SvXMLImportContext *ScXMLDDELinkContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -239,7 +239,7 @@ void ScXMLDDELinkContext::EndElement() ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -281,7 +281,7 @@ ScXMLDDESourceContext::~ScXMLDDESourceContext() } SvXMLImportContext *ScXMLDDESourceContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -297,7 +297,7 @@ void ScXMLDDESourceContext::EndElement() ScXMLDDETableContext::ScXMLDDETableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -312,7 +312,7 @@ ScXMLDDETableContext::~ScXMLDDETableContext() } SvXMLImportContext *ScXMLDDETableContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -336,7 +336,7 @@ void ScXMLDDETableContext::EndElement() ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -367,7 +367,7 @@ ScXMLDDEColumnContext::~ScXMLDDEColumnContext() } SvXMLImportContext *ScXMLDDEColumnContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -382,7 +382,7 @@ void ScXMLDDEColumnContext::EndElement() ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -413,7 +413,7 @@ ScXMLDDERowContext::~ScXMLDDERowContext() } SvXMLImportContext *ScXMLDDERowContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -436,7 +436,7 @@ void ScXMLDDERowContext::EndElement() ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pTempDDELink) : @@ -490,7 +490,7 @@ ScXMLDDECellContext::~ScXMLDDECellContext() } SvXMLImportContext *ScXMLDDECellContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index 6c399b15fca8..5787ad5cb23b 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLDDELinksContext.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,14 +78,14 @@ class ScXMLDDELinksContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinksContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinksContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -118,14 +118,14 @@ class ScXMLDDELinkContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDELinkContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDDELinkContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -150,7 +150,7 @@ class ScXMLDDESourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDESourceContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -158,7 +158,7 @@ public: virtual ~ScXMLDDESourceContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -173,7 +173,7 @@ class ScXMLDDETableContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDETableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -181,7 +181,7 @@ public: virtual ~ScXMLDDETableContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -196,7 +196,7 @@ class ScXMLDDEColumnContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDEColumnContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -204,7 +204,7 @@ public: virtual ~ScXMLDDEColumnContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -220,7 +220,7 @@ class ScXMLDDERowContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDERowContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -228,7 +228,7 @@ public: virtual ~ScXMLDDERowContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -250,7 +250,7 @@ class ScXMLDDECellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDDECellContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDDELinkContext* pDDELink); @@ -258,7 +258,7 @@ public: virtual ~ScXMLDDECellContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 9cf470681c90..02868f7e7eb4 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableShapesContext.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2000-11-28 16:18:57 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ using namespace com::sun::star; ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -103,7 +103,7 @@ ScXMLTableShapesContext::~ScXMLTableShapesContext() } SvXMLImportContext *ScXMLTableShapesContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 8aad0e8d8539..618a1db84f6b 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableShapesContext.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: sab $ $Date: 2000-11-14 18:30:44 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,14 +74,14 @@ class ScXMLTableShapesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableShapesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableShapesContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 05361166e235..f6f0364202e5 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableSourceContext.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2001-03-07 18:02:41 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -103,7 +103,7 @@ using namespace com::sun::star; ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -146,7 +146,7 @@ ScXMLTableSourceContext::~ScXMLTableSourceContext() } SvXMLImportContext *ScXMLTableSourceContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 90d0add219bf..6b356f3034a6 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTableSourceContext.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: sab $ $Date: 2000-12-08 14:42:50 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,14 +84,14 @@ class ScXMLTableSourceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTableSourceContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTableSourceContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx index e6e889b36f5a..fc7984e4c0ee 100644 --- a/sc/source/filter/xml/XMLTextPContext.cxx +++ b/sc/source/filter/xml/XMLTextPContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextPContext.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2001-01-15 14:54:06 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ using namespace com::sun::star; ScXMLTextPContext::ScXMLTextPContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -105,7 +105,7 @@ ScXMLTextPContext::~ScXMLTextPContext() } SvXMLImportContext *ScXMLTextPContext::CreateChildContext( USHORT nTempPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList ) { diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx index 6363abb40e47..1840c8a7a976 100644 --- a/sc/source/filter/xml/XMLTextPContext.hxx +++ b/sc/source/filter/xml/XMLTextPContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTextPContext.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,14 +84,14 @@ class ScXMLTextPContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLTextPContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLTextPContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 96c15580932a..bcb534bdd7df 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTrackedChangesContext.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: aw $ $Date: 2001-02-27 14:22:17 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,7 +119,7 @@ using namespace com::sun::star; ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -133,7 +133,7 @@ ScXMLTrackedChangesContext::~ScXMLTrackedChangesContext() } SvXMLImportContext *ScXMLTrackedChangesContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -175,7 +175,7 @@ void ScXMLTrackedChangesContext::EndElement() ScXMLChangeInfoContext::ScXMLChangeInfoContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -211,7 +211,7 @@ ScXMLChangeInfoContext::~ScXMLChangeInfoContext() } SvXMLImportContext *ScXMLChangeInfoContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -239,7 +239,7 @@ void ScXMLChangeInfoContext::EndElement() ScXMLBigRangeContext::ScXMLBigRangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScBigRange& rTempBigRange ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -312,7 +312,7 @@ ScXMLBigRangeContext::~ScXMLBigRangeContext() } SvXMLImportContext *ScXMLBigRangeContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -330,7 +330,7 @@ void ScXMLBigRangeContext::EndElement() ScXMLCellContentDeletionContext::ScXMLCellContentDeletionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -366,7 +366,7 @@ ScXMLCellContentDeletionContext::~ScXMLCellContentDeletionContext() } SvXMLImportContext *ScXMLCellContentDeletionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -408,7 +408,7 @@ void ScXMLCellContentDeletionContext::EndElement() ScXMLDependenceContext::ScXMLDependenceContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -438,7 +438,7 @@ ScXMLDependenceContext::~ScXMLDependenceContext() } SvXMLImportContext *ScXMLDependenceContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -458,7 +458,7 @@ void ScXMLDependenceContext::EndElement() ScXMLDependingsContext::ScXMLDependingsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -472,7 +472,7 @@ ScXMLDependingsContext::~ScXMLDependingsContext() } SvXMLImportContext *ScXMLDependingsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -496,7 +496,7 @@ void ScXMLDependingsContext::EndElement() ScXMLChangeDeletionContext::ScXMLChangeDeletionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -526,7 +526,7 @@ ScXMLChangeDeletionContext::~ScXMLChangeDeletionContext() } SvXMLImportContext *ScXMLChangeDeletionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -546,7 +546,7 @@ void ScXMLChangeDeletionContext::EndElement() ScXMLDeletionsContext::ScXMLDeletionsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -560,7 +560,7 @@ ScXMLDeletionsContext::~ScXMLDeletionsContext() } SvXMLImportContext *ScXMLDeletionsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -586,7 +586,7 @@ void ScXMLDeletionsContext::EndElement() ScXMLChangeTextPContext::ScXMLChangeTextPContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList, ScXMLChangeCellContext* pTempChangeCellContext) : @@ -608,7 +608,7 @@ ScXMLChangeTextPContext::~ScXMLChangeTextPContext() } SvXMLImportContext *ScXMLChangeTextPContext::CreateChildContext( USHORT nTempPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xTempAttrList ) { @@ -675,7 +675,7 @@ void ScXMLChangeTextPContext::EndElement() ScXMLChangeCellContext::ScXMLChangeCellContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScBaseCell*& rTempOldCell, rtl::OUString& rAddress, rtl::OUString& rFormula, double& fDateTimeValue, sal_uInt16& nType, @@ -765,7 +765,7 @@ ScXMLChangeCellContext::~ScXMLChangeCellContext() } SvXMLImportContext *ScXMLChangeCellContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -870,7 +870,7 @@ void ScXMLChangeCellContext::EndElement() ScXMLPreviousContext::ScXMLPreviousContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -906,7 +906,7 @@ ScXMLPreviousContext::~ScXMLPreviousContext() } SvXMLImportContext *ScXMLPreviousContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -931,7 +931,7 @@ void ScXMLPreviousContext::EndElement() ScXMLContentChangeContext::ScXMLContentChangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -981,7 +981,7 @@ ScXMLContentChangeContext::~ScXMLContentChangeContext() } SvXMLImportContext *ScXMLContentChangeContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1023,7 +1023,7 @@ void ScXMLContentChangeContext::EndElement() ScXMLInsertionContext::ScXMLInsertionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1097,7 +1097,7 @@ ScXMLInsertionContext::~ScXMLInsertionContext() } SvXMLImportContext *ScXMLInsertionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1128,7 +1128,7 @@ void ScXMLInsertionContext::EndElement() ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1165,7 +1165,7 @@ ScXMLInsertionCutOffContext::~ScXMLInsertionCutOffContext() } SvXMLImportContext *ScXMLInsertionCutOffContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1183,7 +1183,7 @@ void ScXMLInsertionCutOffContext::EndElement() ScXMLMovementCutOffContext::ScXMLMovementCutOffContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1235,7 +1235,7 @@ ScXMLMovementCutOffContext::~ScXMLMovementCutOffContext() } SvXMLImportContext *ScXMLMovementCutOffContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1253,7 +1253,7 @@ void ScXMLMovementCutOffContext::EndElement() ScXMLCutOffsContext::ScXMLCutOffsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1267,7 +1267,7 @@ ScXMLCutOffsContext::~ScXMLCutOffsContext() } SvXMLImportContext *ScXMLCutOffsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1293,7 +1293,7 @@ void ScXMLCutOffsContext::EndElement() ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1368,7 +1368,7 @@ ScXMLDeletionContext::~ScXMLDeletionContext() } SvXMLImportContext *ScXMLDeletionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1401,7 +1401,7 @@ void ScXMLDeletionContext::EndElement() ScXMLMovementContext::ScXMLMovementContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1451,7 +1451,7 @@ ScXMLMovementContext::~ScXMLMovementContext() } SvXMLImportContext *ScXMLMovementContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -1487,7 +1487,7 @@ void ScXMLMovementContext::EndElement() ScXMLRejectionContext::ScXMLRejectionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pTempChangeTrackingImportHelper ) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -1537,7 +1537,7 @@ ScXMLRejectionContext::~ScXMLRejectionContext() } SvXMLImportContext *ScXMLRejectionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 6eee42077436..be3f996a3bc1 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLTrackedChangesContext.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,14 +89,14 @@ class ScXMLTrackedChangesContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLTrackedChangesContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLTrackedChangesContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLTrackedChangesContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -113,14 +113,14 @@ class ScXMLChangeInfoContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeInfoContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLChangeInfoContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeInfoContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -135,14 +135,14 @@ class ScXMLBigRangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBigRangeContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLBigRangeContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScBigRange& rBigRange); virtual ~ScXMLBigRangeContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -169,14 +169,14 @@ class ScXMLCellContentDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCellContentDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLCellContentDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCellContentDeletionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -191,14 +191,14 @@ class ScXMLDependenceContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependenceContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLDependenceContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependenceContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -213,14 +213,14 @@ class ScXMLDependingsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDependingsContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLDependingsContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDependingsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -235,14 +235,14 @@ class ScXMLChangeDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLChangeDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLChangeDeletionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -257,14 +257,14 @@ class ScXMLDeletionsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionsContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLDeletionsContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -288,7 +288,7 @@ class ScXMLChangeTextPContext : public SvXMLImportContext public: ScXMLChangeTextPContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeCellContext* pChangeCellContext); @@ -296,7 +296,7 @@ public: virtual ~ScXMLChangeTextPContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -324,7 +324,7 @@ class ScXMLChangeCellContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLChangeCellContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLChangeCellContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScBaseCell*& rOldCell, rtl::OUString& sAddress, rtl::OUString& sFormula, @@ -333,7 +333,7 @@ public: virtual ~ScXMLChangeCellContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -361,14 +361,14 @@ class ScXMLPreviousContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLPreviousContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLPreviousContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLPreviousContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -384,14 +384,14 @@ class ScXMLContentChangeContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLContentChangeContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLContentChangeContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLContentChangeContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -405,14 +405,14 @@ class ScXMLInsertionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLInsertionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -426,14 +426,14 @@ class ScXMLInsertionCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLInsertionCutOffContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLInsertionCutOffContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLInsertionCutOffContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -447,14 +447,14 @@ class ScXMLMovementCutOffContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementCutOffContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLMovementCutOffContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementCutOffContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -468,14 +468,14 @@ class ScXMLCutOffsContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLCutOffsContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLCutOffsContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLCutOffsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -489,14 +489,14 @@ class ScXMLDeletionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLDeletionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLDeletionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -512,14 +512,14 @@ class ScXMLMovementContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLMovementContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLMovementContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLMovementContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); @@ -533,14 +533,14 @@ class ScXMLRejectionContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLRejectionContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLRejectionContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper); virtual ~ScXMLRejectionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 4076a621d64b..94d6a584a0d7 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlannoi.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-15 09:29:26 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,7 +87,7 @@ using namespace com::sun::star; ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, ScXMLTableRowCellContext* pTempCellContext) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -139,7 +139,7 @@ ScXMLAnnotationContext::~ScXMLAnnotationContext() } SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 81b2bbf75391..810700e509a1 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlannoi.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -90,7 +90,7 @@ class ScXMLAnnotationContext : public SvXMLImportContext public: ScXMLAnnotationContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLTableRowCellContext* pCellContext); @@ -98,7 +98,7 @@ public: virtual ~ScXMLAnnotationContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 2e3e5330187d..68b24a2e4efe 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlbodyi.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: sab $ $Date: 2001-02-23 15:46:38 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,7 +119,7 @@ using namespace com::sun::star; ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const uno::Reference<xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), pChangeTrackingImportHelper(NULL), @@ -153,7 +153,7 @@ ScXMLBodyContext::~ScXMLBodyContext() } SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 24850db87856..2670810bde12 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlbodyi.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,12 +83,12 @@ class ScXMLBodyContext : public SvXMLImportContext ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: - ScXMLBodyContext( ScXMLImport& rImport, USHORT nPrfx, const NAMESPACE_RTL(OUString)& rLName, + ScXMLBodyContext( ScXMLImport& rImport, USHORT nPrfx, const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLBodyContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void EndElement(); diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 12e161585134..5e6b96a9fe7c 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcelli.cxx,v $ * - * $Revision: 1.35 $ + * $Revision: 1.36 $ * - * last change: $Author: er $ $Date: 2001-03-14 18:12:39 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -173,7 +173,7 @@ using namespace com::sun::star; ScXMLTableRowCellContext::ScXMLTableRowCellContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bTempIsCovered, @@ -332,7 +332,7 @@ ScXMLTableRowCellContext::~ScXMLTableRowCellContext() } SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 691f865a8bb3..7e89e2905d45 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcelli.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,7 +162,7 @@ class ScXMLTableRowCellContext : public SvXMLImportContext public: ScXMLTableRowCellContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bIsCovered, const sal_Int32 nRepeatedRows ); @@ -170,7 +170,7 @@ public: virtual ~ScXMLTableRowCellContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index f7bb44bc39a5..da81841aa95b 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcoli.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: sab $ $Date: 2001-02-15 09:29:26 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -108,7 +108,7 @@ using namespace com::sun::star; ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -152,7 +152,7 @@ ScXMLTableColContext::~ScXMLTableColContext() } SvXMLImportContext *ScXMLTableColContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -237,7 +237,7 @@ void ScXMLTableColContext::EndElement() ScXMLTableColsContext::ScXMLTableColsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bTempHeader, const sal_Bool bTempGroup) : @@ -279,7 +279,7 @@ ScXMLTableColsContext::~ScXMLTableColsContext() } SvXMLImportContext *ScXMLTableColsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index e49aa294b98c..00cc57dcc5fb 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcoli.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,14 +83,14 @@ class ScXMLTableColContext : public SvXMLImportContext public: ScXMLTableColContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableColContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -113,7 +113,7 @@ class ScXMLTableColsContext : public SvXMLImportContext public: ScXMLTableColsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bHeader, const sal_Bool bGroup); @@ -121,7 +121,7 @@ public: virtual ~ScXMLTableColsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 106729e656d8..2f780a94b7bf 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlconti.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-01-15 14:56:42 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,7 +83,7 @@ ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, rtl::OUStringBuffer& sTempValue) : @@ -98,7 +98,7 @@ ScXMLContentContext::~ScXMLContentContext() } SvXMLImportContext *ScXMLContentContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index d6fc9e6c8e90..6bf488a76090 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlconti.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-01-15 14:56:42 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ class ScXMLContentContext : public SvXMLImportContext public: ScXMLContentContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, rtl::OUStringBuffer& sValue); @@ -93,7 +93,7 @@ public: virtual ~ScXMLContentContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index bc8c13cf85cd..01cc5f574092 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcvali.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2001-02-15 09:29:26 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ using namespace com::sun::star; ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -97,7 +97,7 @@ ScXMLContentValidationsContext::~ScXMLContentValidationsContext() } SvXMLImportContext *ScXMLContentValidationsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -123,7 +123,7 @@ void ScXMLContentValidationsContext::EndElement() ScXMLContentValidationContext::ScXMLContentValidationContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -173,7 +173,7 @@ ScXMLContentValidationContext::~ScXMLContentValidationContext() } SvXMLImportContext *ScXMLContentValidationContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -413,7 +413,7 @@ void ScXMLContentValidationContext::SetErrorMacro(const rtl::OUString& sName, co ScXMLHelpMessageContext::ScXMLHelpMessageContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -452,7 +452,7 @@ ScXMLHelpMessageContext::~ScXMLHelpMessageContext() } SvXMLImportContext *ScXMLHelpMessageContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -484,7 +484,7 @@ void ScXMLHelpMessageContext::EndElement() ScXMLErrorMessageContext::ScXMLErrorMessageContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -527,7 +527,7 @@ ScXMLErrorMessageContext::~ScXMLErrorMessageContext() } SvXMLImportContext *ScXMLErrorMessageContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -559,7 +559,7 @@ void ScXMLErrorMessageContext::EndElement() ScXMLErrorMacroContext::ScXMLErrorMacroContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pTempValidationContext) : @@ -596,7 +596,7 @@ ScXMLErrorMacroContext::~ScXMLErrorMacroContext() } SvXMLImportContext *ScXMLErrorMacroContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index 1d570646e8ae..bec076d38620 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlcvali.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,14 +91,14 @@ class ScXMLContentValidationsContext : public SvXMLImportContext public: ScXMLContentValidationsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -131,14 +131,14 @@ class ScXMLContentValidationContext : public SvXMLImportContext public: ScXMLContentValidationContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLContentValidationContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -164,7 +164,7 @@ class ScXMLHelpMessageContext : public SvXMLImportContext public: ScXMLHelpMessageContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -172,7 +172,7 @@ public: virtual ~ScXMLHelpMessageContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -195,7 +195,7 @@ class ScXMLErrorMessageContext : public SvXMLImportContext public: ScXMLErrorMessageContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -203,7 +203,7 @@ public: virtual ~ScXMLErrorMessageContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -223,7 +223,7 @@ class ScXMLErrorMacroContext : public SvXMLImportContext public: ScXMLErrorMacroContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLContentValidationContext* pValidationContext); @@ -231,7 +231,7 @@ public: virtual ~ScXMLErrorMacroContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index cd7830536279..7e9d872c3aba 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmldpimp.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2001-02-15 09:29:26 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ using namespace com::sun::star; ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -106,7 +106,7 @@ ScXMLDataPilotTablesContext::~ScXMLDataPilotTablesContext() } SvXMLImportContext *ScXMLDataPilotTablesContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -135,7 +135,7 @@ void ScXMLDataPilotTablesContext::EndElement() ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -213,7 +213,7 @@ ScXMLDataPilotTableContext::~ScXMLDataPilotTableContext() } SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -371,7 +371,7 @@ void ScXMLDataPilotTableContext::EndElement() ScXMLDPSourceSQLContext::ScXMLDPSourceSQLContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -417,7 +417,7 @@ ScXMLDPSourceSQLContext::~ScXMLDPSourceSQLContext() } SvXMLImportContext *ScXMLDPSourceSQLContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -435,7 +435,7 @@ void ScXMLDPSourceSQLContext::EndElement() ScXMLDPSourceTableContext::ScXMLDPSourceTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -473,7 +473,7 @@ ScXMLDPSourceTableContext::~ScXMLDPSourceTableContext() } SvXMLImportContext *ScXMLDPSourceTableContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -491,7 +491,7 @@ void ScXMLDPSourceTableContext::EndElement() ScXMLDPSourceQueryContext::ScXMLDPSourceQueryContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -529,7 +529,7 @@ ScXMLDPSourceQueryContext::~ScXMLDPSourceQueryContext() } SvXMLImportContext *ScXMLDPSourceQueryContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -547,7 +547,7 @@ void ScXMLDPSourceQueryContext::EndElement() ScXMLSourceServiceContext::ScXMLSourceServiceContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -600,7 +600,7 @@ ScXMLSourceServiceContext::~ScXMLSourceServiceContext() } SvXMLImportContext *ScXMLSourceServiceContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -618,7 +618,7 @@ void ScXMLSourceServiceContext::EndElement() ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -654,7 +654,7 @@ ScXMLSourceCellRangeContext::~ScXMLSourceCellRangeContext() } SvXMLImportContext *ScXMLSourceCellRangeContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -680,7 +680,7 @@ void ScXMLSourceCellRangeContext::EndElement() ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTable) : @@ -742,7 +742,7 @@ ScXMLDataPilotFieldContext::~ScXMLDataPilotFieldContext() } SvXMLImportContext *ScXMLDataPilotFieldContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -775,7 +775,7 @@ void ScXMLDataPilotFieldContext::EndElement() ScXMLDataPilotLevelContext::ScXMLDataPilotLevelContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -811,7 +811,7 @@ ScXMLDataPilotLevelContext::~ScXMLDataPilotLevelContext() } SvXMLImportContext *ScXMLDataPilotLevelContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -840,7 +840,7 @@ void ScXMLDataPilotLevelContext::EndElement() ScXMLDataPilotSubTotalsContext::ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -858,7 +858,7 @@ ScXMLDataPilotSubTotalsContext::~ScXMLDataPilotSubTotalsContext() } SvXMLImportContext *ScXMLDataPilotSubTotalsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -905,7 +905,7 @@ void ScXMLDataPilotSubTotalsContext::AddFunction(sal_Int16 nFunction) ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pTempDataPilotSubTotals) : @@ -938,7 +938,7 @@ ScXMLDataPilotSubTotalContext::~ScXMLDataPilotSubTotalContext() } SvXMLImportContext *ScXMLDataPilotSubTotalContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -956,7 +956,7 @@ void ScXMLDataPilotSubTotalContext::EndElement() ScXMLDataPilotMembersContext::ScXMLDataPilotMembersContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -972,7 +972,7 @@ ScXMLDataPilotMembersContext::~ScXMLDataPilotMembersContext() } SvXMLImportContext *ScXMLDataPilotMembersContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -998,7 +998,7 @@ void ScXMLDataPilotMembersContext::EndElement() ScXMLDataPilotMemberContext::ScXMLDataPilotMemberContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pTempDataPilotField) : @@ -1047,7 +1047,7 @@ ScXMLDataPilotMemberContext::~ScXMLDataPilotMemberContext() } SvXMLImportContext *ScXMLDataPilotMemberContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index ca23eabc3ea1..63b0a40a040d 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmldpimp.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,14 +92,14 @@ class ScXMLDataPilotTablesContext : public SvXMLImportContext public: ScXMLDataPilotTablesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTablesContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -145,14 +145,14 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext public: ScXMLDataPilotTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDataPilotTableContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -188,7 +188,7 @@ class ScXMLDPSourceSQLContext : public SvXMLImportContext public: ScXMLDPSourceSQLContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -196,7 +196,7 @@ public: virtual ~ScXMLDPSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -213,7 +213,7 @@ class ScXMLDPSourceTableContext : public SvXMLImportContext public: ScXMLDPSourceTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -221,7 +221,7 @@ public: virtual ~ScXMLDPSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -238,7 +238,7 @@ class ScXMLDPSourceQueryContext : public SvXMLImportContext public: ScXMLDPSourceQueryContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -246,7 +246,7 @@ public: virtual ~ScXMLDPSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -263,7 +263,7 @@ class ScXMLSourceServiceContext : public SvXMLImportContext public: ScXMLSourceServiceContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -271,7 +271,7 @@ public: virtual ~ScXMLSourceServiceContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -288,7 +288,7 @@ class ScXMLSourceCellRangeContext : public SvXMLImportContext public: ScXMLSourceCellRangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -296,7 +296,7 @@ public: virtual ~ScXMLSourceCellRangeContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -319,7 +319,7 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext public: ScXMLDataPilotFieldContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pDataPilotTable); @@ -327,7 +327,7 @@ public: virtual ~ScXMLDataPilotFieldContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -348,7 +348,7 @@ class ScXMLDataPilotLevelContext : public SvXMLImportContext public: ScXMLDataPilotLevelContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -356,7 +356,7 @@ public: virtual ~ScXMLDataPilotLevelContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -378,7 +378,7 @@ public: ScXMLDataPilotFieldContext* GetDataPilotField() { return pDataPilotField; } ScXMLDataPilotSubTotalsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -386,7 +386,7 @@ public: virtual ~ScXMLDataPilotSubTotalsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -404,7 +404,7 @@ class ScXMLDataPilotSubTotalContext : public SvXMLImportContext public: ScXMLDataPilotSubTotalContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals); @@ -412,7 +412,7 @@ public: virtual ~ScXMLDataPilotSubTotalContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -429,7 +429,7 @@ class ScXMLDataPilotMembersContext : public SvXMLImportContext public: ScXMLDataPilotMembersContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -437,7 +437,7 @@ public: virtual ~ScXMLDataPilotMembersContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -458,7 +458,7 @@ class ScXMLDataPilotMemberContext : public SvXMLImportContext public: ScXMLDataPilotMemberContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotFieldContext* pDataPilotField); @@ -466,7 +466,7 @@ public: virtual ~ScXMLDataPilotMemberContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index b03248fe3fde..9b20249732bc 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmldrani.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: sab $ $Date: 2001-03-06 16:35:27 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,7 @@ using namespace com::sun::star; ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -124,7 +124,7 @@ ScXMLDatabaseRangesContext::~ScXMLDatabaseRangesContext() } SvXMLImportContext *ScXMLDatabaseRangesContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -153,7 +153,7 @@ void ScXMLDatabaseRangesContext::EndElement() ScXMLDatabaseRangeContext::ScXMLDatabaseRangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -249,7 +249,7 @@ ScXMLDatabaseRangeContext::~ScXMLDatabaseRangeContext() } SvXMLImportContext *ScXMLDatabaseRangeContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -441,7 +441,7 @@ void ScXMLDatabaseRangeContext::EndElement() ScXMLSourceSQLContext::ScXMLSourceSQLContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -488,7 +488,7 @@ ScXMLSourceSQLContext::~ScXMLSourceSQLContext() } SvXMLImportContext *ScXMLSourceSQLContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -506,7 +506,7 @@ void ScXMLSourceSQLContext::EndElement() ScXMLSourceTableContext::ScXMLSourceTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -545,7 +545,7 @@ ScXMLSourceTableContext::~ScXMLSourceTableContext() } SvXMLImportContext *ScXMLSourceTableContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -563,7 +563,7 @@ void ScXMLSourceTableContext::EndElement() ScXMLSourceQueryContext::ScXMLSourceQueryContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -602,7 +602,7 @@ ScXMLSourceQueryContext::~ScXMLSourceQueryContext() } SvXMLImportContext *ScXMLSourceQueryContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -620,7 +620,7 @@ void ScXMLSourceQueryContext::EndElement() ScXMLSubTotalRulesContext::ScXMLSubTotalRulesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -672,7 +672,7 @@ ScXMLSubTotalRulesContext::~ScXMLSubTotalRulesContext() } SvXMLImportContext *ScXMLSubTotalRulesContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -707,7 +707,7 @@ void ScXMLSubTotalRulesContext::EndElement() ScXMLSortGroupsContext::ScXMLSortGroupsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -773,7 +773,7 @@ ScXMLSortGroupsContext::~ScXMLSortGroupsContext() } SvXMLImportContext *ScXMLSortGroupsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -791,7 +791,7 @@ void ScXMLSortGroupsContext::EndElement() ScXMLSubTotalRuleContext::ScXMLSubTotalRuleContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -824,7 +824,7 @@ ScXMLSubTotalRuleContext::~ScXMLSubTotalRuleContext() } SvXMLImportContext *ScXMLSubTotalRuleContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -853,7 +853,7 @@ void ScXMLSubTotalRuleContext::EndElement() ScXMLSubTotalFieldContext::ScXMLSubTotalFieldContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -891,7 +891,7 @@ ScXMLSubTotalFieldContext::~ScXMLSubTotalFieldContext() } SvXMLImportContext *ScXMLSubTotalFieldContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index c46b288eec14..288ee8c4b740 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmldrani.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: sab $ $Date: 2001-03-06 16:43:43 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -99,14 +99,14 @@ class ScXMLDatabaseRangesContext : public SvXMLImportContext public: ScXMLDatabaseRangesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangesContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -153,14 +153,14 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext public: ScXMLDatabaseRangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLDatabaseRangeContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -201,7 +201,7 @@ class ScXMLSourceSQLContext : public SvXMLImportContext public: ScXMLSourceSQLContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -209,7 +209,7 @@ public: virtual ~ScXMLSourceSQLContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -226,7 +226,7 @@ class ScXMLSourceTableContext : public SvXMLImportContext public: ScXMLSourceTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -234,7 +234,7 @@ public: virtual ~ScXMLSourceTableContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -251,7 +251,7 @@ class ScXMLSourceQueryContext : public SvXMLImportContext public: ScXMLSourceQueryContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -259,7 +259,7 @@ public: virtual ~ScXMLSourceQueryContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -276,7 +276,7 @@ class ScXMLSubTotalRulesContext : public SvXMLImportContext public: ScXMLSubTotalRulesContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -284,7 +284,7 @@ public: virtual ~ScXMLSubTotalRulesContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -301,7 +301,7 @@ class ScXMLSortGroupsContext : public SvXMLImportContext public: ScXMLSortGroupsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -309,7 +309,7 @@ public: virtual ~ScXMLSortGroupsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -326,7 +326,7 @@ class ScXMLSubTotalRuleContext : public SvXMLImportContext public: ScXMLSubTotalRuleContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -334,7 +334,7 @@ public: virtual ~ScXMLSubTotalRuleContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -353,7 +353,7 @@ class ScXMLSubTotalFieldContext : public SvXMLImportContext public: ScXMLSubTotalFieldContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -361,7 +361,7 @@ public: virtual ~ScXMLSubTotalFieldContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 825d74fccce2..8600cde35005 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlfilti.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2001-02-15 09:29:26 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ using namespace com::sun::star; ScXMLFilterContext::ScXMLFilterContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -154,7 +154,7 @@ ScXMLFilterContext::~ScXMLFilterContext() } SvXMLImportContext *ScXMLFilterContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -208,7 +208,7 @@ void ScXMLFilterContext::EndElement() ScXMLAndContext::ScXMLAndContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLFilterContext* pTempFilterContext) : @@ -223,7 +223,7 @@ ScXMLAndContext::~ScXMLAndContext() } SvXMLImportContext *ScXMLAndContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -258,7 +258,7 @@ void ScXMLAndContext::EndElement() ScXMLOrContext::ScXMLOrContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLFilterContext* pTempFilterContext) : @@ -273,7 +273,7 @@ ScXMLOrContext::~ScXMLOrContext() } SvXMLImportContext *ScXMLOrContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -309,7 +309,7 @@ void ScXMLOrContext::EndElement() ScXMLConditionContext::ScXMLConditionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLFilterContext* pTempFilterContext) : @@ -366,7 +366,7 @@ ScXMLConditionContext::~ScXMLConditionContext() } SvXMLImportContext *ScXMLConditionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -446,7 +446,7 @@ void ScXMLConditionContext::EndElement() ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext) : @@ -512,7 +512,7 @@ ScXMLDPFilterContext::~ScXMLDPFilterContext() } SvXMLImportContext *ScXMLDPFilterContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -566,7 +566,7 @@ void ScXMLDPFilterContext::EndElement() ScXMLDPAndContext::ScXMLDPAndContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext) : @@ -581,7 +581,7 @@ ScXMLDPAndContext::~ScXMLDPAndContext() } SvXMLImportContext *ScXMLDPAndContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -616,7 +616,7 @@ void ScXMLDPAndContext::EndElement() ScXMLDPOrContext::ScXMLDPOrContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext) : @@ -631,7 +631,7 @@ ScXMLDPOrContext::~ScXMLDPOrContext() } SvXMLImportContext *ScXMLDPOrContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -667,7 +667,7 @@ void ScXMLDPOrContext::EndElement() ScXMLDPConditionContext::ScXMLDPConditionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext) : @@ -724,7 +724,7 @@ ScXMLDPConditionContext::~ScXMLDPConditionContext() } SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 018b9d18b3a6..bfea9f840086 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlfilti.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,7 +112,7 @@ class ScXMLFilterContext : public SvXMLImportContext public: ScXMLFilterContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -120,7 +120,7 @@ public: virtual ~ScXMLFilterContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -147,7 +147,7 @@ class ScXMLAndContext : public SvXMLImportContext public: ScXMLAndContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLFilterContext* pTempFilterContext); @@ -155,7 +155,7 @@ public: virtual ~ScXMLAndContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -172,7 +172,7 @@ class ScXMLOrContext : public SvXMLImportContext public: ScXMLOrContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLFilterContext* pTempFilterContext); @@ -180,7 +180,7 @@ public: virtual ~ScXMLOrContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -203,7 +203,7 @@ class ScXMLConditionContext : public SvXMLImportContext public: ScXMLConditionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLFilterContext* pTempFilterContext); @@ -211,7 +211,7 @@ public: virtual ~ScXMLConditionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -245,7 +245,7 @@ class ScXMLDPFilterContext : public SvXMLImportContext public: ScXMLDPFilterContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTempDataPilotTableContext); @@ -253,7 +253,7 @@ public: virtual ~ScXMLDPFilterContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -281,7 +281,7 @@ class ScXMLDPAndContext : public SvXMLImportContext public: ScXMLDPAndContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -289,7 +289,7 @@ public: virtual ~ScXMLDPAndContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -306,7 +306,7 @@ class ScXMLDPOrContext : public SvXMLImportContext public: ScXMLDPOrContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -314,7 +314,7 @@ public: virtual ~ScXMLDPOrContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -337,7 +337,7 @@ class ScXMLDPConditionContext : public SvXMLImportContext public: ScXMLDPConditionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDPFilterContext* pTempFilterContext); @@ -345,7 +345,7 @@ public: virtual ~ScXMLDPConditionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 17e39da54bee..a9f52422dfce 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlimprt.cxx,v $ * - * $Revision: 1.44 $ + * $Revision: 1.45 $ * - * last change: $Author: sab $ $Date: 2001-03-05 09:29:38 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1529,7 +1529,7 @@ void SAL_CALL ScXMLImport::setTargetDocument( const uno::Reference<lang::XCompon // --------------------------------------------------------------------- -SvXMLImportContext *ScXMLImport::CreateViewSettingsContext(const USHORT nPrefix, const NAMESPACE_RTL(OUString)& rLocalName, +SvXMLImportContext *ScXMLImport::CreateViewSettingsContext(const USHORT nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { SvXMLImportContext *pContext= new ScXMLViewSettingsContext( *this, nPrefix, @@ -1537,7 +1537,7 @@ SvXMLImportContext *ScXMLImport::CreateViewSettingsContext(const USHORT nPrefix, return pContext; } -SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const USHORT nPrefix, const NAMESPACE_RTL(OUString)& rLocalName, +SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const USHORT nPrefix, const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { SvXMLImportContext *pContext = NULL; @@ -1553,7 +1553,7 @@ SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const USHORT nPrefix, co return pContext; } -SvXMLImportContext *ScXMLImport::CreateStylesContext(const NAMESPACE_RTL(OUString)& rLocalName, +SvXMLImportContext *ScXMLImport::CreateStylesContext(const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList, sal_Bool bIsAutoStyle ) { SvXMLImportContext *pContext = NULL; @@ -1570,7 +1570,7 @@ SvXMLImportContext *ScXMLImport::CreateStylesContext(const NAMESPACE_RTL(OUStrin return pContext; } -SvXMLImportContext *ScXMLImport::CreateBodyContext(const NAMESPACE_RTL(OUString)& rLocalName, +SvXMLImportContext *ScXMLImport::CreateBodyContext(const ::rtl::OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { //GetShapeImport()->SetAutoStylesContext((XMLTableStylesContext *)&xAutoStyles); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 35a163270074..b7c436ac1e6d 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlimprt.hxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: sab $ $Date: 2001-03-02 17:28:42 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -109,9 +109,7 @@ class ScRangeList; -#ifdef _USE_NAMESPACE using namespace rtl; -#endif enum ScXMLDocTokens { @@ -773,19 +771,19 @@ public: // namespace office SvXMLImportContext *CreateMetaContext( - const NAMESPACE_RTL(OUString)& rLocalName ); - SvXMLImportContext *CreateViewSettingsContext(const USHORT nPrefix, const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName ); + SvXMLImportContext *CreateViewSettingsContext(const USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - SvXMLImportContext *CreateFontDeclsContext(const USHORT nPrefix, const NAMESPACE_RTL(OUString)& rLocalName, + SvXMLImportContext *CreateFontDeclsContext(const USHORT nPrefix, const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); SvXMLImportContext *CreateScriptContext( - const NAMESPACE_RTL(OUString)& rLocalName ); - SvXMLImportContext *CreateStylesContext(const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName ); + SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, sal_Bool bAutoStyles ); -// SvXMLImportContext *CreateUseStylesContext(const NAMESPACE_RTL(OUString)& rLocalName , +// SvXMLImportContext *CreateUseStylesContext(const ::rtl::OUString& rLocalName , // const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); SvXMLImportContext *CreateBodyContext( - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void SetStatisticAttributes( const ::com::sun::star::uno::Reference< @@ -803,7 +801,7 @@ public: // inline const SvXMLImportItemMapper& GetParaItemMapper() const; // SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix, -// const NAMESPACE_RTL(OUString)& rLocalName, +// const ::rtl::OUString& rLocalName, // const ::com::sun::star::uno::Reference< // ::com::sun::star::xml::sax::XAttributeList& xAttrList, // SfxItemSet& rItemSet ); diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 63f7cfc9b48c..6107f8dd81b6 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnexpi.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2001-02-15 09:29:26 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ using namespace com::sun::star; ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -127,7 +127,7 @@ ScXMLNamedExpressionsContext::~ScXMLNamedExpressionsContext() } SvXMLImportContext *ScXMLNamedExpressionsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -226,7 +226,7 @@ void ScXMLNamedExpressionsContext::EndElement() ScXMLNamedRangeContext::ScXMLNamedRangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -275,7 +275,7 @@ ScXMLNamedRangeContext::~ScXMLNamedRangeContext() } SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -298,7 +298,7 @@ void ScXMLNamedRangeContext::EndElement() ScXMLNamedExpressionContext::ScXMLNamedExpressionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList) : SvXMLImportContext( rImport, nPrfx, rLName ) @@ -342,7 +342,7 @@ ScXMLNamedExpressionContext::~ScXMLNamedExpressionContext() } SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index 43881f9e3e9c..b3db6a0883a3 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlnexpi.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:45:16 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,14 +79,14 @@ class ScXMLNamedExpressionsContext : public SvXMLImportContext public: ScXMLNamedExpressionsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLNamedExpressionsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -102,14 +102,14 @@ class ScXMLNamedRangeContext : public SvXMLImportContext public: ScXMLNamedRangeContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLNamedRangeContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -124,14 +124,14 @@ class ScXMLNamedExpressionContext : public SvXMLImportContext public: ScXMLNamedExpressionContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList); virtual ~ScXMLNamedExpressionContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 1f6a31cded0a..1913f29e6199 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlrowi.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: sab $ $Date: 2001-02-15 09:29:26 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -111,7 +111,7 @@ using namespace com::sun::star; ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ), @@ -161,7 +161,7 @@ ScXMLTableRowContext::~ScXMLTableRowContext() } SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -270,7 +270,7 @@ void ScXMLTableRowContext::EndElement() ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bTempHeader, const sal_Bool bTempGroup ) : @@ -316,7 +316,7 @@ ScXMLTableRowsContext::~ScXMLTableRowsContext() } SvXMLImportContext *ScXMLTableRowsContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 3dda66e536ce..c67d34a84d7e 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlrowi.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,14 +83,14 @@ class ScXMLTableRowContext : public SvXMLImportContext public: ScXMLTableRowContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableRowContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -113,7 +113,7 @@ class ScXMLTableRowsContext : public SvXMLImportContext public: ScXMLTableRowsContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bHeader, const sal_Bool bGroup); @@ -121,7 +121,7 @@ public: virtual ~ScXMLTableRowsContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 833f98667cc1..026fde51e102 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsceni.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,14 +97,14 @@ private: public: ScXMLTableScenarioContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual ~ScXMLTableScenarioContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index d92ce97ece30..55ba0fe9dd97 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsorti.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sab $ $Date: 2001-03-06 16:35:27 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ using namespace com::sun::star; ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext) : @@ -157,7 +157,7 @@ ScXMLSortContext::~ScXMLSortContext() } SvXMLImportContext *ScXMLSortContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { @@ -252,7 +252,7 @@ void ScXMLSortContext::AddSortField(const rtl::OUString& sFieldNumber, const rtl ScXMLSortByContext::ScXMLSortByContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext) : @@ -297,7 +297,7 @@ ScXMLSortByContext::~ScXMLSortByContext() } SvXMLImportContext *ScXMLSortByContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 2ff45488403e..a11289d50676 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlsorti.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,7 +96,7 @@ class ScXMLSortContext : public SvXMLImportContext public: ScXMLSortContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDatabaseRangeContext* pTempDatabaseRangeContext); @@ -104,7 +104,7 @@ public: virtual ~ScXMLSortContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -127,7 +127,7 @@ class ScXMLSortByContext : public SvXMLImportContext public: ScXMLSortByContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLSortContext* pTempSortContext); @@ -135,7 +135,7 @@ public: virtual ~ScXMLSortByContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index b956b9746310..8a7b31546d5e 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlstyle.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: sab $ $Date: 2001-03-01 13:17:16 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,9 +121,7 @@ #include <rtl/ustrbuf.hxx> -#ifdef _USE_NAMESPACE using namespace com::sun::star; -#endif const XMLPropertyMapEntry aXMLScCellStylesProperties[] = { diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 8666dddcc3f5..68e58f588426 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlstyle.hxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: sab $ $Date: 2001-01-09 12:03:48 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,9 +87,7 @@ #include <xmloff/contextid.hxx> #endif -#ifdef _USE_NAMESPACE using namespace rtl; -#endif extern const XMLPropertyMapEntry aXMLScCellStylesProperties[]; extern const XMLPropertyMapEntry aXMLScColumnStylesProperties[]; diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 3f4004166f0d..196f325cdaf6 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltabi.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: sab $ $Date: 2001-02-22 18:10:43 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,7 +106,7 @@ using namespace com::sun::star; ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bTempIsSubTable, @@ -165,7 +165,7 @@ ScXMLTableContext::~ScXMLTableContext() } SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index bd6b59fb5bc7..1aec7a04ddfa 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmltabi.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: sab $ $Date: 2001-02-28 08:19:33 $ + * last change: $Author: nn $ $Date: 2001-03-16 14:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,7 @@ class ScXMLTableContext : public SvXMLImportContext public: ScXMLTableContext( ScXMLImport& rImport, USHORT nPrfx, - const NAMESPACE_RTL(OUString)& rLName, + const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, const sal_Bool bTempIsSubTable = sal_False, @@ -87,7 +87,7 @@ public: virtual ~ScXMLTableContext(); virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, - const NAMESPACE_RTL(OUString)& rLocalName, + const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); |