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 /basic | |
| 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 'basic')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 29 |
1 files changed, 15 insertions, 14 deletions
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); |