From e3cf16e6fbf8d39cad8762f002b6db1d4f61ed36 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 07:03:24 +0200 Subject: Merging upstream version 4:24.2.3. Signed-off-by: Daniel Baumann --- xmloff/source/draw/eventimp.cxx | 3 +++ xmloff/source/text/txtimp.cxx | 8 ++++++++ 2 files changed, 11 insertions(+) (limited to 'xmloff') diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 2b8921ee27..2a6ce1fa23 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -210,6 +210,9 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, if( maData.mbValid ) maData.mbValid = !sEventName.isEmpty(); + + if (!maData.msMacroName.isEmpty()) + rImp.NotifyMacroEventRead(); } css::uno::Reference< css::xml::sax::XFastContextHandler > SdXMLEventContext::createFastChildContext( diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index ac0e894742..d6e132323d 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1016,6 +1016,10 @@ auto IsPropertySet(uno::Reference const& rxParaStyles { return true; } + if (xPropState->getPropertyState("NumberingStyleName") == beans::PropertyState_DIRECT_VALUE) + { + return false; // tdf#159903 this overrides value in the parent style + } // check if it is set by any parent common style OUString style; rxPropSet->getPropertyValue("ParaStyleName") >>= style; @@ -1028,6 +1032,10 @@ auto IsPropertySet(uno::Reference const& rxParaStyles { return true; } + if (xStyleProps->getPropertyState("NumberingStyleName") == beans::PropertyState_DIRECT_VALUE) + { + return false; // tdf#159903 this overrides value in the parent style + } style = xStyle->getParentStyle(); } return false; -- cgit v1.2.3