weld native message dialogs

just the straight-forward MessageDialog cases first

a) remove border_width from message dialog .ui so as to take
the default border width
b) retain 12 as default message dialog border for vcl widget case
c) remove layour_style from message dialog button boxes so as to
take the default mode (a no-op for vcl widget case)
d) use gtk response ids (vcl builder will converts to vcl ones)

Change-Id: I7de281093a1b64f92f71ca11e7cbba42bb658154
Reviewed-on: https://gerrit.libreoffice.org/50143
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

28 files changed, 198 insertions, 160 deletions

diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index 9e8f3dfceab8..918cb173a525 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -26,7 +26,8 @@
 #include <svx/graphichelper.hxx>
 #include <svx/strings.hrc>
 
-#include <vcl/layout.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
 
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/anytostring.hxx>
@@ -416,11 +417,12 @@ void GraphicHelper::SaveShapeAsGraphic(const vcl::Window* pParent,  const Refere
     }
 }
 
-short GraphicHelper::HasToSaveTransformedImage(vcl::Window* pWin)
+short GraphicHelper::HasToSaveTransformedImage(weld::Widget* pWin)
 {
     OUString aMsg(SvxResId(RID_SVXSTR_SAVE_MODIFIED_IMAGE));
-    ScopedVclPtrInstance< MessageDialog > aBox(pWin, aMsg, VclMessageType::Question, VclButtonsType::YesNo);
-    return aBox->Execute();
+    std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(pWin,
+                                              VclMessageType::Question, VclButtonsType::YesNo, aMsg));
+    return xBox->run();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index 4d3ff711e9ce..12027f312a42 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -14,7 +14,7 @@
 #include <osl/file.hxx>
 #include <sfx2/safemode.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
 #include <comphelper/anytostring.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/ZipPackageHelper.hxx>
