diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-26 09:40:07 +0000 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2017-01-27 15:32:42 +0000 |
commit | 011bae55cdd24a1d3e42f0aa2fcfd98d3ddc9b14 (patch) | |
tree | d4590c36d3d389eaa0282c69476391859c4676a5 /sc/source/ui/dbgui/PivotLayoutDialog.cxx | |
parent | 53eb2fae381f4ed9d73bcc6d8e76a6f09777ba60 (diff) |
Resolves: tdf#104153 lookup what listbox an entry is dragged from
so we can find where its been dragged from in order to remove it from that
source, rather than relying that it comes from the previously focused listbox
Change-Id: Ie6aa1a311b46e5e9ee96cab05e0705b794b5eb0b
Reviewed-on: https://gerrit.libreoffice.org/33575
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/ui/dbgui/PivotLayoutDialog.cxx')
-rw-r--r-- | sc/source/ui/dbgui/PivotLayoutDialog.cxx | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 312fdd33dee7..5503c5e1d52d 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -70,8 +70,6 @@ ScPivotLayoutDialog::ScPivotLayoutDialog( ScViewData* pViewData, const ScDPObject* pPivotTableObject, bool bNewPivotTable) : ScAnyRefDlg (pSfxBindings, pChildWindow, pParent, "PivotTableLayout", "modules/scalc/ui/pivottablelayoutdialog.ui"), maPivotTableObject (*pPivotTableObject), - mpPreviouslyFocusedListBox(nullptr), - mpCurrentlyFocusedListBox(nullptr), mpViewData (pViewData), mpDocument (pViewData->GetDocument()), mbNewPivotTable (bNewPivotTable), @@ -189,8 +187,6 @@ ScPivotLayoutDialog::~ScPivotLayoutDialog() void ScPivotLayoutDialog::dispose() { - mpPreviouslyFocusedListBox.clear(); - mpCurrentlyFocusedListBox.clear(); mpListBoxField.clear(); mpListBoxPage.clear(); mpListBoxColumn.clear(); @@ -736,4 +732,17 @@ void ScPivotLayoutDialog::ToggleDestination() mpDestinationEdit->Enable(bSelection); } +ScPivotLayoutTreeListBase* ScPivotLayoutDialog::FindListBoxFor(SvTreeListEntry *pEntry) +{ + if (mpListBoxPage->HasEntry(pEntry)) + return mpListBoxPage.get(); + if (mpListBoxColumn->HasEntry(pEntry)) + return mpListBoxColumn.get(); + if (mpListBoxRow->HasEntry(pEntry)) + return mpListBoxRow.get(); + if (mpListBoxData->HasEntry(pEntry)) + return mpListBoxData.get(); + return nullptr; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |