mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop winId and KWindowSystem::setMainWindow

Browse Source 
as fpicker isn't a separate binary anymore

Change-Id: I9c9c57a21f5dc79714f37f8bc65b998887c29e78
This commit is contained in:
Katarina Behrens
2018-06-15 15:30:16 +02:00
parent 2d92d754ae
commit 47b0285d7b
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vcl/unx/kde5/KDE5FilePicker.cxx
View File

@@ -40,8 +40,6 @@ KDE5FilePicker::~KDE5FilePicker()
delete _dialog; delete _dialog;
} }
void KDE5FilePicker::setWinId(sal_uIntPtr winId) { _winId = winId; }
bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e) bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
{ {
if (e->type() == QEvent::Show && o->isWidgetType()) if (e->type() == QEvent::Show && o->isWidgetType())
@@ -49,7 +47,6 @@ bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
auto* w = static_cast<QWidget*>(o); auto* w = static_cast<QWidget*>(o);
if (!w->parentWidget() && w->isModal()) if (!w->parentWidget() && w->isModal())
{ {
KWindowSystem::setMainWindow(w, _winId);
if (auto* fileWidget = w->findChild<KFileWidget*>({}, Qt::FindDirectChildrenOnly)) if (auto* fileWidget = w->findChild<KFileWidget*>({}, Qt::FindDirectChildrenOnly))
fileWidget->setCustomWidget(_extraControls); fileWidget->setCustomWidget(_extraControls);
} }

4
vcl/unx/kde5/KDE5FilePicker.hxx
View File

@@ -78,8 +78,6 @@ protected:
//layout for extra custom controls //layout for extra custom controls
QGridLayout* _layout; QGridLayout* _layout;
sal_uIntPtr _winId;
bool allowRemoteUrls; bool allowRemoteUrls;
public: public:
@@ -140,8 +138,6 @@ public:
// XFilePicker2 functions // XFilePicker2 functions
virtual css::uno::Sequence<OUString> SAL_CALL getSelectedFiles() override; virtual css::uno::Sequence<OUString> SAL_CALL getSelectedFiles() override;
void setWinId(sal_uIntPtr winId);
// XInitialization // XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override; virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;

1
vcl/unx/kde5/KDE5FilePicker2.cxx
View File

@@ -82,7 +82,6 @@ KDE5FilePicker::KDE5FilePicker(QFileDialog::FileMode eMode)
, _dialog(new QFileDialog(nullptr, {}, QDir::homePath())) , _dialog(new QFileDialog(nullptr, {}, QDir::homePath()))
, _extraControls(new QWidget) , _extraControls(new QWidget)
, _layout(new QGridLayout(_extraControls)) , _layout(new QGridLayout(_extraControls))
, _winId(0)
, allowRemoteUrls(false) , allowRemoteUrls(false)
{ {
_dialog->setSupportedSchemes({ _dialog->setSupportedSchemes({