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 /cui/source | |
| 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 'cui/source')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 8 | ||||
| -rw-r--r-- | cui/source/dialogs/about.cxx | 4 | ||||
| -rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 45319736b7db..def983911b70 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -24,7 +24,7 @@ #include <stdlib.h> #include <typeinfo> -#include <vcl/button.hxx> +#include <vcl/stdtext.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/edit.hxx> #include <vcl/event.hxx> @@ -2981,11 +2981,11 @@ namespace : m_xQueryBox(Application::CreateMessageDialog(pParent, VclMessageType::Warning, VclButtonsType::NONE, ReplaceIconName(rMessage))) { m_xQueryBox->set_title(CuiResId(RID_SVXSTR_REPLACE_ICON_CONFIRM)); - m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Yes), 2); + m_xQueryBox->add_button(GetStandardText(StandardButtonType::Yes), 2); if (bYestoAll) m_xQueryBox->add_button(CuiResId(RID_SVXSTR_YESTOALL), 5); - m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::No), 4); - m_xQueryBox->add_button(Button::GetStandardText(StandardButtonType::Cancel), 6); + m_xQueryBox->add_button(GetStandardText(StandardButtonType::No), 4); + m_xQueryBox->add_button(GetStandardText(StandardButtonType::Cancel), 6); m_xQueryBox->set_default_response(2); } short run() { return m_xQueryBox->run(); } diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index da2e4d2b4e2d..0dc219df8156 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -22,9 +22,9 @@ #include <sal/log.hxx> #include <osl/diagnose.h> #include <rtl/character.hxx> -#include <vcl/button.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/settings.hxx> +#include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> @@ -63,7 +63,7 @@ AboutDialog::AboutDialog(weld::Window* pParent) , m_xDialog(m_xBuilder->weld_about_dialog("AboutDialog")) , m_xContentArea(m_xDialog->weld_content_area()) { - m_xDialog->add_button(Button::GetStandardText(StandardButtonType::Close), RET_CLOSE); + m_xDialog->add_button(GetStandardText(StandardButtonType::Close), RET_CLOSE); m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_CREDITS), 101); m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_WEBSITE), 102); m_xDialog->add_button(CuiResId(RID_SVXSTR_ABOUT_RELEASE_NOTES), 103); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index bac466b572ff..de7681fa7d79 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -18,9 +18,9 @@ */ #include <tools/debug.hxx> -#include <vcl/button.hxx> -#include <vcl/weld.hxx> +#include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld.hxx> #include <dialmgr.hxx> #include <sfx2/app.hxx> #include <svx/fmsrccfg.hxx> @@ -71,7 +71,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor ) FmSearchDialog::FmSearchDialog(weld::Window* pParent, const OUString& sInitialText, const std::vector< OUString >& _rContexts, sal_Int16 nInitialContext, const Link<FmSearchContext&,sal_uInt32>& lnkContextSupplier) : GenericDialogController(pParent, "cui/ui/fmsearchdialog.ui", "RecordSearchDialog") - , m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) ) + , m_sCancel( GetStandardText( StandardButtonType::Cancel ) ) , m_lnkContextSupplier(lnkContextSupplier) , m_prbSearchForText(m_xBuilder->weld_radio_button("rbSearchForText")) , m_prbSearchForNull(m_xBuilder->weld_radio_button("rbSearchForNull")) |