commit 27ddda4356f18f464a41cc828cf42bf9d5e053b8
author Gabor Kelemen <kelemeng@ubuntu.com> Fri Jun 10 10:28:36 2022 +0200
committer Thorsten Behrens <thorsten.behrens@allotropia.de> Thu Jun 16 00:08:20 2022 +0200
tree f7a95b5fb986917bd845c1d48d7ce50d7be1be8f
parent bae9d1d5e1e5d7e962b8f22d2c8b5ce8e9e8f61e

tdf#149351 Add a 'Turn off mouse as pen' shortcut

for UX compatibility with PP: Ctrl-A turns off 'mouse as pen' mode

Change-Id: I0379580f4034f07f044dc1079c14898f3014face
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135579
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
(cherry picked from commit 76f7f0c167a5148c01cdb1e0d8ea56b905f5a875)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135849
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>

officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu

diff --git a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index 4f99dae..b21e67f 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -1163,6 +1163,14 @@
            <value xml:lang="en-US">Switches monitors</value>
          </prop>
        </node>
        <node oor:name="z" oor:op="replace">
          <prop oor:name="Left">
            <value xml:lang="en-US">Ctrl-'A'</value>
          </prop>
          <prop oor:name="Right">
            <value xml:lang="en-US">Turn off pointer as pen mode</value>
          </prop>
        </node>
      </node>
    </node>
  </node>

sd/source/ui/slideshow/slideshowimpl.cxx

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3215a55..89a8ac9 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1816,6 +1816,15 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
                setUsePen( !mbUsePen );
                break;

            // tdf#149351 Ctrl+A disables pointer as pen mode
            case KEY_A:
                if(rKEvt.GetKeyCode().IsMod1())
                {
                    setUsePen( false );
                    break;
                }
            break;

            case KEY_E:
                setEraseAllInk( true );
                updateSlideShow();

sdext/source/presenter/PresenterController.cxx

diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 5b501db..1062d89 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -878,6 +878,17 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
            }
            break;

        // tdf#149351 Ctrl+A disables pointer as pen mode
        case awt::Key::A:
            if (mxSlideShowController.is())
            {
                if (rEvent.Modifiers == awt::KeyModifier::MOD1)
                {
                    mxSlideShowController->setUsePen( false );
                }
            }
            break;

        case awt::Key::E:
            if (mxSlideShowController.is())
            {