strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loplugin:ostr avmedia

Browse source 
Change-Id: Ice017029f0b93ae92e76d3905f38c730cc5a2fc8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167189
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-05-06 10:17:16 +02:00
parent 64a50c65ee
commit 8b091048d1
8 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
animations/source/animcore/animcore.cxx
View file

@ -1893,7 +1893,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc
std::unique_lock l( m_aMutex ); std::unique_lock l( m_aMutex );
if( !newChild.is() || !refChild.is() ) if( !newChild.is() || !refChild.is() )
throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), -1); throw IllegalArgumentException(u"no child"_ustr, static_cast<cppu::OWeakObject*>(this), -1);
if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException(); throw ElementExistException();
@ -1918,7 +1918,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference
std::unique_lock l( m_aMutex ); std::unique_lock l( m_aMutex );
if( !newChild.is() || !refChild.is() ) if( !newChild.is() || !refChild.is() )
throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), -1); throw IllegalArgumentException(u"no child"_ustr, static_cast<cppu::OWeakObject*>(this), -1);
if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException(); throw ElementExistException();
@ -1947,7 +1947,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc
std::unique_lock l( m_aMutex ); std::unique_lock l( m_aMutex );
if( !newChild.is() || !oldChild.is() ) if( !newChild.is() || !oldChild.is() )
throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), -1); throw IllegalArgumentException(u"no child"_ustr, static_cast<cppu::OWeakObject*>(this), -1);
if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException(); throw ElementExistException();
@ -1973,7 +1973,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference
std::unique_lock l( m_aMutex ); std::unique_lock l( m_aMutex );
if( !oldChild.is() ) if( !oldChild.is() )
throw IllegalArgumentException("no child", static_cast<cppu::OWeakObject*>(this), 1); throw IllegalArgumentException(u"no child"_ustr, static_cast<cppu::OWeakObject*>(this), 1);
auto old = std::find(maChildren.begin(), maChildren.end(), oldChild); auto old = std::find(maChildren.begin(), maChildren.end(), oldChild);
if( old == maChildren.end() ) if( old == maChildren.end() )
@ -1996,13 +1996,13 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference
std::unique_lock aGuard( m_aMutex ); std::unique_lock aGuard( m_aMutex );
if( !newChild.is() ) if( !newChild.is() )
throw IllegalArgumentException("no child", xThis, 1); throw IllegalArgumentException(u"no child"_ustr, xThis, 1);
if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() ) if( std::find(maChildren.begin(), maChildren.end(), newChild) != maChildren.end() )
throw ElementExistException({}, xThis); throw ElementExistException({}, xThis);
if( xThis == newChild ) if( xThis == newChild )
throw IllegalArgumentException("cannot append self", xThis, -1); throw IllegalArgumentException(u"cannot append self"_ustr, xThis, -1);
maChildren.push_back( newChild ); maChildren.push_back( newChild );
} }

48
avmedia/source/framework/MediaControlBase.cxx
View file

