diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-11-03 17:26:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2023-12-03 21:28:08 +0000 |
| commit | d96b41c136ad3c3f1730a0ad356b2da74b519e17 (patch) | |
| tree | 89f66fbc899d7a4286f6c01b8f11be0cfc58b3d4 /include/sfx2 | |
| parent | b723a1b0c76a1a8a3e696f762e1493da94aabb58 (diff) | |
default to ignoring libreoffice special-purpose protocols in calc hyperlink
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158911
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit b6062623b4d69c79e90e9365ac7c5e7f11986793)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159046
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit cfe5672c069d6ed3a62dfc3370fdfbc80b6de434)
(cherry picked from commit 5109649b65206ca6abd823fe2ccf07925e36d71b)
(cherry picked from commit 01e7c1682b544266f7b85d58127e878484ea46b0)
(cherry picked from commit ee4849d06b7db4dbb0bed9696c548ace8f8d8313)
(cherry picked from commit 1b0c07506acadd615c560cbaa67f4bcb17132c24)
(cherry picked from commit 1a30b62ac7c23dd12aee88f0b90d8a715c652475)
(cherry picked from commit 3a376837d591f09e79b7c706aefa75853a777230)
(cherry picked from commit f0e537b956efde03e97d04f77b9dda62c9c3251c)
Change-Id: Ib9f62be3acc05f24ca234dec0fec21e24579e9de
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/docmacromode.hxx | 5 | ||||
| -rw-r--r-- | include/sfx2/objsh.hxx | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index 19199f7a410e..923b5c631046 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -259,7 +259,10 @@ namespace sfx2 */ static bool storageHasMacros( const css::uno::Reference< css::embed::XStorage >& _rxStorage ); + bool hasMacros() const; + static bool containerHasBasicMacros( const css::uno::Reference< css::script::XLibraryContainer >& xContainter ); + /** checks the macro execution mode while loading the document. This must be called when the loading is effectively finished, but before any macro action @@ -286,7 +289,7 @@ namespace sfx2 bool checkMacrosOnLoading( const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction, - bool bHasValidContentSignature = false + bool bHasValidContentSignature, bool bHasMacros ); private: diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 7f14bce2f0c8..964e8f319037 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -437,6 +437,9 @@ public: void SetMacroCallsSeenWhileLoading(); bool GetMacroCallsSeenWhileLoading() const; + // true if the document had macros (or similar) on load to trigger warning user + bool GetHadCheckedMacrosOnLoad() const; + const css::uno::Sequence< css::beans::PropertyValue >& GetModifyPasswordInfo() const; bool SetModifyPasswordInfo( const css::uno::Sequence< css::beans::PropertyValue >& aInfo ); |