@@ -373,8 +373,10 @@ IMPL_LINK(SafeModeDialog, CreateZipBtnHdl, Button*, /*pBtn*/, void)
     }
     catch (uno::Exception)
     {
-        ScopedVclPtrInstance< MessageDialog > aErrorBox(this, SvxResId(RID_SVXSTR_SAFEMODE_ZIP_FAILURE));
-        aErrorBox->Execute();
+        std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                 VclMessageType::Warning, VclButtonsType::Ok,
+                                                                 SvxResId(RID_SVXSTR_SAFEMODE_ZIP_FAILURE)));
+        xBox->run();
         return;
     }
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 25e8045e64f8..5cdae19699bc 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -44,7 +44,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include "dlgunit.hxx"
-#include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
 
 SFX_IMPL_FLOATINGWINDOW_WITHID( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
 
@@ -317,8 +317,9 @@ bool SvxSuperContourDlg::Close()
 
     if (m_pTbx1->IsItemEnabled(mnApplyId))
     {
-        ScopedVclPtrInstance< MessageDialog > aQBox( this,"QuerySaveContourChangesDialog","svx/ui/querysavecontchangesdialog.ui");
-        const long  nRet = aQBox->Execute();
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querysavecontchangesdialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QuerySaveContourChangesDialog"));
+        const short nRet = xQBox->run();
 
         if ( nRet == RET_YES )
         {
@@ -438,9 +439,10 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void )
     {
         if (m_pTbx1->IsItemChecked(mnWorkSpaceId))
         {
-            ScopedVclPtrInstance< MessageDialog > aQBox( this,"QueryDeleteContourDialog","svx/ui/querydeletecontourdialog.ui" );
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querydeletecontourdialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QueryDeleteContourDialog"));
 
-            if ( !m_pContourWnd->IsContourChanged() || ( aQBox->Execute() == RET_YES ) )
+            if (!m_pContourWnd->IsContourChanged() || (xQBox->run() == RET_YES))
                 m_pContourWnd->SetWorkplaceMode( true );
             else
                 m_pTbx1->CheckItem(mnWorkSpaceId, false);
@@ -512,9 +514,10 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void )
             m_pStbStatus->Invalidate();
         else if ( bGraphicLinked )
         {
-            ScopedVclPtrInstance<MessageDialog> aQBox(this, "QueryUnlinkGraphicsDialog",
-                                                      "svx/ui/queryunlinkgraphicsdialog.ui");
-            if (aQBox->Execute() != RET_YES)
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/queryunlinkgraphicsdialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QueryUnlinkGraphicsDialog"));
+
+            if (xQBox->run() != RET_YES)
             {
                 bPipette = false;
                 m_pTbx1->CheckItem(mnPipetteId, bPipette);
@@ -694,7 +697,9 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void )
 
             if( !!aMask )
             {
-                ScopedVclPtrInstance< MessageDialog > aQBox( this,"QueryNewContourDialog","svx/ui/querynewcontourdialog.ui" );
+                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querynewcontourdialog.ui"));
+                std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QueryNewContourDialog"));
+
                 bool        bNewContour;
 
                 aRedoGraphic = Graphic();
@@ -702,7 +707,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void )
                 aGraphic = Graphic( BitmapEx( aBmp, aMask ) );
                 mnGrfChanged++;
 
-                bNewContour = ( aQBox->Execute() == RET_YES );
+                bNewContour = (xQBox->run() == RET_YES);
                 rWnd.SetGraphic( aGraphic, bNewContour );
 
                 if( bNewContour )
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index a943eb4565f3..040afecf3b37 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -33,7 +33,7 @@
 #include <vcl/xtextedt.hxx>
 #include <vcl/settings.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/scrbar.hxx>
@@ -828,10 +828,11 @@ void RecovDocList::InitEntry(SvTreeListEntry* pEntry,
 }
 
 
-short impl_askUserForWizardCancel(vcl::Window* pParent, const char* pRes)
+short impl_askUserForWizardCancel(weld::Widget* pParent, const char* pRes)
 {
-    ScopedVclPtrInstance< MessageDialog > aQuery(pParent, SvxResId(pRes), VclMessageType::Question, VclButtonsType::YesNo);
-    if (aQuery->Execute() == RET_YES)
+    std::unique_ptr<weld::MessageDialog> xQuery(Application::CreateMessageDialog(pParent,
+                                                VclMessageType::Question, VclButtonsType::YesNo, SvxResId(pRes)));
+    if (xQuery->run() == RET_YES)
         return DLG_RET_OK;
     else
         return DLG_RET_CANCEL;
@@ -1161,7 +1162,7 @@ IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl, Button*, void)
     switch (m_eRecoveryState)
     {
         case RecoveryDialog::E_RECOVERY_PREPARED:
-            if (impl_askUserForWizardCancel(this, RID_SVXSTR_QUERY_EXIT_RECOVERY) != DLG_RET_CANCEL)
+            if (impl_askUserForWizardCancel(GetFrameWeld(), RID_SVXSTR_QUERY_EXIT_RECOVERY) != DLG_RET_CANCEL)
             {
                 m_eRecoveryState = RecoveryDialog::E_RECOVERY_CANCELED;
                 execute();
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 392e98473ffd..e109b7472fa7 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -540,9 +540,15 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, Button *, pButton, void )
         {
             short nResult;
             if (nId == SID_ATTR_PAGE_HEADERSET)
-                nResult = ScopedVclPtrInstance<DeleteHeaderDialog>(this)->Execute();
+            {
+                DeleteHeaderDialog aDlg(GetFrameWeld());
+                nResult = aDlg.run();
+            }
             else
-                nResult = ScopedVclPtrInstance<DeleteFooterDialog>(this)->Execute();
+            {
+                DeleteFooterDialog aDlg(GetFrameWeld());
+                nResult = aDlg.run();
+            }
             bDelete = nResult == RET_YES;
         }
 
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 8972b9155282..e910cd964b40 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -40,6 +40,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
 #include <svx/imapdlg.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
@@ -242,8 +243,9 @@ bool SvxIMapDlg::Close()
 
     if ( m_pTbxIMapDlg1->IsItemEnabled( mnApplyId ) )
     {
-        ScopedVclPtrInstance< MessageDialog > aQBox(this,"QueryModifyImageMapChangesDialog","svx/ui/querymodifyimagemapchangesdialog.ui");
-        const long  nRet = aQBox->Execute();
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querymodifyimagemapchangesdialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QueryModifyImageMapChangesDialog"));
+        const long nRet = xQBox->run();
 
         if( nRet == RET_YES )
         {
@@ -257,8 +259,9 @@ bool SvxIMapDlg::Close()
     }
     else if( pIMapWnd->IsChanged() )
     {
-        ScopedVclPtrInstance< MessageDialog > aQBox(this,"QuerySaveImageMapChangesDialog","svx/ui/querysaveimagemapchangesdialog.ui");
-        const long  nRet = aQBox->Execute();
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querysaveimagemapchangesdialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QuerySaveImageMapChangesDialog"));
+        const long nRet = xQBox->run();
 
         if( nRet == RET_YES )
             bRet = DoSave();
@@ -724,11 +727,14 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Timer *, void)
 
     if ( pOwnData->pUpdateEditingObject != pCheckObj )
     {
-        if ( pIMapWnd->IsChanged() &&
-             ( ScopedVclPtrInstance<MessageDialog>(this,"QuerySaveImageMapChangesDialog",
-             "svx/ui/querysaveimagemapchangesdialog.ui")->Execute() == RET_YES ) )
+        if (pIMapWnd->IsChanged())
         {
-            DoSave();
+            std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querysaveimagemapchangesdialog.ui"));
+            std::unique_ptr<weld::MessageDialog> xQBox(xBuilder->weld_message_dialog("QuerySaveImageMapChangesDialog"));
+            if (xQBox->run() == RET_YES)
+            {
+                DoSave();
+            }
         }
 
         pIMapWnd->SetGraphic( pOwnData->aUpdateGraphic );
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx
index 26879f23f7fe..23a4f0d2102f 100644
--- a/svx/source/dialog/linkwarn.cxx
+++ b/svx/source/dialog/linkwarn.cxx
@@ -18,43 +18,36 @@
  */
 
 #include <osl/file.hxx>
+#include <vcl/svapp.hxx>
 #include <svx/linkwarn.hxx>
 #include <svtools/miscopt.hxx>
 
-SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* pParent, const OUString& _rFileName )
-    : MessageDialog(pParent, "LinkWarnDialog" , "svx/ui/linkwarndialog.ui")
+SvxLinkWarningDialog::SvxLinkWarningDialog(weld::Widget* pParent, const OUString& _rFileName)
+    : m_xBuilder(Application::CreateBuilder(pParent, "svx/ui/linkwarndialog.ui"))
+    , m_xDialog(m_xBuilder->weld_message_dialog("LinkWarnDialog"))
+    , m_xWarningOnBox(m_xBuilder->weld_check_button("ask"))
 {
-    get(m_pWarningOnBox, "ask");
-
     // replace filename
-    OUString sInfoText = get_primary_text();
+    OUString sInfoText = m_xDialog->get_primary_text();
     OUString aPath;
     if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( _rFileName, aPath ) )
         aPath = _rFileName;
     sInfoText = sInfoText.replaceAll("%FILENAME", aPath);
-    set_primary_text( sInfoText );
+    m_xDialog->set_primary_text(sInfoText);
 
     // load state of "warning on" checkbox from misc options
     SvtMiscOptions aMiscOpt;
-    m_pWarningOnBox->Check( aMiscOpt.ShowLinkWarningDialog() );
-    if( aMiscOpt.IsShowLinkWarningDialogReadOnly() )
-        m_pWarningOnBox->Disable();
+    m_xWarningOnBox->set_active(aMiscOpt.ShowLinkWarningDialog());
+    m_xWarningOnBox->set_sensitive(!aMiscOpt.IsShowLinkWarningDialogReadOnly());
 }
 
 SvxLinkWarningDialog::~SvxLinkWarningDialog()
 {
-    disposeOnce();
-}
-
-void SvxLinkWarningDialog::dispose()
-{
     // save value of "warning off" checkbox, if necessary
     SvtMiscOptions aMiscOpt;
-    bool bChecked = m_pWarningOnBox->IsChecked();
-    if ( aMiscOpt.ShowLinkWarningDialog() != bChecked )
-        aMiscOpt.SetShowLinkWarningDialog( bChecked );
-    m_pWarningOnBox.clear();
-    MessageDialog::dispose();
+    bool bChecked = m_xWarningOnBox->get_active();
+    if (aMiscOpt.ShowLinkWarningDialog() != bChecked)
+        aMiscOpt.SetShowLinkWarningDialog(bChecked);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index e44397770bab..641624fd236e 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -18,7 +18,8 @@
  */
 
 #include <comphelper/string.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
 #include <svx/passwd.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
@@ -29,7 +30,10 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void)
 
     if ( m_pNewPasswdED->GetText() != m_pRepeatPasswdED->GetText() )
     {
-        ScopedVclPtrInstance<MessageDialog>(this, aRepeatPasswdErrStr)->Execute();
+        std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                 VclMessageType::Warning, VclButtonsType::Ok,
+                                                                 aRepeatPasswdErrStr));
+        xBox->run();
         m_pNewPasswdED->SetText( "" );
         m_pRepeatPasswdED->SetText( "" );
         m_pNewPasswdED->GrabFocus();
@@ -38,7 +42,10 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void)
 
     if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) )
     {
-        ScopedVclPtrInstance<MessageDialog>(this, aOldPasswdErrStr)->Execute();
+        std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                 VclMessageType::Warning, VclButtonsType::Ok,
+                                                                 aOldPasswdErrStr));
+        xBox->run();
         m_pOldPasswdED->SetText( "" );
         m_pOldPasswdED->GrabFocus();
         bOK = false;