@ -106,11 +106,11 @@ void MediaControlBase::UpdateTimeSlider( MediaItem const & aMediaItem )
void MediaControlBase::InitializeWidgets() void MediaControlBase::InitializeWidgets()
{ {
mxPlayToolBox->set_item_help_id("play", HID_AVMEDIA_TOOLBOXITEM_PLAY); mxPlayToolBox->set_item_help_id(u"play"_ustr, HID_AVMEDIA_TOOLBOXITEM_PLAY);
mxPlayToolBox->set_item_help_id("pause", HID_AVMEDIA_TOOLBOXITEM_PAUSE); mxPlayToolBox->set_item_help_id(u"pause"_ustr, HID_AVMEDIA_TOOLBOXITEM_PAUSE);
mxPlayToolBox->set_item_help_id("stop", HID_AVMEDIA_TOOLBOXITEM_STOP); mxPlayToolBox->set_item_help_id(u"stop"_ustr, HID_AVMEDIA_TOOLBOXITEM_STOP);
mxPlayToolBox->set_item_help_id("loop", HID_AVMEDIA_TOOLBOXITEM_LOOP); mxPlayToolBox->set_item_help_id(u"loop"_ustr, HID_AVMEDIA_TOOLBOXITEM_LOOP);
mxMuteToolBox->set_item_help_id("mute", HID_AVMEDIA_TOOLBOXITEM_MUTE); mxMuteToolBox->set_item_help_id(u"mute"_ustr, HID_AVMEDIA_TOOLBOXITEM_MUTE);
mxZoomListBox->append(OUString::number(AVMEDIA_ZOOMLEVEL_50), AvmResId( AVMEDIA_STR_ZOOM_50 )); mxZoomListBox->append(OUString::number(AVMEDIA_ZOOMLEVEL_50), AvmResId( AVMEDIA_STR_ZOOM_50 ));
mxZoomListBox->append(OUString::number(AVMEDIA_ZOOMLEVEL_100), AvmResId( AVMEDIA_STR_ZOOM_100 )); mxZoomListBox->append(OUString::number(AVMEDIA_ZOOMLEVEL_100), AvmResId( AVMEDIA_STR_ZOOM_100 ));
@ -119,7 +119,7 @@ void MediaControlBase::InitializeWidgets()
mxZoomListBox->set_help_id( HID_AVMEDIA_ZOOMLISTBOX ); mxZoomListBox->set_help_id( HID_AVMEDIA_ZOOMLISTBOX );
mxZoomListBox->set_tooltip_text(AvmResId( AVMEDIA_STR_ZOOM_TOOLTIP )); mxZoomListBox->set_tooltip_text(AvmResId( AVMEDIA_STR_ZOOM_TOOLTIP ));
mxTimeEdit->set_text( " 00:00:00/00:00:00 " ); mxTimeEdit->set_text( u" 00:00:00/00:00:00 "_ustr );
mxTimeEdit->set_help_id( HID_AVMEDIA_TIMEEDIT ); mxTimeEdit->set_help_id( HID_AVMEDIA_TIMEEDIT );
mxTimeEdit->set_sensitive(false); mxTimeEdit->set_sensitive(false);
@ -135,32 +135,32 @@ void MediaControlBase::UpdatePlayState(const MediaItem& rMediaItem)
{ {
if (rMediaItem.getState() == MediaState::Play) if (rMediaItem.getState() == MediaState::Play)
{ {
mxPlayToolBox->set_item_active("play", true); mxPlayToolBox->set_item_active(u"play"_ustr, true);
mxPlayToolBox->set_item_active("pause", false); mxPlayToolBox->set_item_active(u"pause"_ustr, false);
mxPlayToolBox->set_item_active("stop", false); mxPlayToolBox->set_item_active(u"stop"_ustr, false);
} }
else if( rMediaItem.getState() == MediaState::Pause ) else if( rMediaItem.getState() == MediaState::Pause )
{ {
mxPlayToolBox->set_item_active("play", false); mxPlayToolBox->set_item_active(u"play"_ustr, false);
mxPlayToolBox->set_item_active("pause", true); mxPlayToolBox->set_item_active(u"pause"_ustr, true);
mxPlayToolBox->set_item_active("stop", false); mxPlayToolBox->set_item_active(u"stop"_ustr, false);
} }
else else
{ {
mxPlayToolBox->set_item_active("play", false); mxPlayToolBox->set_item_active(u"play"_ustr, false);
mxPlayToolBox->set_item_active("pause", false); mxPlayToolBox->set_item_active(u"pause"_ustr, false);
mxPlayToolBox->set_item_active("stop", true); mxPlayToolBox->set_item_active(u"stop"_ustr, true);
} }
} }
void MediaControlBase::UpdateToolBoxes(const MediaItem& rMediaItem) void MediaControlBase::UpdateToolBoxes(const MediaItem& rMediaItem)
{ {
const bool bValidURL = !rMediaItem.getURL().isEmpty(); const bool bValidURL = !rMediaItem.getURL().isEmpty();
mxPlayToolBox->set_item_sensitive("play", bValidURL); mxPlayToolBox->set_item_sensitive(u"play"_ustr, bValidURL);
mxPlayToolBox->set_item_sensitive("pause", bValidURL); mxPlayToolBox->set_item_sensitive(u"pause"_ustr, bValidURL);
mxPlayToolBox->set_item_sensitive("stop", bValidURL); mxPlayToolBox->set_item_sensitive(u"stop"_ustr, bValidURL);
mxPlayToolBox->set_item_sensitive("loop", bValidURL); mxPlayToolBox->set_item_sensitive(u"loop"_ustr, bValidURL);
mxMuteToolBox->set_item_sensitive("mute", bValidURL); mxMuteToolBox->set_item_sensitive(u"mute"_ustr, bValidURL);
if( !bValidURL ) if( !bValidURL )
{ {
mxZoomListBox->set_sensitive(false); mxZoomListBox->set_sensitive(false);
@ -171,8 +171,8 @@ void MediaControlBase::UpdateToolBoxes(const MediaItem& rMediaItem)
mxPlayToolBox->set_sensitive(true); mxPlayToolBox->set_sensitive(true);
mxMuteToolBox->set_sensitive(true); mxMuteToolBox->set_sensitive(true);
UpdatePlayState(rMediaItem); UpdatePlayState(rMediaItem);
mxPlayToolBox->set_item_active("loop", rMediaItem.isLoop()); mxPlayToolBox->set_item_active(u"loop"_ustr, rMediaItem.isLoop());
mxMuteToolBox->set_item_active("mute", rMediaItem.isMute()); mxMuteToolBox->set_item_active(u"mute"_ustr, rMediaItem.isMute());
if (!mbCurrentlySettingZoom) if (!mbCurrentlySettingZoom)
{ {
sal_uInt16 nSelectEntryPos ; sal_uInt16 nSelectEntryPos ;
@ -247,11 +247,11 @@ void MediaControlBase::SelectPlayToolBoxItem( MediaItem& aExecItem, MediaItem co
} }
else if (rId == u"mute") else if (rId == u"mute")
{ {
aExecItem.setMute( mxMuteToolBox->get_item_active("mute") ); aExecItem.setMute( mxMuteToolBox->get_item_active(u"mute"_ustr) );
} }
else if (rId == u"loop") else if (rId == u"loop")
{ {
aExecItem.setLoop( mxPlayToolBox->get_item_active("loop") ); aExecItem.setLoop( mxPlayToolBox->get_item_active(u"loop"_ustr) );
} }
} }

30
avmedia/source/framework/mediacontrol.cxx
View file

@ -32,22 +32,22 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
// MediaControlStyle::MultiLine is the normal docking windows of tools->media player // MediaControlStyle::MultiLine is the normal docking windows of tools->media player
// MediaControlStyle::SingleLine is the toolbar of view->toolbar->media playback // MediaControlStyle::SingleLine is the toolbar of view->toolbar->media playback
InterimItemWindow(pParent, eControlStyle == MediaControlStyle::MultiLine ? InterimItemWindow(pParent, eControlStyle == MediaControlStyle::MultiLine ?
OUString("svx/ui/mediawindow.ui") : u"svx/ui/mediawindow.ui"_ustr :
OUString("svx/ui/medialine.ui"), u"svx/ui/medialine.ui"_ustr,
"MediaWindow"), u"MediaWindow"_ustr),
maIdle( "avmedia MediaControl Idle" ), maIdle( "avmedia MediaControl Idle" ),
maChangeTimeIdle( "avmedia MediaControl Change Time Idle" ), maChangeTimeIdle( "avmedia MediaControl Change Time Idle" ),
maItem( 0, AVMediaSetMask::ALL ), maItem( 0, AVMediaSetMask::ALL ),
mbLocked( false ), mbLocked( false ),
meControlStyle( eControlStyle ) meControlStyle( eControlStyle )
{ {
mxPlayToolBox = m_xBuilder->weld_toolbar("playtoolbox"); mxPlayToolBox = m_xBuilder->weld_toolbar(u"playtoolbox"_ustr);
mxTimeSlider = m_xBuilder->weld_scale("timeslider"); mxTimeSlider = m_xBuilder->weld_scale(u"timeslider"_ustr);
mxMuteToolBox = m_xBuilder->weld_toolbar("mutetoolbox"); mxMuteToolBox = m_xBuilder->weld_toolbar(u"mutetoolbox"_ustr);
mxVolumeSlider = m_xBuilder->weld_scale("volumeslider"); mxVolumeSlider = m_xBuilder->weld_scale(u"volumeslider"_ustr);
mxZoomListBox = m_xBuilder->weld_combo_box("zoombox"); mxZoomListBox = m_xBuilder->weld_combo_box(u"zoombox"_ustr);
mxTimeEdit = m_xBuilder->weld_entry("timeedit"); mxTimeEdit = m_xBuilder->weld_entry(u"timeedit"_ustr);
mxMediaPath = m_xBuilder->weld_label("url"); mxMediaPath = m_xBuilder->weld_label(u"url"_ustr);
InitializeWidgets(); InitializeWidgets();
@ -59,7 +59,7 @@ MediaControl::MediaControl( vcl::Window* pParent, MediaControlStyle eControlStyl
maChangeTimeIdle.SetPriority( TaskPriority::LOWEST ); maChangeTimeIdle.SetPriority( TaskPriority::LOWEST );
maChangeTimeIdle.SetInvokeHandler( LINK( this, MediaControl, implTimeEndHdl ) ); maChangeTimeIdle.SetInvokeHandler( LINK( this, MediaControl, implTimeEndHdl ) );
mxTimeEdit->set_text(" 00:00:00/00:00:00 "); mxTimeEdit->set_text(u" 00:00:00/00:00:00 "_ustr);
Size aTextSize = mxTimeEdit->get_preferred_size(); Size aTextSize = mxTimeEdit->get_preferred_size();
mxTimeEdit->set_size_request(aTextSize.Width(), aTextSize.Height()); mxTimeEdit->set_size_request(aTextSize.Width(), aTextSize.Height());
mxTimeEdit->set_text(OUString()); mxTimeEdit->set_text(OUString());
@ -85,8 +85,8 @@ void MediaControl::InitializeWidgets()
{ {
if( meControlStyle != MediaControlStyle::SingleLine ) if( meControlStyle != MediaControlStyle::SingleLine )
{ {
mxPlayToolBox->set_item_help_id("open", HID_AVMEDIA_TOOLBOXITEM_OPEN); mxPlayToolBox->set_item_help_id(u"open"_ustr, HID_AVMEDIA_TOOLBOXITEM_OPEN);
mxPlayToolBox->set_item_help_id("apply", HID_AVMEDIA_TOOLBOXITEM_INSERT); mxPlayToolBox->set_item_help_id(u"apply"_ustr, HID_AVMEDIA_TOOLBOXITEM_INSERT);
} }
avmedia::MediaControlBase::InitializeWidgets(); avmedia::MediaControlBase::InitializeWidgets();
} }
@ -164,11 +164,11 @@ IMPL_LINK( MediaControl, implSelectHdl, const OUString&, rIdent, void )
OUString aURL; OUString aURL;
if (MediaWindow::executeMediaURLDialog(GetFrameWeld(), aURL, nullptr)) if (MediaWindow::executeMediaURLDialog(GetFrameWeld(), aURL, nullptr))
{ {
if( !MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) ) if( !MediaWindow::isMediaURL( aURL, u""_ustr/*TODO?*/, true ) )
MediaWindow::executeFormatErrorBox(GetFrameWeld()); MediaWindow::executeFormatErrorBox(GetFrameWeld());
else else
{ {
aExecItem.setURL( aURL, "", ""/*TODO?*/ ); aExecItem.setURL( aURL, u""_ustr, u""_ustr/*TODO?*/ );
aExecItem.setState( MediaState::Play ); aExecItem.setState( MediaState::Play );
} }
} }

4
avmedia/source/framework/mediaitem.cxx
View file

@ -450,10 +450,10 @@ CreateStream(uno::Reference<embed::XStorage> const& xStorage,
uno::UNO_QUERY); uno::UNO_QUERY);
if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage
OUString const guessed(::comphelper::GuessMediaMimeType(filename)); OUString const guessed(::comphelper::GuessMediaMimeType(filename));
xStreamProps->setPropertyValue("MediaType", xStreamProps->setPropertyValue(u"MediaType"_ustr,
uno::Any(guessed.isEmpty() ? AVMEDIA_MIMETYPE_COMMON : guessed)); uno::Any(guessed.isEmpty() ? AVMEDIA_MIMETYPE_COMMON : guessed));
xStreamProps->setPropertyValue( // turn off compression xStreamProps->setPropertyValue( // turn off compression
"Compressed", uno::Any(false)); u"Compressed"_ustr, uno::Any(false));
} }
return xStream; return xStream;
} }

4
avmedia/source/framework/mediatoolbox.cxx
View file

@ -112,7 +112,7 @@ VclPtr<InterimItemWindow> MediaToolBoxControl::CreateItemWindow( vcl::Window *pP
void MediaToolBoxControl::implUpdateMediaControl() void MediaToolBoxControl::implUpdateMediaControl()
{ {
updateStatus( ".uno:AVMediaToolBox" ); updateStatus( u".uno:AVMediaToolBox"_ustr );
} }
void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem ) void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
@ -126,7 +126,7 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
{ "AVMediaToolBox", aAny } { "AVMediaToolBox", aAny }
})); }));
Dispatch( ".uno:AVMediaToolBox" , aArgs ); Dispatch( u".uno:AVMediaToolBox"_ustr , aArgs );
} }
} // namespace avmedia } // namespace avmedia

