[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 3 commits - basctl/uiconfig chart2/uiconfig dbaccess/uiconfig extensions/uiconfig framework/uiconfig include/sfx2 include/svtools reportdesign/uiconfig sc/uiconfig sd/uiconfig sfx2/source starmath/uiconfig svtools/inc sw/uiconfig
Samuel Mehrbrodt (via logerrit)
logerrit at kemper.freedesktop.org
Fri Feb 26 15:14:25 UTC 2021
basctl/uiconfig/basicide/menubar/menubar.xml | 2 -
chart2/uiconfig/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbapp/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbquery/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbrelation/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbtable/menubar/menubar.xml | 2 -
dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 2 -
extensions/uiconfig/sbibliography/menubar/menubar.xml | 2 -
framework/uiconfig/startmodule/menubar/menubar.xml | 2 -
include/sfx2/docmacromode.hxx | 7 +++--
include/svtools/sfxecode.hxx | 1
reportdesign/uiconfig/dbreport/menubar/menubar.xml | 2 -
sc/uiconfig/scalc/menubar/menubar.xml | 2 -
sc/uiconfig/scalc/ui/notebookbar.ui | 7 -----
sd/uiconfig/sdraw/menubar/menubar.xml | 2 -
sd/uiconfig/sdraw/ui/notebookbar.ui | 7 -----
sd/uiconfig/sdraw/ui/notebookbar_compact.ui | 7 -----
sd/uiconfig/simpress/menubar/menubar.xml | 2 -
sd/uiconfig/simpress/ui/notebookbar.ui | 7 -----
sd/uiconfig/simpress/ui/notebookbar_compact.ui | 7 -----
sfx2/source/doc/docmacromode.cxx | 23 ++++++++++++++----
sfx2/source/doc/objmisc.cxx | 3 +-
starmath/uiconfig/smath/menubar/menubar.xml | 2 -
svtools/inc/errtxt.hrc | 1
sw/uiconfig/sglobal/menubar/menubar.xml | 2 -
sw/uiconfig/sweb/menubar/menubar.xml | 2 -
sw/uiconfig/swform/menubar/menubar.xml | 2 -
sw/uiconfig/swreport/menubar/menubar.xml | 2 -
sw/uiconfig/swriter/menubar/menubar.xml | 2 -
sw/uiconfig/swriter/ui/notebookbar.ui | 7 -----
sw/uiconfig/swxform/menubar/menubar.xml | 2 -
31 files changed, 28 insertions(+), 89 deletions(-)
New commits:
commit 345987cb9fb5a7e861598d45d1d17e3f5b7253de
Author: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Fri Feb 26 15:16:45 2021 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
CommitDate: Fri Feb 26 15:16:45 2021 +0100
Remove 'Get involved' from menu
Change-Id: I917ba9602cf3b010a2eb11f377d42a9f6f9080c4
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index 73a3612703e2..68f7cbab6742 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -166,8 +166,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml
index e588977b62be..dca2eaff7efe 100644
--- a/chart2/uiconfig/menubar/menubar.xml
+++ b/chart2/uiconfig/menubar/menubar.xml
@@ -167,8 +167,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbapp/menubar/menubar.xml b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
index a577e14fbc23..34d8b8f5dc0e 100644
--- a/dbaccess/uiconfig/dbapp/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbapp/menubar/menubar.xml
@@ -154,8 +154,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbquery/menubar/menubar.xml b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
index ed335167a2e7..e896abfa00da 100644
--- a/dbaccess/uiconfig/dbquery/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbquery/menubar/menubar.xml
@@ -109,8 +109,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
index 9b9a85aaceba..fbeda4a1e9c2 100644
--- a/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbrelation/menubar/menubar.xml
@@ -93,8 +93,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbtable/menubar/menubar.xml b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
index 820dd9a0892c..4ef7c80a26a2 100644
--- a/dbaccess/uiconfig/dbtable/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtable/menubar/menubar.xml
@@ -93,8 +93,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index 7a80e2a432b7..c858d89878e4 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -118,8 +118,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/extensions/uiconfig/sbibliography/menubar/menubar.xml b/extensions/uiconfig/sbibliography/menubar/menubar.xml
index 00871a58aefe..65f55fff0012 100644
--- a/extensions/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/uiconfig/sbibliography/menubar/menubar.xml
@@ -67,8 +67,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index af3c832e0486..1c4c5cf4202b 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -68,8 +68,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/reportdesign/uiconfig/dbreport/menubar/menubar.xml b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
index 8a124b83f6c1..e31c19bffcc3 100644
--- a/reportdesign/uiconfig/dbreport/menubar/menubar.xml
+++ b/reportdesign/uiconfig/dbreport/menubar/menubar.xml
@@ -284,8 +284,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 5b01a2d49c0f..ac0092ad062b 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -781,8 +781,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 9cf319a888e6..4f888da7004a 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -776,13 +776,6 @@
<property name="action_name">.uno:SafeMode</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:GetInvolved</property>
- </object>
- </child>
<child>
<object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
<property name="visible">True</property>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index de591c375c8a..87d81f5446be 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -638,8 +638,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index b5ada6927374..2a541d470184 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -832,13 +832,6 @@
<property name="action_name">.uno:SafeMode</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:GetInvolved</property>
- </object>
- </child>
<child>
<object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
<property name="visible">True</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
index b6d7942476a4..53e3d6da180c 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_compact.ui
@@ -874,13 +874,6 @@
<property name="action_name">.uno:SafeMode</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:GetInvolved</property>
- </object>
- </child>
<child>
<object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
<property name="visible">True</property>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 8eb30ce6cffd..cec28407957b 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -678,8 +678,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 28c303527bfd..fce116aec371 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -754,13 +754,6 @@
<property name="action_name">.uno:SafeMode</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:GetInvolved</property>
- </object>
- </child>
<child>
<object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
<property name="visible">True</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index 675a9148bdcd..67c811e31958 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -873,13 +873,6 @@
<property name="action_name">.uno:SafeMode</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:GetInvolved</property>
- </object>
- </child>
<child>
<object class="GtkSeparatorMenuItem" id="MenuHelp-separator2">
<property name="visible">True</property>
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index 3aea34038a19..f1dbdf8745a9 100644
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -160,8 +160,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index e84001726d20..9fc2e154628a 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -788,8 +788,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 2b85d5b540ba..2c61bd98711d 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -659,8 +659,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 5c06e544a2e0..ab27ec3cc546 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -740,8 +740,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 22cb08a35b1d..045696fa6cbe 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -699,8 +699,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 4461ee345a33..f84f9c18de07 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -799,8 +799,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index f104e9309649..e19282968a57 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -536,13 +536,6 @@
<property name="can_focus">False</property>
</object>
</child>
- <child>
- <object class="GtkMenuItem" id="MenuHelp-GetInvolved">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:GetInvolved</property>
- </object>
- </child>
<child>
<object class="GtkSeparatorMenuItem" id="MenuHelp-separator3">
<property name="visible">True</property>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index d1dc13fac4a7..84a0a247722a 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -787,8 +787,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SafeMode"/>
<menu:menuseparator/>
- <menu:menuitem menu:id=".uno:GetInvolved"/>
- <menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShowLicense"/>
<menu:menuitem menu:id=".uno:About"/>
</menu:menupopup>
commit a4cd681b520451ec67e309be72442847bf475647
Author: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Thu Jan 28 13:50:30 2021 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
CommitDate: Fri Feb 26 15:05:04 2021 +0100
Fix TODO: Remove parameter
Left-over from 1dc71daf7fa7204a98c75dac680af664ab9c8edb
At this point macros are already disabled when content signature is
missing or invalid, and this call does not change it.
Change-Id: I5a609c07dea115d45fa8f71195b2455c13381e73
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a2e43227e195..4afaf1cc5d7b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1624,7 +1624,7 @@ bool SfxObjectShell::AdjustMacroMode()
CheckEncryption_Impl( xInteraction );
- return pImpl->aMacroMode.adjustMacroMode( xInteraction, true /*TODO*/ );
+ return pImpl->aMacroMode.adjustMacroMode( xInteraction );
}
vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium const * pLoadingMedium )
commit e0f61eed443b0ae2ef51048007c02cd9675f340c
Author: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Mon Jan 18 15:24:48 2021 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
CommitDate: Fri Feb 26 15:05:04 2021 +0100
Improve macro checks
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109552
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens at allotropia.de>
(cherry picked from commit 1dc71daf7fa7204a98c75dac680af664ab9c8edb)
Change-Id: Ie40801df8866b52c1458e020ffa9cba120720af7
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index a15bbbe9ba56..bd4f13fb016c 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -220,7 +220,8 @@ namespace sfx2
<TRUE/> if and only if macro execution in this document is allowed.
*/
bool adjustMacroMode(
- const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction,
+ bool bHasValidContentSignature = false
);
/** determines whether macro execution is disallowed
@@ -286,11 +287,13 @@ namespace sfx2
*/
bool
checkMacrosOnLoading(
- const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction,
+ bool bHasValidContentSignature = false
);
private:
std::shared_ptr< DocumentMacroMode_Data > m_xData;
+ bool m_bNeedsContentSigned;
};
diff --git a/include/svtools/sfxecode.hxx b/include/svtools/sfxecode.hxx
index 3cdad87f4cd9..ccdccae9014b 100644
--- a/include/svtools/sfxecode.hxx
+++ b/include/svtools/sfxecode.hxx
@@ -37,6 +37,7 @@ class ErrCode;
#define ERRCODE_SFX_CANTCREATEBACKUP ErrCode(ErrCodeArea::Sfx, ErrCodeClass::Create, 50)
#define ERRCODE_SFX_MACROS_SUPPORT_DISABLED ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 51)
#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 52)
+#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_CONTENT_UNSIGNED ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 53)
#define ERRCODE_SFX_SHARED_NOPASSWORDCHANGE ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 54)
#define ERRCODE_SFX_INCOMPLETE_ENCRYPTION ErrCode(WarningFlag::Yes, ErrCodeArea::Sfx, ErrCodeClass::NONE, 55)
#define ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC \
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 492bd0a63009..2fa7b968fc41 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -113,6 +113,10 @@ namespace sfx2
#endif
}
+ void lcl_showMacrosDisabledUnsignedContentError( const Reference< XInteractionHandler >& rxHandler, bool& rbAlreadyShown )
+ {
+ lcl_showGeneralSfxErrorOnce( rxHandler, ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_CONTENT_UNSIGNED, rbAlreadyShown );
+ }
bool lcl_showMacroWarning( const Reference< XInteractionHandler >& rxHandler,
const OUString& rDocumentLocation )
@@ -125,7 +129,8 @@ namespace sfx2
//= DocumentMacroMode
DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess& rDocumentAccess )
- :m_xData( new DocumentMacroMode_Data( rDocumentAccess ) )
+ :m_xData( new DocumentMacroMode_Data( rDocumentAccess ) ),
+ m_bNeedsContentSigned(false)
{
}
@@ -141,7 +146,7 @@ namespace sfx2
return false;
}
- bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction )
+ bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction, bool bHasValidContentSignature )
{
sal_uInt16 nMacroExecutionMode = m_xData->m_rDocumentAccess.getCurrentMacroExecMode();
@@ -238,6 +243,14 @@ namespace sfx2
lcl_showDocumentMacrosDisabledError(rxInteraction, m_xData->m_bDocMacroDisabledMessageShown);
return disallowMacroExecution();
}
+ else if ( m_xData->m_rDocumentAccess.macroCallsSeenWhileLoading() &&
+ bHasTrustedMacroSignature &&
+ !bHasValidContentSignature)
+ {
+ // When macros are signed, and the document has events which call macros, the document content needs to be signed too.
+ lcl_showMacrosDisabledUnsignedContentError(rxInteraction, m_xData->m_bDocMacroDisabledMessageShown);
+ return disallowMacroExecution();
+ }
else if ( bHasTrustedMacroSignature )
{
// there is trusted macro signature, allow macro execution
@@ -392,7 +405,7 @@ namespace sfx2
}
- bool DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& rxInteraction )
+ bool DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& rxInteraction, bool bHasValidContentSignature )
{
bool bAllow = false;
if ( SvtSecurityOptions().IsMacroDisabled() )
@@ -404,7 +417,9 @@ namespace sfx2
{
if (m_xData->m_rDocumentAccess.documentStorageHasMacros() || hasMacroLibrary() || m_xData->m_rDocumentAccess.macroCallsSeenWhileLoading())
{
- bAllow = adjustMacroMode( rxInteraction );
+ if (m_xData->m_rDocumentAccess.macroCallsSeenWhileLoading())
+ m_bNeedsContentSigned = true;
+ bAllow = adjustMacroMode( rxInteraction, bHasValidContentSignature );
}
else if ( !isMacroExecutionDisallowed() )
{
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 17243ffc826a..a2e43227e195 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -956,7 +956,8 @@ void SfxObjectShell::CheckSecurityOnLoading_Impl()
CheckEncryption_Impl( xInteraction );
// check macro security
- pImpl->aMacroMode.checkMacrosOnLoading( xInteraction );
+ const bool bHasValidContentSignature = HasValidSignatures();
+ pImpl->aMacroMode.checkMacrosOnLoading( xInteraction, bHasValidContentSignature );
}
@@ -1623,7 +1624,7 @@ bool SfxObjectShell::AdjustMacroMode()
CheckEncryption_Impl( xInteraction );
- return pImpl->aMacroMode.adjustMacroMode( xInteraction );
+ return pImpl->aMacroMode.adjustMacroMode( xInteraction, true /*TODO*/ );
}
vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium const * pLoadingMedium )
diff --git a/svtools/inc/errtxt.hrc b/svtools/inc/errtxt.hrc
index e5694df18ffd..2f9b4919ad81 100644
--- a/svtools/inc/errtxt.hrc
+++ b/svtools/inc/errtxt.hrc
@@ -120,6 +120,7 @@ const ErrMsgCode RID_ERRHDL[] =
{ NC_("RID_ERRHDL", "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."), ERRCODE_SFX_NOMOREDOCUMENTSALLOWED },
{ NC_("RID_ERRHDL", "Could not create backup copy.") , ERRCODE_SFX_CANTCREATEBACKUP },
{ NC_("RID_ERRHDL", "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."), ERRCODE_SFX_MACROS_SUPPORT_DISABLED },
+ { NC_("RID_ERRHDL", "Execution of macros is disabled. Macros are signed, but the document (containing document events) is not signed."), ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_CONTENT_UNSIGNED },
{ NC_("RID_ERRHDL", "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in %PRODUCTNAME - Preferences - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available.") , ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC },
{ NC_("RID_ERRHDL", "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available.") , ERRCODE_SFX_DOCUMENT_MACRO_DISABLED },
{ NC_("RID_ERRHDL", "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n ") , ERRCODE_SFX_INCOMPLETE_ENCRYPTION },
More information about the Libreoffice-commits
mailing list