INTEGRATION: CWS oasisbf1 (1.2.38); FILE MERGED

2004/08/18 12:53:15 mib 1.2.38.1: #i32840#: some form events had different names

xmloff/source/transform/TransformerBase.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransformerBase.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 09:00:42 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:26:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -185,7 +185,8 @@ public:
                                       const TransformerAction_Impl& rAction,
                                       const ::rtl::OUString& rQName,
                                          sal_Bool bPersistent=sal_False ) = 0;
-    virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName ) = 0;
+    virtual ::rtl::OUString GetEventName( const ::rtl::OUString& rName,
+                                             sal_Bool bForm = sal_False ) = 0;
 
 
     XMLMutableAttributeList *ProcessAttrList( ::com::sun::star::uno::Reference<
@@ -214,6 +215,7 @@ public:
     ::xmloff::token::XMLTokenEnum GetToken( const ::rtl::OUString& rStr ) const;
 
     const XMLTransformerContext *GetCurrentContext() const;
+    const XMLTransformerContext *GetAncestorContext( sal_uInt32 i ) const;
 
     // C++
     inline void SetClass( const ::rtl::OUString& r ) { m_aClass = r; }

xmloff/source/transform/TransformerContext.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransformerContext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 09:00:54 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:26:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,6 +98,11 @@ sal_Bool XMLTransformerContext::HasQName( sal_uInt16 nPrefix,
            ::xmloff::token::IsXMLToken( aLocalName, eToken );
 }
 
+sal_Bool XMLTransformerContext::HasNamespace( sal_uInt16 nPrefix ) const
+{
+    return GetTransformer().GetNamespaceMap().GetKeyByAttrName( m_aQName ) == nPrefix;
+}
+
 XMLTransformerContext::XMLTransformerContext( XMLTransformerBase& rImp,
                                                 const OUString& rQName ) :
     m_rTransformer( rImp ),

xmloff/source/transform/TransformerContext.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransformerContext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 09:01:06 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:26:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,6 +111,7 @@ public:
     const ::rtl::OUString& GetQName() const { return m_aQName; }
     sal_Bool HasQName( sal_uInt16 nPrefix,
                        ::xmloff::token::XMLTokenEnum eToken ) const;
+    sal_Bool HasNamespace( sal_uInt16 nPrefix ) const;
 
     // A contexts constructor does anything that is required if an element
     // starts. Namespace processing has been done already.