4
avmedia/source/gstreamer/gstmanager.cxx
View file

@ -50,7 +50,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
OUString SAL_CALL Manager::getImplementationName( ) OUString SAL_CALL Manager::getImplementationName( )
{ {
return "com.sun.star.comp.media.Manager_GStreamer"; return u"com.sun.star.comp.media.Manager_GStreamer"_ustr;
} }
sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
@ -60,7 +60,7 @@ sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
{ {
return { "com.sun.star.media.Manager" }; return { u"com.sun.star.media.Manager"_ustr };
} }
} // namespace } // namespace

4
avmedia/source/viewer/mediawindow.cxx
View file

@ -257,7 +257,7 @@ bool MediaWindow::executeMediaURLDialog(weld::Window* pParent, OUString& rURL, b
} }
// add filter for all types // add filter for all types
aDlg.AddFilter( AvmResId( AVMEDIA_STR_ALL_FILES ), "*.*" ); aDlg.AddFilter( AvmResId( AVMEDIA_STR_ALL_FILES ), u"*.*"_ustr );
uno::Reference<ui::dialogs::XFilePicker3> const xFP(aDlg.GetFilePicker()); uno::Reference<ui::dialogs::XFilePicker3> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP, uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,
@ -450,7 +450,7 @@ void MediaWindow::dispatchInsertAVMedia(const css::uno::Reference<css::frame::XD
css::uno::Reference<css::util::XURLTransformer> xTrans(css::util::URLTransformer::create(::comphelper::getProcessComponentContext())); css::uno::Reference<css::util::XURLTransformer> xTrans(css::util::URLTransformer::create(::comphelper::getProcessComponentContext()));
xTrans->parseStrict(aDispatchURL); xTrans->parseStrict(aDispatchURL);
css::uno::Reference<css::frame::XDispatch> xDispatch = rDispatchProvider->queryDispatch(aDispatchURL, "", 0); css::uno::Reference<css::frame::XDispatch> xDispatch = rDispatchProvider->queryDispatch(aDispatchURL, u""_ustr, 0);
css::uno::Sequence<css::beans::PropertyValue> aArgs(comphelper::InitPropertySequence({ css::uno::Sequence<css::beans::PropertyValue> aArgs(comphelper::InitPropertySequence({
{ "URL", css::uno::Any(rURL) }, { "URL", css::uno::Any(rURL) },
{ "Size.Width", uno::Any(rSize.Width)}, { "Size.Width", uno::Any(rSize.Width)},

4
avmedia/source/viewer/mediawindow_impl.cxx
View file

@ -185,9 +185,9 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR
{ {
uno::Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext()); uno::Reference<uno::XComponentContext> xContext(::comphelper::getProcessComponentContext());
if (Application::GetToolkitName() == "gtk4") if (Application::GetToolkitName() == "gtk4")
xPlayer = createPlayer(rURL, "com.sun.star.comp.avmedia.Manager_Gtk", xContext); xPlayer = createPlayer(rURL, u"com.sun.star.comp.avmedia.Manager_Gtk"_ustr, xContext);
else else
xPlayer = createPlayer(rURL, AVMEDIA_MANAGER_SERVICE_NAME, xContext); xPlayer = createPlayer(rURL, u"" AVMEDIA_MANAGER_SERVICE_NAME ""_ustr, xContext);
} }
return xPlayer; return xPlayer;