filter/source/svg/svgwriter.cxx | 11 +++++++++++
filter/source/svg/svgwriter.hxx | 1 +
2 files changed, 12 insertions(+)
New commits:
commit cc5becc37dc4828e09f4d2f2af48b8482f7efaa3
Author: Marco Cecchetti <marco.cecche...@collabora.com>
AuthorDate: Thu Dec 10 21:05:49 2020 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Dec 15 11:51:58 2020 +0100
impress: <count> variable not substituted in presentation on slideshow
Change-Id: Ifa93c112dae217b65a874b37de7727e671da8b60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107580
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit 345fcef24098cf7f827bfc49c7976b0bfe814edc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107699
Tested-by: Jenkins
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 6b7f082c8668..8e0c90ce2e4e 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1136,6 +1136,7 @@ bool SVGTextWriter::nextTextPortion()
sInfo = "type: " + sPortionType + "; ";
}
#endif
+ msPageCount = "";
if( xPortionTextRange.is() )
{
#if OSL_DEBUG_LEVEL > 0
@@ -1187,6 +1188,10 @@ bool SVGTextWriter::nextTextPortion()
{
mbIsPlaceholderShape = true;
}
+ else if (sFieldName == "PageCount")
+ {
+ msPageCount = xTextField->getPresentation( /* show
command: */ false );
+ }
else
{
mbIsURLField = sFieldName == "URL";
@@ -1705,6 +1710,12 @@ void SVGTextWriter::implWriteTextPortion( const Point&
rPos,
mrExport.GetDocHandler()->characters( rText );
}
}
+ else if ( !msPageCount.isEmpty() )
+ {
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "PageCount" );
+ SvXMLElementExport aSVGTspanElem( mrExport, XML_NAMESPACE_NONE,
aXMLElemTspan, mbIWS, mbIWS );
+ mrExport.GetDocHandler()->characters( msPageCount );
+ }
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 f75f5d01e786..c56780158ded 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -227,6 +227,7 @@ class SVGTextWriter final
bool mbIsURLField;
OUString msUrl;
OUString msHyperlinkIdList;
+ OUString msPageCount;
bool mbIsPlaceholderShape;
static const bool mbIWS = false;
vcl::Font maCurrentFont;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
