diff options
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/docmacromode.hxx | 18 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/sfx.hrc | 2 |
3 files changed, 3 insertions, 19 deletions
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 01a1d7a3a593..e2ffeab68c43 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -149,24 +149,6 @@ namespace sfx2 virtual bool hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ) = 0; - /** shows a warning that the document's signature is broken - - Here, a similar note applies as to getScriptingSignatureState: This method doesn't - really belong here. It's just there because SfxObjectShell_Impl::bSignatureErrorIsShown - is not accessible where the method is called. - So, once the signature handling has been oursourced from SfxObjectShell/_Impl, so it - is re-usable in non-SFX contexts as well, this method here is also unneeded, probably. - - @param _rxInteraction - the interaction handler to use for showing the warning. It is exactly the same - as passed to DocumentMacroMode::adjustMacroMode, so it is <NULL/> if and - only if the instance passed to that method was <NULL/>. - */ - virtual void - showBrokenSignatureWarning( - const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction - ) const = 0; - protected: ~IMacroDocumentAccess() {} }; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 7a2e133c83fa..bd9640934714 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -684,7 +684,7 @@ public: SAL_DLLPRIVATE void InitOwnModel_Impl(); SAL_DLLPRIVATE void BreakMacroSign_Impl( bool bBreakMacroSing ); SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl(); - SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); + SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl(); SAL_DLLPRIVATE static SignatureState ImplCheckSignaturesInformation( const css::uno::Sequence< css::security::DocumentSignatureInformation >& aInfos ); SAL_DLLPRIVATE void CheckEncryption_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 5e2c759dab35..25e8355829f6 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -120,6 +120,8 @@ #define STR_CLASSIFIED_EXPORT_CONTROL (RID_SFX_START+136) #define STR_READONLY_SIGN (RID_SFX_START+137) #define STR_READONLY_PDF (RID_SFX_START+138) +#define STR_SIGNATURE_BROKEN (RID_SFX_START+139) +#define STR_SIGNATURE_SHOW (RID_SFX_START+140) #define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157) #define SFX_THUMBNAIL_TEXT (RID_SFX_START+158) |