diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-21 09:21:42 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-21 16:02:20 +0100 |
| commit | f62e5eaf5fa0bff571331e1adad518489929272d (patch) | |
| tree | 44ebd4af456cc334e291109530d35a88a7c37910 | |
| parent | 6eb87f03edc8a750e347e2fad8d7000244f8ecca (diff) | |
weld querycolmenu
Change-Id: I0b4e27b15b1526eb7122bc5eec98f8d389e58de1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108084
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 2b0104a4374f..38c51605a2e9 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1946,12 +1946,14 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) if (!static_cast<OQueryController&>(getDesignView()->getController()).isReadOnly()) { - VclBuilder aBuilder(nullptr, AllSettings::GetUIRootDir(), "dbaccess/ui/querycolmenu.ui", ""); - VclPtr<PopupMenu> aContextMenu(aBuilder.get_menu("menu")); - sal_uInt16 nItemId = aContextMenu->Execute(this, aMenuPos); - if (nItemId == aContextMenu->GetItemId("delete")) + ::tools::Rectangle aRect(aMenuPos, Size(1, 1)); + weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect); + std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/querycolmenu.ui")); + std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu")); + OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect); + if (sIdent == "delete") RemoveField(nColId); - else if (nItemId == aContextMenu->GetItemId("width")) + else if (sIdent == "width") adjustBrowseBoxColumnWidth( this, nColId ); } } |