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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/core/drawdoc3.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationDialog.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 9aac00728c05..d206a03a1c4a 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -30,7 +30,7 @@ #include <svl/style.hxx> #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> -#include <vcl/button.hxx> +#include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <xmloff/autolayout.hxx> @@ -451,7 +451,7 @@ bool SdDrawDocument::InsertBookmarkAsPage( std::unique_ptr<weld::MessageDialog> xQueryBox(Application::CreateMessageDialog(nullptr, VclMessageType::Question, VclButtonsType::YesNo, aStr)); - xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), RET_CANCEL); + xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), RET_CANCEL); sal_uInt16 nBut = xQueryBox->run(); bScaleObjects = nBut == RET_YES; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 4f68909bda7a..743d08ddc71d 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -38,6 +38,7 @@ #include <vcl/svapp.hxx> #include <vcl/field.hxx> #include <vcl/lstbox.hxx> +#include <vcl/stdtext.hxx> #include <vcl/weld.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> @@ -2213,8 +2214,8 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(nullptr, VclMessageType::Warning, VclButtonsType::NONE, aStrWarning)); - 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; bValidSoundFile=false; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 998b0c58ef6b..4bc3e3577b61 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -38,6 +38,7 @@ #include <tools/debug.hxx> #include <svx/gallery.hxx> #include <vcl/layout.hxx> +#include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <tools/urlobj.hxx> @@ -770,8 +771,8 @@ void SlideTransitionPane::openSoundFileDialog() std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(nullptr, VclMessageType::Warning, VclButtonsType::NONE, aStrWarning)); - 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); bValidSoundFile = false; |