diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-11-14 12:05:55 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-11-16 22:46:39 +0000 |
| commit | 9f36f90b614007540fbcc1db850e00ca5f73c14d (patch) | |
| tree | 5d70550979bfead3676d7c1196e7c3e82e913ef5 | |
| parent | 567580bddfa7b3d437b072698de77968c6513513 (diff) | |
Use an own config setting for screenshot mode instead of experimental mode
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>
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 6 | ||||
| -rw-r--r-- | vcl/source/window/layout.cxx | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index eeff8801d3f0..c5129ed4536c 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -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 diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 800a6ecfe78d..5f921c2b5da8 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -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; } |