[Libreoffice-commits] core.git: 2 commits - sw/source

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d87e1859cbd41a623f48a9522507ab0adc8e7324
Author:     Jim Raykowski <rayk...@gmail.com>
AuthorDate: Thu Sep 15 14:20:23 2022 -0800
Commit:     Jim Raykowski <rayk...@gmail.com>
CommitDate: Fri Sep 16 22:11:26 2022 +0200

    SwNavigator: Make Drawing objects context menu entry 'Edit..' edit
    
    This patch uses SwEditWin::KeyInput handling of KEY_RETURN for the
    Drawing objects context menu entry 'Edit...' which moves focus of the
    selected drawing object into the text box of the drawing object.
    Previous to this patch the 'Edit...' menu entry would select the
    drawing object the same as the 'Go to' menu entry.
    
    Change-Id: I4d6d278e25badd086dc718c4c7ea02ce6330a45d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140037
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 2dfc91fbfdf1..68b77a6d9249 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -5110,6 +5110,12 @@ void SwContentTree::EditEntry(const weld::TreeIter& 
rEntry, EditEntryMode nMode)
                 nSlot = SID_DELETE;
             else if(nMode == EditEntryMode::RENAME)
                 nSlot = FN_NAME_SHAPE;
+            else if (nMode == EditEntryMode::EDIT)
+            {
+                vcl::KeyCode aKeyCode(KEY_RETURN, false, false, false, false);
+                KeyEvent aKeyEvent(0, aKeyCode);
+                m_pActiveShell->GetWin()->KeyInput(aKeyEvent);
+            }
         break;
         case ContentTypeId::FOOTNOTE:
         case ContentTypeId::ENDNOTE:
commit a5eb6660ed85afb706527704e1170a35e0677cf8
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Sep 16 16:33:05 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Sep 16 22:11:13 2022 +0200

    cid#1514676 perturb mysterious Logically dead code warning
    
    throw a const at it
    
    Change-Id: I273c85329765e1655cfde9efdf5422e5bb90ee57
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140082
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 55e51b52d51b..2dfc91fbfdf1 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1878,7 +1878,7 @@ IMPL_LINK(SwContentTree, CommandHdl, const CommandEvent&, 
rCEvt, bool)
     if (bRemoveDeleteFieldEntry)
         xPop->remove("deletefield");
 
-    bool bRemoveDeleteEntry =
+    const bool bRemoveDeleteEntry =
             bRemoveDeleteChapterEntry ||
             bRemoveDeleteTableEntry ||
             bRemoveDeleteFrameEntry ||