@@ -48,7 +55,6 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void)
         EndDialog( RET_OK );
 }
 
-
 IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, Edit&, void)
 {
     if ( !bEmpty )
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a75633f13962..9f0bf7f064d2 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -43,7 +43,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/builderfactory.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XSet.hpp>
@@ -522,8 +522,8 @@ namespace svxform
                 {
                     if ( !m_sInstanceURL.isEmpty() )
                     {
-                        ScopedVclPtrInstance< LinkedInstanceWarningBox > aMsgBox( this );
-                        if ( aMsgBox->Execute() != RET_OK )
+                        LinkedInstanceWarningBox aMsgBox(GetFrameWeld());
+                        if (aMsgBox.run() != RET_OK)
                             return bHandled;
                     }
 
@@ -685,8 +685,8 @@ namespace svxform
                 {
                     if ( DGTInstance == m_eGroup && !m_sInstanceURL.isEmpty() )
                     {
-                        ScopedVclPtrInstance< LinkedInstanceWarningBox > aMsgBox( this );
-                        if ( aMsgBox->Execute() != RET_OK )
+                        LinkedInstanceWarningBox aMsgBox(GetFrameWeld());
+                        if (aMsgBox.run() != RET_OK)
                             return bHandled;
                     }
 
@@ -770,8 +770,8 @@ namespace svxform
             bHandled = true;
             if ( DGTInstance == m_eGroup && !m_sInstanceURL.isEmpty() )
             {
-                ScopedVclPtrInstance< LinkedInstanceWarningBox > aMsgBox( this );
-                if ( aMsgBox->Execute() != RET_OK )
+                LinkedInstanceWarningBox aMsgBox(GetFrameWeld());
+                if (aMsgBox.run() != RET_OK)
                     return bHandled;
             }
             bIsDocModified = RemoveEntry();
@@ -952,12 +952,14 @@ namespace svxform
                     bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
                     const char* pResId = bIsElement ? RID_STR_QRY_REMOVE_ELEMENT : RID_STR_QRY_REMOVE_ATTRIBUTE;
                     OUString sVar = bIsElement ? OUString(ELEMENTNAME) : OUString(ATTRIBUTENAME);
-                    ScopedVclPtrInstance< MessageDialog > aQBox(this, SvxResId(pResId), VclMessageType::Question, VclButtonsType::YesNo);
-                    OUString sMessText = aQBox->get_primary_text();
+                    std::unique_ptr<weld::MessageDialog> xQBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                             VclMessageType::Question, VclButtonsType::YesNo,
+                                                                             SvxResId(pResId)));
+                    OUString sMessText = xQBox->get_primary_text();
                     sMessText = sMessText.replaceFirst(
                         sVar, m_xUIHelper->getNodeDisplayName( pNode->m_xNode, false ) );
-                    aQBox->set_primary_text(sMessText);
-                    if ( aQBox->Execute() == RET_YES )
+                    xQBox->set_primary_text(sMessText);
+                    if (xQBox->run() == RET_YES)
                     {
                         SvTreeListEntry* pParent = m_pItemList->GetParent( pEntry );
                         DBG_ASSERT( pParent, "XFormsPage::RemoveEntry(): no parent entry" );
@@ -994,12 +996,13 @@ namespace svxform
                 {
                     SAL_WARN( "svx.form", "XFormsPage::RemoveEntry(): exception caught" );
                 }
-                ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(pResId),
-                                                          VclMessageType::Question, VclButtonsType::YesNo);
-                OUString sMessText = aQBox->get_primary_text();
+                std::unique_ptr<weld::MessageDialog> xQBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                         VclMessageType::Question, VclButtonsType::YesNo,
+                                                                         SvxResId(pResId)));
+                OUString sMessText = xQBox->get_primary_text();
                 sMessText = sMessText.replaceFirst( sSearch, sName);
