INTEGRATION: CWS oasisbf1 (1.2.38); FILE MERGED

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

4 files changed, 50 insertions, 26 deletions

diff --git a/xmloff/source/transform/EventMap.cxx b/xmloff/source/transform/EventMap.cxx
index 25202d03f010..6f9a32a5dac1 100644
--- a/xmloff/source/transform/EventMap.cxx
+++ b/xmloff/source/transform/EventMap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EventMap.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 08:48:11 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:21:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,3 +132,11 @@ XMLTransformerEventMapEntry aTransformerEventMap[] =
     { XML_NAMESPACE_FORM,   "adjust",   "on-adjust" },
     { 0, 0, 0 }
 };
+
+XMLTransformerEventMapEntry aFormTransformerEventMap[] =
+{
+    { XML_NAMESPACE_DOM,    "mouseover",    "on-mouseover" },
+    { XML_NAMESPACE_DOM,    "mouseout", "on-mouseout" },
+    { XML_NAMESPACE_DOM,    "DOMFocusOut",  "on-blur" },
+    { 0, 0, 0 }
+};
diff --git a/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx
index 1c040be2e987..e7b13d438d26 100644
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EventMap.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 08:48:23 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:21:40 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,6 +74,7 @@ struct XMLTransformerEventMapEntry
 };
 
 extern XMLTransformerEventMapEntry aTransformerEventMap[];
+extern XMLTransformerEventMapEntry aFormTransformerEventMap[];
 
 #endif  //  _XMLOFF_EVENTMAP_HXX
 
diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx
index d90e701153cb..f8d87f3e5419 100644
--- a/xmloff/source/transform/EventOASISTContext.hxx
+++ b/xmloff/source/transform/EventOASISTContext.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EventOASISTContext.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 08:48:53 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:22:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,11 +77,13 @@ public:
                            const ::rtl::OUString& rQName );
     virtual ~XMLEventOASISTransformerContext();
 
+    static XMLTransformerOASISEventMap_Impl *CreateFormEventMap();
     static XMLTransformerOASISEventMap_Impl *CreateEventMap();
     static void FlushEventMap( XMLTransformerOASISEventMap_Impl *p );
     static ::rtl::OUString GetEventName( sal_uInt16 nPrefix,
-                                           const ::rtl::OUString& rName,
-                                     XMLTransformerOASISEventMap_Impl& rMap );
+                             const ::rtl::OUString& rName,
+                             XMLTransformerOASISEventMap_Impl& rMap,
+                             XMLTransformerOASISEventMap_Impl* pMap2    );
 
     virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
 };
diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx
index 56df8b8fa33c..1722aa892129 100644
--- a/xmloff/source/transform/EventOOoTContext.cxx
+++ b/xmloff/source/transform/EventOOoTContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EventOOoTContext.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-07-13 08:49:07 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 12:22:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,33 +102,45 @@ class XMLTransformerOOoEventMap_Impl:
                             ::rtl::OUStringHash, ::comphelper::UStringEqual >
 {
 public:
-    XMLTransformerOOoEventMap_Impl( XMLTransformerEventMapEntry *pInit );
+
+    void AddMap( XMLTransformerEventMapEntry *pInit );
+
+    XMLTransformerOOoEventMap_Impl( XMLTransformerEventMapEntry *pInit,
+                                       XMLTransformerEventMapEntry *pInit2  );
     ~XMLTransformerOOoEventMap_Impl();
 };
 
-XMLTransformerOOoEventMap_Impl::XMLTransformerOOoEventMap_Impl( XMLTransformerEventMapEntry *pInit )
+void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
 {
-    if( pInit )
+    XMLTransformerOOoEventMap_Impl::key_type aKey;
+    XMLTransformerOOoEventMap_Impl::data_type aData;
+    while( pInit->m_pOOoName )
     {
-        XMLTransformerOOoEventMap_Impl::key_type aKey;
-        XMLTransformerOOoEventMap_Impl::data_type aData;
-        while( pInit->m_pOOoName )
-        {
-            aKey = OUString::createFromAscii(pInit->m_pOOoName);
+        aKey = OUString::createFromAscii(pInit->m_pOOoName);
 
-            OSL_ENSURE( find( aKey ) == end(), "duplicate event map entry" );
+        OSL_ENSURE( find( aKey ) == end(), "duplicate event map entry" );
 
-            aData.m_nPrefix = pInit->m_nOASISPrefix;
-            aData.m_aLocalName = OUString::createFromAscii(pInit->m_pOASISName);
+        aData.m_nPrefix = pInit->m_nOASISPrefix;
+        aData.m_aLocalName = OUString::createFromAscii(pInit->m_pOASISName);
 
-            XMLTransformerOOoEventMap_Impl::value_type aVal( aKey, aData );
+        XMLTransformerOOoEventMap_Impl::value_type aVal( aKey, aData );
 
-            insert( aVal );
-            ++pInit;
-        }
+        bool bInserted = insert( aVal ).second;
+        OSL_ENSURE( bInserted, "duplicate OOo event name extry" );
+        ++pInit;
     }
 }
 
+XMLTransformerOOoEventMap_Impl::XMLTransformerOOoEventMap_Impl(
+        XMLTransformerEventMapEntry *pInit,
+        XMLTransformerEventMapEntry *pInit2 )
+{
+    if( pInit )
+        AddMap( pInit );
+    if( pInit )
+        AddMap( pInit2 );
+}
+
 XMLTransformerOOoEventMap_Impl::~XMLTransformerOOoEventMap_Impl()
 {
 }
@@ -154,7 +166,8 @@ XMLEventOOoTransformerContext::~XMLEventOOoTransformerContext()
 XMLTransformerOOoEventMap_Impl
     *XMLEventOOoTransformerContext::CreateEventMap()
 {
-    return new XMLTransformerOOoEventMap_Impl( aTransformerEventMap );
+    return new XMLTransformerOOoEventMap_Impl( aTransformerEventMap,
+                                                  aFormTransformerEventMap );
 }
 
 void XMLEventOOoTransformerContext::FlushEventMap(