diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-21 21:20:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-25 20:03:26 +0100 |
| commit | d75144cf44779a8f6cc9bccf9b0a6328b94a5b90 (patch) | |
| tree | 25b9f3c677c50ad715e1a0bc6bef3d5bf79ef957 /extensions | |
| parent | 8d42909cd326cb26d8ba1fb383b5578f820c72ed (diff) | |
convert remaining InfoBox to weld::MessageDialog
Change-Id: I91d828e38d96264cf4a76f30940942556b8f78d8
Reviewed-on: https://gerrit.libreoffice.org/50205
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 7 | ||||
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 539e5be292d6..6b19672c004b 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -42,7 +42,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/property.hxx> -#include <vcl/msgbox.hxx> +#include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <vcl/tabpage.hxx> #include <osl/mutex.hxx> @@ -1376,7 +1376,10 @@ namespace pcr } catch(const PropertyVetoException& eVetoException) { - ScopedVclPtrInstance<InfoBox>(m_pView, eVetoException.Message)->Execute(); + std::unique_ptr<weld::MessageDialog> xInfoBox(Application::CreateMessageDialog(m_pView ? m_pView->GetFrameWeld() : nullptr, + VclMessageType::Info, VclButtonsType::Ok, + eVetoException.Message)); + xInfoBox->run(); PropertyHandlerRef handler = impl_getHandlerForProperty_throw( rName ); Any aNormalizedValue = handler->getPropertyValue( rName ); getPropertyBox().SetPropertyValue( rName, aNormalizedValue, false ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 82e8e55a750a..b633fa7d2b58 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -269,7 +269,7 @@ Image UpdateCheckUI::GetBubbleImage( OUString const &rURL ) } if ( aImage.GetSizePixel().Width() == 0 ) - aImage = InfoBox::GetStandardImage(); + aImage = GetStandardInfoBoxImage(); return aImage; } @@ -777,7 +777,6 @@ void BubbleWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const tools::Re aThickLine ); SetLineColor( aOldLine ); - //Image aImage = InfoBox::GetStandardImage(); Size aImgSize = maBubbleImage.GetSizePixel(); DrawImage( Point( BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT ), maBubbleImage ); @@ -820,7 +819,6 @@ void BubbleWindow::Show( bool bVisible, ShowFlags nFlags ) Size aWindowSize = GetSizePixel(); - // Image aImage = InfoBox::GetStandardImage(); Size aImgSize = maBubbleImage.GetSizePixel(); RecalcTextRects(); |