summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/doc/DocumentLinksAdministrationManager.cxx2
-rw-r--r--sw/source/core/edit/edfcol.cxx8
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx10
-rw-r--r--sw/source/ui/misc/glosbib.cxx11
-rw-r--r--sw/source/uibase/shells/textsh1.cxx2
6 files changed, 23 insertions, 12 deletions
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 2d275359f57b..c30eeb382382 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -241,7 +241,7 @@ void DocumentLinksAdministrationManager::UpdateLinks()
SfxMedium* pMedium = m_rDoc.GetDocShell()->GetMedium();
SfxFrame* pFrame = pMedium ? pMedium->GetLoadTargetFrame() : nullptr;
- vcl::Window* pDlgParent = pFrame ? &pFrame->GetWindow() : nullptr;
+ weld::Window* pDlgParent = pFrame ? pFrame->GetWindow().GetFrameWeld() : nullptr;
GetLinkManager().UpdateAllLinks( bAskUpdate, false, pDlgParent );
}
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 8ace8092a783..4a0fcd5e6266 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -57,7 +57,7 @@
#include <svx/ClassificationCommon.hxx>
#include <svl/cryptosign.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/weld.hxx>
#include <hintids.hxx>
#include <doc.hxx>
@@ -2129,8 +2129,10 @@ void SwEditShell::ClassifyDocPerHighestParagraphClass()
if (aClassificationCategory != sHighestClass)
{
- ScopedVclPtrInstance<QueryBox> aQueryBox(nullptr, MessBoxStyle::Ok, SwResId(STR_CLASSIFICATION_LEVEL_CHANGED));
- aQueryBox->Execute();
+ std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr,
+ VclMessageType::Question, VclButtonsType::Ok,
+ SwResId(STR_CLASSIFICATION_LEVEL_CHANGED)));
+ xQueryBox->run();
}
const SfxClassificationPolicyType eHighestClassType = SfxClassificationHelper::stringToPolicyType(sHighestClass);
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 6212ae20cf5c..c77fadac9ca5 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -60,7 +60,6 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pParent)
else
m_pMailRB->Check();
TypeHdl_Impl(m_pLetterRB);
-
}
SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage()
@@ -235,6 +234,7 @@ SwSendWarningBox_Impl::SwSendWarningBox_Impl(vcl::Window* pParent, const OUStrin
m_pDetailED->set_width_request(80 * m_pDetailED->approximate_char_width());
m_pDetailED->set_height_request(8 * m_pDetailED->GetTextHeight());
m_pDetailED->SetText(rDetails);
+ create_message_area();
}
#define ITEMID_TASK 1
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 25af6e39e51b..262d10ab5e58 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -40,6 +40,7 @@
#include <svtools/sfxecode.hxx>
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/weld.hxx>
#include <sfx2/dinfdlg.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/fcontnr.hxx>
@@ -178,7 +179,7 @@ SwSendQueryBox_Impl::SwSendQueryBox_Impl(vcl::Window* pParent, const OUString& r
: SwMessageAndEditDialog(pParent, rID, rUIXMLDescription)
, bIsEmptyAllowed(true)
{
- m_pImageIM->SetImage(QueryBox::GetStandardImage());
+ m_pImageIM->SetImage(GetStandardQueryBoxImage());
m_pEdit->SetModifyHdl(LINK(this, SwSendQueryBox_Impl, ModifyHdl));
ModifyHdl(*m_pEdit);
}
@@ -908,8 +909,11 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void)
if (xConfigItem->GetMailServer().isEmpty() ||
!SwMailMergeHelper::CheckMailAddress(xConfigItem->GetMailAddress()) )
{
- ScopedVclPtrInstance< QueryBox > aQuery(pButton, MessBoxStyle::YesNoCancel, m_sConfigureMail);
- sal_uInt16 nRet = aQuery->Execute();
+ std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(pButton->GetFrameWeld(),
+ VclMessageType::Question, VclButtonsType::YesNo,
+ m_sConfigureMail));
+ xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ sal_uInt16 nRet = xQueryBox->run();
if (RET_YES == nRet )
{
SwView* pConfigView = pTargetView ? pTargetView : pView;
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 4d9c5f0956fa..4c84074f2e7e 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -19,8 +19,9 @@
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/help.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
#include <vcl/builderfactory.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <unotools/tempfile.hxx>
@@ -158,8 +159,12 @@ void SwGlossaryGroupDlg::Apply()
const OUString sMsg(SwResId(STR_QUERY_DELETE_GROUP1)
+ sTitle
+ SwResId(STR_QUERY_DELETE_GROUP2));
- ScopedVclPtrInstance< QueryBox > aQuery(GetParent(), MessBoxStyle::YesNo|MessBoxStyle::DefaultNo, sMsg );
- if(RET_YES == aQuery->Execute())
+
+ vcl::Window* pWin = GetParent();
+ std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr,
+ VclMessageType::Question, VclButtonsType::YesNo, sMsg));
+ xQueryBox->set_default_response(RET_NO);
+ if (RET_YES == xQueryBox->run())
pGlosHdl->DelGroup( sDelGroup );
}
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 4bf74057082c..3641c4c89978 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -278,7 +278,7 @@ static short lcl_AskRedlineFlags(vcl::Window *pWin)
ScopedVclPtrInstance<MessBox> aQBox( pWin, MessBoxStyle::NONE, 0,
SwResId( STR_REDLINE_TITLE ),
SwResId( STR_REDLINE_MSG ) );
- aQBox->SetImage( QueryBox::GetStandardImage() );
+ aQBox->SetImage(GetStandardQueryBoxImage());
const ButtonDialogFlags nBtnFlags = ButtonDialogFlags::Default |
ButtonDialogFlags::OK |
ButtonDialogFlags::Focus;
generated by cgit (git 2.34.1) at 2024-07-10 16:37:15 +0000