diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2021-02-17 13:21:07 +0100 |
---|---|---|
committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2021-03-09 15:36:09 +0100 |
commit | e3f62ee770afe34dceb467eb8ccda55eba0a2243 (patch) | |
tree | a9e5a0413806818ca9edec310677b399d0c86862 /filter | |
parent | filter: svg: export tiled background by exploiting svg:pattern element (diff) | |
download | core-e3f62ee770afe34dceb467eb8ccda55eba0a2243.tar.gz core-e3f62ee770afe34dceb467eb8ccda55eba0a2243.zip |
filter: svg: export: renaming class attributes related to TextShape
TextShape => SVGTextShape
com.sun.star.drawing.TextShape => TextShape
Change-Id: I4bbb465e0f65aa328527ac3022c0b68546fb5db6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111224
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111846
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/qa/unit/svg.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/presentation_engine.js | 4 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index be11dc57c631..4c37dac61548 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -148,14 +148,14 @@ CPPUNIT_TEST_FIXTURE(SvgFilterTest, testSemiTransparentText) xmlDocUniquePtr pXmlDoc = parseXmlStream(&aStream); - // We expect 2 groups of class "com.sun.star.drawing.TextShape" that + // We expect 2 groups of class "TextShape" that // have some svg:text node inside. // Without the accompanying fix in place, this test would have failed with: // - Expected: 2 // - Actual : 1 // i.e. the 2nd shape lots its text. - assertXPath(pXmlDoc, "//svg:g[@class='com.sun.star.drawing.TextShape']//svg:text", 2); + assertXPath(pXmlDoc, "//svg:g[@class='TextShape']//svg:text", 2); // First shape has semi-transparent text. assertXPath(pXmlDoc, "//svg:text[1]/svg:tspan/svg:tspan/svg:tspan[@fill-opacity='0.8']"); diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index 884d3430f4bd..275d455ca4e5 100644 --- a/filter/source/svg/presentation_engine.js +++ b/filter/source/svg/presentation_engine.js @@ -5371,7 +5371,7 @@ function getTextFieldType ( elem ) { var sFieldType = null; var sClass = elem.getAttribute('class'); - if( sClass.endsWith( 'TextShape' ) ) + if( sClass == 'TextShape' ) { var aPlaceholderElement = getElementByClassName( elem, 'PlaceholderText' ); if (aPlaceholderElement) @@ -14725,7 +14725,7 @@ function AnimatedTextElement( aElement, aEventMultiplexer ) } var aTextShapeElement = aElement.parentNode; sTextType = aTextShapeElement.getAttribute( 'class' ); - if( sTextType !== 'TextShape' ) + if( sTextType !== 'SVGTextShape' ) { log( 'AnimatedTextElement: element parent is not a text shape.' ); return; diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 3e2da0cd0cb9..96da555f5279 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2575,6 +2575,8 @@ OUString SVGFilter::implGetClassFromShape( const Reference< css::drawing::XShape aRet = "Graphic"; else if( aShapeType.lastIndexOf( "drawing.OLE2Shape" ) != -1 ) aRet = "OLE2"; + else if( aShapeType.lastIndexOf( "drawing.TextShape" ) != -1 ) + aRet = "TextShape"; else if( aShapeType.lastIndexOf( "presentation.HeaderShape" ) != -1 ) aRet = "Header"; else if( aShapeType.lastIndexOf( "presentation.FooterShape" ) != -1 ) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index b7eab491429d..08ad2c5781ce 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1275,7 +1275,7 @@ void SVGTextWriter::startTextShape() { mbIsTextShapeStarted = true; maParentFont = vcl::Font(); - mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextShape" ); + mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "SVGTextShape" ); // if text is rotated, set transform matrix at text element const vcl::Font& rFont = mpVDev->GetFont(); |