-                aQBox->set_primary_text(sMessText);
-                if ( aQBox->Execute() == RET_YES )
+                xQBox->set_primary_text(sMessText);
+                if (xQBox->run() == RET_YES)
                 {
                     try
                     {
@@ -1496,9 +1499,11 @@ namespace svxform
                         if ( m_pModelsBox->GetEntryPos( sNewName ) != LISTBOX_ENTRY_NOTFOUND )
                         {
                             // error: model name already exists
-                            ScopedVclPtrInstance< MessageDialog > aErrBox( this, SvxResId( RID_STR_DOUBLE_MODELNAME ) );
-                            aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
-                            aErrBox->Execute();
+                            std::unique_ptr<weld::MessageDialog> xErrBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                                     VclMessageType::Warning, VclButtonsType::Ok,
+                                                                                     SvxResId(RID_STR_DOUBLE_MODELNAME)));
+                            xErrBox->set_primary_text(xErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
+                            xErrBox->run();
                             bShowDialog = true;
                         }
                         else
@@ -1586,12 +1591,13 @@ namespace svxform
             }
             else if (sIdent == "modelsremove")
             {
-                ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId( RID_STR_QRY_REMOVE_MODEL),
-                                    VclMessageType::Question, VclButtonsType::YesNo);
-                OUString sText = aQBox->get_primary_text();
+                std::unique_ptr<weld::MessageDialog> xQBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                         VclMessageType::Question, VclButtonsType::YesNo,
+                                                                         SvxResId( RID_STR_QRY_REMOVE_MODEL)));
+                OUString sText = xQBox->get_primary_text();
                 sText = sText.replaceFirst( MODELNAME, sSelectedModel );
