avmedia/inc/strings.hrc | 7 ------- avmedia/source/framework/MediaControlBase.cxx | 5 ----- avmedia/source/framework/mediacontrol.cxx | 2 -- 3 files changed, 14 deletions(-)
New commits: commit 9576b5e411562bcbe6c6be9a78560874e66a1b1e Author: Caolán McNamara <[email protected]> AuthorDate: Thu Feb 10 14:18:31 2022 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 11 10:04:41 2022 +0100 these label properties are already set to this text in the .ui so we're just wastefully overwriting with the same string Change-Id: Ib03d5ae2cf48aa00f5f31256427afef58b684177 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129802 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/avmedia/inc/strings.hrc b/avmedia/inc/strings.hrc index 084bdf5353cf..f9f52fa3a45c 100644 --- a/avmedia/inc/strings.hrc +++ b/avmedia/inc/strings.hrc @@ -21,13 +21,6 @@ #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) -#define AVMEDIA_STR_OPEN NC_("AVMEDIA_STR_OPEN", "Open") -#define AVMEDIA_STR_INSERT NC_("AVMEDIA_STR_INSERT", "Apply") -#define AVMEDIA_STR_PLAY NC_("AVMEDIA_STR_PLAY", "Play") -#define AVMEDIA_STR_PAUSE NC_("AVMEDIA_STR_PAUSE", "Pause") -#define AVMEDIA_STR_STOP NC_("AVMEDIA_STR_STOP", "Stop") -#define AVMEDIA_STR_LOOP NC_("AVMEDIA_STR_LOOP", "Repeat") -#define AVMEDIA_STR_MUTE NC_("AVMEDIA_STR_MUTE", "Mute") #define AVMEDIA_STR_ZOOM_50 NC_("AVMEDIA_STR_ZOOM_50", "50%") #define AVMEDIA_STR_ZOOM_100 NC_("AVMEDIA_STR_ZOOM_100", "100%") #define AVMEDIA_STR_ZOOM_200 NC_("AVMEDIA_STR_ZOOM_200", "200%") diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx index c572bed7d0e6..eac8fc3923c5 100644 --- a/avmedia/source/framework/MediaControlBase.cxx +++ b/avmedia/source/framework/MediaControlBase.cxx @@ -104,15 +104,10 @@ void MediaControlBase::UpdateTimeSlider( MediaItem const & aMediaItem ) void MediaControlBase::InitializeWidgets() { mxPlayToolBox->set_item_help_id("play", HID_AVMEDIA_TOOLBOXITEM_PLAY); - mxPlayToolBox->set_item_label("play", AvmResId(AVMEDIA_STR_PLAY)); mxPlayToolBox->set_item_help_id("pause", HID_AVMEDIA_TOOLBOXITEM_PAUSE); - mxPlayToolBox->set_item_label("pause", AvmResId(AVMEDIA_STR_PAUSE)); mxPlayToolBox->set_item_help_id("stop", HID_AVMEDIA_TOOLBOXITEM_STOP); - mxPlayToolBox->set_item_label("stop", AvmResId(AVMEDIA_STR_STOP)); mxPlayToolBox->set_item_help_id("loop", HID_AVMEDIA_TOOLBOXITEM_LOOP); - mxPlayToolBox->set_item_label("loop", AvmResId(AVMEDIA_STR_LOOP)); mxMuteToolBox->set_item_help_id("mute", HID_AVMEDIA_TOOLBOXITEM_MUTE); - mxMuteToolBox->set_item_label("mute", AvmResId(AVMEDIA_STR_MUTE)); mxZoomListBox->append(OUString::number(AVMEDIA_ZOOMLEVEL_50), AvmResId( AVMEDIA_STR_ZOOM_50 )); mxZoomListBox->append(OUString::number(AVMEDIA_ZOOMLEVEL_100), AvmResId( AVMEDIA_STR_ZOOM_100 )); diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 55286145bb39..49cee3e977d6 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -89,9 +89,7 @@ void MediaControl::InitializeWidgets() if( meControlStyle != MediaControlStyle::SingleLine ) { mxPlayToolBox->set_item_help_id("open", HID_AVMEDIA_TOOLBOXITEM_OPEN); - mxPlayToolBox->set_item_label("open", AvmResId(AVMEDIA_STR_OPEN)); mxPlayToolBox->set_item_help_id("apply", HID_AVMEDIA_TOOLBOXITEM_INSERT); - mxPlayToolBox->set_item_label("apply", AvmResId(AVMEDIA_STR_INSERT)); } avmedia::MediaControlBase::InitializeWidgets(); }
