diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2021-02-15 17:57:00 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2021-03-31 10:41:55 +0200 |
commit | 4d51c4db9b65555ff8bb6fd2a719814a3dfe53c7 (patch) | |
tree | 8e3a3848b94a66a7cdd07543ecef77eb89cf9870 /filter | |
parent | 398c470cbe0b0b66a440e643b095615fb8c04471 (diff) |
filter: svg: text field: placeholder localization issue
The text content for a placeholder is localized,
so in case a French locale is used, the placeholder
for a PageNumber text field is <numéro> instead of
<number>.
Change-Id: If1d31fee98d044775995b5b80567296f78d2a6c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110944
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Ashod Nakashian <ash@collabora.com>
Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111845
Tested-by: Jenkins
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 16 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.hxx | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 56eba1236a32..5dfa543f5cca 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1138,6 +1138,7 @@ bool SVGTextWriter::nextTextPortion() #endif msPageCount = ""; msDateTimeType = ""; + msTextFieldType = ""; if( xPortionTextRange.is() ) { #if OSL_DEBUG_LEVEL > 0 @@ -1181,6 +1182,7 @@ bool SVGTextWriter::nextTextPortion() ++pNames; } + msTextFieldType = sFieldName; #if OSL_DEBUG_LEVEL > 0 sInfo += "text field type: " + sFieldName + "; content: " + xTextField->getPresentation( /* show command: */ false ) + "; "; #endif @@ -1717,7 +1719,6 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, if( mbIsPlaceholderShape ) { mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PlaceholderText" ); - mbIsPlaceholderShape = false; } addFontAttributes( /* isTexTContainer: */ false ); @@ -1755,6 +1756,19 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos, SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ); mrExport.GetDocHandler()->characters( msDateTimeType ); } + else if( mbIsPlaceholderShape && rText.startsWith("<") && rText.endsWith(">") ) + { + OUString sContent; + if( msTextFieldType == "PageNumber" ) + sContent = "<number>"; + else if( msTextFieldType == "PageName" ) + sContent = "<slide-name>"; + else + sContent = rText; + + SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ); + mrExport.GetDocHandler()->characters( sContent ); + } else { SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ); diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx index 1fa351f10382..993d1162fcf3 100644 --- a/filter/source/svg/svgwriter.hxx +++ b/filter/source/svg/svgwriter.hxx @@ -231,6 +231,7 @@ class SVGTextWriter final OUString msHyperlinkIdList; OUString msPageCount; OUString msDateTimeType; + OUString msTextFieldType; bool mbIsPlaceholderShape; static const bool mbIWS = false; vcl::Font maCurrentFont; |