-                aQBox->set_primary_text(sText);
-                if ( aQBox->Execute() == RET_YES )
+                xQBox->set_primary_text(sText);
+                if (xQBox->run() == RET_YES)
                 {
                     try
                     {
@@ -1686,12 +1692,13 @@ namespace svxform
                 if ( pPage )
                 {
                     OUString sInstName = pPage->GetInstanceName();
-                    ScopedVclPtrInstance<MessageDialog> aQBox(this, SvxResId(RID_STR_QRY_REMOVE_INSTANCE),
-                                                              VclMessageType::Question, VclButtonsType::YesNo);
-                    OUString sMessText = aQBox->get_primary_text();
+                    std::unique_ptr<weld::MessageDialog> xQBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                             VclMessageType::Question, VclButtonsType::YesNo,
+                                                                             SvxResId(RID_STR_QRY_REMOVE_INSTANCE)));
+                    OUString sMessText = xQBox->get_primary_text();
                     sMessText = sMessText.replaceFirst( INSTANCENAME, sInstName );
-                    aQBox->set_primary_text(sMessText);
-                    if ( aQBox->Execute() == RET_YES )
+                    xQBox->set_primary_text(sMessText);
+                    if (xQBox->run() == RET_YES)
                     {
                         bool bDoRemove = false;
                         if (IsAdditionalPage(nId))
@@ -2439,9 +2446,11 @@ namespace svxform
              ( bIsHandleBinding && sNewName.isEmpty() ) )
         {
             // Error and don't close the dialog
-            ScopedVclPtrInstance< MessageDialog > aErrBox( this, SvxResId( RID_STR_INVALID_XMLNAME ) );
-            aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
-            aErrBox->Execute();
+            std::unique_ptr<weld::MessageDialog> xErrBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                     VclMessageType::Warning, VclButtonsType::Ok,
+                                                                     SvxResId(RID_STR_INVALID_XMLNAME)));
+            xErrBox->set_primary_text(xErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sNewName));
+            xErrBox->run();
             return;
         }
 
@@ -3072,9 +3081,11 @@ namespace svxform
         {
             if ( !m_pConditionDlg->GetUIHelper()->isValidPrefixName( sPrefix ) )
             {
-                ScopedVclPtrInstance< MessageDialog > aErrBox(this, SvxResId( RID_STR_INVALID_XMLPREFIX ) );
-                aErrBox->set_primary_text(aErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sPrefix));
-                aErrBox->Execute();
+                std::unique_ptr<weld::MessageDialog> xErrBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                         VclMessageType::Warning, VclButtonsType::Ok,
+                                                                         SvxResId(RID_STR_INVALID_XMLPREFIX)));
+                xErrBox->set_primary_text(xErrBox->get_primary_text().replaceFirst(MSG_VARIABLE, sPrefix));
+                xErrBox->run();
                 return;
             }
         }
