diff options
| -rw-r--r-- | cui/source/dialogs/AdditionsDialog.cxx | 6 | ||||
| -rw-r--r-- | cui/uiconfig/ui/additionsdialog.ui | 1 | ||||
| -rw-r--r-- | include/unotools/ucbstreamhelper.hxx | 2 | ||||
| -rw-r--r-- | sw/qa/uitest/options/optionsDialog.py | 5 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/ucbstreamhelper.cxx | 5 |
5 files changed, 10 insertions, 9 deletions
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index 45a2ffadd72b..ab91e47cd21b 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -70,8 +70,7 @@ std::string ucbGet(const OUString& rURL) { try { - auto const s = utl::UcbStreamHelper::CreateStream( - rURL, StreamMode::STD_READ, css::uno::Reference<css::task::XInteractionHandler>()); + auto const s = utl::UcbStreamHelper::CreateStream(rURL, StreamMode::STD_READ); if (!s) { SAL_WARN("cui.dialogs", "CreateStream <" << rURL << "> failed"); @@ -522,7 +521,10 @@ AdditionsDialog::getInstalledExtensions() void AdditionsDialog::SetProgress(const OUString& rProgress) { if (rProgress.isEmpty()) + { m_xLabelProgress->hide(); + m_xButtonClose->set_sensitive(true); + } else { SolarMutexGuard aGuard; diff --git a/cui/uiconfig/ui/additionsdialog.ui b/cui/uiconfig/ui/additionsdialog.ui index cd072fe47f57..7671a5bf2fd9 100644 --- a/cui/uiconfig/ui/additionsdialog.ui +++ b/cui/uiconfig/ui/additionsdialog.ui @@ -146,6 +146,7 @@ <object class="GtkButton" id="buttonClose"> <property name="label">gtk-close</property> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="valign">end</property> diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index 9f16bb8fc0de..69bae538b316 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -33,14 +33,12 @@ namespace com::sun::star::io } namespace com::sun::star::awt { class XWindow; } -namespace com::sun::star::task { class XInteractionHandler; } namespace utl { class UNOTOOLS_DLLPUBLIC UcbStreamHelper { public: - static std::unique_ptr<SvStream> CreateStream(const OUString& rFileName, StreamMode eOpenMode, css::uno::Reference<css::task::XInteractionHandler> const & handler); static std::unique_ptr<SvStream> CreateStream(const OUString& rFileName, StreamMode eOpenMode, css::uno::Reference<css::awt::XWindow> xParentWin = nullptr); static std::unique_ptr<SvStream> CreateStream(const OUString& rFileName, StreamMode eOpenMode, bool bFileExists, css::uno::Reference<css::awt::XWindow> xParentWin = nullptr); diff --git a/sw/qa/uitest/options/optionsDialog.py b/sw/qa/uitest/options/optionsDialog.py index 13a856c0e246..d991eae826f1 100644 --- a/sw/qa/uitest/options/optionsDialog.py +++ b/sw/qa/uitest/options/optionsDialog.py @@ -5,6 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # from uitest.framework import UITestCase +import time +import uitest.config +import uitest.uihelper.common class optionsDialog(UITestCase): @@ -25,6 +28,8 @@ class optionsDialog(UITestCase): def handle_more_icons_dlg(dialog): # Check it doesn't crash while opening it xCloseBtn = dialog.getChild("buttonClose") + while uitest.uihelper.common.get_state_as_dict(xCloseBtn)['Enabled'] != 'true': + time.sleep(uitest.config.DEFAULT_SLEEP) self.ui_test.close_dialog_through_button(xCloseBtn) self.ui_test.execute_blocking_action(xMoreIconsBtn.executeAction, args=('CLICK', ()), diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 7c95e7ef9078..6f72c00bc985 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -138,11 +138,6 @@ static std::unique_ptr<SvStream> lcl_CreateStream( const OUString& rFileName, St return pStream; } -std::unique_ptr<SvStream> UcbStreamHelper::CreateStream(const OUString& rFileName, StreamMode eOpenMode, css::uno::Reference<css::task::XInteractionHandler> const & handler) -{ - return lcl_CreateStream( rFileName, eOpenMode, handler, true /* bEnsureFileExists */ ); -} - std::unique_ptr<SvStream> UcbStreamHelper::CreateStream(const OUString& rFileName, StreamMode eOpenMode, css::uno::Reference<css::awt::XWindow> xParentWin) { // related tdf#99312 |