diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-05-17 11:10:34 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-11-08 13:58:57 +0100 |
| commit | a266cfa742f6b03ea38da7dda6229b6d3db0e391 (patch) | |
| tree | a6694a1344af04988f9322257364dea52b6513fa /include | |
| parent | f6c5c8b14bd47aa31a37801ca27294e156d92dbb (diff) | |
Refactor SfxObjectShell sign methods
for signature line signing
Reviewed-on: https://gerrit.libreoffice.org/54473
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 0ca1659353cc9847f436280873e1047d2524395e)
Conflicts:
cui/source/dialogs/SignSignatureLineDialog.cxx
sfx2/source/doc/objserv.cxx
Change-Id: Iac4f3a248af53bdbf159e6e8d656e1dcbc3aacbf
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/storagehelper.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx index 778fb1c8ea25..e8fcc0d11cb7 100644 --- a/include/comphelper/storagehelper.hxx +++ b/include/comphelper/storagehelper.hxx @@ -193,6 +193,9 @@ public: const css::uno::Reference< css::embed::XStorage > &xStorage, const OUString& rURL, sal_uInt32 const nOpenMode, LifecycleProxy const & rNastiness ); + + static OUString + GetODFVersionFromStorage(css::uno::Reference<css::embed::XStorage> xStorage); }; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 5208e1a58184..72ff66e22660 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -205,6 +205,7 @@ private: // sal_False := new object bool bIsInGenerateThumbnail; //optimize thumbnail generate and store procedure to improve odt saving performance, i120030 bool mbAvoidRecentDocs; ///< Avoid adding to the recent documents list, if not necessary. + bool m_bAllowModifiedBackAfterSigning; enum TriState {undefined, yes, no}; TriState mbContinueImportOnFilterExceptions = undefined; // try to import as much as possible @@ -356,11 +357,14 @@ public: css::uno::Reference<css::text::XTextRange> const& xInsertPosition); bool ExportTo( SfxMedium &rMedium ); - // xmlsec05, check with SFX team + /** Returns to if preparing was succesful, else false. */ + bool PrepareForSigning(); + void AfterSigning(bool bSignSuccess, bool bSignScriptingContent); + bool HasValidSignatures(); SignatureState GetDocumentSignatureState(); void SignDocumentContent(); - void SignDocumentContent(css::uno::Reference<css::security::XCertificate> xCert, - const OUString& aSignatureLineId); + void SignSignatureLine(const OUString& aSignatureLineId, + const css::uno::Reference<css::security::XCertificate> xCert); SignatureState GetScriptingSignatureState(); void SignScriptingContent(); DECL_LINK(SignDocumentHandler, Button*, void); @@ -743,10 +747,6 @@ public: const css::uno::Reference< css::security::XDocumentDigitalSignatures >& xSigner = css::uno::Reference< css::security::XDocumentDigitalSignatures >() ); - SAL_DLLPRIVATE void ImplSign(const css::uno::Reference<css::security::XCertificate> xCert - = css::uno::Reference<css::security::XCertificate>(), - const OUString& aSignatureLineId = OUString(), bool bScriptingContent = false); - SAL_DLLPRIVATE bool QuerySaveSizeExceededModules_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); SAL_DLLPRIVATE bool QueryAllowExoticFormat_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, const OUString& rURL, |