core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/eventimp.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8c58736107413ed28149c37d3ac7d27c95294479
Author: Caolán McNamara 
AuthorDate: Wed Mar 27 17:07:20 2024 +
Commit: Thorsten Behrens 
CommitDate: Fri Mar 29 15:36:01 2024 +0100

add notify for script use

Change-Id: I84af197cec7755f6803a578e1e21c03966ad5f3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165412
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index f9e10c11cf7d..fcc36f946ff1 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -231,6 +231,9 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp,  
sal_uInt16 nPrfx, cons
 
 if( maData.mbValid )
 maData.mbValid = !sEventName.isEmpty();
+
+if (!maData.msMacroName.isEmpty())
+rImp.NotifyMacroEventRead();
 }
 
 SvXMLImportContextRef SdXMLEventContext::CreateChildContext( sal_uInt16 
nPrefix, const OUString& rLocalName, const Reference< XAttributeList>& 
xAttrList )

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - xmloff/source

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/ximpshap.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 67ad71fb5a7ab09bc7a3c5d83e25d40bdc304960
Author: Caolán McNamara 
AuthorDate: Tue Sep 6 11:38:55 2022 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Sep 6 23:09:47 2022 +0200

check impress/calc IFrame "FrameURL" target

similar to

commit c7450d0b9d02c64ae3da467d329040787039767e
Date:   Tue Aug 30 17:01:08 2022 +0100

check IFrame "FrameURL" target

Conflicts:
xmloff/source/draw/ximpshap.cxx

Change-Id: Ibf28c29acb4476830431d02772f3ecd4b23a6a27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139524
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 8bee4b376ba1..a7f2f2f76f1b 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -87,6 +87,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -3243,6 +3244,9 @@ void SdXMLFloatingFrameShapeContext::StartElement( const 
css::uno::Reference< cs
 
 if( !maHref.isEmpty() )
 {
+if (INetURLObject(maHref).GetProtocol() == INetProtocol::Macro)
+GetImport().NotifyMacroEventRead();
+
 xProps->setPropertyValue("FrameURL", Any(maHref) );
 }
 }

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - xmloff/source

[Samuel Mehrbrodt (via logerrit)]

 xmloff/source/text/XMLTextFrameContext.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit ff045b937c9f8a4786bb3e82cdcffa6588aa3a8f
Author: Samuel Mehrbrodt 
AuthorDate: Wed Aug 18 16:48:43 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Aug 23 00:51:29 2021 +0200

tdf#143736 Fix loading hyperlink from textbox

Change-Id: I56f5aec153d9544a6c345e0cbb5857cf5d0074b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120673
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit da006fbe2d4c5891933390d72f6e6026b28d39fc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120697
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/xmloff/source/text/XMLTextFrameContext.cxx 
b/xmloff/source/text/XMLTextFrameContext.cxx
index 7f0ce41a1d74..f5f3cfac29cd 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1401,6 +1401,7 @@ void XMLTextFrameContext::EndElement()
 (pMultiContext.is()) ? pMultiContext.get() : m_xImplContext.get();
 XMLTextFrameContext_Impl *pImpl = 
const_cast(dynamic_cast< const 
XMLTextFrameContext_Impl*>( pContext ));
 assert(!pMultiContext.is() || pImpl);
+
 if( pImpl )
 {
 pImpl->CreateIfNotThere();
@@ -1431,6 +1432,18 @@ void XMLTextFrameContext::EndElement()
 
GetImport().GetTextImport()->StoreLastImportedFrameName(pImpl->GetOrigName());
 
 }
+else
+{
+// When we are dealing with a textbox, pImpl will be null;
+// we need to set the hyperlink to the shape instead
+Reference xShape = GetShape();
+if (xShape.is() && m_pHyperlink)
+{
+Reference xProps(xShape, UNO_QUERY);
+if (xProps.is())
+xProps->setPropertyValue("Hyperlink", 
Any(m_pHyperlink->GetHRef()));
+}
+}
 }
 
 SvXMLImportContextRef XMLTextFrameContext::CreateChildContext(