@@ -3144,11 +3155,13 @@ namespace svxform
     IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl, Button*, void)
     {
         OUString sName(m_pNameED->GetText());
-        if(sName.isEmpty()) {
-
-            ScopedVclPtrInstance< MessageDialog > aErrorBox(this,SvxResId(RID_STR_EMPTY_SUBMISSIONNAME));
-            aErrorBox->set_primary_text( Application::GetDisplayName() );
-            aErrorBox->Execute();
+        if(sName.isEmpty())
+        {
+            std::unique_ptr<weld::MessageDialog> xErrorBox(Application::CreateMessageDialog(GetFrameWeld(),
+                                                                     VclMessageType::Warning, VclButtonsType::Ok,
+                                                                     SvxResId(RID_STR_EMPTY_SUBMISSIONNAME)));
+            xErrorBox->set_primary_text(Application::GetDisplayName());
+            xErrorBox->run();
             return;
         }
 
@@ -3388,8 +3401,9 @@ namespace svxform
             m_pURLED->SetText( aDlg.GetPath() );
     }
 
-    LinkedInstanceWarningBox::LinkedInstanceWarningBox( vcl::Window* pParent )
-        : MessageDialog(pParent, "FormLinkWarnDialog", "svx/ui/formlinkwarndialog.ui")
+    LinkedInstanceWarningBox::LinkedInstanceWarningBox(weld::Widget* pParent)
+        : m_xBuilder(Application::CreateBuilder(pParent, "svx/ui/formlinkwarndialog.ui"))
+        , m_xDialog(m_xBuilder->weld_message_dialog("FormLinkWarnDialog"))
     {
     }
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 7642cad54cfd..f3fd91f1f10b 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -63,6 +63,7 @@
 #include <tools/diagnose_ex.h>
 #include <unotools/confignode.hxx>
 #include <vcl/stdtext.hxx>
+#include <vcl/weld.hxx>
 
 #include <algorithm>
 
@@ -563,7 +564,8 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
 
     if ( !m_xBrowserController.is() )
     {
-        ShowServiceNotAvailableError( GetParent(), "com.sun.star.inspection.ObjectInspector", true );
+        vcl::Window *pWin = GetParent();
+        ShowServiceNotAvailableError(pWin ? pWin->GetFrameWeld() : nullptr, "com.sun.star.inspection.ObjectInspector", true);
     }
     else
     {
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 8b4e0a97f99b..6fce0e94f774 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/awt/XTabControllerModel.hpp>
 #include <sfx2/viewfrm.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/wrkwin.hxx>
 #include <svl/whiter.hxx>
 #include <sfx2/app.hxx>
@@ -250,10 +250,9 @@ bool FmFormShell::PrepareClose(bool bUI)
 
                     if ( bModified && bUI )
                     {
-                        ScopedVclPtrInstance<MessageDialog> aQry(
-                            nullptr, "SaveModifiedDialog",
-                            "svx/ui/savemodifieddialog.ui");
-                        switch (aQry->Execute())
+                        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(nullptr, "svx/ui/savemodifieddialog.ui"));
+                        std::unique_ptr<weld::MessageDialog> xQry(xBuilder->weld_message_dialog("SaveModifiedDialog"));
+                        switch (xQry->run())
                         {
                             case RET_YES:
                                 bResult = rController->commitCurrentRecord( );
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 7724e4221205..5fc8ea4f226b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -92,7 +92,7 @@
 #include <sfx2/viewsh.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/layout.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/make_unique.hxx>
@@ -1474,8 +1474,12 @@ void FmXFormShell::ExecuteSearch_Lock()
     }
 
     if (m_aSearchForms.empty() )
-    {   // there are no controls that meet all the conditions for a search
-        ScopedVclPtrInstance<MessageDialog>(nullptr, SvxResId(RID_STR_NODATACONTROLS))->Execute();
+    {
+        // there are no controls that meet all the conditions for a search
+        std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(nullptr,
+                                                                 VclMessageType::Warning, VclButtonsType::Ok,
+                                                                 SvxResId(RID_STR_NODATACONTROLS)));
+        xBox->run();
         return;
     }
 
@@ -3154,7 +3158,10 @@ void FmXFormShell::CreateExternalView_Lock()
 
         if (!bHaveUsableControls)
         {
-            ScopedVclPtrInstance<MessageDialog>(nullptr, SvxResId(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY))->Execute();
+            std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(nullptr,
+                                                                     VclMessageType::Warning, VclButtonsType::Ok,
+                                                                     SvxResId(RID_STR_NOCONTROLS_FOR_EXTERNALDISPLAY)));
+            xBox->run();
             return;
         }
     }
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 1217a632a0a0..2082050ecc4e 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -24,6 +24,8 @@
 #include <unotools/datetime.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
 #include <ucbhelper/content.hxx>
 #include <sfx2/app.hxx>
 #include <helpids.h>
