[Libreoffice-commits] core.git: include/vcl vcl/source

[panoskorovesis (via logerrit)]

 include/vcl/filter/SvmReader.hxx    |    1 +
 vcl/source/filter/svm/SvmReader.cxx |   11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit ce0f7ae74e64d496f689c263a22776c5efc5ab3b
Author:     panoskorovesis <panoskorovesis at outlook.com>
AuthorDate: Thu Jul 15 10:44:36 2021 +0300
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jul 19 10:03:28 2021 +0200

    Add Handler for Pop Read
    
    The handler separates MetaPopAction::Read from metaact.hxx
    Read implementation is now in SvmReader
    
    Change-Id: I831ac97d29554e90773a939dcfedb383974e2495
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118981
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index 1a7960d322f9..5f44ece9f1ef 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -81,6 +81,7 @@ public:
     rtl::Reference<MetaAction> MapModeHandler();
     rtl::Reference<MetaAction> FontHandler(ImplMetaReadData* pData);
     rtl::Reference<MetaAction> PushHandler();
+    rtl::Reference<MetaAction> PopHandler();
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/svm/SvmReader.cxx b/vcl/source/filter/svm/SvmReader.cxx
index 0a8a4ebf2dfd..d4d5953959e6 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -293,7 +293,7 @@ rtl::Reference<MetaAction> SvmReader::MetaActionHandler(ImplMetaReadData* pData)
             return PushHandler();
             break;
         case MetaActionType::POP:
-            pAction = new MetaPopAction;
+            return PopHandler();
             break;
         case MetaActionType::RASTEROP:
             pAction = new MetaRasterOpAction;
@@ -1273,4 +1273,13 @@ rtl::Reference<MetaAction> SvmReader::PushHandler()
 
     return pAction;
 }
+
+rtl::Reference<MetaAction> SvmReader::PopHandler()
+{
+    auto pAction = new MetaPopAction();
+
+    VersionCompatRead aCompat(mrStream);
+
+    return pAction;
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */