filter/source/svg/presentation_engine.js | 4 ++--
filter/source/svg/svgexport.cxx | 2 ++
filter/source/svg/svgwriter.cxx | 2 +-
sd/qa/unit/SVGExportTests.cxx | 12 ++++++------
4 files changed, 11 insertions(+), 9 deletions(-)
New commits:
commit 14d6f3ec3b0a3d39b491068ca9c32751c07e5428
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Wed Feb 17 13:21:07 2021 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Mon Feb 22 12:18:40 2021 +0100
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
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();
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index 0b4cc8f52e6a..bf54df519a6a 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -165,11 +165,11 @@ public:
assertXPath(svgDoc, MAKE_PATH_STRING( /SVG_SVG/SVG_G[2] ), "class",
"SlideGroup");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G ), "class", "Slide");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1] ), "class", "TitleText");
- assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT ), "class",
"TextShape");
+ assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT ), "class",
"SVGTextShape");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"class", "TextParagraph");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"text-decoration", "underline");
- assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT ), "class",
"TextShape");
+ assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT ), "class",
"SVGTextShape");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"class", "TextParagraph");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"text-decoration", "line-through");
}
@@ -208,19 +208,19 @@ public:
assertXPath(svgDoc, MAKE_PATH_STRING( /SVG_SVG/SVG_DEFS[9]/SVG_G[2] ),
"class", "Master_Slide");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2] ), "class", "BackgroundObjects");
// Current Date Field
- assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[4] ), "class",
"com.sun.star.drawing.TextShape");
+ assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[4] ), "class", "TextShape");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[4]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "class", "PlaceholderText");
assertXPathContent(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[4]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "<date>");
// Current Time Field
- assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[5] ), "class",
"com.sun.star.drawing.TextShape");
+ assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[5] ), "class", "TextShape");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[5]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "class", "PlaceholderText");
assertXPathContent(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[5]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "<time>");
// Slide Name Field
- assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6] ), "class",
"com.sun.star.drawing.TextShape");
+ assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6] ), "class", "TextShape");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "class", "PlaceholderText");
assertXPathContent(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "<slide-name>");
// Slide Number Field
- assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7] ), "class",
"com.sun.star.drawing.TextShape");
+ assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7] ), "class", "TextShape");
assertXPath(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "class", "PlaceholderText");
assertXPathContent(svgDoc, MAKE_PATH_STRING(
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "<number>");
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
