tdf#152266 only warn about script:event-listener with non-empty targets

Change-Id: I19518c4872b522686b3df1881ccee02d840c3db4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143727 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]>
LibreOffice · Dec 14, 2022 · 30f1327 · 30f1327
1 parent acfc2ae
commit 30f1327
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -102,8 +102,6 @@ SvXMLImportContext* XMLEventImportHelper::CreateContext(
     const OUString& rXmlEventName,
     const OUString& rLanguage)
 {
-    rImport.NotifyMacroEventRead();
-
     SvXMLImportContext* pContext = nullptr;
 
     // translate event name from xml to api

diff --git a/xmloff/source/script/XMLScriptContextFactory.cxx b/xmloff/source/script/XMLScriptContextFactory.cxx
@@ -53,6 +53,9 @@ SvXMLImportContext* XMLScriptContextFactory::CreateContext(
         // else: ignore
     }
 
+    if (!sURLVal.isEmpty())
+        rImport.NotifyMacroEventRead();
+
     Sequence<PropertyValue> aValues{ comphelper::makePropertyValue(gsEventType, OUString(gsScript)),
                                      comphelper::makePropertyValue(gsURL, sURLVal) };
 

diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -81,6 +81,9 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
         sMacroNameVal = sMacroNameVal.copy( rDoc.getLength()+1 );
     }
 
+    if (!sMacroNameVal.isEmpty())
+        rImport.NotifyMacroEventRead();
+
     Sequence<PropertyValue> aValues
     {
         comphelper::makePropertyValue(gsEventType, OUString(gsStarBasic)),