diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-17 09:41:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-17 13:41:48 +0200 |
| commit | 28fc986025009473c9782b61d8c6062fa60085ba (patch) | |
| tree | 08c19f552e49802b93537ea108b04f9fe13770e9 /sc | |
| parent | 65575016ab29b942aea482eab0b54afa262fb998 (diff) | |
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>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 5 |
2 files changed, 7 insertions, 5 deletions
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) { |