diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /avmedia | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstframegrabber.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 90b388dcb0c1..36a73658a457 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -65,7 +65,7 @@ FrameGrabber::FrameGrabber( const OUString &rURL ) : "uridecodebin uri=%s ! videoconvert ! videoscale ! appsink " "name=sink caps=\"video/x-raw,format=RGB,pixel-aspect-ratio=1/1\"", #endif - rtl::OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); GError *pError = NULL; mpPipeline = gst_parse_launch( pPipelineStr, &pError ); diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 6d23f2004fb2..14fecf3b5253 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -351,7 +351,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink ) else mbFakeVideo = false; - rtl::OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ); + OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ); g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , NULL ); pBus = gst_element_get_bus( mpPlaybin ); diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx index 325e6d4fa676..71e57792c64f 100644 --- a/avmedia/source/viewer/mediawindowbase_impl.cxx +++ b/avmedia/source/viewer/mediawindowbase_impl.cxx @@ -50,7 +50,7 @@ MediaWindowBaseImpl::~MediaWindowBaseImpl() // ------------------------------------------------------------------------- -uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL ) +uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const OUString& rURL ) { uno::Reference< media::XPlayer > xPlayer; uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -66,7 +66,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl: for( sal_uInt32 i = 0; !xPlayer.is() && i < SAL_N_ELEMENTS( aServiceManagers ); ++i ) { - const rtl::OUString aServiceName( aServiceManagers[ i ], + const OUString aServiceName( aServiceManagers[ i ], strlen( aServiceManagers[ i ] ), RTL_TEXTENCODING_ASCII_US ); |