commit 2421b42c006e1a9c9059c8a256685d2124f4e396
author Caolán McNamara <caolanm@redhat.com> Mon Dec 17 16:53:35 2018 +0000
committer Caolán McNamara <caolanm@redhat.com> Tue Dec 18 09:56:50 2018 +0100
tree 96c813d3c237b156a975e3cc1b5f4420b777e85b
parent d9f02548f29678b8b7fc3a6c714ab144bd728005

Resolves: tdf#122153 keep Execute for modal dialogs

and not modeless ones

cause you get one main loop running inside another, and everything
is running inside the modeless dialog main loop until it exits.

Change-Id: I45e92380288727669e287b62e84b815d5dc1960c
Reviewed-on: https://gerrit.libreoffice.org/65282
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c821da3ecc3c309be2ec2db204a4c853b53fa979)
Reviewed-on: https://gerrit.libreoffice.org/65292

filter/source/xsltdialog/xmlfilterdialogcomponent.cxx

diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 0e55cd3..31e69c3 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -265,7 +265,6 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* 
        mpDialog->Close();
}


void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ )
{
    // we are going down, so dispose us!
@@ -276,35 +275,41 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source 
{
}


void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ )
{
}


sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  )
sal_Int16 SAL_CALL XMLFilterDialogComponent::execute()
{
    ::SolarMutexGuard aGuard;

    if( nullptr == mpDialog )
    bool bLaunch = false;
    if (!mpDialog)
    {
        Reference< XComponent > xComp( this );
        if (mxParent.is())
            mpDialog = VclPtr<XMLFilterSettingsDialog>::Create(VCLUnoHelper::GetWindow(mxParent), mxContext);
        else
            mpDialog = VclPtr<XMLFilterSettingsDialog>::Create(nullptr, mxContext, Dialog::InitFlag::NoParent);
        mpDialog->Execute();
        bLaunch = true;
    }
    else if( !mpDialog->IsVisible() )

    mpDialog->UpdateWindow();

    if (!bLaunch)
    {
        mpDialog->Execute();
        mpDialog->ToTop();
        return 0;
    }
    mpDialog->ToTop();

    mpDialog->StartExecuteAsync([this](sal_Int32)
    {
        mpDialog.reset();
    });

    return 0;
}


void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArguments )
{
    for(const Any& rArgument : aArguments)
@@ -320,7 +325,6 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu
    }
}


extern "C"
{
SAL_DLLPUBLIC_EXPORT void * xsltdlg_component_getFactory(

filter/source/xsltdialog/xmlfiltersettingsdialog.cxx

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 5ef80ab..d54ee23 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -177,15 +177,13 @@ IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl, SvTreeListBox*, bo
    return false;
}

short XMLFilterSettingsDialog::Execute()
void XMLFilterSettingsDialog::UpdateWindow()
{
    m_pCtrlFilterList->GrabFocus();
    disposeFilterList();
    m_pFilterListBox->Clear();
    initFilterList();
    updateStates();

    return ModelessDialog::Execute();
}

void XMLFilterSettingsDialog::updateStates()

filter/source/xsltdialog/xmlfiltersettingsdialog.hxx

diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 072c5d4..7ca7d43 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -92,7 +92,7 @@ public:
    DECL_LINK(SelectionChangedHdl_Impl, SvTreeListBox*, void );
    DECL_LINK(DoubleClickHdl_Impl, SvTreeListBox*, bool );

    virtual short Execute() override;
    void    UpdateWindow();

    void    onNew();
    void    onEdit();