summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-09 15:03:37 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-09-10 08:14:48 +0000
commitd468b72a27f9c20cea1c3df186ac7eb267df9a5b (patch)
tree10f2c184e8473841389e675641f26f6c52a55ecd
parent1af3d8a211852da5a1f130aa22e00ab329301ee7 (diff)
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@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--sw/source/core/uibase/utlui/glbltree.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx
index 3c4b938beb9c..07ebd8028b82 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();