From 2e874cb1079d552147362058a3fb837e8706def6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 30 Jun 2015 16:39:10 +0100 Subject: some random tweaks Change-Id: I305c23e5bf717c0a8f1e3889b3533458f242ec6f --- cui/source/dialogs/SpellDialog.cxx | 2 +- cui/source/dialogs/about.cxx | 2 +- cui/source/dialogs/scriptdlg.cxx | 12 ++-- cui/source/options/optcolor.cxx | 2 +- desktop/source/app/app.cxx | 2 +- desktop/source/app/lockfile2.cxx | 2 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 +- .../deployment/gui/dp_gui_extensioncmdqueue.cxx | 2 +- filter/source/pdf/impdialog.cxx | 4 +- filter/source/pdf/impdialog.hxx | 2 +- include/svtools/fileview.hxx | 2 +- include/svx/linkwarn.hxx | 2 +- include/vcl/layout.hxx | 43 +++++-------- include/vcl/salnativedialogs.hxx | 71 ++++++++++++++++++++++ sd/source/ui/view/Outliner.cxx | 4 +- sfx2/source/appl/appopen.cxx | 2 +- sfx2/source/appl/sfxhelp.cxx | 4 +- sfx2/source/dialog/alienwarn.cxx | 4 +- sfx2/source/inc/alienwarn.hxx | 2 +- svtools/source/contnr/fileview.cxx | 4 +- svtools/source/java/javainteractionhandler.cxx | 6 +- svx/source/dialog/linkwarn.cxx | 4 +- sw/source/ui/dbui/mmoutputtypepage.cxx | 6 +- sw/source/ui/dialog/swmessdialog.cxx | 2 +- sw/source/uibase/lingu/olmenu.cxx | 2 +- uui/source/iahndl-ssl.cxx | 2 +- uui/source/sslwarndlg.cxx | 4 +- uui/source/sslwarndlg.hxx | 2 +- uui/source/unknownauthdlg.cxx | 4 +- uui/source/unknownauthdlg.hxx | 2 +- vcl/source/app/dbggui.cxx | 4 +- vcl/source/app/stdtext.cxx | 2 +- vcl/source/app/svdata.cxx | 2 +- vcl/source/control/edit.cxx | 2 +- vcl/source/window/builder.cxx | 2 +- vcl/source/window/layout.cxx | 61 ++++++++++++------- 36 files changed, 176 insertions(+), 101 deletions(-) create mode 100644 include/vcl/salnativedialogs.hxx diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 778a69aac695..b820b6cd2def 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -2055,7 +2055,7 @@ IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, msg); - aErrorBox->SetText(sTitle); + aErrorBox->set_title(sTitle); aErrorBox->Execute(); } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 630dd30e9725..745b07f8e19c 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -144,7 +144,7 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, msg); - aErrorBox->SetText( GetText() ); + aErrorBox->set_title( GetText() ); aErrorBox->Execute(); } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 4bddaae613f9..013e42ddd9a2 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -921,7 +921,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) OUString aError( m_createErrStr ); aError += m_createDupStr; ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), aError); - aErrorBox->SetText( m_createErrTitleStr ); + aErrorBox->set_title( m_createErrTitleStr ); aErrorBox->Execute(); xNewDlg->SetObjectName( aNewName ); break; @@ -1003,7 +1003,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) //ISSUE L10N & message from exception? OUString aError( m_createErrStr ); ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), aError); - aErrorBox->SetText( m_createErrTitleStr ); + aErrorBox->set_title( m_createErrTitleStr ); aErrorBox->Execute(); } } @@ -1079,7 +1079,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) //ISSUE L10N & message from exception? OUString aError( m_renameErrStr ); ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), aError); - aErrorBox->SetText( m_renameErrTitleStr ); + aErrorBox->set_title( m_renameErrTitleStr ); aErrorBox->Execute(); } } @@ -1090,7 +1090,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) // ISSUE L10N string & can we centre list? OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 ); VclPtrInstance< MessageDialog > aQueryBox(static_cast(this), aQuery, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); - aQueryBox->SetText( m_delQueryTitleStr ); + aQueryBox->set_title( m_delQueryTitleStr ); if ( aQueryBox->Execute() == RET_NO ) { return; @@ -1125,7 +1125,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) { //ISSUE L10N & message from exception? ScopedVclPtrInstance< MessageDialog > aErrorBox(static_cast(this), m_delErrStr); - aErrorBox->SetText( m_delErrTitleStr ); + aErrorBox->set_title( m_delErrTitleStr ); aErrorBox->Execute(); } @@ -1498,7 +1498,7 @@ IMPL_STATIC_LINK( } ScopedVclPtrInstance pBox( nullptr, message, VCL_MESSAGE_WARNING ); - pBox->SetText( CUI_RES( RID_SVXSTR_ERROR_TITLE ) ); + pBox->set_title( CUI_RES( RID_SVXSTR_ERROR_TITLE ) ); pBox->Execute(); delete pMessage; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 9098a795dbc0..e3173368e20b 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1217,7 +1217,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton ) { DBG_ASSERT(m_pColorSchemeLB->GetEntryCount() > 1, "don't delete the last scheme"); ScopedVclPtrInstance< MessageDialog > aQuery(pButton, CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE), VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); - aQuery->SetText(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); + aQuery->set_title(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); if(RET_YES == aQuery->Execute()) { OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index bba9292b9854..80fe33fb3ac5 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -702,7 +702,7 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat OUString const aMessage(aDiagnosticMessage + "\n"); ScopedVclPtrInstance< MessageDialog > aBootstrapFailedBox(nullptr, aMessage); - aBootstrapFailedBox->SetText( aProductKey ); + aBootstrapFailedBox->set_title( aProductKey ); aBootstrapFailedBox->Execute(); } } diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index 7636431048a6..c003d5c4fdb7 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -42,7 +42,7 @@ bool Lockfile_execWarning( Lockfile * that ) VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO); // set box title OUString aTitle = OUString( DesktopResId( STR_TITLE_USERDATALOCKED )); - aBox->SetText( aTitle ); + aBox->set_title( aTitle ); // insert values... OUString aMsgText = aBox->get_primary_text(); aMsgText = aMsgText.replaceFirst( diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 86adb0289ff2..9593924ca368 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -629,7 +629,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, msg); - aErrorBox->SetText( sTitle ); + aErrorBox->set_title( sTitle ); aErrorBox->Execute(); } } diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 3ff721489ea7..6ccb02463776 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -816,7 +816,7 @@ void ExtensionCmdQueue::Thread::execute() ScopedVclPtr box( VclPtr::Create(currentCmdEnv->activeDialog(), msg)); if ( m_pDialogHelper ) - box->SetText( m_pDialogHelper->getWindow()->GetText() ); + box->set_title( m_pDialogHelper->getWindow()->GetText() ); box->Execute(); //Continue with installation of the remaining extensions } diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 8902b4c8636b..d30b158db8eb 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1552,7 +1552,7 @@ IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl) } ImplErrorDialog::ImplErrorDialog(const std::set< vcl::PDFWriter::ErrorCode >& rErrors) - : MessageDialog(NULL, "WarnPDFDialog", "filter/ui/warnpdfdialog.ui") + : VclMessageDialog(NULL, "WarnPDFDialog", "filter/ui/warnpdfdialog.ui") { get(m_pErrors, "errors"); get(m_pExplanation, "message"); @@ -1634,7 +1634,7 @@ void ImplErrorDialog::dispose() delete static_cast(m_pErrors->GetEntryData( n )); m_pErrors.clear(); m_pExplanation.clear(); - MessageDialog::dispose(); + VclMessageDialog::dispose(); } IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl) diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index ffc8acc10b9d..e2ebaf99aaf0 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -54,7 +54,7 @@ public: PDFFilterResId( sal_uInt32 nId ); }; -class ImplErrorDialog : public MessageDialog +class ImplErrorDialog : public VclMessageDialog { VclPtr m_pErrors; VclPtr m_pExplanation; diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index 09affbebaf75..eef7a92b4cb9 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -203,7 +203,7 @@ enum QueryDeleteResult_Impl QUERYDELETE_ALL = -1 }; -class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public MessageDialog +class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public VclMessageDialog { private: VclPtr m_pAllButton; diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx index b832637fc8b9..eb36b71e3c19 100644 --- a/include/svx/linkwarn.hxx +++ b/include/svx/linkwarn.hxx @@ -24,7 +24,7 @@ #include #include -class SVX_DLLPUBLIC SvxLinkWarningDialog : public MessageDialog +class SVX_DLLPUBLIC SvxLinkWarningDialog : public VclMessageDialog { private: VclPtr m_pWarningOnBox; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index fc9eb56faa6a..ebd9b73eef2b 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -693,25 +694,7 @@ public: bool set_property(const OString &rKey, const OString &rValue); }; -enum VclButtonsType -{ - VCL_BUTTONS_NONE, - VCL_BUTTONS_OK, - VCL_BUTTONS_CLOSE, - VCL_BUTTONS_CANCEL, - VCL_BUTTONS_YES_NO, - VCL_BUTTONS_OK_CANCEL -}; - -enum VclMessageType -{ - VCL_MESSAGE_INFO, - VCL_MESSAGE_WARNING, - VCL_MESSAGE_QUESTION, - VCL_MESSAGE_ERROR -}; - -class VCL_DLLPUBLIC MessageDialog : public Dialog +class VCL_DLLPUBLIC VclMessageDialog : public Dialog, public MessageDialogImpl { private: VclButtonsType m_eButtonsType; @@ -731,27 +714,29 @@ private: short get_response(const vcl::Window *pWindow) const; void create_owned_areas(); - friend class VclPtr; - MessageDialog(vcl::Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); + friend class VclPtr; + VclMessageDialog(vcl::Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); public: - MessageDialog(vcl::Window* pParent, + VclMessageDialog(vcl::Window* pParent, const OUString &rMessage, VclMessageType eMessageType = VCL_MESSAGE_ERROR, VclButtonsType eButtonsType = VCL_BUTTONS_OK, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE); - MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); + VclMessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); + virtual void set_title(const OUString &rTitle) SAL_OVERRIDE { SetText(rTitle); } virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; ///Emitted when an action widget is clicked - virtual void response(short nResponseId); - OUString get_primary_text() const; - OUString get_secondary_text() const; - void set_primary_text(const OUString &rPrimaryString); - void set_secondary_text(const OUString &rSecondaryString); - virtual ~MessageDialog(); + virtual void response(short nResponseId) SAL_OVERRIDE; + OUString get_primary_text() const SAL_OVERRIDE; + OUString get_secondary_text() const SAL_OVERRIDE; + void set_primary_text(const OUString &rPrimaryString) SAL_OVERRIDE; + void set_secondary_text(const OUString &rSecondaryString) SAL_OVERRIDE; virtual void dispose() SAL_OVERRIDE; + virtual ~VclMessageDialog(); + static void SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage); }; diff --git a/include/vcl/salnativedialogs.hxx b/include/vcl/salnativedialogs.hxx new file mode 100644 index 000000000000..78791d17e8d0 --- /dev/null +++ b/include/vcl/salnativedialogs.hxx @@ -0,0 +1,71 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_VCL_SALNATIVEDIALOGS_HXX +#define INCLUDED_VCL_SALNATIVEDIALOGS_HXX + +#include + +class VCL_DLLPUBLIC MessageDialogImpl : public virtual VclPtrRefCountBase +{ +public: + virtual short Execute() = 0; + virtual void response(short nResponseId) = 0; + virtual OUString get_primary_text() const = 0; + virtual OUString get_secondary_text() const = 0; + virtual void set_title(const OUString &rTitle) = 0; + virtual void set_primary_text(const OUString &rPrimaryString) = 0; + virtual void set_secondary_text(const OUString &rSecondaryString) = 0; + virtual void dispose() = 0; + virtual ~MessageDialogImpl() = 0; +}; + +enum VclButtonsType +{ + VCL_BUTTONS_NONE, + VCL_BUTTONS_OK, + VCL_BUTTONS_CLOSE, + VCL_BUTTONS_CANCEL, + VCL_BUTTONS_YES_NO, + VCL_BUTTONS_OK_CANCEL +}; + +enum VclMessageType +{ + VCL_MESSAGE_INFO, + VCL_MESSAGE_WARNING, + VCL_MESSAGE_QUESTION, + VCL_MESSAGE_ERROR +}; + +class VCL_DLLPUBLIC MessageDialog : public VclPtrRefCountBase +{ +private: + VclPtr m_xImpl; +public: + MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription); + MessageDialog(vcl::Window* pParent, + const OUString &rMessage, + VclMessageType eMessageType = VCL_MESSAGE_ERROR, + VclButtonsType eButtonsType = VCL_BUTTONS_OK); + short Execute() { return m_xImpl->Execute(); } + ///Emitted when an action widget is clicked + void response(short nResponseId) { m_xImpl->response(nResponseId); } + OUString get_primary_text() const { return m_xImpl->get_primary_text(); } + OUString get_secondary_text() const { return m_xImpl->get_secondary_text(); } + void set_title(const OUString &rTitle) { return m_xImpl->set_title(rTitle); } + void set_primary_text(const OUString &rPrimaryString) { m_xImpl->set_primary_text(rPrimaryString); } + void set_secondary_text(const OUString &rSecondaryString) { m_xImpl->set_secondary_text(rSecondaryString); } + virtual void dispose() SAL_OVERRIDE { m_xImpl->dispose(); } + ~MessageDialog(); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index e073118c4a8f..39735cc724c3 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -1065,7 +1065,7 @@ void Outliner::ShowEndOfSearchDialog() // Show the message in an info box that is modal with respect to the // whole application. - ScopedVclPtrInstance< MessageDialog > aInfoBox(nullptr, aString, VCL_MESSAGE_INFO); + ScopedVclPtrInstance< VclMessageDialog > aInfoBox(nullptr, aString, VCL_MESSAGE_INFO); ShowModalMessageBox (*aInfoBox.get()); } @@ -1147,7 +1147,7 @@ void Outliner::PrepareSpellCheck() { mbError = true; mbEndOfSearch = true; - ScopedVclPtrInstance aErrorBox ( + ScopedVclPtrInstance aErrorBox ( nullptr, SD_RESSTR(STR_NOLANGUAGE)); ShowModalMessageBox (*aErrorBox.get()); } diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 4ac17df231a0..76ec8c20dbbf 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -834,7 +834,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) ScopedVclPtrInstance aSecurityWarningBox(pWindow, SfxResId(STR_SECURITY_WARNING_NO_HYPERLINKS), VCL_MESSAGE_WARNING); - aSecurityWarningBox->SetText( SfxResId(RID_SECURITY_WARNING_TITLE).toString() ); + aSecurityWarningBox->set_title( SfxResId(RID_SECURITY_WARNING_TITLE).toString() ); aSecurityWarningBox->Execute(); return; } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 3e5258d82569..66a2a008b19a 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -75,7 +75,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::system; -class NoHelpErrorBox : public MessageDialog +class NoHelpErrorBox : public VclMessageDialog { public: NoHelpErrorBox( vcl::Window* _pParent ); @@ -84,7 +84,7 @@ public: }; NoHelpErrorBox::NoHelpErrorBox( vcl::Window* _pParent ) - : MessageDialog(_pParent, SfxResId(RID_STR_HLPFILENOTEXIST)) + : VclMessageDialog(_pParent, SfxResId(RID_STR_HLPFILENOTEXIST)) { // Error message: "No help available" } diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index 7421173023f0..a18195aed0b5 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -27,7 +27,7 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(vcl::Window* pParent, const OUString& _rFormatName, const OUString& _rDefaultExtension, bool rDefaultIsAlien) - : MessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui") + : VclMessageDialog(pParent, "AlienWarnDialog", "sfx/ui/alienwarndialog.ui") { get(m_pWarningOnBox, "ask"); //fdo#75121, a bit tricky because the widgets we want to align with @@ -81,7 +81,7 @@ void SfxAlienWarningDialog::dispose() m_pKeepCurrentBtn.clear(); m_pUseDefaultFormatBtn.clear(); m_pWarningOnBox.clear(); - MessageDialog::dispose(); + VclMessageDialog::dispose(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx index 82884a76ccdf..3a7404ab43d4 100644 --- a/sfx2/source/inc/alienwarn.hxx +++ b/sfx2/source/inc/alienwarn.hxx @@ -22,7 +22,7 @@ #include #include -class SfxAlienWarningDialog : public MessageDialog +class SfxAlienWarningDialog : public VclMessageDialog { private: VclPtr m_pKeepCurrentBtn; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 10fa19fac992..25d1d38c3fcc 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -2318,7 +2318,7 @@ void SvtFileView_Impl::SetActualFolder( const INetURLObject& rActualFolder ) namespace svtools { QueryDeleteDlg_Impl::QueryDeleteDlg_Impl(vcl::Window* pParent, const OUString& rName) - : MessageDialog(pParent, "QueryDeleteDialog", "svt/ui/querydeletedialog.ui") + : VclMessageDialog(pParent, "QueryDeleteDialog", "svt/ui/querydeletedialog.ui") { get(m_pAllButton, "all"); @@ -2334,7 +2334,7 @@ QueryDeleteDlg_Impl::~QueryDeleteDlg_Impl() void QueryDeleteDlg_Impl::dispose() { m_pAllButton.clear(); - MessageDialog::dispose(); + VclMessageDialog::dispose(); } } diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index e380fb1972cf..fd0cf7b82132 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -123,7 +123,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque SolarMutexGuard aSolarGuard; m_bJavaNotFound_Handled = true; ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, SvtResId(STR_WARNING_JAVANOTFOUND), VCL_MESSAGE_WARNING); - aWarningBox->SetText(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE)); + aWarningBox->set_title(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE)); nResult = aWarningBox->Execute(); } else @@ -143,7 +143,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque #else ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, SvtResId(STR_WARNING_INVALIDJAVASETTINGS), VCL_MESSAGE_WARNING); #endif - aWarningBox->SetText(SvtResId(STR_WARNING_INVALIDJAVASETTINGS_TITLE)); + aWarningBox->set_title(SvtResId(STR_WARNING_INVALIDJAVASETTINGS_TITLE)); nResult = aWarningBox->Execute(); } else @@ -186,7 +186,7 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque #else ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SvtResId(STR_ERROR_JVMCREATIONFAILED)); #endif - aErrorBox->SetText(SvtResId(STR_ERROR_JVMCREATIONFAILED_TITLE)); + aErrorBox->set_title(SvtResId(STR_ERROR_JVMCREATIONFAILED_TITLE)); nResult = aErrorBox->Execute(); } else diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index 26879f23f7fe..8ab946995365 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -22,7 +22,7 @@ #include SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* pParent, const OUString& _rFileName ) - : MessageDialog(pParent, "LinkWarnDialog" , "svx/ui/linkwarndialog.ui") + : VclMessageDialog(pParent, "LinkWarnDialog" , "svx/ui/linkwarndialog.ui") { get(m_pWarningOnBox, "ask"); @@ -54,7 +54,7 @@ void SvxLinkWarningDialog::dispose() if ( aMiscOpt.ShowLinkWarningDialog() != bChecked ) aMiscOpt.SetShowLinkWarningDialog( bChecked ); m_pWarningOnBox.clear(); - MessageDialog::dispose(); + VclMessageDialog::dispose(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index b1140d1562ce..1f85018289ca 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -222,7 +222,7 @@ void SwMailDispatcherListener_Impl::DeleteAttachments( uno::Reference< mail::XMa } } -class SwSendWarningBox_Impl : public MessageDialog +class SwSendWarningBox_Impl : public VclMessageDialog { VclPtr m_pDetailED; public: @@ -231,12 +231,12 @@ public: virtual void dispose() SAL_OVERRIDE { m_pDetailED.clear(); - MessageDialog::dispose(); + VclMessageDialog::dispose(); } }; SwSendWarningBox_Impl::SwSendWarningBox_Impl(vcl::Window* pParent, const OUString& rDetails) - : MessageDialog(pParent, "WarnEmailDialog", "modules/swriter/ui/warnemaildialog.ui") + : VclMessageDialog(pParent, "WarnEmailDialog", "modules/swriter/ui/warnemaildialog.ui") { get(m_pDetailED, "errors"); m_pDetailED->SetMaxTextWidth(80 * m_pDetailED->approximate_char_width()); diff --git a/sw/source/ui/dialog/swmessdialog.cxx b/sw/source/ui/dialog/swmessdialog.cxx index 79aba4459af6..a309f9e64820 100644 --- a/sw/source/ui/dialog/swmessdialog.cxx +++ b/sw/source/ui/dialog/swmessdialog.cxx @@ -24,7 +24,7 @@ SwMessageAndEditDialog::SwMessageAndEditDialog(vcl::Window* pParent, const OUStr m_pPrimaryMessage->SetPaintTransparent(true); get(m_pSecondaryMessage, "secondarymessage"); m_pSecondaryMessage->SetPaintTransparent(true); - MessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, m_pSecondaryMessage); + VclMessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, m_pSecondaryMessage); get(m_pImageIM, "image"); m_pImageIM->SetImage(WarningBox::GetStandardImage()); get(m_pEdit, "edit"); diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index d04ef90da678..7112699159b7 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -804,7 +804,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) OUString msg( ::comphelper::anyToString( exc ) ); const SolarMutexGuard guard; ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, msg); - aErrorBox->SetText( "Explanations" ); + aErrorBox->set_title( "Explanations" ); aErrorBox->Execute(); } } diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index e42ed909b5b2..88202ad1adb4 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -232,7 +232,7 @@ executeSSLWarnDialog( if (ErrorResource(aResId).getString( ERRCODE_AREA_UUI_UNKNOWNAUTH + failure + TITLE, aTitle)) { - xDialog->SetText(aTitle); + xDialog->set_title(aTitle); } } diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx index 1e3a55edda88..81c129167dbf 100644 --- a/uui/source/sslwarndlg.cxx +++ b/uui/source/sslwarndlg.cxx @@ -41,7 +41,7 @@ void SSLWarnDialog::ViewCert() SSLWarnDialog::SSLWarnDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext) - : MessageDialog(pParent, "SSLWarnDialog", "uui/ui/sslwarndialog.ui") + : VclMessageDialog(pParent, "SSLWarnDialog", "uui/ui/sslwarndialog.ui") , m_xContext(xContext) , m_rXCert(rXCert) { @@ -55,7 +55,7 @@ void SSLWarnDialog::response(short nResponseId) ViewCert(); break; default: - MessageDialog::response(nResponseId); + VclMessageDialog::response(nResponseId); break; } } diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx index 73b25c2c4c0d..64226c27a8fc 100644 --- a/uui/source/sslwarndlg.hxx +++ b/uui/source/sslwarndlg.hxx @@ -29,7 +29,7 @@ //= Https_WarnDialog -class SSLWarnDialog : public MessageDialog +class SSLWarnDialog : public VclMessageDialog { private: const css::uno::Reference< css::uno::XComponentContext >& m_xContext; diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 731882ccc45b..0485e57496e1 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -61,7 +61,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl) UnknownAuthDialog::UnknownAuthDialog(vcl::Window* pParent, const css::uno::Reference< css::security::XCertificate >& rXCert, const css::uno::Reference< css::uno::XComponentContext >& xContext) - : MessageDialog(pParent, "UnknownAuthDialog", + : VclMessageDialog(pParent, "UnknownAuthDialog", "uui/ui/unknownauthdialog.ui") , m_xContext(xContext) , m_rXCert(rXCert) @@ -86,7 +86,7 @@ void UnknownAuthDialog::dispose() m_pView_Certificate.clear(); m_pOptionButtonAccept.clear(); m_pOptionButtonDontAccept.clear(); - MessageDialog::dispose(); + VclMessageDialog::dispose(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx index 2eafe5e3b5f0..ae7a1435c5a1 100644 --- a/uui/source/unknownauthdlg.hxx +++ b/uui/source/unknownauthdlg.hxx @@ -28,7 +28,7 @@ //= Https_UADialog -class UnknownAuthDialog : public MessageDialog +class UnknownAuthDialog : public VclMessageDialog { private: VclPtr m_pCommandButtonOK; diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index f696bd3cce5f..8f8a4853e622 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -354,7 +354,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) } if( (aData.nTestFlags & ~IMMEDIATE_FLAGS) != (pData->nTestFlags & ~IMMEDIATE_FLAGS) ) { - ScopedVclPtrInstance aBox(this, OUString( + ScopedVclPtrInstance aBox(this, OUString( "Some of the changed settings will only be active after " "restarting the process"), VCL_MESSAGE_INFO); aBox->Execute(); @@ -842,7 +842,7 @@ void DbgGUIStart() } else { - ScopedVclPtrInstance::Create(nullptr, OUString("TOOLS Library has no Debug-Routines"))->Execute(); + ScopedVclPtrInstance::Create(nullptr, OUString("TOOLS Library has no Debug-Routines"))->Execute(); } } diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx index fcf7b9d129c7..062a4fda21e5 100644 --- a/vcl/source/app/stdtext.cxx +++ b/vcl/source/app/stdtext.cxx @@ -39,7 +39,7 @@ void ShowServiceNotAvailableError(vcl::Window* pParent, { OUString aText = GetStandardText(STANDARD_TEXT_SERVICE_NOT_AVAILABLE). replaceAll("%s", rServiceName); - ScopedVclPtrInstance< MessageDialog > aBox( pParent, aText, bError ? VCL_MESSAGE_ERROR : VCL_MESSAGE_WARNING ); + ScopedVclPtrInstance< VclMessageDialog > aBox( pParent, aText, bError ? VCL_MESSAGE_ERROR : VCL_MESSAGE_WARNING ); aBox->Execute(); } diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 8b1a2a60e380..89e2f86cb9b5 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -170,7 +170,7 @@ ResMgr* ImplGetResMgr() "Missing vcl resource. This indicates that files vital to localization are missing. " "You might have a corrupt installation."; SAL_WARN("vcl", "" << pMsg << "\n"); - ScopedVclPtrInstance< MessageDialog > aBox( nullptr, OUString(pMsg, strlen(pMsg), RTL_TEXTENCODING_ASCII_US) ); + ScopedVclPtrInstance< VclMessageDialog > aBox( nullptr, OUString(pMsg, strlen(pMsg), RTL_TEXTENCODING_ASCII_US) ); aBox->Execute(); } } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 4feeb2d02b0a..1f305241ed16 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -810,7 +810,7 @@ void Edit::ShowTruncationWarning( vcl::Window* pParent ) ResMgr* pResMgr = ImplGetResMgr(); if( pResMgr ) { - ScopedVclPtrInstance< MessageDialog > aBox( pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr), VCL_MESSAGE_WARNING ); + ScopedVclPtrInstance< VclMessageDialog > aBox( pParent, ResId(SV_EDIT_WARNING_STR, *pResMgr), VCL_MESSAGE_WARNING ); aBox->Execute(); } } diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 40d4614daa44..affafb423c40 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1325,7 +1325,7 @@ VclPtr VclBuilder::makeObject(vcl::Window *pParent, const OString & WinBits nBits = WB_CLIPCHILDREN|WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE; if (extractResizable(rMap)) nBits |= WB_SIZEABLE; - xWindow = VclPtr::Create(pParent, nBits); + xWindow = VclPtr::Create(pParent, nBits); } else if (name == "GtkBox") { diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 090a70c9e570..cf44b0930f0d 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1972,7 +1972,26 @@ bool VclSizeGroup::set_property(const OString &rKey, const OString &rValue) return true; } -void MessageDialog::create_owned_areas() +MessageDialogImpl::~MessageDialogImpl() +{ +} + +MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +{ +// SalFrame* pParentFrame = pParent ? pParent->mpWindowImpl->mpFrame : NULL; +// m_pImpl = pSVData->mpDefInst->CreateChildFrame( pSystemParentData, nFrameStyle | SAL_FRAME_STYLE_PLUG ); + m_pImpl = new VclMessageDialog(pParent, rID, rUIXMLDescription); +} + +MessageDialog::MessageDialog(vcl::Window* pParent, const OUString &rMessage, VclMessageType eMessageType, + VclButtonsType eButtonsType) +{ +// SalFrame* pParentFrame = pParent ? pParent->mpWindowImpl->mpFrame : NULL; +// m_pImpl = pSVData->mpDefInst->CreateChildFrame( pSystemParentData, nFrameStyle | SAL_FRAME_STYLE_PLUG ); + m_pImpl = new VclMessageDialog(pParent, rMessage, eMessageType, eButtonsType); +} + +void VclMessageDialog::create_owned_areas() { set_border_width(12); m_pOwnedContentArea.set(VclPtr::Create(this, false, 24)); @@ -1983,7 +2002,7 @@ void MessageDialog::create_owned_areas() m_pOwnedActionArea->Show(); } -MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle) +VclMessageDialog::VclMessageDialog(vcl::Window* pParent, WinBits nStyle) : Dialog(pParent, nStyle) , m_eButtonsType(VCL_BUTTONS_NONE) , m_eMessageType(VCL_MESSAGE_INFO) @@ -1997,7 +2016,7 @@ MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle) SetType(WINDOW_MESSBOX); } -MessageDialog::MessageDialog(vcl::Window* pParent, +VclMessageDialog::VclMessageDialog(vcl::Window* pParent, const OUString &rMessage, VclMessageType eMessageType, VclButtonsType eButtonsType, @@ -2015,7 +2034,7 @@ MessageDialog::MessageDialog(vcl::Window* pParent, create_owned_areas(); } -MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) +VclMessageDialog::VclMessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_MESSBOX) , m_eButtonsType(VCL_BUTTONS_NONE) , m_eMessageType(VCL_MESSAGE_INFO) @@ -2028,7 +2047,7 @@ MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUS { } -void MessageDialog::dispose() +void VclMessageDialog::dispose() { for (size_t i = 0; i < m_aOwnedButtons.size(); ++i) m_aOwnedButtons[i].disposeAndClear(); @@ -2043,23 +2062,23 @@ void MessageDialog::dispose() Dialog::dispose(); } -MessageDialog::~MessageDialog() +VclMessageDialog::~VclMessageDialog() { disposeOnce(); } -void MessageDialog::response(short nResponseId) +void VclMessageDialog::response(short nResponseId) { EndDialog(nResponseId); } -IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton) +IMPL_LINK(VclMessageDialog, ButtonHdl, Button *, pButton) { response(get_response(pButton)); return 0; } -short MessageDialog::get_response(const vcl::Window *pWindow) const +short VclMessageDialog::get_response(const vcl::Window *pWindow) const { auto aFind = m_aResponses.find(pWindow); if (aFind != m_aResponses.end()) @@ -2069,7 +2088,7 @@ short MessageDialog::get_response(const vcl::Window *pWindow) const return m_pUIBuilder->get_response(pWindow); } -void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) +void VclMessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) { assert(pButtonBox); for (vcl::Window* pChild = pButtonBox->GetWindow(GetWindowType::FirstChild); pChild; @@ -2080,7 +2099,7 @@ void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) case WINDOW_PUSHBUTTON: { PushButton* pButton = static_cast(pChild); - pButton->SetClickHdl(LINK(this, MessageDialog, ButtonHdl)); + pButton->SetClickHdl(LINK(this, VclMessageDialog, ButtonHdl)); break; } //insist that the response ids match the default actions for those @@ -2108,7 +2127,7 @@ void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) } } -void MessageDialog::SetMessagesWidths(vcl::Window *pParent, +void VclMessageDialog::SetMessagesWidths(vcl::Window *pParent, VclMultiLineEdit *pPrimaryMessage, VclMultiLineEdit *pSecondaryMessage) { if (pSecondaryMessage) @@ -2125,7 +2144,7 @@ void MessageDialog::SetMessagesWidths(vcl::Window *pParent, pPrimaryMessage->SetMaxTextWidth(pPrimaryMessage->approximate_char_width() * 60); } -short MessageDialog::Execute() +short VclMessageDialog::Execute() { setDeferredProperties(); @@ -2183,7 +2202,7 @@ short MessageDialog::Execute() m_pSecondaryMessage->SetText(m_sSecondaryString); m_pSecondaryMessage->Show(bHasSecondaryText); - MessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, bHasSecondaryText ? m_pSecondaryMessage.get() : NULL); + VclMessageDialog::SetMessagesWidths(this, m_pPrimaryMessage, bHasSecondaryText ? m_pSecondaryMessage.get() : NULL); VclButtonBox *pButtonBox = get_action_area(); assert(pButtonBox); @@ -2247,21 +2266,21 @@ short MessageDialog::Execute() return Dialog::Execute(); } -OUString MessageDialog::get_primary_text() const +OUString VclMessageDialog::get_primary_text() const { - const_cast(this)->setDeferredProperties(); + const_cast(this)->setDeferredProperties(); return m_sPrimaryString; } -OUString MessageDialog::get_secondary_text() const +OUString VclMessageDialog::get_secondary_text() const { - const_cast(this)->setDeferredProperties(); + const_cast(this)->setDeferredProperties(); return m_sSecondaryString; } -bool MessageDialog::set_property(const OString &rKey, const OString &rValue) +bool VclMessageDialog::set_property(const OString &rKey, const OString &rValue) { if (rKey == "text") set_primary_text(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); @@ -2310,7 +2329,7 @@ bool MessageDialog::set_property(const OString &rKey, const OString &rValue) return true; } -void MessageDialog::set_primary_text(const OUString &rPrimaryString) +void VclMessageDialog::set_primary_text(const OUString &rPrimaryString) { m_sPrimaryString = rPrimaryString; if (m_pPrimaryMessage) @@ -2320,7 +2339,7 @@ void MessageDialog::set_primary_text(const OUString &rPrimaryString) } } -void MessageDialog::set_secondary_text(const OUString &rSecondaryString) +void VclMessageDialog::set_secondary_text(const OUString &rSecondaryString) { m_sSecondaryString = rSecondaryString; if (m_pSecondaryMessage) -- cgit v1.2.3