1 --- scribus-1.5.6/scribus/plugins/import/pdf/importpdf.cpp
2 +++ scribus-1.5.6/scribus/plugins/import/pdf/importpdf.cpp
3 @@ -792,14 +792,15 @@ bool PdfPlug::convert(const QString& fn)
4 names = catDict.dictLookup("OpenAction");
\r
7 - LinkAction *linkAction = nullptr;
\r
8 + std::unique_ptr<::LinkAction> linkAction;
\r
9 linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());
\r
12 - LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
\r
13 + LinkJavaScript *jsa = static_cast<LinkJavaScript *>(linkAction.get());
16 - QString script = UnicodeParsedString(jsa->getScript());
\r
17 + const GooString scriptGooString(jsa->getScript());
18 + QString script = UnicodeParsedString(&scriptGooString);
\r
19 if (script.startsWith("this."))
\r
21 script.remove(0, 5);
\r
22 --- scribus-1.5.6/scribus/plugins/import/pdf/slaoutput.cpp
23 +++ scribus-1.5.6/scribus/plugins/import/pdf/slaoutput.cpp
24 @@ -324,7 +324,7 @@ LinkAction* SlaOutputDev::SC_getAddition
26 Object actionObject = additionalActionsObject.dictLookup(key);
\r
27 if (actionObject.isDict())
\r
28 - linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI());
\r
29 + linkAction = (LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI())).release();
\r
33 @@ -455,7 +455,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot
34 POPPLER_CONST GooString *ndst = gto->getNamedDest();
\r
37 - LinkDest *dstn = pdfDoc->findDest(ndst);
\r
38 + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
\r
41 if (dstn->getKind() == destXYZ)
\r
42 @@ -499,7 +499,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot
43 POPPLER_CONST GooString *ndst = gto->getNamedDest();
\r
46 - LinkDest *dstn = pdfDoc->findDest(ndst);
\r
47 + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
\r
50 if (dstn->getKind() == destXYZ)
\r
51 @@ -516,8 +516,9 @@ bool SlaOutputDev::handleLinkAnnot(Annot
52 else if (act->getKind() == actionURI)
\r
54 LinkURI *gto = (LinkURI*)act;
\r
55 + const GooString uriGooString(gto->getURI());
57 - fileName = UnicodeParsedString(gto->getURI());
\r
58 + fileName = UnicodeParsedString(&uriGooString);
\r
62 @@ -929,8 +930,9 @@ void SlaOutputDev::handleActions(PageIte
63 LinkJavaScript *jsa = (LinkJavaScript*)Lact;
\r
66 + const GooString scriptGooString(jsa->getScript());
67 ite->annotation().setActionType(1);
\r
68 - ite->annotation().setAction(UnicodeParsedString(jsa->getScript()));
\r
69 + ite->annotation().setAction(UnicodeParsedString(&scriptGooString));
\r
72 else if (Lact->getKind() == actionGoTo)
\r
73 @@ -967,7 +969,7 @@ void SlaOutputDev::handleActions(PageIte
74 POPPLER_CONST GooString *ndst = gto->getNamedDest();
\r
77 - LinkDest *dstn = pdfDoc->findDest(ndst);
\r
78 + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
\r
81 if (dstn->getKind() == destXYZ)
\r
82 @@ -1019,7 +1021,7 @@ void SlaOutputDev::handleActions(PageIte
83 POPPLER_CONST GooString *ndst = gto->getNamedDest();
\r
86 - LinkDest *dstn = pdfDoc->findDest(ndst);
\r
87 + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst);
\r
90 if (dstn->getKind() == destXYZ)
\r
91 @@ -1039,7 +1041,8 @@ void SlaOutputDev::handleActions(PageIte
92 else if (Lact->getKind() == actionUnknown)
\r
94 LinkUnknown *uno = (LinkUnknown*)Lact;
\r
95 - QString actString = UnicodeParsedString(uno->getAction());
\r
96 + const GooString actionGooString(uno->getAction());
97 + QString actString = UnicodeParsedString(&actionGooString);
\r
98 if (actString == "ResetForm")
\r
100 ite->annotation().setActionType(4);
\r
101 @@ -1082,8 +1085,9 @@ void SlaOutputDev::handleActions(PageIte
102 else if (Lact->getKind() == actionNamed)
\r
104 LinkNamed *uno = (LinkNamed*)Lact;
\r
105 + const GooString nameGooString(uno->getName());
106 ite->annotation().setActionType(10);
\r
107 - ite->annotation().setAction(UnicodeParsedString(uno->getName()));
\r
108 + ite->annotation().setAction(UnicodeParsedString(&nameGooString));
\r
111 qDebug() << "Found unsupported Action of type" << Lact->getKind();
\r
112 @@ -1096,7 +1100,8 @@ void SlaOutputDev::handleActions(PageIte
113 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
116 - ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));
\r
117 + const GooString scriptGooString(jsa->getScript());
118 + ite->annotation().setD_act(UnicodeParsedString(&scriptGooString));
\r
119 ite->annotation().setAAact(true);
\r
122 @@ -1110,7 +1115,8 @@ void SlaOutputDev::handleActions(PageIte
123 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
126 - ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));
\r
127 + const GooString scriptGooString(jsa->getScript());
128 + ite->annotation().setE_act(UnicodeParsedString(&scriptGooString));
\r
129 ite->annotation().setAAact(true);
\r
132 @@ -1124,7 +1130,8 @@ void SlaOutputDev::handleActions(PageIte
133 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
136 - ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));
\r
137 + const GooString scriptGooString(jsa->getScript());
138 + ite->annotation().setX_act(UnicodeParsedString(&scriptGooString));
\r
139 ite->annotation().setAAact(true);
\r
142 @@ -1138,7 +1145,8 @@ void SlaOutputDev::handleActions(PageIte
143 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
146 - ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));
\r
147 + const GooString scriptGooString(jsa->getScript());
148 + ite->annotation().setFo_act(UnicodeParsedString(&scriptGooString));
\r
149 ite->annotation().setAAact(true);
\r
152 @@ -1152,7 +1160,8 @@ void SlaOutputDev::handleActions(PageIte
153 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
156 - ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));
\r
157 + const GooString scriptGooString(jsa->getScript());
158 + ite->annotation().setBl_act(UnicodeParsedString(&scriptGooString));
\r
159 ite->annotation().setAAact(true);
\r
162 @@ -1166,7 +1175,8 @@ void SlaOutputDev::handleActions(PageIte
163 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
166 - ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));
\r
167 + const GooString scriptGooString(jsa->getScript());
168 + ite->annotation().setC_act(UnicodeParsedString(&scriptGooString));
\r
169 ite->annotation().setAAact(true);
\r
172 @@ -1180,7 +1190,8 @@ void SlaOutputDev::handleActions(PageIte
173 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
176 - ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));
\r
177 + const GooString scriptGooString(jsa->getScript());
178 + ite->annotation().setF_act(UnicodeParsedString(&scriptGooString));
\r
179 ite->annotation().setAAact(true);
\r
180 ite->annotation().setFormat(5);
\r
182 @@ -1195,7 +1206,8 @@ void SlaOutputDev::handleActions(PageIte
183 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
186 - ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));
\r
187 + const GooString scriptGooString(jsa->getScript());
188 + ite->annotation().setK_act(UnicodeParsedString(&scriptGooString));
\r
189 ite->annotation().setAAact(true);
\r
190 ite->annotation().setFormat(5);
\r
192 @@ -1210,7 +1222,8 @@ void SlaOutputDev::handleActions(PageIte
193 LinkJavaScript *jsa = (LinkJavaScript*)Aact;
\r
196 - ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));
\r
197 + const GooString scriptGooString(jsa->getScript());
198 + ite->annotation().setV_act(UnicodeParsedString(&scriptGooString));
\r
199 ite->annotation().setAAact(true);
\r