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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/opengrf.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 3 |
2 files changed, 5 insertions, 4 deletions
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(); } |