mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use an own config setting for screenshot mode instead of experimental mode

Browse Source 
This is not an experimental feature and it should be possible to enable it
without enabling other features.

Change-Id: Idbdce23d0db2983a4eb1c8e1d02d15c43733f042
Reviewed-on: https://gerrit.libreoffice.org/30848
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt
2016-11-14 12:05:55 +01:00
parent 567580bddf
commit 9f36f90b61
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View File

@@ -5651,6 +5651,12 @@
</info>
<value>false</value>
</prop>
<prop oor:name="ScreenshotMode" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Determines whether the interactive screenshot mode should be enabled.</desc>
</info>
<value>false</value>
</prop>
<prop oor:name="CollectUsageInformation" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Determines whether the usage information (like what actions

6
vcl/source/window/layout.cxx
View File

@@ -198,9 +198,9 @@ void VclContainer::Command(const CommandEvent& rCEvt)
{
if (rCEvt.IsMouseEvent() && CommandEventId::ContextMenu == rCEvt.GetCommand())
{
const bool bIsExperimentalMode(officecfg::Office::Common::Misc::ExperimentalMode::get());
const bool bScreenshotMode(officecfg::Office::Common::Misc::ScreenshotMode::get());
if (bIsExperimentalMode)
if (bScreenshotMode)
{
bool bVisibleChildren(false);
vcl::Window* pChild(nullptr);
@@ -326,7 +326,7 @@ void VclContainer::Command(const CommandEvent& rCEvt)
// consume event when:
// - CommandEventId::ContextMenu
// - bIsExperimentalMode
// - bScreenshotMode
// - bVisibleChildren
return;
}