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>

9 files changed, 28 insertions, 28 deletions

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);
     }
 }