diff options
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/contentenumeration.hxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/fileview.cxx | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx index 9dcfae687883..bc2180c53c47 100644 --- a/fpicker/source/office/contentenumeration.hxx +++ b/fpicker/source/office/contentenumeration.hxx @@ -19,6 +19,10 @@ #pragma once +#include <sal/config.h> + +#include <memory> + #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <salhelper/thread.hxx> #include <ucbhelper/content.hxx> diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index d8e8ce6f7d72..d3b5237384f4 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -642,16 +642,20 @@ void ViewTabListBox_Impl::DeleteEntries() eResult = aDlg.run(); } - if ( ( eResult == svtools::QUERYDELETE_ALL ) || - ( eResult == svtools::QUERYDELETE_YES ) ) + bool bDeleted = false; + + if (eResult == svtools::QUERYDELETE_ALL || eResult == svtools::QUERYDELETE_YES) { if ( Kill( aURL ) ) { - delete reinterpret_cast<SvtContentEntry*>(mxTreeView->get_id(rCurEntry).toInt64()); mpParent->EntryRemoved( aURL ); + bDeleted = true; } } + if (!bDeleted) + mxTreeView->unselect(rCurEntry); + return false; }); |