sd signature line: extract part of signature line UI from cui to svx

So the "sign existing pdf" code in sd can reuse that.

Change-Id: If51fae203ed0c68ed8e5e63368e60ae1c705bade
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95841
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

4 files changed, 11 insertions, 66 deletions

diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 10f80f72983d..80e8f9815053 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -31,6 +31,7 @@
 #include <utility>
 #include <vcl/graph.hxx>
 #include <vcl/weld.hxx>
+#include <svx/signaturelinehelper.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
@@ -167,33 +168,14 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, chooseCertificate, weld::Button&, void)
     if (!pShell->PrepareForSigning(m_xDialog.get()))
         return;
 
-    Reference<XDocumentDigitalSignatures> xSigner;
-    if (pShell->GetMedium()->GetFilter()->IsAlienFormat())
-    {
-        xSigner
-            = DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext());
-    }
-    else
-    {
-        OUString const aODFVersion(
-            comphelper::OStorageHelper::GetODFVersionFromStorage(pShell->GetStorage()));
-        xSigner = DocumentDigitalSignatures::createWithVersion(
-            comphelper::getProcessComponentContext(), aODFVersion);
-    }
-    xSigner->setParentWindow(m_xDialog->GetXWindow());
-    OUString aDescription;
-    CertificateKind certificateKind = CertificateKind_NONE;
-    // When signing ooxml, we only want X.509 certificates
-    if (pShell->GetMedium()->GetFilter()->IsAlienFormat())
-        certificateKind = CertificateKind_X509;
     Reference<XCertificate> xSignCertificate
-        = xSigner->selectSigningCertificateWithType(certificateKind, aDescription);
+        = svx::SignatureLineHelper::getSignatureCertificate(pShell, m_xDialog.get());
 
     if (xSignCertificate.is())
     {
         m_xSelectedCertifate = xSignCertificate;
-        m_xBtnChooseCertificate->set_label(xmlsec::GetContentPart(
-            xSignCertificate->getSubjectName(), xSignCertificate->getCertificateKind()));
+        m_xBtnChooseCertificate->set_label(
+            svx::SignatureLineHelper::getSignerName(xSignCertificate));
     }
     ValidateFields();
 }
@@ -229,15 +211,13 @@ void SignSignatureLineDialog::Apply()
 css::uno::Reference<css::graphic::XGraphic> SignSignatureLineDialog::getSignedGraphic(bool bValid)
 {
     // Read svg and replace placeholder texts
-    OUString aSvgImage(getSignatureImage());
+    OUString aSvgImage(svx::SignatureLineHelper::getSignatureImage());
     aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", getCDataString(m_aSuggestedSignerName));
     aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", getCDataString(m_aSuggestedSignerTitle));
 
     OUString aIssuerLine
         = CuiResId(RID_SVXSTR_SIGNATURELINE_SIGNED_BY)
-              .replaceFirst("%1",
-                            xmlsec::GetContentPart(m_xSelectedCertifate->getSubjectName(),
-                                                   m_xSelectedCertifate->getCertificateKind()));
+              .replaceFirst("%1", svx::SignatureLineHelper::getSignerName(m_xSelectedCertifate));
     aSvgImage = aSvgImage.replaceAll("[SIGNED_BY]", getCDataString(aIssuerLine));
     if (bValid)
         aSvgImage = aSvgImage.replaceAll("[INVALID_SIGNATURE]", "");
@@ -245,10 +225,7 @@ css::uno::Reference<css::graphic::XGraphic> SignSignatureLineDialog::getSignedGr
     OUString aDate;
     if (m_bShowSignDate && bValid)
     {
-        const SvtSysLocale aSysLocale;
-        const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
-        Date aDateTime(Date::SYSTEM);
-        aDate = rLocaleData.getDate(aDateTime);
+        aDate = svx::SignatureLineHelper::getLocalizedDate();
     }
     aSvgImage = aSvgImage.replaceAll("[DATE]", aDate);
 
@@ -278,16 +255,7 @@ css::uno::Reference<css::graphic::XGraphic> SignSignatureLineDialog::getSignedGr
     }
 
     // Create graphic
