[Libreoffice-commits] core.git: officecfg/registry vcl/source

[Samuel Mehrbrodt]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    6 ++++++
 vcl/source/window/layout.cxx                               |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 9f36f90b614007540fbcc1db850e00ca5f73c14d
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Nov 14 12:05:55 2016 +0100

    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 at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index eeff880..c5129ed 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 800a6ec..5f921c2 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;
                 }