[Libreoffice-commits] core.git: basctl/source basic/source cui/source dbaccess/source forms/source include/vcl sc/source sd/source sfx2/source svtools/source svx/source sw/source toolkit/source uui/inc uui/source vcl/osx vcl/source vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 17 11:43:13 UTC 2019
basctl/source/basicide/baside3.cxx | 8 ++--
basic/source/runtime/methods.cxx | 29 ++++++++--------
cui/source/customize/cfg.cxx | 8 ++--
cui/source/dialogs/about.cxx | 4 +-
cui/source/dialogs/cuifmsearch.cxx | 6 +--
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4 +-
dbaccess/source/ui/dlg/sqlmessage.cxx | 18 ++++-----
dbaccess/source/ui/misc/datasourceconnector.cxx | 2 -
dbaccess/source/ui/querydesign/querycontroller.cxx | 4 +-
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 3 +
forms/source/richtext/richtextvclcontrol.hxx | 2 -
forms/source/runtime/formoperations.cxx | 3 -
include/vcl/button.hxx | 2 -
include/vcl/stdtext.hxx | 2 +
sc/source/ui/docshell/docfunc.cxx | 7 ++-
sc/source/ui/docshell/docsh.cxx | 5 +-
sd/source/core/drawdoc3.cxx | 4 +-
sd/source/ui/animations/CustomAnimationDialog.cxx | 5 +-
sd/source/ui/animations/SlideTransitionPane.cxx | 5 +-
sfx2/source/appl/opengrf.cxx | 6 +--
sfx2/source/view/viewfrm.cxx | 3 +
svtools/source/misc/ehdl.cxx | 4 +-
svx/source/tbxctrls/layctrl.cxx | 5 +-
sw/source/ui/dbui/mmresultdialogs.cxx | 3 +
sw/source/uibase/uiview/viewprt.cxx | 4 +-
toolkit/source/helper/btndlg.cxx | 3 +
uui/inc/pch/precompiled_uui.hxx | 5 +-
uui/source/alreadyopen.cxx | 4 +-
uui/source/filechanged.cxx | 4 +-
uui/source/fltdlg.cxx | 1
uui/source/iahndl-errorhandler.cxx | 24 ++++++-------
uui/source/lockcorrupt.cxx | 4 +-
uui/source/lockfailed.cxx | 4 +-
uui/source/openlocked.cxx | 4 +-
uui/source/trylater.cxx | 6 +--
vcl/osx/salsys.cxx | 4 +-
vcl/source/control/button.cxx | 11 +++---
vcl/source/toolkit/morebtn.cxx | 5 +-
vcl/source/window/layout.cxx | 5 +-
vcl/unx/gtk3/gtk3gtkinst.cxx | 11 +++---
40 files changed, 127 insertions(+), 114 deletions(-)
New commits:
commit 28fc986025009473c9782b61d8c6062fa60085ba
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 17 09:41:02 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 17 13:41:48 2019 +0200
move GetStandardText to stdtext.hxx
Change-Id: Iaf9b5107cf88390f62d5ca94bf985c77bcb8b7ad
Reviewed-on: https://gerrit.libreoffice.org/79048
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index ab9bbe06f544..00b0d0db0056 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -51,10 +51,10 @@
#include <svx/svxids.hrc>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
-#include <vcl/button.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
@@ -803,7 +803,7 @@ public:
m_xQueryBox->set_title(rTitle);
m_xQueryBox->add_button(IDEResId(RID_STR_DLGIMP_CLASH_RENAME), RET_YES);
m_xQueryBox->add_button(IDEResId(RID_STR_DLGIMP_CLASH_REPLACE), RET_NO);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_YES);
}
short run() { return m_xQueryBox->run(); }
@@ -821,8 +821,8 @@ public:
m_xQueryBox->set_title(rTitle);
m_xQueryBox->add_button(IDEResId(RID_STR_DLGIMP_MISMATCH_ADD), RET_YES);
m_xQueryBox->add_button(IDEResId(RID_STR_DLGIMP_MISMATCH_OMIT), RET_NO);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Help), RET_HELP);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Help), RET_HELP);
m_xQueryBox->set_default_response(RET_YES);
}
short run() { return m_xQueryBox->run(); }
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 13d16b0bfd23..f7d3f25f7185 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -24,11 +24,12 @@
#include <basic/sbuno.hxx>
#include <osl/process.h>
#include <vcl/dibtools.hxx>
+#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/sound.hxx>
#include <tools/wintypes.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <basic/sbx.hxx>
#include <svl/zforlist.hxx>
@@ -4401,11 +4402,11 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool)
{
case 0: // MB_OK
default:
- xBox->add_button(Button::GetStandardText(StandardButtonType::OK), BasicResponse::Ok);
+ xBox->add_button(GetStandardText(StandardButtonType::OK), BasicResponse::Ok);
break;
case 1: // MB_OKCANCEL
- xBox->add_button(Button::GetStandardText(StandardButtonType::OK), BasicResponse::Ok);
- xBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), BasicResponse::Cancel);
+ xBox->add_button(GetStandardText(StandardButtonType::OK), BasicResponse::Ok);
+ xBox->add_button(GetStandardText(StandardButtonType::Cancel), BasicResponse::Cancel);
if (nType & 256 || nType & 512)
xBox->set_default_response(BasicResponse::Cancel);
@@ -4414,9 +4415,9 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool)
break;
case 2: // MB_ABORTRETRYIGNORE
- xBox->add_button(Button::GetStandardText(StandardButtonType::Abort), BasicResponse::Abort);
- xBox->add_button(Button::GetStandardText(StandardButtonType::Retry), BasicResponse::Retry);
- xBox->add_button(Button::GetStandardText(StandardButtonType::Ignore), BasicResponse::Ignore);
+ xBox->add_button(GetStandardText(StandardButtonType::Abort), BasicResponse::Abort);
+ xBox->add_button(GetStandardText(StandardButtonType::Retry), BasicResponse::Retry);
+ xBox->add_button(GetStandardText(StandardButtonType::Ignore), BasicResponse::Ignore);
if (nType & 256)
xBox->set_default_response(BasicResponse::Retry);
@@ -4427,9 +4428,9 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool)
break;
case 3: // MB_YESNOCANCEL
- xBox->add_button(Button::GetStandardText(StandardButtonType::Yes), BasicResponse::Yes);
- xBox->add_button(Button::GetStandardText(StandardButtonType::No), BasicResponse::No);
- xBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), BasicResponse::Cancel);
+ xBox->add_button(GetStandardText(StandardButtonType::Yes), BasicResponse::Yes);
+ xBox->add_button(GetStandardText(StandardButtonType::No), BasicResponse::No);
+ xBox->add_button(GetStandardText(StandardButtonType::Cancel), BasicResponse::Cancel);
if (nType & 256 || nType & 512)
xBox->set_default_response(BasicResponse::Cancel);
@@ -4438,8 +4439,8 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool)
break;
case 4: // MB_YESNO
- xBox->add_button(Button::GetStandardText(StandardButtonType::Yes), BasicResponse::Yes);
- xBox->add_button(Button::GetStandardText(StandardButtonType::No), BasicResponse::No);
+ xBox->add_button(GetStandardText(StandardButtonType::Yes), BasicResponse::Yes);
+ xBox->add_button(GetStandardText(StandardButtonType::No), BasicResponse::No);
if (nType & 256 || nType & 512)
xBox->set_default_response(BasicResponse::No);
@@ -4448,8 +4449,8 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool)
break;
case 5: // MB_RETRYCANCEL
- xBox->add_button(Button::GetStandardText(StandardButtonType::Retry), BasicResponse::Retry);
- xBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), BasicResponse::Cancel);
+ xBox->add_button(GetStandardText(StandardButtonType::Retry), BasicResponse::Retry);
+ xBox->add_button(GetStandardText(StandardButtonType::Cancel), BasicResponse::Cancel);
if (nType & 256 || nType & 512)
xBox->set_default_response(BasicResponse::Cancel);
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 45319736b7db..def983911b70 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <typeinfo>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <vcl/edit.hxx>
#include <vcl/event.hxx>
@@ -2981,11 +2981,11 @@ namespace
: m_xQueryBox(Application::CreateMessageDialog(pParent, VclMessageType::Warning, VclButtonsType::NONE, ReplaceIconName(rMessage)))
{
m_xQueryBox->set_title(CuiResId(RID_SVXSTR_REPLACE_ICON_CONFIRM));
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Yes), 2);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Yes), 2);
if (bYestoAll)
m_xQueryBox->add_button(CuiResId(RID_SVXSTR_YESTOALL), 5);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::No), 4);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), 6);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::No), 4);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), 6);
m_xQueryBox->set_default_response(2);
}
short run() { return m_xQueryBox->run(); }
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index da2e4d2b4e2d..0dc219df8156 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -22,9 +22,9 @@
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <rtl/character.hxx>
-#include <vcl/button.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/settings.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
@@ -63,7 +63,7 @@ AboutDialog::AboutDialog(weld::Window* pParent)
, m_xDialog(m_xBuilder->weld_about_dialog("AboutDialog"))
, m_xContentArea(m_xDialog->weld_content_area())
{
- m_xDialog->add_button(Button::GetStandardText(StandardButtonType::Close), RET_CLOSE);
+ m_xDialog->add_button(GetStandardText(StandardButtonType::Close), RET_CLOSE);
m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_CREDITS), 101);
m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_WEBSITE), 102);
m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_RELEASE_NOTES), 103);
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index bac466b572ff..de7681fa7d79 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -18,9 +18,9 @@
*/
#include <tools/debug.hxx>
-#include <vcl/button.hxx>
-#include <vcl/weld.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
#include <svx/fmsrccfg.hxx>
@@ -71,7 +71,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
FmSearchDialog::FmSearchDialog(weld::Window* pParent, const OUString& sInitialText, const std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier)
: GenericDialogController(pParent, "cui/ui/fmsearchdialog.ui", "RecordSearchDialog")
- , m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) )
+ , m_sCancel( GetStandardText( StandardButtonType::Cancel ) )
, m_lnkContextSupplier(lnkContextSupplier)
, m_prbSearchForText(m_xBuilder->weld_radio_button("rbSearchForText"))
, m_prbSearchForNull(m_xBuilder->weld_radio_button("rbSearchForNull"))
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 18dde46c0c52..7a6901ce2150 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -495,8 +495,8 @@ namespace dbaui
std::unique_ptr<weld::MessageDialog> xWhatToDo(Application::CreateMessageDialog(pWin ? pWin->GetFrameWeld() : nullptr,
VclMessageType::Question, VclButtonsType::NONE,
sQuery));
- xWhatToDo->add_button(Button::GetStandardText(StandardButtonType::Retry), RET_RETRY);
- xWhatToDo->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xWhatToDo->add_button(GetStandardText(StandardButtonType::Retry), RET_RETRY);
+ xWhatToDo->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
xWhatToDo->set_default_response(RET_RETRY);
nQueryResult = xWhatToDo->run();
m_bUserGrabFocus = true;
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f585b6fd1276..c48c4c224c12 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -24,9 +24,9 @@
#include <bitmaps.hlst>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
-#include <vcl/button.hxx>
-#include <vcl/weld.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/weld.hxx>
#include <osl/diagnose.h>
#include <connectivity/dbexception.hxx>
#include <connectivity/sqlerror.hxx>
@@ -376,27 +376,27 @@ namespace
{
case StandardButtonType::Yes:
nButtonID = RET_YES;
- pDialog->add_button(Button::GetStandardText(StandardButtonType::Yes), nButtonID);
+ pDialog->add_button(GetStandardText(StandardButtonType::Yes), nButtonID);
break;
case StandardButtonType::No:
nButtonID = RET_NO;
- pDialog->add_button(Button::GetStandardText(StandardButtonType::No), nButtonID);
+ pDialog->add_button(GetStandardText(StandardButtonType::No), nButtonID);
break;
case StandardButtonType::OK:
nButtonID = RET_OK;
- pDialog->add_button(Button::GetStandardText(StandardButtonType::OK), nButtonID);
+ pDialog->add_button(GetStandardText(StandardButtonType::OK), nButtonID);
break;
case StandardButtonType::Cancel:
nButtonID = RET_CANCEL;
- pDialog->add_button(Button::GetStandardText(StandardButtonType::Cancel), nButtonID);
+ pDialog->add_button(GetStandardText(StandardButtonType::Cancel), nButtonID);
break;
case StandardButtonType::Retry:
nButtonID = RET_RETRY;
- pDialog->add_button(Button::GetStandardText(StandardButtonType::Retry), nButtonID);
+ pDialog->add_button(GetStandardText(StandardButtonType::Retry), nButtonID);
break;
case StandardButtonType::Help:
nButtonID = RET_HELP;
- pDialog->add_button(Button::GetStandardText(StandardButtonType::Help), nButtonID);
+ pDialog->add_button(GetStandardText(StandardButtonType::Help), nButtonID);
break;
default:
OSL_FAIL( "lcl_addButton: invalid button id!" );
@@ -508,7 +508,7 @@ void OSQLMessageBox::impl_addDetailsButton()
if ( bMoreDetailsAvailable )
{
- m_xDialog->add_button(Button::GetStandardText(StandardButtonType::More), RET_MORE);
+ m_xDialog->add_button(GetStandardText(StandardButtonType::More), RET_MORE);
m_xMoreButton.reset(m_xDialog->weld_widget_for_response(RET_MORE));
m_xMoreButton->connect_clicked(LINK(this, OSQLMessageBox, ButtonClickHdl));
}
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx
index 67da61ad905b..2d9fec95b8cf 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -159,7 +159,7 @@ namespace dbaui
if ( aWarnings.hasValue() )
{
OUString sMessage( DBA_RES( STR_WARNINGS_DURING_CONNECT ) );
- sMessage = sMessage.replaceFirst( "$buttontext$", Button::GetStandardText( StandardButtonType::More ) );
+ sMessage = sMessage.replaceFirst( "$buttontext$", GetStandardText( StandardButtonType::More ) );
sMessage = OutputDevice::GetNonMnemonicString( sMessage );
SQLWarning aContext;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 3a349ba86dc4..1d6694c5bf99 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -75,7 +75,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <osl/mutex.hxx>
@@ -1613,7 +1613,7 @@ short OQueryController::saveModified()
std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(getFrameWeld(),
VclMessageType::Question, VclButtonsType::YesNo,
sMessageText));
- xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
xQueryBox->set_default_response(RET_YES);
nRet = xQueryBox->run();
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 5a6c1568688d..30f349a4e68e 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -47,6 +47,7 @@
#include "RTableWindow.hxx"
#include <JAccess.hxx>
#include <svl/undo.hxx>
+#include <vcl/stdtext.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
using namespace dbaui;
@@ -346,7 +347,7 @@ void ORelationTableView::lookForUiActivities()
aDlg.add_button(DBA_RES(STR_QUERY_REL_EDIT), RET_OK);
aDlg.set_default_response(RET_OK);
aDlg.add_button(DBA_RES(STR_QUERY_REL_CREATE), RET_YES);
- aDlg.add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ aDlg.add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
sal_uInt16 nRet = aDlg.run();
if (nRet == RET_CANCEL)
{
diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx
index bff1a9d3f8d3..322856619278 100644
--- a/forms/source/richtext/richtextvclcontrol.hxx
+++ b/forms/source/richtext/richtextvclcontrol.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
#define INCLUDED_FORMS_SOURCE_RICHTEXT_RICHTEXTVCLCONTROL_HXX
-#include <vcl/button.hxx>
+#include <vcl/ctrl.hxx>
#include <vcl/toolbox.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include "rtattributes.hxx"
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 8ae085794f43..c26a758a2068 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -52,7 +52,6 @@
#include <connectivity/dbexception.hxx>
#include <vcl/svapp.hxx>
#include <vcl/stdtext.hxx>
-#include <vcl/button.hxx>
#include <vcl/weld.hxx>
#include <vcl/waitobj.hxx>
#include <tools/diagnose_ex.h>
@@ -440,7 +439,7 @@ namespace frm
std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr,
VclMessageType::Question, VclButtonsType::YesNo,
FRM_RES_STRING(RID_STR_QUERY_SAVE_MODIFIED_ROW)));
- xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
xQueryBox->set_default_response(RET_YES);
switch (xQueryBox->run())
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 57e7a9b55857..bff3c8af3de9 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -76,8 +76,6 @@ public:
void SetCommandHandler(const OUString& aCommand);
OUString const & GetCommand() const { return maCommand; }
- static OUString GetStandardText( StandardButtonType eButton );
-
void SetModeImage( const Image& rImage );
Image const & GetModeImage( ) const;
bool HasImage() const;
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx
index 196725d4e278..5287fc746a26 100644
--- a/include/vcl/stdtext.hxx
+++ b/include/vcl/stdtext.hxx
@@ -21,11 +21,13 @@
#define INCLUDED_VCL_STDTEXT_HXX
#include <rtl/ustring.hxx>
+#include <tools/wintypes.hxx>
#include <vcl/dllapi.h>
namespace weld { class Widget; }
void VCL_DLLPUBLIC ShowServiceNotAvailableError(weld::Widget* pParent, const OUString& rServiceName, bool bError);
+OUString VCL_DLLPUBLIC GetStandardText(StandardButtonType eButton);
#endif // INCLUDED_VCL_STDTEXT_HXX
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 998a160f88bc..366f0dae96db 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -25,9 +25,10 @@
#include <editeng/justifyitem.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/bindings.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/weld.hxx>
#include <vcl/waitobj.hxx>
+#include <vcl/weld.hxx>
+#include <vcl/stdtext.hxx>
+#include <vcl/svapp.hxx>
#include <svx/svdocapt.hxx>
#include <sal/log.hxx>
#include <unotools/charclass.hxx>
@@ -5184,7 +5185,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList,
std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(ScDocShell::GetActiveDialogParent(),
VclMessageType::Question, VclButtonsType::YesNo,
aMessage));
- xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
xQueryBox->set_default_response(RET_YES);
short nResult = xQueryBox->run();
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 6bfda5109233..42b538035405 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -26,6 +26,7 @@
#include <comphelper/fileformat.h>
#include <comphelper/classids.hxx>
#include <formula/errorcodes.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <vcl/waitobj.hxx>
@@ -864,8 +865,8 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetActiveDialogParent(),
VclMessageType::Warning, VclButtonsType::NONE,
aMessage));
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Retry), RET_RETRY);
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xWarn->add_button(GetStandardText(StandardButtonType::Retry), RET_RETRY);
+ xWarn->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
xWarn->set_default_response(RET_RETRY);
if (xWarn->run() == RET_RETRY)
{
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 9aac00728c05..d206a03a1c4a 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -30,7 +30,7 @@
#include <svl/style.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdundo.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <xmloff/autolayout.hxx>
@@ -451,7 +451,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr,
VclMessageType::Question, VclButtonsType::YesNo,
aStr));
- xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
sal_uInt16 nBut = xQueryBox->run();
bScaleObjects = nBut == RET_YES;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 4f68909bda7a..743d08ddc71d 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -38,6 +38,7 @@
#include <vcl/svapp.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <vcl/menu.hxx>
#include <vcl/settings.hxx>
@@ -2213,8 +2214,8 @@ void CustomAnimationEffectTabPage::openSoundFileDialog()
std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(nullptr,
VclMessageType::Warning, VclButtonsType::NONE,
aStrWarning));
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Retry), RET_RETRY);
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xWarn->add_button(GetStandardText(StandardButtonType::Retry), RET_RETRY);
+ xWarn->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
bQuitLoop = xWarn->run() != RET_RETRY;
bValidSoundFile=false;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 998b0c58ef6b..4bc3e3577b61 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -38,6 +38,7 @@
#include <tools/debug.hxx>
#include <svx/gallery.hxx>
#include <vcl/layout.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <tools/urlobj.hxx>
@@ -770,8 +771,8 @@ void SlideTransitionPane::openSoundFileDialog()
std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(nullptr,
VclMessageType::Warning, VclButtonsType::NONE,
aStrWarning));
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Retry), RET_RETRY);
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xWarn->add_button(GetStandardText(StandardButtonType::Retry), RET_RETRY);
+ xWarn->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
bQuitLoop = (xWarn->run() != RET_RETRY);
bValidSoundFile = false;
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 00a31a4f3ca9..dc0e09231b40 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -39,7 +39,7 @@
#include <svl/urihelper.hxx>
#include <vcl/transfer.hxx>
#include <sot/formats.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
@@ -164,8 +164,8 @@ ErrCode SvxOpenGraphicDialog::Execute()
std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(nullptr,
VclMessageType::Warning, VclButtonsType::NONE,
SfxResId(SvxOpenGrfErr2ResId(nImpRet))));
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Retry), RET_RETRY);
- xWarn->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xWarn->add_button(GetStandardText(StandardButtonType::Retry), RET_RETRY);
+ xWarn->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
bQuitLoop = xWarn->run() != RET_RETRY;
}
else
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 07d3549e750d..5214f17ee980 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -44,6 +44,7 @@
#include <svl/slstitm.hxx>
#include <svl/whiter.hxx>
#include <svl/undo.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/miscopt.hxx>
@@ -191,7 +192,7 @@ public:
m_xQueryBox->add_button(SfxResId(STR_QUERY_OPENASTEMPLATE_OPENCOPY_BTN), RET_YES);
if (bAllowIgnoreLock)
m_xQueryBox->add_button(SfxResId(STR_QUERY_OPENASTEMPLATE_OPEN_BTN), RET_IGNORE);
- m_xQueryBox->add_button(Button::GetStandardText( StandardButtonType::Cancel ), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText( StandardButtonType::Cancel ), RET_CANCEL);
m_xQueryBox->set_default_response(RET_YES);
}
short run() { return m_xQueryBox->run(); }
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index c4b444f69a57..73399037e30f 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -18,7 +18,7 @@
*/
#include <unotools/resmgr.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
@@ -98,7 +98,7 @@ static DialogMask aWndFunc(
eMessageType, eButtonsType, aErr));
if (bAddRetry)
- xBox->add_button(Button::GetStandardText(StandardButtonType::Retry), RET_RETRY);
+ xBox->add_button(GetStandardText(StandardButtonType::Retry), RET_RETRY);
switch(nFlags & DialogMask(0x0f00))
{
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index c70b1822a873..38646d3dcd91 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -18,8 +18,9 @@
*/
#include <string>
-#include <vcl/toolbox.hxx>
#include <vcl/button.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -660,7 +661,7 @@ void ColumnsWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta
if (nCol)
aText = OUString::number(nCol);
else
- aText = Button::GetStandardText(StandardButtonType::Cancel).replaceAll("~", "");
+ aText = GetStandardText(StandardButtonType::Cancel).replaceAll("~", "");
Size aTextSize(rRenderContext.GetTextWidth(aText), rRenderContext.GetTextHeight());
rRenderContext.DrawText(Point((aSize.Width() - aTextSize.Width()) / 2, aSize.Height() - nTextHeight + 2), aText);
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 18af8ebd1752..c5230e195a8a 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -42,6 +42,7 @@
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
#include <vcl/layout.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <sfx2/dinfdlg.hxx>
#include <sfx2/printer.hxx>
@@ -843,7 +844,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(m_xDialog.get(),
VclMessageType::Question, VclButtonsType::YesNo,
m_sConfigureMail));
- xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
sal_uInt16 nRet = xQueryBox->run();
if (RET_YES == nRet )
{
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 799f7351e361..1aaa7750f5ac 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -25,8 +25,8 @@
#include <sfx2/app.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
-#include <vcl/button.hxx>
#include <vcl/oldprintadaptor.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/prnmon.hxx>
@@ -165,7 +165,7 @@ namespace
m_xQueryBox->add_button(SvxResId(RID_SVXSTR_QRY_PRINT_SELECTION), RET_OK);
m_xQueryBox->add_button(SvxResId(RID_SVXSTR_QRY_PRINT_ALL), 2);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_OK);
}
short run() { return m_xQueryBox->run(); }
diff --git a/toolkit/source/helper/btndlg.cxx b/toolkit/source/helper/btndlg.cxx
index f890ddb0fd8b..90d1dd174676 100644
--- a/toolkit/source/helper/btndlg.cxx
+++ b/toolkit/source/helper/btndlg.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <helper/btndlg.hxx>
#include <sal/log.hxx>
@@ -279,7 +280,7 @@ void ButtonDialog::AddButton( StandardButtonType eType, sal_uInt16 nId,
auto itr = mapButtonTypeToID.find(eType);
if (itr != mapButtonTypeToID.end())
pItem->mpPushButton->set_id(itr->second);
- pItem->mpPushButton->SetText( Button::GetStandardText( eType ) );
+ pItem->mpPushButton->SetText( GetStandardText( eType ) );
}
if ( nBtnFlags & ButtonDialogFlags::Focus )
diff --git a/uui/inc/pch/precompiled_uui.hxx b/uui/inc/pch/precompiled_uui.hxx
index c8f975bd48bc..e9064c346efd 100644
--- a/uui/inc/pch/precompiled_uui.hxx
+++ b/uui/inc/pch/precompiled_uui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-04-29 21:19:18 using:
+ Generated on 2019-09-17 09:34:44 using:
./bin/update_pch uui uui --cutoff=4 --exclude:system --exclude:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -49,12 +49,13 @@
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/config.h>
+#include <sal/detail/log.h>
#include <sal/macros.h>
#include <sal/saldllapi.h>
#include <sal/types.h>
#include <sal/typesizes.h>
-#include <vcl/button.hxx>
#include <vcl/dllapi.h>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#endif // PCH_LEVEL >= 2
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 9f94e22dc49a..2fe5dcbc424f 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -20,7 +20,7 @@
#include <strings.hrc>
#include "alreadyopen.hxx"
#include <unotools/resmgr.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
AlreadyOpenQueryBox::AlreadyOpenQueryBox(weld::Window* pParent, const std::locale& rLocale, const OUString& rMessage, bool bIsStoring)
@@ -37,7 +37,7 @@ AlreadyOpenQueryBox::AlreadyOpenQueryBox(weld::Window* pParent, const std::local
m_xQueryBox->add_button(Translate::get(STR_ALREADYOPEN_READONLY_BTN, rLocale), RET_YES);
m_xQueryBox->add_button(Translate::get(STR_ALREADYOPEN_OPEN_BTN, rLocale), RET_NO);
}
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_YES);
}
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 0c0b5d53dcc9..23db10450b86 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -19,7 +19,7 @@
#include <strings.hrc>
#include <unotools/resmgr.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include "filechanged.hxx"
@@ -29,7 +29,7 @@ FileChangedQueryBox::FileChangedQueryBox(weld::Window* pParent, const std::local
{
m_xQueryBox->set_title(Translate::get(STR_FILECHANGED_TITLE, rLocale));
m_xQueryBox->add_button(Translate::get(STR_FILECHANGED_SAVEANYWAY_BTN, rLocale), RET_YES);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_YES);
}
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index dec3a798b0d2..124471716771 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -25,7 +25,6 @@
#include <cppuhelper/implbase.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/button.hxx>
#include <osl/file.hxx>
#include <vcl/svapp.hxx>
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 007d6686d44d..1faa1f59990b 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -17,8 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <vcl/errinf.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <com/sun/star/task/XInteractionAbort.hpp>
@@ -26,7 +27,6 @@
#include <com/sun/star/task/XInteractionDisapprove.hpp>
#include <com/sun/star/task/XInteractionRetry.hpp>
-#include <vcl/errinf.hxx>
#include <svx/svxerr.hxx>
#include <svx/dialogs.hrc>
#include <unotools/resmgr.hxx>
@@ -99,24 +99,24 @@ executeErrorDialog(
case MessageBoxStyle::NONE:
break;
case MessageBoxStyle::Ok:
- xBox->add_button(Button::GetStandardText(StandardButtonType::OK), static_cast<int>(DialogMask::ButtonsOk));
+ xBox->add_button(GetStandardText(StandardButtonType::OK), static_cast<int>(DialogMask::ButtonsOk));
break;
case MessageBoxStyle::OkCancel:
- xBox->add_button(Button::GetStandardText(StandardButtonType::OK), static_cast<int>(DialogMask::ButtonsOk));
- xBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), static_cast<int>(DialogMask::ButtonsCancel));
+ xBox->add_button(GetStandardText(StandardButtonType::OK), static_cast<int>(DialogMask::ButtonsOk));
+ xBox->add_button(GetStandardText(StandardButtonType::Cancel), static_cast<int>(DialogMask::ButtonsCancel));
break;
case MessageBoxStyle::YesNo:
- xBox->add_button(Button::GetStandardText(StandardButtonType::Yes), static_cast<int>(DialogMask::ButtonsYes));
- xBox->add_button(Button::GetStandardText(StandardButtonType::No), static_cast<int>(DialogMask::ButtonsNo));
+ xBox->add_button(GetStandardText(StandardButtonType::Yes), static_cast<int>(DialogMask::ButtonsYes));
+ xBox->add_button(GetStandardText(StandardButtonType::No), static_cast<int>(DialogMask::ButtonsNo));
break;
case MessageBoxStyle::YesNoCancel:
- xBox->add_button(Button::GetStandardText(StandardButtonType::Yes), static_cast<int>(DialogMask::ButtonsYes));
- xBox->add_button(Button::GetStandardText(StandardButtonType::No), static_cast<int>(DialogMask::ButtonsNo));
- xBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), static_cast<int>(DialogMask::ButtonsCancel));
+ xBox->add_button(GetStandardText(StandardButtonType::Yes), static_cast<int>(DialogMask::ButtonsYes));
+ xBox->add_button(GetStandardText(StandardButtonType::No), static_cast<int>(DialogMask::ButtonsNo));
+ xBox->add_button(GetStandardText(StandardButtonType::Cancel), static_cast<int>(DialogMask::ButtonsCancel));
break;
case MessageBoxStyle::RetryCancel:
- xBox->add_button(Button::GetStandardText(StandardButtonType::Retry), static_cast<int>(DialogMask::ButtonsRetry));
- xBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), static_cast<int>(DialogMask::ButtonsCancel));
+ xBox->add_button(GetStandardText(StandardButtonType::Retry), static_cast<int>(DialogMask::ButtonsRetry));
+ xBox->add_button(GetStandardText(StandardButtonType::Cancel), static_cast<int>(DialogMask::ButtonsCancel));
break;
}
diff --git a/uui/source/lockcorrupt.cxx b/uui/source/lockcorrupt.cxx
index 008d4555a520..e0d5a24c1094 100644
--- a/uui/source/lockcorrupt.cxx
+++ b/uui/source/lockcorrupt.cxx
@@ -21,7 +21,7 @@
#include <strings.hrc>
#include "lockcorrupt.hxx"
#include <unotools/resmgr.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
LockCorruptQueryBox::LockCorruptQueryBox(weld::Window* pParent, const std::locale& rResLocale)
@@ -30,7 +30,7 @@ LockCorruptQueryBox::LockCorruptQueryBox(weld::Window* pParent, const std::local
{
m_xQueryBox->set_title(Translate::get(STR_LOCKCORRUPT_TITLE, rResLocale));
m_xQueryBox->add_button(Translate::get(STR_LOCKCORRUPT_OPENREADONLY_BTN, rResLocale), RET_OK);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_OK);
}
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index 0f2167294f21..8254b19e509b 100644
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
@@ -20,7 +20,7 @@
#include <strings.hrc>
#include "lockfailed.hxx"
#include <unotools/resmgr.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
LockFailedQueryBox::LockFailedQueryBox(weld::Window* pParent, const std::locale& rLocale)
@@ -29,7 +29,7 @@ LockFailedQueryBox::LockFailedQueryBox(weld::Window* pParent, const std::locale&
{
m_xQueryBox->set_title(Translate::get(STR_LOCKFAILED_TITLE, rLocale));
m_xQueryBox->add_button(Translate::get(STR_LOCKFAILED_OPENREADONLY_BTN, rLocale), RET_OK);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_OK);
}
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 453067f8e3ae..eb50450adc86 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -20,7 +20,7 @@
#include <strings.hrc>
#include "openlocked.hxx"
#include <unotools/resmgr.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
OpenLockedQueryBox::OpenLockedQueryBox(weld::Window* pParent, const std::locale& rResLocale, const OUString& rMessage, bool bEnableOverride)
@@ -34,7 +34,7 @@ OpenLockedQueryBox::OpenLockedQueryBox(weld::Window* pParent, const std::locale&
// Present option to ignore the (stale?) lock file and open the document
m_xQueryBox->add_button(Translate::get(STR_ALREADYOPEN_OPEN_BTN, rResLocale), RET_IGNORE);
}
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 242c1fa7bb22..1150613940d8 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -18,7 +18,7 @@
*/
#include <unotools/resmgr.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/svapp.hxx>
#include <strings.hrc>
#include "trylater.hxx"
@@ -34,14 +34,14 @@ TryLaterQueryBox::TryLaterQueryBox(weld::Window* pParent, const std::locale& rRe
if (bEnableOverride)
{
m_xQueryBox->add_button(Translate::get(STR_FILECHANGED_SAVEANYWAY_BTN, rResLocale), RET_IGNORE);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_IGNORE);
}
else
{
m_xQueryBox->add_button(Translate::get(STR_TRYLATER_RETRYSAVING_BTN, rResLocale), RET_YES);
m_xQueryBox->add_button(Translate::get(STR_TRYLATER_SAVEAS_BTN, rResLocale), RET_NO);
- m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
+ m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL);
m_xQueryBox->set_default_response(RET_YES);
}
}
diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx
index b8c306e2e806..36c92b8f2757 100644
--- a/vcl/osx/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -19,7 +19,7 @@
#include <rtl/ustrbuf.hxx>
-#include <vcl/button.hxx>
+#include <vcl/stdtext.hxx>
#include <osx/salsys.h>
#include <osx/saldata.hxx>
@@ -70,7 +70,7 @@ static NSString* getStandardString( StandardButtonType nButtonId, bool bUseResou
OUString aText;
if( bUseResources )
{
- aText = Button::GetStandardText( nButtonId );
+ aText = GetStandardText( nButtonId );
}
if( aText.isEmpty() ) // this is for bad cases, we might be missing the vcl resource
{
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 91141d35cc4e..0036d6dbb90d 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -31,6 +31,7 @@
#include <vcl/salnativewidgets.hxx>
#include <vcl/edit.hxx>
#include <vcl/layout.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/vclstatuslistener.hxx>
#include <vcl/uitest/uiobject.hxx>
@@ -122,7 +123,7 @@ void Button::Click()
ImplCallEventListenersAndHandler( VclEventId::ButtonClick, [this] () { maClickHdl.Call(this); } );
}
-OUString Button::GetStandardText(StandardButtonType eButton)
+OUString GetStandardText(StandardButtonType eButton)
{
static const char* aResIdAry[static_cast<int>(StandardButtonType::Count)] =
{
@@ -1671,7 +1672,7 @@ void OKButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
set_id("ok");
PushButton::ImplInit( pParent, nStyle );
- SetText( Button::GetStandardText( StandardButtonType::OK ) );
+ SetText( GetStandardText( StandardButtonType::OK ) );
}
OKButton::OKButton( vcl::Window* pParent, WinBits nStyle ) :
@@ -1717,7 +1718,7 @@ void CancelButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
set_id("cancel");
PushButton::ImplInit( pParent, nStyle );
- SetText( Button::GetStandardText( StandardButtonType::Cancel ) );
+ SetText( GetStandardText( StandardButtonType::Cancel ) );
}
CancelButton::CancelButton( vcl::Window* pParent, WinBits nStyle ) :
@@ -1761,7 +1762,7 @@ void CancelButton::Click()
CloseButton::CloseButton( vcl::Window* pParent, WinBits nStyle )
: CancelButton(pParent, nStyle)
{
- SetText( Button::GetStandardText( StandardButtonType::Close ) );
+ SetText( GetStandardText( StandardButtonType::Close ) );
}
void HelpButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
@@ -1769,7 +1770,7 @@ void HelpButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
set_id("help");
PushButton::ImplInit( pParent, nStyle | WB_NOPOINTERFOCUS );
- SetText( Button::GetStandardText( StandardButtonType::Help ) );
+ SetText( GetStandardText( StandardButtonType::Help ) );
}
HelpButton::HelpButton( vcl::Window* pParent, WinBits nStyle ) :
diff --git a/vcl/source/toolkit/morebtn.cxx b/vcl/source/toolkit/morebtn.cxx
index 61fc3ff05f26..1a3ca8eaf777 100644
--- a/vcl/source/toolkit/morebtn.cxx
+++ b/vcl/source/toolkit/morebtn.cxx
@@ -18,6 +18,7 @@
*/
#include <vcl/toolkit/morebtn.hxx>
+#include <vcl/stdtext.hxx>
struct ImplMoreButtonData
{
@@ -32,8 +33,8 @@ void MoreButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
PushButton::ImplInit( pParent, nStyle );
- mpMBData->maMoreText = Button::GetStandardText( StandardButtonType::More );
- mpMBData->maLessText = Button::GetStandardText( StandardButtonType::Less );
+ mpMBData->maMoreText = GetStandardText( StandardButtonType::More );
+ mpMBData->maLessText = GetStandardText( StandardButtonType::Less );
ShowState();
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f5beadaf0a9f..49fecb7476fc 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -16,6 +16,7 @@
#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/stdtext.hxx>
#include <messagedialog.hxx>
#include <window.h>
#include <boost/multi_array.hpp>
@@ -2249,13 +2250,13 @@ void MessageDialog::create_message_area()
break;
case VclButtonsType::YesNo:
pBtn = VclPtr<PushButton>::Create(pButtonBox);
- pBtn->SetText(Button::GetStandardText(StandardButtonType::Yes));
+ pBtn->SetText(GetStandardText(StandardButtonType::Yes));
pBtn->Show();
pBtn->set_id("yes");
add_button(pBtn, RET_YES, true);
pBtn.set( VclPtr<PushButton>::Create(pButtonBox) );
- pBtn->SetText(Button::GetStandardText(StandardButtonType::No));
+ pBtn->SetText(GetStandardText(StandardButtonType::No));
pBtn->Show();
pBtn->set_id("no");
add_button(pBtn, RET_NO, true);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8bb71ebf7f3b..3509f9c2bb75 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -43,6 +43,7 @@
#include <vcl/quickselectionengine.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/pngwrite.hxx>
+#include <vcl/stdtext.hxx>
#include <vcl/syswin.hxx>
#include <vcl/weld.hxx>
#include <vcl/virdev.hxx>
@@ -3699,26 +3700,26 @@ public:
gtk_button_box_set_layout(m_pButtonBox, GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(m_pButtonBox), 6);
- m_pBack = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(Button::GetStandardText(StandardButtonType::Back)).getStr()));
+ m_pBack = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(GetStandardText(StandardButtonType::Back)).getStr()));
gtk_widget_set_can_default(GTK_WIDGET(m_pBack), true);
gtk_buildable_set_name(GTK_BUILDABLE(m_pBack), "previous");
gtk_box_pack_end(GTK_BOX(m_pButtonBox), GTK_WIDGET(m_pBack), false, false, 0);
- m_pNext = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(Button::GetStandardText(StandardButtonType::Next)).getStr()));
+ m_pNext = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(GetStandardText(StandardButtonType::Next)).getStr()));
gtk_widget_set_can_default(GTK_WIDGET(m_pNext), true);
gtk_buildable_set_name(GTK_BUILDABLE(m_pNext), "next");
gtk_box_pack_end(GTK_BOX(m_pButtonBox), GTK_WIDGET(m_pNext), false, false, 0);
- m_pCancel = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(Button::GetStandardText(StandardButtonType::Cancel)).getStr()));
+ m_pCancel = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(GetStandardText(StandardButtonType::Cancel)).getStr()));
gtk_widget_set_can_default(GTK_WIDGET(m_pCancel), true);
gtk_box_pack_end(GTK_BOX(m_pButtonBox), GTK_WIDGET(m_pCancel), false, false, 0);
- m_pFinish = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(Button::GetStandardText(StandardButtonType::Finish)).getStr()));
+ m_pFinish = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(GetStandardText(StandardButtonType::Finish)).getStr()));
gtk_widget_set_can_default(GTK_WIDGET(m_pFinish), true);
gtk_buildable_set_name(GTK_BUILDABLE(m_pFinish), "finish");
gtk_box_pack_end(GTK_BOX(m_pButtonBox), GTK_WIDGET(m_pFinish), false, false, 0);
- m_pHelp = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(Button::GetStandardText(StandardButtonType::Help)).getStr()));
+ m_pHelp = GTK_BUTTON(gtk_button_new_with_mnemonic(MapToGtkAccelerator(GetStandardText(StandardButtonType::Help)).getStr()));
gtk_widget_set_can_default(GTK_WIDGET(m_pHelp), true);
g_signal_connect(m_pHelp, "clicked", G_CALLBACK(signalHelpClicked), this);
gtk_box_pack_end(GTK_BOX(m_pButtonBox), GTK_WIDGET(m_pHelp), false, false, 0);
More information about the Libreoffice-commits
mailing list