[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - filter/source

[Marco Cecchetti (via logerrit)]

 filter/source/svg/svgwriter.cxx |   11 +++++++++++
 filter/source/svg/svgwriter.hxx |    1 +
 2 files changed, 12 insertions(+)

New commits:
commit 80d37706ac65dc3438398bdb543e3a5e5e866c63
Author:     Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Thu Dec 10 21:05:49 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Dec 14 16:28:53 2020 +0100

    impress: <count> variable not substituted in presentation on slideshow
    
    Change-Id: Ifa93c112dae217b65a874b37de7727e671da8b60
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107633
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 1558836a21e9..e4a7c4bac7a7 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1110,6 +1110,7 @@ bool SVGTextWriter::nextTextPortion()
                 sInfo = "type: " + sPortionType + "; ";
             }
 #endif
+            msPageCount = "";
             if( xPortionTextRange.is() )
             {
 #if OSL_DEBUG_LEVEL > 0
@@ -1161,6 +1162,10 @@ bool SVGTextWriter::nextTextPortion()
                         {
                             mbIsPlaceholderShape = true;
                         }
+                        else if (sFieldName == "PageCount")
+                        {
+                            msPageCount = xTextField->getPresentation( /* show command: */ false );
+                        }
                         else
                         {
                             mbIsURLField = sFieldName == "URL";
@@ -1673,6 +1678,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 687f6cae5676..e8396f16b886 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -248,6 +248,7 @@ class SVGTextWriter final
     bool                                        mbIsURLField;
     OUString                                    msUrl;
     OUString                                    msHyperlinkIdList;
+    OUString                                    msPageCount;
     bool                                        mbIsPlaceholderShape;
     static const bool                           mbIWS = false;
     vcl::Font                                   maCurrentFont;