Attachment 138372 Details for Bug 105758 – Patch to add support for the hide action

[patch] Patch to add support for the hide action

0001-Add-support-for-hide-action.patch (text/plain), 9.28 KB, created by Andre Heinecke on 2018-03-27 07:15:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Heinecke

Created: 2018-03-27 07:15:59 UTC

Size: 9.28 KB

patch

obsolete

>From be487a732073ad8572986d051bb1d2ed1965534f Mon Sep 17 00:00:00 2001
>From: Andre Heinecke <aheinecke@intevation.de>
>Date: Thu, 22 Mar 2018 11:30:49 +0100
>Subject: [PATCH] Add support for hide action
>
>The hide action can be used to show / hide fields.
>---
> poppler/Link.cc               | 31 +++++++++++++++++++++++++++++
> poppler/Link.h                | 35 +++++++++++++++++++++++++++++++++
> qt5/src/poppler-annotation.cc |  5 +++++
> qt5/src/poppler-link.cc       | 45 +++++++++++++++++++++++++++++++++++++++++++
> qt5/src/poppler-link.h        | 38 +++++++++++++++++++++++++++++++++++-
> qt5/src/poppler-page.cc       |  8 ++++++++
> 6 files changed, 161 insertions(+), 1 deletion(-)
>
>diff --git a/poppler/Link.cc b/poppler/Link.cc
>index 326cfb97..608c0bb0 100644
>--- a/poppler/Link.cc
>+++ b/poppler/Link.cc
>@@ -20,6 +20,7 @@
> // Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
> // Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
> // Copyright (C) 2012 Tobias Koening <tobias.koenig@kdab.com>
>+// Copyright (C) 2018 Intevation GmbH <intevation@intevation.de>
> //
> // To see a description of the changes please see the Changelog file that
> // came with your tarball or type make ChangeLog if you are building from git
>@@ -119,6 +120,10 @@ LinkAction *LinkAction::parseAction(Object *obj, GooString *baseURI) {
>   } else if (obj2.isName("SetOCGState")) {
>     action = new LinkOCGState(obj);
> 
>+  // Hide action
>+  } else if (obj2.isName("Hide")) {
>+    action = new LinkHide(obj);
>+
>   // unknown action
>   } else if (obj2.isName()) {
>     action = new LinkUnknown(obj2.getName());
>@@ -810,6 +815,32 @@ LinkOCGState::StateList::~StateList() {
> }
> 
> //------------------------------------------------------------------------
>+// LinkHide
>+//------------------------------------------------------------------------
>+
>+LinkHide::LinkHide(Object *hideObj) {
>+  targetName = nullptr;
>+  show = false; // Default
>+
>+  if (hideObj->isDict()) {
>+      Object targetObj = hideObj->dictLookup("T");
>+      if (targetObj.isString()) {
>+        targetName = targetObj.getString()->copy();
>+      }
>+      Object shouldHide = hideObj->dictLookup("H");
>+      if (shouldHide.isBool()) {
>+          show = !shouldHide.getBool();
>+      }
>+  }
>+}
>+
>+LinkHide::~LinkHide() {
>+  if (targetName) {
>+    delete targetName;
>+  }
>+}
>+
>+//------------------------------------------------------------------------
> // LinkUnknown
> //------------------------------------------------------------------------
> 
>diff --git a/poppler/Link.h b/poppler/Link.h
>index 05892cff..fa428f9d 100644
>--- a/poppler/Link.h
>+++ b/poppler/Link.h
>@@ -18,6 +18,7 @@
> // Copyright (C) 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
> // Copyright (C) 2012 Tobias Koening <tobias.koenig@kdab.com>
> // Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
>+// Copyright (C) 2018 Intevation GmbH <intevation@intevation.de>
> //
> // To see a description of the changes please see the Changelog file that
> // came with your tarball or type make ChangeLog if you are building from git
>@@ -57,6 +58,7 @@ enum LinkActionKind {
>   actionSound,			// sound action
>   actionJavaScript,		// JavaScript action
>   actionOCGState,               // Set-OCG-State action
>+  actionHide,			// Hide action
>   actionUnknown			// anything else
> };
> 
>@@ -451,6 +453,39 @@ private:
> };
> 
> //------------------------------------------------------------------------
>+// LinkHide
>+//------------------------------------------------------------------------
>+
>+class LinkHide: public LinkAction {
>+public:
>+  LinkHide(Object *hideObj);
>+
>+  ~LinkHide();
>+
>+  GBool isOk() override { return targetName != nullptr; }
>+  LinkActionKind getKind() override { return actionHide; }
>+
>+  // According to spec the target can be either:
>+  // a) A text string containing the fully qualified name of the target
>+  //    field.
>+  // b) An indirect reference to an annotation dictionary.
>+  // c) An array of "such dictionaries or text strings".
>+  //
>+  // While b / c appear to be very uncommon and can't easily be
>+  // created with Adobe Acrobat DC. So only support hide
>+  // actions with named targets (yet).
>+  GBool hasTargetName() { return targetName != nullptr; }
>+  GooString *getTargetName() { return targetName; }
>+
>+  // Should this action show or hide.
>+  GBool isShowAction() { return show; }
>+
>+private:
>+  GooString *targetName;
>+  GBool show;
>+};
>+
>+//------------------------------------------------------------------------
> // LinkUnknown
> //------------------------------------------------------------------------
> 
>diff --git a/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc
>index 42f2e9fe..45de95b0 100644
>--- a/qt5/src/poppler-annotation.cc
>+++ b/qt5/src/poppler-annotation.cc
>@@ -3945,6 +3945,11 @@ void LinkAnnotation::store( QDomNode & node, QDomDocument & document ) const
>                 hyperlinkElement.setAttribute( QStringLiteral("type"), QStringLiteral("OCGState") );
>                 break;
>             }
>+            case Poppler::Link::Hide:
>+            {
>+                hyperlinkElement.setAttribute( QStringLiteral("type"), QStringLiteral("Hide") );
>+                break;
>+            }
>             case Poppler::Link::None:
>                 break;
>         }
>diff --git a/qt5/src/poppler-link.cc b/qt5/src/poppler-link.cc
>index 626040fb..03bcea14 100644
>--- a/qt5/src/poppler-link.cc
>+++ b/qt5/src/poppler-link.cc
>@@ -4,6 +4,7 @@
>  * Copyright (C) 2010 Hib Eris <hib@hiberis.nl>
>  * Copyright (C) 2012, Tobias Koenig <tokoe@kdab.com>
>  * Copyright (C) 2012, Guillermo A. Amaral B. <gamaral@kde.org>
>+ * Copyright (C) 2018 Intevation GmbH <intevation@intevation.de>
>  * Adapting code from
>  *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>
>  *
>@@ -220,6 +221,20 @@ class LinkMoviePrivate : public LinkPrivate
> 	{
> 	}
> 
>+class LinkHidePrivate : public LinkPrivate
>+{
>+	public:
>+		LinkHidePrivate( const QRectF &area );
>+
>+		QString targetName;
>+		bool isShow;
>+};
>+
>+	LinkHidePrivate::LinkHidePrivate( const QRectF &area )
>+		: LinkPrivate( area )
>+	{
>+	}
>+
> 	static void cvtUserToDev(::Page *page, double xu, double yu, int *xd, int *yd) {
> 		double ctm[6];
> 		
>@@ -704,4 +719,34 @@ class LinkMoviePrivate : public LinkPrivate
> 	{
> 		return OCGState;
> 	}
>+
>+	// LinkHide
>+	LinkHide::LinkHide( const QRectF &linkArea, const QString &targetName, bool isShow )
>+		: Link( *new LinkHidePrivate( linkArea ) )
>+	{
>+		Q_D( LinkHide );
>+		d->targetName = targetName;
>+		d->isShow = isShow;
>+	}
>+
>+	LinkHide::~LinkHide()
>+	{
>+	}
>+
>+	Link::LinkType LinkHide::linkType() const
>+	{
>+		return Hide;
>+	}
>+
>+	QString LinkHide::targetName() const
>+	{
>+		Q_D( const LinkHide );
>+		return d->targetName;
>+	}
>+
>+	bool LinkHide::isShowAction() const
>+	{
>+		Q_D( const LinkHide );
>+		return d->isShow;
>+	}
> }
>diff --git a/qt5/src/poppler-link.h b/qt5/src/poppler-link.h
>index 0753ce99..d3f89965 100644
>--- a/qt5/src/poppler-link.h
>+++ b/qt5/src/poppler-link.h
>@@ -49,6 +49,7 @@ class LinkDestinationData;
> class LinkDestinationPrivate;
> class LinkRenditionPrivate;
> class LinkOCGStatePrivate;
>+class LinkHidePrivate;
> class MediaRendition;
> class SoundObject;
> 
>@@ -197,7 +198,8 @@ class POPPLER_QT5_EXPORT Link
> 		    Movie,    ///< An action to be executed on a movie
> 		    Rendition,    ///< A rendition link \since 0.20
> 		    JavaScript,   ///< A JavaScript code to be interpreted \since 0.10
>-		    OCGState      ///< An Optional Content Group state change \since 0.50
>+		    OCGState,      ///< An Optional Content Group state change \since 0.50
>+		    Hide,     ///< An action to hide a field \since 0.64
> 		};
> 
> 		/**
>@@ -627,6 +629,40 @@ class POPPLER_QT5_EXPORT LinkOCGState : public Link
> 		Q_DISABLE_COPY( LinkOCGState )
> };
> 
>+/**
>+ * Hide: an action to show / hide a field.
>+ *
>+ * \since 0.64
>+ */
>+class POPPLER_QT5_EXPORT LinkHide: public Link
>+{
>+	public:
>+		/**
>+		 * Create a new Hide link.
>+		 */
>+		LinkHide( const QRectF &linkArea, const QString &targetName, bool isShow );
>+		/**
>+		 * Destructor.
>+		 */
>+		~LinkHide();
>+
>+		LinkType linkType() const override;
>+
>+		/**
>+		 * The fully qualified target name of the action.
>+		 */
>+		QString targetName() const;
>+
>+		/**
>+		 * Should this action change the visibility of the target to true.
>+		 */
>+		bool isShowAction() const;
>+
>+	private:
>+		Q_DECLARE_PRIVATE( LinkHide )
>+		Q_DISABLE_COPY( LinkHide )
>+};
>+
> }
> 
> #endif
>diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
>index 381a608b..3121acf8 100644
>--- a/qt5/src/poppler-page.cc
>+++ b/qt5/src/poppler-page.cc
>@@ -20,6 +20,7 @@
>  * Copyright (C) 2017, Oliver Sander <oliver.sander@tu-dresden.de>
>  * Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
>  * Copyright (C) 2017, 2018 KlarÃ¤lvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
>+ * Copyright (C) 2018 Intevation GmbH <intevation@intevation.de>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License as published by
>@@ -343,6 +344,13 @@ Link* PageData::convertLinkActionToLink(::LinkAction * a, DocumentData *parentDo
>       popplerLink = new LinkOCGState( locgp );
>     }
> 
>+    case actionHide:
>+    {
>+      ::LinkHide *lh = (::LinkHide *)a;
>+      popplerLink = new LinkHide( linkArea, lh->hasTargetName() ? UnicodeParsedString( lh->getTargetName() ) : QString(), lh->isShowAction() );
>+    }
>+    break;
>+
>     case actionUnknown:
>     break;
>   }
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 105758: 138372 | 138702

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.