move GetStandardText to stdtext.hxx

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

5 files changed, 16 insertions, 15 deletions

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)
         {