office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-29 20:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on certain pdf actions

Browse source 
The Qt6 port left sometimes a deleted pointer behind to be dereferenced
later.

Fix this by leveraging smartpointers.

Also clean up the related code to be a bit more specific about data
deletion
This commit is contained in:
Sune Vuorela 2024-06-19 18:05:21 +00:00 committed by Albert Astals Cid
parent a0babd7fa4
commit 71957e02f6
5 changed files with 144 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/action.cpp
View file

@ -33,6 +33,7 @@ public:
ActionPrivate &operator=(const ActionPrivate &) = delete; ActionPrivate &operator=(const ActionPrivate &) = delete;
QVariant m_nativeId; QVariant m_nativeId;
std::shared_ptr<const void> m_nativeHandle;
QVector<Action *> m_nextActions; QVector<Action *> m_nextActions;
}; };
@ -69,6 +70,17 @@ QVector<Action *> Action::nextActions() const
return d->m_nextActions; return d->m_nextActions;
} }
void Action::setNativeHandle(std::shared_ptr<const void> ptr)
{
Q_D(Action);
d->m_nativeHandle = ptr;
}
const void *Action::nativeHandle() const
{
Q_D(const Action);
return d->m_nativeHandle.get();
}
void Action::setNextActions(const QVector<Action *> &actions) void Action::setNextActions(const QVector<Action *> &actions)
{ {
Q_D(Action); Q_D(Action);

29
core/action.h
View file

@ -82,17 +82,40 @@ public:
* object, if any. * object, if any.
* *
* @note Okular makes no use of this * @note Okular makes no use of this
* * @deprecated use @ref setNativeHandle
* @since 0.15 (KDE 4.9) * @since 0.15 (KDE 4.9)
*/ */
void setNativeId(const QVariant &id); OKULARCORE_DEPRECATED void setNativeId(const QVariant &id);
/** /**
* Returns the "native" id of the action. * Returns the "native" id of the action.
* *
* @since 0.15 (KDE 4.9) * @since 0.15 (KDE 4.9)
*
*/ */
QVariant nativeId() const; OKULARCORE_DEPRECATED QVariant nativeId() const;
/**
* Sets "native" handle for the action
*
* This is a opaque datapointer used for the action by the
* Generator. The generator is responsible for setting it
* to something sensible and also for interpreting it.
*
* The handle is deleted according to rules of the
* shared pointer.
*
* @note Okular (core/part/shell/...) itself makes no use of this
* @since 24.05.2
*/
void setNativeHandle(std::shared_ptr<const void> handle);
/**
* @returns the native handle pointer
*
* @since 24.05.2
*/
const void *nativeHandle() const;
/** /**
* Returns the next actions to be executed after. * Returns the next actions to be executed after.

24
generators/poppler/formfields.cpp
View file

@ -16,21 +16,21 @@
#include <poppler-qt6.h> #include <poppler-qt6.h>
extern Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool deletePopplerLink); extern Okular::Action *createLinkFromPopplerLink(std::variant<const Poppler::Link *, std::unique_ptr<Poppler::Link>> popplerLink);
#define SET_ANNOT_ACTIONS \ #define SET_ANNOT_ACTIONS \
setAdditionalAction(Okular::Annotation::CursorEntering, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorEnteringAction).get(), false)); \ setAdditionalAction(Okular::Annotation::CursorEntering, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorEnteringAction))); \
setAdditionalAction(Okular::Annotation::CursorLeaving, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorLeavingAction).get(), false)); \ setAdditionalAction(Okular::Annotation::CursorLeaving, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::CursorLeavingAction))); \
setAdditionalAction(Okular::Annotation::MousePressed, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::MousePressedAction).get(), false)); \ setAdditionalAction(Okular::Annotation::MousePressed, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::MousePressedAction))); \
setAdditionalAction(Okular::Annotation::MouseReleased, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::MouseReleasedAction).get(), false)); \ setAdditionalAction(Okular::Annotation::MouseReleased, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::MouseReleasedAction))); \
setAdditionalAction(Okular::Annotation::FocusIn, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusInAction).get(), false)); \ setAdditionalAction(Okular::Annotation::FocusIn, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusInAction))); \
setAdditionalAction(Okular::Annotation::FocusOut, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusOutAction).get(), false)); setAdditionalAction(Okular::Annotation::FocusOut, createLinkFromPopplerLink(m_field->additionalAction(Poppler::Annotation::FocusOutAction)));
#define SET_ACTIONS \ #define SET_ACTIONS \
setActivationAction(createLinkFromPopplerLink(m_field->activationAction().get(), false)); \ setActivationAction(createLinkFromPopplerLink(m_field->activationAction())); \
setAdditionalAction(Okular::FormField::FieldModified, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::FieldModified).get(), false)); \ setAdditionalAction(Okular::FormField::FieldModified, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::FieldModified))); \
setAdditionalAction(Okular::FormField::FormatField, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::FormatField).get(), false)); \ setAdditionalAction(Okular::FormField::FormatField, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::FormatField))); \
setAdditionalAction(Okular::FormField::ValidateField, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::ValidateField).get(), false)); \ setAdditionalAction(Okular::FormField::ValidateField, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::ValidateField))); \
setAdditionalAction(Okular::FormField::CalculateField, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::CalculateField).get(), false)); \ setAdditionalAction(Okular::FormField::CalculateField, createLinkFromPopplerLink(m_field->additionalAction(Poppler::FormField::CalculateField))); \
SET_ANNOT_ACTIONS SET_ANNOT_ACTIONS
PopplerFormFieldButton::PopplerFormFieldButton(std::unique_ptr<Poppler::FormFieldButton> field) PopplerFormFieldButton::PopplerFormFieldButton(std::unique_ptr<Poppler::FormFieldButton> field)

170
generators/poppler/generator_pdf.cpp
View file

@ -66,9 +66,6 @@
Q_DECLARE_METATYPE(Poppler::Annotation *) Q_DECLARE_METATYPE(Poppler::Annotation *)
Q_DECLARE_METATYPE(Poppler::FontInfo) Q_DECLARE_METATYPE(Poppler::FontInfo)
Q_DECLARE_METATYPE(const Poppler::LinkMovie *)
Q_DECLARE_METATYPE(const Poppler::LinkRendition *)
Q_DECLARE_METATYPE(const Poppler::LinkOCGState *)
#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO)) #define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))
@ -407,32 +404,51 @@ static Okular::DocumentAction::DocumentActionType popplerToOkular(Poppler::LinkA
return Okular::DocumentAction::PageFirst; return Okular::DocumentAction::PageFirst;
} }
/** // helper for using std::visit to get a dependent false for static_asserts
* Note: the function will take ownership of the popplerLink object. // to help get compile errors if one ever extends variants
*/ template<class> inline constexpr bool always_false_v = false;
Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool deletePopplerLink)
const Poppler::Link *rawPtr(std::variant<const Poppler::Link *, std::unique_ptr<Poppler::Link>> &link)
{ {
if (!popplerLink) { return std::visit(
[](auto &&item) {
using T = std::decay_t<decltype(item)>;
if constexpr (std::is_same_v<T, const Poppler::Link *>) {
return item;
} else if constexpr (std::is_same_v<T, std::unique_ptr<Poppler::Link>>) {
return const_cast<const Poppler::Link *>(item.get());
} else {
static_assert(always_false_v<T>, "non-exhaustive visitor");
}
},
link);
}
template<typename T> auto toSharedPointer(std::unique_ptr<Poppler::Link> link)
{
std::shared_ptr<Poppler::Link> sharedLink = std::move(link);
return std::static_pointer_cast<T>(sharedLink);
}
/**
* Note: the function will take ownership of the popplerLink if the popplerlink object is in a unique ptr
*/
Okular::Action *createLinkFromPopplerLink(std::variant<const Poppler::Link *, std::unique_ptr<Poppler::Link>> popplerLink)
{
auto rawPopplerLink = rawPtr(popplerLink);
if (!rawPopplerLink) {
return nullptr; return nullptr;
} }
Okular::Action *link = nullptr; Okular::Action *link = nullptr;
const Poppler::LinkGoto *popplerLinkGoto;
const Poppler::LinkExecute *popplerLinkExecute;
const Poppler::LinkBrowse *popplerLinkBrowse;
const Poppler::LinkAction *popplerLinkAction;
const Poppler::LinkSound *popplerLinkSound;
const Poppler::LinkJavaScript *popplerLinkJS;
const Poppler::LinkMovie *popplerLinkMovie;
const Poppler::LinkRendition *popplerLinkRendition;
Okular::DocumentViewport viewport; Okular::DocumentViewport viewport;
switch (popplerLink->linkType()) { switch (rawPopplerLink->linkType()) {
case Poppler::Link::None: case Poppler::Link::None:
break; break;
case Poppler::Link::Goto: { case Poppler::Link::Goto: {
popplerLinkGoto = static_cast<const Poppler::LinkGoto *>(popplerLink); auto popplerLinkGoto = static_cast<const Poppler::LinkGoto *>(rawPopplerLink);
const Poppler::LinkDestination dest = popplerLinkGoto->destination(); const Poppler::LinkDestination dest = popplerLinkGoto->destination();
const QString destName = dest.destinationName(); const QString destName = dest.destinationName();
if (destName.isEmpty()) { if (destName.isEmpty()) {
@ -443,47 +459,55 @@ Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool
} }
} break; } break;
case Poppler::Link::Execute: case Poppler::Link::Execute: {
popplerLinkExecute = static_cast<const Poppler::LinkExecute *>(popplerLink); auto popplerLinkExecute = static_cast<const Poppler::LinkExecute *>(rawPopplerLink);
link = new Okular::ExecuteAction(popplerLinkExecute->fileName(), popplerLinkExecute->parameters()); link = new Okular::ExecuteAction(popplerLinkExecute->fileName(), popplerLinkExecute->parameters());
break; break;
}
case Poppler::Link::Browse: case Poppler::Link::Browse: {
popplerLinkBrowse = static_cast<const Poppler::LinkBrowse *>(popplerLink); auto popplerLinkBrowse = static_cast<const Poppler::LinkBrowse *>(rawPopplerLink);
link = new Okular::BrowseAction(QUrl(popplerLinkBrowse->url())); link = new Okular::BrowseAction(QUrl(popplerLinkBrowse->url()));
break; break;
}
case Poppler::Link::Action: case Poppler::Link::Action: {
popplerLinkAction = static_cast<const Poppler::LinkAction *>(popplerLink); auto popplerLinkAction = static_cast<const Poppler::LinkAction *>(rawPopplerLink);
link = new Okular::DocumentAction(popplerToOkular(popplerLinkAction->actionType())); link = new Okular::DocumentAction(popplerToOkular(popplerLinkAction->actionType()));
break; break;
}
case Poppler::Link::Sound: { case Poppler::Link::Sound: {
popplerLinkSound = static_cast<const Poppler::LinkSound *>(popplerLink); auto popplerLinkSound = static_cast<const Poppler::LinkSound *>(rawPopplerLink);
Poppler::SoundObject *popplerSound = popplerLinkSound->sound(); Poppler::SoundObject *popplerSound = popplerLinkSound->sound();
Okular::Sound *sound = createSoundFromPopplerSound(popplerSound); Okular::Sound *sound = createSoundFromPopplerSound(popplerSound);
link = new Okular::SoundAction(popplerLinkSound->volume(), popplerLinkSound->synchronous(), popplerLinkSound->repeat(), popplerLinkSound->mix(), sound); link = new Okular::SoundAction(popplerLinkSound->volume(), popplerLinkSound->synchronous(), popplerLinkSound->repeat(), popplerLinkSound->mix(), sound);
} break; } break;
case Poppler::Link::JavaScript: { case Poppler::Link::JavaScript: {
popplerLinkJS = static_cast<const Poppler::LinkJavaScript *>(popplerLink); auto popplerLinkJS = static_cast<const Poppler::LinkJavaScript *>(rawPopplerLink);
link = new Okular::ScriptAction(Okular::JavaScript, popplerLinkJS->script()); link = new Okular::ScriptAction(Okular::JavaScript, popplerLinkJS->script());
} break; } break;
case Poppler::Link::Rendition: { case Poppler::Link::Rendition: {
if (!deletePopplerLink) { /* This gets weird. Depending on which parts of Poppler gives us a
// If links should not be deleted it probably means that they * rendition link, it might be owned by us; it might be owned by poppler
// are part of a nextActions chain. There is no support * Luckily we can count on the return types being correct from poppler.
// to resolveMediaLinkReferences on nextActions. It would also * If it is owned by poppler, we get a raw pointer
// be necessary to ensure that resolveMediaLinkReferences does * if ownership is transferred, we get a unique ptr.
// not delete the Links which are part of a nextActions list *
// to avoid a double deletion. * So for that reason, put the owned one in a normal shared_ptr for later usage
qCDebug(OkularPdfDebug) << "parsing rendition link without deletion is not supported. Action chain might be broken."; * and cleanup
break; *
* and put the non-owned in a special shared_ptr with a nondeleter as deleter
*/
std::shared_ptr<const Poppler::LinkRendition> popplerLinkRendition;
if (std::holds_alternative<std::unique_ptr<Poppler::Link>>(popplerLink)) {
auto uniquePopplerLink = std::get<std::unique_ptr<Poppler::Link>>(std::move(popplerLink));
popplerLinkRendition = toSharedPointer<const Poppler::LinkRendition>(std::move(uniquePopplerLink));
} else {
popplerLinkRendition = std::shared_ptr<const Poppler::LinkRendition>(static_cast<const Poppler::LinkRendition *>(rawPopplerLink), [](auto *) { /*don't delete this*/ });
} }
deletePopplerLink = false; // we'll delete it inside resolveMediaLinkReferences() after we have resolved all references
popplerLinkRendition = static_cast<const Poppler::LinkRendition *>(popplerLink);
Okular::RenditionAction::OperationType operation = Okular::RenditionAction::None; Okular::RenditionAction::OperationType operation = Okular::RenditionAction::None;
switch (popplerLinkRendition->action()) { switch (popplerLinkRendition->action()) {
@ -506,23 +530,23 @@ Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool
Okular::Movie *movie = nullptr; Okular::Movie *movie = nullptr;
if (popplerLinkRendition->rendition()) { if (popplerLinkRendition->rendition()) {
movie = createMovieFromPopplerScreen(popplerLinkRendition); movie = createMovieFromPopplerScreen(popplerLinkRendition.get());
} }
Okular::RenditionAction *renditionAction = new Okular::RenditionAction(operation, movie, Okular::JavaScript, popplerLinkRendition->script()); Okular::RenditionAction *renditionAction = new Okular::RenditionAction(operation, movie, Okular::JavaScript, popplerLinkRendition->script());
renditionAction->setNativeId(QVariant::fromValue(popplerLinkRendition)); renditionAction->setNativeHandle(popplerLinkRendition);
link = renditionAction; link = renditionAction;
} break; } break;
case Poppler::Link::Movie: { case Poppler::Link::Movie: {
if (!deletePopplerLink) { if (!std::holds_alternative<std::unique_ptr<Poppler::Link>>(popplerLink)) {
// See comment above in Link::Rendition // See comment above in Link::Rendition
qCDebug(OkularPdfDebug) << "parsing movie link without deletion is not supported. Action chain might be broken."; qCDebug(OkularPdfDebug) << "parsing movie link without taking ownership is not supported. Action chain might be broken.";
break; break;
} }
deletePopplerLink = false; // we'll delete it inside resolveMediaLinkReferences() after we have resolved all references
popplerLinkMovie = static_cast<const Poppler::LinkMovie *>(popplerLink); auto uniquePopplerLink = std::get<std::unique_ptr<Poppler::Link>>(std::move(popplerLink));
auto popplerLinkMovie = toSharedPointer<const Poppler::LinkMovie>(std::move(uniquePopplerLink));
Okular::MovieAction::OperationType operation = Okular::MovieAction::Play; Okular::MovieAction::OperationType operation = Okular::MovieAction::Play;
switch (popplerLinkMovie->operation()) { switch (popplerLinkMovie->operation()) {
@ -541,12 +565,12 @@ Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool
}; };
Okular::MovieAction *movieAction = new Okular::MovieAction(operation); Okular::MovieAction *movieAction = new Okular::MovieAction(operation);
movieAction->setNativeId(QVariant::fromValue(popplerLinkMovie)); movieAction->setNativeHandle(popplerLinkMovie);
link = movieAction; link = movieAction;
} break; } break;
case Poppler::Link::Hide: { case Poppler::Link::Hide: {
const Poppler::LinkHide *l = static_cast<const Poppler::LinkHide *>(popplerLink); const Poppler::LinkHide *l = static_cast<const Poppler::LinkHide *>(rawPopplerLink);
QStringList scripts; QStringList scripts;
const QVector<QString> targets = l->targets(); const QVector<QString> targets = l->targets();
for (const QString &target : targets) { for (const QString &target : targets) {
@ -555,26 +579,29 @@ Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool
link = new Okular::ScriptAction(Okular::JavaScript, scripts.join(QLatin1Char('\n'))); link = new Okular::ScriptAction(Okular::JavaScript, scripts.join(QLatin1Char('\n')));
} break; } break;
case Poppler::Link::OCGState: case Poppler::Link::OCGState: {
if (!std::holds_alternative<std::unique_ptr<Poppler::Link>>(popplerLink)) {
// See comment above in Link::Rendition
qCDebug(OkularPdfDebug) << "ocg link without taking ownership is not supported. Action chain might be broken.";
break;
}
link = new Okular::BackendOpaqueAction(); link = new Okular::BackendOpaqueAction();
link->setNativeId(QVariant::fromValue(static_cast<const Poppler::LinkOCGState *>(popplerLink))); auto uniquePopplerLink = std::get<std::unique_ptr<Poppler::Link>>(std::move(popplerLink));
deletePopplerLink = false; auto popplerLinkOCG = toSharedPointer<const Poppler::LinkOCGState>(std::move(uniquePopplerLink));
link->setNativeHandle(popplerLinkOCG);
break; break;
} }
}
if (link) { if (link) {
QVector<Okular::Action *> nextActions; QVector<Okular::Action *> nextActions;
const QVector<Poppler::Link *> nextLinks = popplerLink->nextLinks(); const QVector<Poppler::Link *> nextLinks = rawPopplerLink->nextLinks();
for (const Poppler::Link *nl : nextLinks) { for (const Poppler::Link *nl : nextLinks) {
nextActions << createLinkFromPopplerLink(nl, false); nextActions << createLinkFromPopplerLink(nl);
} }
link->setNextActions(nextActions); link->setNextActions(nextActions);
} }
if (deletePopplerLink) {
delete popplerLink;
}
return link; return link;
} }
@ -584,11 +611,11 @@ Okular::Action *createLinkFromPopplerLink(const Poppler::Link *popplerLink, bool
static QList<Okular::ObjectRect *> generateLinks(std::vector<std::unique_ptr<Poppler::Link>> &&popplerLinks) static QList<Okular::ObjectRect *> generateLinks(std::vector<std::unique_ptr<Poppler::Link>> &&popplerLinks)
{ {
QList<Okular::ObjectRect *> links; QList<Okular::ObjectRect *> links;
for (const auto &popplerLink : popplerLinks) { for (auto &popplerLink : popplerLinks) {
QRectF linkArea = popplerLink->linkArea(); QRectF linkArea = popplerLink->linkArea();
double nl = linkArea.left(), nt = linkArea.top(), nr = linkArea.right(), nb = linkArea.bottom(); double nl = linkArea.left(), nt = linkArea.top(), nr = linkArea.right(), nb = linkArea.bottom();
// create the rect using normalized coords and attach the Okular::Link to it // create the rect using normalized coords and attach the Okular::Link to it
Okular::ObjectRect *rect = new Okular::ObjectRect(nl, nt, nr, nb, false, Okular::ObjectRect::Action, createLinkFromPopplerLink(popplerLink.get(), false)); Okular::ObjectRect *rect = new Okular::ObjectRect(nl, nt, nr, nb, false, Okular::ObjectRect::Action, createLinkFromPopplerLink(std::move(popplerLink)));
// add the ObjectRect to the container // add the ObjectRect to the container
links.push_front(rect); links.push_front(rect);
} }
@ -832,11 +859,11 @@ void PDFGenerator::loadPages(QVector<Okular::Page *> &pagesVector, int rotation,
} }
std::unique_ptr<Poppler::Link> tmplink = p->action(Poppler::Page::Opening); std::unique_ptr<Poppler::Link> tmplink = p->action(Poppler::Page::Opening);
if (tmplink) { if (tmplink) {
page->setPageAction(Okular::Page::Opening, createLinkFromPopplerLink(tmplink.get(), false)); page->setPageAction(Okular::Page::Opening, createLinkFromPopplerLink(std::move(tmplink)));
} }
tmplink = p->action(Poppler::Page::Closing); tmplink = p->action(Poppler::Page::Closing);
if (tmplink) { if (tmplink) {
page->setPageAction(Okular::Page::Closing, createLinkFromPopplerLink(tmplink.get(), false)); page->setPageAction(Okular::Page::Closing, createLinkFromPopplerLink(std::move(tmplink.get())));
} }
page->setDuration(p->duration()); page->setDuration(p->duration());
page->setLabel(p->label()); page->setLabel(p->label());
@ -1092,15 +1119,10 @@ QAbstractItemModel *PDFGenerator::layersModel() const
void PDFGenerator::opaqueAction(const Okular::BackendOpaqueAction *action) void PDFGenerator::opaqueAction(const Okular::BackendOpaqueAction *action)
{ {
const Poppler::LinkOCGState *popplerLink = action->nativeId().value<const Poppler::LinkOCGState *>(); const Poppler::LinkOCGState *popplerLink = static_cast<const Poppler::LinkOCGState *>(action->nativeHandle());
pdfdoc->optionalContentModel()->applyLink(const_cast<Poppler::LinkOCGState *>(popplerLink)); pdfdoc->optionalContentModel()->applyLink(const_cast<Poppler::LinkOCGState *>(popplerLink));
} }
void PDFGenerator::freeOpaqueActionContents(const Okular::BackendOpaqueAction &action)
{
delete action.nativeId().value<const Poppler::LinkOCGState *>();
}
bool PDFGenerator::isAllowed(Okular::Permission permission) const bool PDFGenerator::isAllowed(Okular::Permission permission) const
{ {
bool b = true; bool b = true;
@ -1250,7 +1272,7 @@ void resolveMediaLinks(Okular::Action *action, enum Okular::Annotation::SubType
{ {
OkularLinkType *okularAction = static_cast<OkularLinkType *>(action); OkularLinkType *okularAction = static_cast<OkularLinkType *>(action);
const PopplerLinkType *popplerLink = action->nativeId().value<const PopplerLinkType *>(); const PopplerLinkType *popplerLink = static_cast<const PopplerLinkType *>(action->nativeHandle());
QHashIterator<Okular::Annotation *, Poppler::Annotation *> it(annotationsHash); QHashIterator<Okular::Annotation *, Poppler::Annotation *> it(annotationsHash);
while (it.hasNext()) { while (it.hasNext()) {
@ -1261,8 +1283,7 @@ void resolveMediaLinks(Okular::Action *action, enum Okular::Annotation::SubType
if (popplerLink->isReferencedAnnotation(popplerAnnotation)) { if (popplerLink->isReferencedAnnotation(popplerAnnotation)) {
okularAction->setAnnotation(static_cast<OkularAnnotationType *>(it.key())); okularAction->setAnnotation(static_cast<OkularAnnotationType *>(it.key()));
okularAction->setNativeId(QVariant()); okularAction->setNativeHandle({});
delete popplerLink; // delete the associated Poppler::LinkMovie object, it's not needed anymore
break; break;
} }
} }
@ -1807,21 +1828,18 @@ void PDFGenerator::addAnnotations(Poppler::Page *popplerPage, Okular::Page *page
// The activation action // The activation action
Poppler::Link *actionLink = annotScreen->action(); Poppler::Link *actionLink = annotScreen->action();
if (actionLink) { if (actionLink) {
screenAnnotation->setAction(createLinkFromPopplerLink(actionLink, true /*The function doesn't delete this kind*/)); screenAnnotation->setAction(createLinkFromPopplerLink(actionLink));
/* The actionLink is still owned by the poppler annotation, but createLinkFromPopplerLink specialcases this and
* insists on on being passed 'true' to tell them we know what we are doing
* At some point in the future, there is probably stuff to be cleaned up here */
} }
// The additional actions // The additional actions
std::unique_ptr<Poppler::Link> pageOpeningLink = annotScreen->additionalAction(Poppler::Annotation::PageOpeningAction); std::unique_ptr<Poppler::Link> pageOpeningLink = annotScreen->additionalAction(Poppler::Annotation::PageOpeningAction);
if (pageOpeningLink) { if (pageOpeningLink) {
screenAnnotation->setAdditionalAction(Okular::Annotation::PageOpening, createLinkFromPopplerLink(pageOpeningLink.get(), false)); screenAnnotation->setAdditionalAction(Okular::Annotation::PageOpening, createLinkFromPopplerLink(std::move(pageOpeningLink)));
} }
std::unique_ptr<Poppler::Link> pageClosingLink = annotScreen->additionalAction(Poppler::Annotation::PageClosingAction); std::unique_ptr<Poppler::Link> pageClosingLink = annotScreen->additionalAction(Poppler::Annotation::PageClosingAction);
if (pageClosingLink) { if (pageClosingLink) {
screenAnnotation->setAdditionalAction(Okular::Annotation::PageClosing, createLinkFromPopplerLink(pageClosingLink.get(), false)); screenAnnotation->setAdditionalAction(Okular::Annotation::PageClosing, createLinkFromPopplerLink(std::move(pageClosingLink)));
} }
} }
@ -1832,12 +1850,12 @@ void PDFGenerator::addAnnotations(Poppler::Page *popplerPage, Okular::Page *page
// The additional actions // The additional actions
std::unique_ptr<Poppler::Link> pageOpeningLink = annotWidget->additionalAction(Poppler::Annotation::PageOpeningAction); std::unique_ptr<Poppler::Link> pageOpeningLink = annotWidget->additionalAction(Poppler::Annotation::PageOpeningAction);
if (pageOpeningLink) { if (pageOpeningLink) {
widgetAnnotation->setAdditionalAction(Okular::Annotation::PageOpening, createLinkFromPopplerLink(pageOpeningLink.get(), false)); widgetAnnotation->setAdditionalAction(Okular::Annotation::PageOpening, createLinkFromPopplerLink(std::move(pageOpeningLink)));
} }
std::unique_ptr<Poppler::Link> pageClosingLink = annotWidget->additionalAction(Poppler::Annotation::PageClosingAction); std::unique_ptr<Poppler::Link> pageClosingLink = annotWidget->additionalAction(Poppler::Annotation::PageClosingAction);
if (pageClosingLink) { if (pageClosingLink) {
widgetAnnotation->setAdditionalAction(Okular::Annotation::PageClosing, createLinkFromPopplerLink(pageClosingLink.get(), false)); widgetAnnotation->setAdditionalAction(Okular::Annotation::PageClosing, createLinkFromPopplerLink(std::move(pageClosingLink)));
} }
} }

1
generators/poppler/generator_pdf.h
View file

@ -73,7 +73,6 @@ public:
} }
QAbstractItemModel *layersModel() const override; QAbstractItemModel *layersModel() const override;
void opaqueAction(const Okular::BackendOpaqueAction *action) override; void opaqueAction(const Okular::BackendOpaqueAction *action) override;
void freeOpaqueActionContents(const Okular::BackendOpaqueAction &action) override;
// [INHERITED] document information // [INHERITED] document information
bool isAllowed(Okular::Permission permission) const override; bool isAllowed(Okular::Permission permission) const override;