diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2021-02-17 13:21:07 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-02-22 12:18:40 +0100 |
| commit | 14d6f3ec3b0a3d39b491068ca9c32751c07e5428 (patch) | |
| tree | 1b6625ada3af439fd3736317de8f1fae553ae86c /filter | |
| parent | 185f3117e8090f796dd437899bcf02c024e6af72 (diff) | |
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>
Diffstat (limited to 'filter')
| -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 |
3 files changed, 5 insertions, 3 deletions
diff --git a/filter/source/svg/presentation_engine.js b/filter/source/svg/presentation_engine.js index 1ab4e5eac01b..76bd4d41b12d 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 50d328371eaf..ef13ab4884d9 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -2583,6 +2583,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 39bd446a31b0..95980ce9b932 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1250,7 +1250,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(); |