diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 05:03:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 05:09:28 +0000 |
| commit | 97ac77f067910fa5e8206d75160fa63546a9358d (patch) | |
| tree | e6fa64b43e8150ef65578afa4f1f40f3e19f7fa3 /filter | |
| parent | Releasing progress-linux version 4:24.2.2-3~progress7.99u1. (diff) | |
| download | libreoffice-97ac77f067910fa5e8206d75160fa63546a9358d.tar.xz libreoffice-97ac77f067910fa5e8206d75160fa63546a9358d.zip | |
Merging upstream version 4:24.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/qa/unit/svg.cxx | 3 | ||||
| -rw-r--r-- | filter/source/svg/presentation_engine.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index 4446fa35cb..617213933f 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -46,7 +46,8 @@ void SvgFilterTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) CPPUNIT_TEST_FIXTURE(SvgFilterTest, testPreserveJpg) { -#if !defined(MACOSX) +// On Windows, SVGFilter::filterWriterOrCalc can't get current frame to obtain selection +#if !defined(MACOSX) && !defined(_WIN32) // Load a document with a jpeg image in it. loadFromFile(u"preserve-jpg.odt"); diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index 839bd1676f..fa42b89b2f 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -15110,7 +15110,7 @@ function AnimatedTextElement( aElement, aEventMultiplexer ) if( aBulletPlaceholderElem ) { var sId = aBulletPlaceholderElem.getAttribute( 'id' ); - sId = 'bullet-char(' + sId + ')'; + sId = 'bullet-char-' + sId; aBulletCharElem = theDocument.getElementById( sId ); if( aBulletCharElem ) { |