@@ -358,7 +360,9 @@ void GalleryBrowser1::ImplExecute(const OString &rIdent)
     }
     else if (rIdent == "delete")
     {
-        if( ScopedVclPtrInstance<MessageDialog>(nullptr, "QueryDeleteThemeDialog","svx/ui/querydeletethemedialog.ui")->Execute() == RET_YES )
+        std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querydeletethemedialog.ui"));
+        std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteThemeDialog"));
+        if (xQuery->run() == RET_YES)
             mpGallery->RemoveTheme( mpThemes->GetSelectedEntry() );
     }
     else if (rIdent == "rename")
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 220e358380ae..43b79f3bd33a 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -43,6 +43,7 @@
 #include <galbrws2.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/weld.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svxdlg.hxx>
@@ -1099,10 +1100,14 @@ void GalleryBrowser2::Execute(const OString &rIdent)
             SetMode( ( GALLERYBROWSERMODE_PREVIEW != GetMode() ) ? GALLERYBROWSERMODE_PREVIEW : meLastMode );
         else if (rIdent == "delete")
         {
-            if( !mpCurTheme->IsReadOnly() &&
-                ScopedVclPtrInstance<MessageDialog>(nullptr, "QueryDeleteObjectDialog","svx/ui/querydeleteobjectdialog.ui")->Execute() == RET_YES )
+            if (!mpCurTheme->IsReadOnly())
             {
-                mpCurTheme->RemoveObject( mnCurActionPos );
+                std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetFrameWeld(), "svx/ui/querydeleteobjectdialog.ui"));
+                std::unique_ptr<weld::MessageDialog> xQuery(xBuilder->weld_message_dialog("QueryDeleteObjectDialog"));
+                if (xQuery->run() == RET_YES)
+                {
+                    mpCurTheme->RemoveObject( mnCurActionPos );
+                }
             }
         }
         else if (rIdent == "title")
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 1d38dd5102b1..c2daff365856 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -29,6 +29,7 @@
 #include <vcl/tabpage.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/weld.hxx>
 #include <svtools/inettbc.hxx>
 #include <svtools/simptabl.hxx>
 #include <svtools/svmedit.hxx>
@@ -632,13 +633,15 @@ namespace svxform
     };
 
 
-    class LinkedInstanceWarningBox : public MessageDialog
+    class LinkedInstanceWarningBox
     {
+    private:
+        std::unique_ptr<weld::Builder> m_xBuilder;
+        std::unique_ptr<weld::MessageDialog> m_xDialog;
     public:
-        LinkedInstanceWarningBox( vcl::Window* pParent );
+        LinkedInstanceWarningBox(weld::Widget* pParent);
+        short run() { return m_xDialog->run(); }
     };
-
-
 }
 
 
diff --git a/svx/uiconfig/ui/deletefooterdialog.ui b/svx/uiconfig/ui/deletefooterdialog.ui
index f77b40390d99..ce33ef1315ca 100644
--- a/svx/uiconfig/ui/deletefooterdialog.ui
+++ b/svx/uiconfig/ui/deletefooterdialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteFooterDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="deletefooterdialog|DeleteFooterDialog">Delete footer?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/deleteheaderdialog.ui b/svx/uiconfig/ui/deleteheaderdialog.ui
index 9a09130c24d2..2d2a7f02912c 100644
--- a/svx/uiconfig/ui/deleteheaderdialog.ui
+++ b/svx/uiconfig/ui/deleteheaderdialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="DeleteHeaderDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="deleteheaderdialog|DeleteHeaderDialog">Delete header?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/formlinkwarndialog.ui b/svx/uiconfig/ui/formlinkwarndialog.ui
index dcd7d76bc5ff..8fb64ac1dae8 100644
--- a/svx/uiconfig/ui/formlinkwarndialog.ui
+++ b/svx/uiconfig/ui/formlinkwarndialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="FormLinkWarnDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
@@ -21,7 +20,6 @@ How do you want to proceed?</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" context="formlinkwarndialog|ok">_Edit</property>
@@ -63,8 +61,8 @@ How do you want to proceed?</property>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">ok</action-widget>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-5">ok</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/linkwarndialog.ui b/svx/uiconfig/ui/linkwarndialog.ui
index 7da928127f10..f1f22847db6f 100644
--- a/svx/uiconfig/ui/linkwarndialog.ui
+++ b/svx/uiconfig/ui/linkwarndialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="LinkWarnDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="linkwarndialog|LinkWarnDialog">Confirm Linked Graphic</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" context="linkwarndialog|ok">_Keep Link</property>
@@ -83,8 +81,8 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="1">ok</action-widget>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-5">ok</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querydeletecontourdialog.ui b/svx/uiconfig/ui/querydeletecontourdialog.ui
index f2d7c3d35c4c..15af36d2b81e 100644
--- a/svx/uiconfig/ui/querydeletecontourdialog.ui
+++ b/svx/uiconfig/ui/querydeletecontourdialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteContourDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querydeletecontourdialog|QueryDeleteContourDialog">Delete the contour?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -22,7 +21,6 @@ cause the contour to be deleted.</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/querydeleteobjectdialog.ui b/svx/uiconfig/ui/querydeleteobjectdialog.ui
index 024e704d8d44..cd5b7c6a9fd4 100644
--- a/svx/uiconfig/ui/querydeleteobjectdialog.ui
+++ b/svx/uiconfig/ui/querydeleteobjectdialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteObjectDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querydeleteobjectdialog|QueryDeleteObjectDialog">Delete this object?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -20,7 +19,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area4">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -31,5 +29,8 @@
         </child>
       </object>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querydeletethemedialog.ui b/svx/uiconfig/ui/querydeletethemedialog.ui
