Kaydet (Commit) ee79612f authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

tdf#83877 Make user input xml safe

Change-Id: Iff1311932ef6a4525faa999553884bd8d23f3f30
Reviewed-on: https://gerrit.libreoffice.org/52814Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 39f1c0cd
......@@ -148,9 +148,4 @@ void SignSignatureLineDialog::Apply()
m_xShapeProperties->setPropertyValue("Graphic", Any(xGraphic));
}
OUString SignSignatureLineDialog::getCDataString(const OUString& rString)
{
return "<![CDATA[" + rString + "]]>";
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
......@@ -101,8 +101,8 @@ void SignatureLineDialog::Apply()
// Read svg and replace placeholder texts
OUString aSvgImage(getSignatureImage());
aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", aSignerName);
aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", aSignerTitle);
aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", getCDataString(aSignerName));
aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", getCDataString(aSignerTitle));
// These are only filled if the signature line is signed.
aSvgImage = aSvgImage.replaceAll("[SIGNATURE]", "");
......
......@@ -30,6 +30,11 @@ short SignatureLineDialogBase::execute()
return nRet;
}
OUString SignatureLineDialogBase::getCDataString(const OUString& rString)
{
return "<![CDATA[" + rString + "]]>";
}
OUString SignatureLineDialogBase::getSignatureImage()
{
OUString const svg(
......
......@@ -35,7 +35,6 @@ private:
void ValidateFields();
virtual void Apply() override;
OUString getCDataString(const OUString& rString);
DECL_LINK(chooseCertificate, weld::Button&, void);
};
......
......@@ -26,6 +26,7 @@ protected:
css::uno::Reference<css::frame::XModel> m_xModel;
OUString getSignatureImage();
virtual void Apply() = 0;
OUString getCDataString(const OUString& rString);
};
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment