mib16: contributed bugfixes and various new symbols in VBA compatibility implementation

2 files changed, 30 insertions, 3 deletions

diff --git a/xmloff/inc/xmloff/XMLEventExport.hxx b/xmloff/inc/xmloff/XMLEventExport.hxx
index 6ec4ed86ea..dc00dc00f2 100644
--- a/xmloff/inc/xmloff/XMLEventExport.hxx
+++ b/xmloff/inc/xmloff/XMLEventExport.hxx
@@ -73,6 +73,8 @@ class XMLOFF_DLLPUBLIC XMLEventExport
     HandlerMap aHandlerMap;
     NameMap aNameTranslationMap;
 
+    bool bExtNamespace;
+
 public:
     XMLEventExport(SvXMLExport& rExport,
                    const XMLEventNameTranslation* pTranslationTable = NULL);
@@ -104,6 +106,12 @@ public:
                      ::com::sun::star::container::XNameAccess> & xAccess,
                 sal_Bool bUseWhitespace = sal_True);
 
+    /// export the events, but write <officeooo:events> element
+    /// (for new file format additions)
+    void ExportExt( ::com::sun::star::uno::Reference<
+                     ::com::sun::star::container::XNameAccess> & xAccess,
+                sal_Bool bUseWhitespace = sal_True);
+
     /// export a single event (writes <office:events> element)
     void ExportSingleEvent(
         ::com::sun::star::uno::Sequence<
diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index a67aee443d..31d143c62c 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -62,7 +62,8 @@ using ::xmloff::token::XML_EVENT_LISTENERS;
 XMLEventExport::XMLEventExport(SvXMLExport& rExp,
                          const XMLEventNameTranslation* pTranslationTable) :
     sEventType(RTL_CONSTASCII_USTRINGPARAM("EventType")),
-    rExport(rExp)
+    rExport(rExp),
+    bExtNamespace(false)
 {
     AddTranslationTable(pTranslationTable);
 }
@@ -175,6 +176,16 @@ void XMLEventExport::Export( Reference<XNameAccess> & rAccess,
     }
 }
 
+void XMLEventExport::ExportExt( Reference<XNameAccess> & rAccess,
+                                sal_Bool bWhitespace )
+{
+    // set bExtNamespace flag to use XML_NAMESPACE_OFFICE_EXT namespace
+    // for events element (not for child elements)
+    bExtNamespace = true;
+    Export(rAccess, bWhitespace);
+    bExtNamespace = false;          // reset for future Export calls
+}
+
 /// export a singular event and wirte <office:events> container
 void XMLEventExport::ExportSingleEvent(
     Sequence<PropertyValue>& rEventValues,
@@ -270,13 +281,17 @@ void XMLEventExport::StartElement(sal_Bool bWhitespace)
     {
         rExport.IgnorableWhitespace();
     }
-    rExport.StartElement( XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS,
+    sal_uInt16 nNamespace = bExtNamespace ? XML_NAMESPACE_OFFICE_EXT
+                                          : XML_NAMESPACE_OFFICE;
+    rExport.StartElement( nNamespace, XML_EVENT_LISTENERS,
                           bWhitespace);
 }
 
 void XMLEventExport::EndElement(sal_Bool bWhitespace)
 {
-    rExport.EndElement(XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, bWhitespace);
+    sal_uInt16 nNamespace = bExtNamespace ? XML_NAMESPACE_OFFICE_EXT
+                                          : XML_NAMESPACE_OFFICE;
+    rExport.EndElement(nNamespace, XML_EVENT_LISTENERS, bWhitespace);
     if (bWhitespace)
     {
         rExport.IgnorableWhitespace();
@@ -343,6 +358,10 @@ const XMLEventNameTranslation aStandardEventTable[] =
     { "OnFieldMerge",           XML_NAMESPACE_OFFICE, "field-merge" },
     { "OnFieldMergeFinished",   XML_NAMESPACE_OFFICE, "field-merge-finished" },
     { "OnLayoutFinished",       XML_NAMESPACE_OFFICE, "layout-finished" },
+    { "OnDoubleClick",      XML_NAMESPACE_OFFICE, "dblclick" },
+    { "OnRightClick",       XML_NAMESPACE_OFFICE, "contextmenu" },
+    { "OnChange",           XML_NAMESPACE_OFFICE, "content-changed" },
+    { "OnCalculate",        XML_NAMESPACE_OFFICE, "calculated" },
 
     { NULL, 0, 0 }
 };