index a7eb54ab2d3e..4c1a05c4f5c2 100644
--- a/svx/uiconfig/ui/querydeletethemedialog.ui
+++ b/svx/uiconfig/ui/querydeletethemedialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryDeleteThemeDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querydeletethemedialog|QueryDeleteThemeDialog">Delete this theme?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -20,7 +19,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area2">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -31,5 +29,8 @@
         </child>
       </object>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
index 1d874646ad9b..eff11a64bb29 100644
--- a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
+++ b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryModifyImageMapChangesDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querymodifyimagemapchangesdialog|QueryModifyImageMapChangesDialog">Save ImageMap changes?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area5">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
@@ -49,7 +47,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querynewcontourdialog.ui b/svx/uiconfig/ui/querynewcontourdialog.ui
index 8dc1d1994cf8..b511a02dc6af 100644
--- a/svx/uiconfig/ui/querynewcontourdialog.ui
+++ b/svx/uiconfig/ui/querynewcontourdialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryNewContourDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querynewcontourdialog|QueryNewContourDialog">Create a new contour?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -20,7 +19,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/querysavecontchangesdialog.ui b/svx/uiconfig/ui/querysavecontchangesdialog.ui
index 91af4774429e..f4b3d022305c 100644
--- a/svx/uiconfig/ui/querysavecontchangesdialog.ui
+++ b/svx/uiconfig/ui/querysavecontchangesdialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveContourChangesDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querysavecontchangesdialog|QuerySaveContourChangesDialog">Save contour changes?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
@@ -47,7 +45,10 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
index a74be0694b8d..f0ad846b6935 100644
--- a/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
+++ b/svx/uiconfig/ui/querysaveimagemapchangesdialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QuerySaveImageMapChangesDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="querysaveimagemapchangesdialog|QuerySaveImageMapChangesDialog">Save ImageMap changes?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area4">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="cancel">
                 <property name="label">gtk-cancel</property>
@@ -49,7 +47,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>
diff --git a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui b/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
index 82bd731b9ea8..1449fcae153a 100644
--- a/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
+++ b/svx/uiconfig/ui/queryunlinkgraphicsdialog.ui
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.2 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="QueryUnlinkGraphicsDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="title" translatable="yes" context="queryunlinkgraphicsdialog|QueryUnlinkGraphicsDialog">Unlink the graphics?</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
@@ -21,7 +20,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/savemodifieddialog.ui b/svx/uiconfig/ui/savemodifieddialog.ui
index 8ad47b0b3925..0c98506f092a 100644
--- a/svx/uiconfig/ui/savemodifieddialog.ui
+++ b/svx/uiconfig/ui/savemodifieddialog.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkMessageDialog" id="SaveModifiedDialog">
     <property name="can_focus">False</property>
-    <property name="border_width">6</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
@@ -19,7 +18,6 @@
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="messagedialog-action_area">
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="no">
                 <property name="label">gtk-no</property>
@@ -77,9 +75,9 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="3">no</action-widget>
-      <action-widget response="2">yes</action-widget>
-      <action-widget response="0">cancel</action-widget>
+      <action-widget response="-9">no</action-widget>
+      <action-widget response="-8">yes</action-widget>
+      <action-widget response="-6">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>