Hi!
Replaced a few RTL_CONSTASCII... macros in avmedia.
Szabolcs
From 116fc5e8f22f4234944dacc73b5b489ca27aa694 Mon Sep 17 00:00:00 2001
From: Szabolcs Dezsi <dezsisz...@hotmail.com>
Date: Thu, 19 Apr 2012 10:22:50 +0200
Subject: [PATCH] Removed RTL_CONSTASCII_(U)STRINGPARAM from avmedia
---
avmedia/source/framework/mediacontrol.cxx | 4 ++--
avmedia/source/framework/mediaitem.cxx | 22 ++++++++--------------
avmedia/source/framework/mediatoolbox.cxx | 6 +++---
avmedia/source/framework/soundhandler.cxx | 5 ++---
avmedia/source/gstreamer/gstframegrabber.cxx | 2 +-
avmedia/source/gstreamer/gstmanager.cxx | 2 +-
avmedia/source/gstreamer/gstplayer.cxx | 2 +-
avmedia/source/gstreamer/gstuno.cxx | 4 ++--
avmedia/source/gstreamer/gstwindow.cxx | 2 +-
avmedia/source/quicktime/framegrabber.mm | 2 +-
avmedia/source/quicktime/manager.mm | 2 +-
avmedia/source/quicktime/player.mm | 2 +-
avmedia/source/quicktime/quicktimeuno.mm | 4 ++--
avmedia/source/quicktime/window.mm | 2 +-
avmedia/source/viewer/mediawindow.cxx | 6 +++---
avmedia/source/viewer/mediawindowbase_impl.cxx | 2 +-
avmedia/source/win/framegrabber.cxx | 2 +-
avmedia/source/win/manager.cxx | 2 +-
avmedia/source/win/player.cxx | 2 +-
avmedia/source/win/window.cxx | 2 +-
avmedia/source/win/winuno.cxx | 4 ++--
21 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index decf7be..1a4df7b 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -84,7 +84,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
meControlStyle( eControlStyle ),
mbLocked( false )
{
- const String aTimeText( RTL_CONSTASCII_USTRINGPARAM( " 00:00:00/00:00:00 " ) );
+ const String aTimeText( " 00:00:00/00:00:00 " );
SetBackground();
SetPaintTransparent( sal_True );
@@ -424,7 +424,7 @@ void MediaControl::implUpdateTimeField( double fCurTime )
const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) );
- aTimeString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " / " ));
+ aTimeString.AppendAscii( " / " );
aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) );
if( maTimeEdit.GetText() != aTimeString )
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 2dda7a9..91d7f69 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -373,10 +373,7 @@ void MediaItem::setZoom( ::com::sun::star::media::ZoomLevel eZoom )
static ::rtl::OUString lcl_GetFilename(::rtl::OUString const& rSourceURL)
{
uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
- ::comphelper::createProcessComponent(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.uri.UriReferenceFactory"))),
- uno::UNO_QUERY_THROW);
+ ::comphelper::createProcessComponent( "com.sun.star.uri.UriReferenceFactory" ), uno::UNO_QUERY_THROW );
uno::Reference<uri::XUriReference> const xSourceURI(
xUriFactory->parse(rSourceURL), uno::UNO_SET_THROW);
@@ -392,7 +389,7 @@ static ::rtl::OUString lcl_GetFilename(::rtl::OUString const& rSourceURL)
if (!::comphelper::OStorageHelper::IsValidZipEntryFileName(
filename, false) || !filename.getLength())
{
- filename = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("media"));
+ filename = "media";
}
return filename;
}
@@ -430,14 +427,12 @@ lcl_CreateStream(uno::Reference<embed::XStorage> const& xStorage,
uno::UNO_QUERY);
if (xStreamProps.is()) { // this is NOT supported in FileSystemStorage
xStreamProps->setPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
- uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- //FIXME how to detect real media type?
- //but currently xmloff has this one hardcoded anyway...
+ "MediaType", uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ //FIXME how to detect real media type?
+ //but currently xmloff has this one hardcoded anyway...
"application/vnd.sun.star.media"))));
xStreamProps->setPropertyValue( // turn off compression
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")),
- uno::makeAny(sal_False));
+ "Compressed", uno::makeAny(sal_False));
}
return xStream;
}
@@ -455,7 +450,7 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
uno::Reference<embed::XStorage> const xStorage(
xSBD->getDocumentStorage(), uno::UNO_QUERY_THROW);
- ::rtl::OUString const media(RTL_CONSTASCII_USTRINGPARAM("Media"));
+ ::rtl::OUString const media("Media");
uno::Reference<embed::XStorage> const xSubStorage(
xStorage->openStorageElement(media, embed::ElementModes::WRITE));
@@ -483,8 +478,7 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
xTransaction->commit();
}
- ::rtl::OUStringBuffer buf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "vnd.sun.star.Package:")));
+ ::rtl::OUStringBuffer buf("vnd.sun.star.Package:");
buf.append(media);
buf.append(sal_Unicode('/'));
buf.append(filename);
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx
index cb79569..b56580c 100644
--- a/avmedia/source/framework/mediatoolbox.cxx
+++ b/avmedia/source/framework/mediatoolbox.cxx
@@ -147,7 +147,7 @@ Window* MediaToolBoxControl::CreateItemWindow( Window *pParent )
void MediaToolBoxControl::implUpdateMediaControl()
{
- updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AVMediaToolBox" ) ) );
+ updateStatus( ".uno:AVMediaToolBox" );
}
// -----------------------------------------------------------------------------
@@ -160,10 +160,10 @@ void MediaToolBoxControl::implExecuteMediaControl( const MediaItem& rItem )
aExecItem.merge( rItem );
aExecItem.QueryValue( aAny );
- aArgs[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AVMediaToolBox" ) );
+ aArgs[ 0 ].Name = "AVMediaToolBox";
aArgs[ 0 ].Value = aAny;
- Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AVMediaToolBox" ) ), aArgs );
+ Dispatch( ".uno:AVMediaToolBox", aArgs );
}
}
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 4c8a502..e0a38ac 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -162,7 +162,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
#define IMPLEMENTATIONNAME_SOUNDHANDLER DECLARE_ASCII("com.sun.star.comp.framework.SoundHandler")
-#define SERVICENAME_CONTENTHANDLER DECLARE_ASCII("com.sun.star.frame.ContentHandler")
/*===========================================================================================================*/
/* XServiceInfo */
@@ -216,7 +215,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL SoundHandler::getSupportedService
css::uno::Sequence< ::rtl::OUString > SoundHandler::impl_getStaticSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 );
- seqServiceNames.getArray() [0] = SERVICENAME_CONTENTHANDLER;
+ seqServiceNames.getArray() [0] = "com.sun.star.frame.ContentHandler";
return seqServiceNames;
}
@@ -423,7 +422,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
// I think we can the following ones:
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
- sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wav_Wave_Audio_File"));
+ sTypeName = "wav_Wave_Audio_File";
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 4223675..79f11cf 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -225,7 +225,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_FRAMEGRABBER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_GST_FRAMEGRABBER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index 6b3ffff..c04c7c8 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -98,7 +98,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_MANAGER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_GST_MANAGER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 863d1e8..3928cf9 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -588,7 +588,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_PLAYER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_GST_PLAYER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 4bd4f9f..dc63902 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -46,11 +46,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_C
if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_GStreamer" ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_GStreamer" )) );
+ const ::rtl::OUString aServiceName( "com.sun.star.media.Manager_GStreamer" );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_GStreamer" )),
+ "com.sun.star.comp.media.Manager_GStreamer",
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 7f569f7..c8346b8 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -315,7 +315,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_GST_WINDOW_SERVICENAME ) );
+ aRet[0] = AVMEDIA_GST_WINDOW_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index 5da2aa2..a4aa7ed 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -144,7 +144,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index ca8da8e..8683d67 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -88,7 +88,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_QUICKTIME_MANAGER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index 15c39e9..cd4ac8a 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -426,7 +426,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_QUICKTIME_PLAYER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/quicktime/quicktimeuno.mm b/avmedia/source/quicktime/quicktimeuno.mm
index 0a927d6..19690c4 100644
--- a/avmedia/source/quicktime/quicktimeuno.mm
+++ b/avmedia/source/quicktime/quicktimeuno.mm
@@ -47,11 +47,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_C
if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) );
+ const ::rtl::OUString aServiceName( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME )),
+ AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME,
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index ca7c6d1..6c52c78 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -343,7 +343,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ) );
+ aRet[0] = AVMEDIA_QUICKTIME_WINDOW_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index e6c6c06..b051c58 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -259,9 +259,9 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
::sfx2::FileDialogHelper aDlg( (o_pbLink)
? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW
: ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
- static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+ static const ::rtl::OUString aWildcard( "*." );
FilterNameVector aFilters;
- const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
+ const ::rtl::OUString aSeparator( ";" );
::rtl::OUString aAllTypes;
aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
@@ -301,7 +301,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
}
// add filter for all types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
+ aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( "*.*" ) );
uno::Reference<ui::dialogs::XFilePicker> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index b60a835..dde6f14 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -74,7 +74,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
{
uno::Reference< ::com::sun::star::media::XManager > xManager(
- xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_MANAGER_SERVICE_NAME )) ),
+ xFactory->createInstance( AVMEDIA_MANAGER_SERVICE_NAME ),
uno::UNO_QUERY );
if( xManager.is() )
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 054664f..6b9e486 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -238,7 +238,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index 3a189cd..fb807b0 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -89,7 +89,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_MANAGER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_WIN_MANAGER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 50e7737..60f1379 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -453,7 +453,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_PLAYER_SERVICENAME ) );
+ aRet[0] = AVMEDIA_WIN_PLAYER_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 2ea2221..0949b3f 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -697,7 +697,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( AVMEDIA_WIN_WINDOW_SERVICENAME ) );
+ aRet[0] = AVMEDIA_WIN_WINDOW_SERVICENAME;
return aRet;
}
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index d59e287..dd012a3 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -47,11 +47,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_C
if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_DirectX" ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_DirectX" )) );
+ const ::rtl::OUString aServiceName( "com.sun.star.media.Manager_DirectX" );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.avmedia.Manager_DirectX" )),
+ "com.sun.star.comp.avmedia.Manager_DirectX",
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
--
1.7.7
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
