[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

Caolán McNamara caolanm at redhat.com
Wed Sep 10 01:15:12 PDT 2014


 sw/source/core/uibase/utlui/glbltree.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d468b72a27f9c20cea1c3df186ac7eb267df9a5b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 9 15:03:37 2014 +0100

    Resolves: fdo#83251 menu on master doc insert disappears
    
    on releaseing mouse button
    
    (cherry picked from commit a29ece90621b2fef9126a6e9a976561ce5d1b461)
    
    Conflicts:
    	sw/source/uibase/utlui/glbltree.cxx
    
    Change-Id: Ia2f8da6e62d708744707b8187d5961fe12169eb8
    Reviewed-on: https://gerrit.libreoffice.org/11362
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx
index 3c4b938..07ebd80 100644
--- a/sw/source/core/uibase/utlui/glbltree.cxx
+++ b/sw/source/core/uibase/utlui/glbltree.cxx
@@ -396,7 +396,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
         pMenu->EnableItem(CTX_INSERT_FILE,      0 != (nEnableFlags & ENABLE_INSERT_FILE));
         pMenu->EnableItem(CTX_INSERT_NEW_FILE,  0 != (nEnableFlags & ENABLE_INSERT_FILE));
         pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
-        pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+        pMenu->Execute(pBox, pBox->GetItemRect(nTbxId));
         delete pMenu;
         pBox->EndSelection();
         pBox->Invalidate();
@@ -411,7 +411,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox)
         }
         pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL));
         pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
-        pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+        pMenu->Execute(pBox, pBox->GetItemRect(nTbxId));
         delete pMenu;
         pBox->EndSelection();
         pBox->Invalidate();


More information about the Libreoffice-commits mailing list