-    SvMemoryStream aSvgStream(4096, 4096);
-    aSvgStream.WriteOString(OUStringToOString(aSvgImage, RTL_TEXTENCODING_UTF8));
-    Reference<XInputStream> xInputStream(new utl::OSeekableInputStreamWrapper(aSvgStream));
-    Reference<XComponentContext> xContext(comphelper::getProcessComponentContext());
-    Reference<XGraphicProvider> xProvider = css::graphic::GraphicProvider::create(xContext);
-
-    Sequence<PropertyValue> aMediaProperties(1);
-    aMediaProperties[0].Name = "InputStream";
-    aMediaProperties[0].Value <<= xInputStream;
-    return xProvider->queryGraphic(aMediaProperties);
+    return svx::SignatureLineHelper::importSVG(aSvgImage);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/source/dialogs/SignatureLineDialog.cxx b/cui/source/dialogs/SignatureLineDialog.cxx
index e295e288e388..7f6caabc49d9 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -15,6 +15,7 @@
 #include <unotools/streamwrap.hxx>
 #include <utility>
 #include <vcl/weld.hxx>
+#include <svx/signaturelinehelper.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
@@ -111,7 +112,7 @@ void SignatureLineDialog::Apply()
     bool bShowSignDate(m_xCheckboxShowSignDate->get_active());
 
     // Read svg and replace placeholder texts
-    OUString aSvgImage(getSignatureImage());
+    OUString aSvgImage(svx::SignatureLineHelper::getSignatureImage());
     aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", getCDataString(aSignerName));
     aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", getCDataString(aSignerTitle));
 
@@ -122,16 +123,7 @@ void SignatureLineDialog::Apply()
     aSvgImage = aSvgImage.replaceAll("[DATE]", "");
 
     // Insert/Update graphic
-    SvMemoryStream aSvgStream(4096, 4096);
-    aSvgStream.WriteOString(OUStringToOString(aSvgImage, RTL_TEXTENCODING_UTF8));
-    Reference<XInputStream> xInputStream(new utl::OSeekableInputStreamWrapper(aSvgStream));
-    Reference<XComponentContext> xContext(comphelper::getProcessComponentContext());
-    Reference<XGraphicProvider> xProvider = css::graphic::GraphicProvider::create(xContext);
-
-    Sequence<PropertyValue> aMediaProperties(1);
-    aMediaProperties[0].Name = "InputStream";
-    aMediaProperties[0].Value <<= xInputStream;
-    Reference<XGraphic> xGraphic(xProvider->queryGraphic(aMediaProperties));
+    Reference<XGraphic> xGraphic = svx::SignatureLineHelper::importSVG(aSvgImage);
 
     bool bIsExistingSignatureLine = m_xExistingShapeProperties.is();
     Reference<XPropertySet> xShapeProps;
diff --git a/cui/source/dialogs/SignatureLineDialogBase.cxx b/cui/source/dialogs/SignatureLineDialogBase.cxx
index d72fa7b93f1d..50214308fe10 100644
--- a/cui/source/dialogs/SignatureLineDialogBase.cxx
+++ b/cui/source/dialogs/SignatureLineDialogBase.cxx
@@ -41,18 +41,4 @@ OUString SignatureLineDialogBase::getCDataString(const OUString& rString)
     return "<![CDATA[" + rString + "]]>";
 }
 
-OUString SignatureLineDialogBase::getSignatureImage()
-{
-    OUString aPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/filter/signature-line.svg");
-    rtl::Bootstrap::expandMacros(aPath);
-    SvFileStream aStream(aPath, StreamMode::READ);
-    if (aStream.GetError() != ERRCODE_NONE)
-    {
-        SAL_WARN("cui.dialogs", "failed to open signature-line.svg");
-    }
-
-    OString const svg = read_uInt8s_ToOString(aStream, aStream.remainingSize());
-    return OUString::fromUtf8(svg);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/cui/source/inc/SignatureLineDialogBase.hxx b/cui/source/inc/SignatureLineDialogBase.hxx
index 2e046d945d80..3b065fe87838 100644
--- a/cui/source/inc/SignatureLineDialogBase.hxx
+++ b/cui/source/inc/SignatureLineDialogBase.hxx
@@ -24,7 +24,6 @@ public:
 
 protected:
     css::uno::Reference<css::frame::XModel> m_xModel;
-    static OUString getSignatureImage();
     virtual void Apply() = 0;
     static OUString getCDataString(const OUString& rString);
 };