mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

::rtl::OUString to OUString in avmedia

Browse Source 
Change-Id: Id62d30e33ad68ffa6d3199a181b002155f224732
Reviewed-on: https://gerrit.libreoffice.org/668
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
This commit is contained in:
Ricardo Montania
2012-09-21 12:19:04 -03:00
committed by Noel Power
parent 207aebf733
commit 6c98b12cd6
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
avmedia/source/quicktime/window.hxx
View File

@@ -88,9 +88,9 @@ public:
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private: private:

32
avmedia/source/viewer/mediawindow.cxx
View File

@@ -70,15 +70,15 @@ MediaWindow::~MediaWindow()
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void MediaWindow::setURL( const ::rtl::OUString& rURL ) void MediaWindow::setURL( const OUString& rURL )
{ {
if( mpImpl ) if( mpImpl )
mpImpl->setURL( rURL, ::rtl::OUString() ); mpImpl->setURL( rURL, OUString() );
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
const ::rtl::OUString& MediaWindow::getURL() const const OUString& MediaWindow::getURL() const
{ {
return mpImpl->getURL(); return mpImpl->getURL();
} }
@@ -238,24 +238,24 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
for( size_t i = 0; i < SAL_N_ELEMENTS(pFilters); i += 2 ) for( size_t i = 0; i < SAL_N_ELEMENTS(pFilters); i += 2 )
{ {
rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >( rFilterNameVector.push_back( ::std::make_pair< OUString, OUString >(
::rtl::OUString::createFromAscii(pFilters[i]), OUString::createFromAscii(pFilters[i]),
::rtl::OUString::createFromAscii(pFilters[i+1]) ) ); OUString::createFromAscii(pFilters[i+1]) ) );
} }
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
bool MediaWindow::executeMediaURLDialog(Window* /* pParent */, bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
::rtl::OUString& rURL, bool *const o_pbLink) OUString& rURL, bool *const o_pbLink)
{ {
::sfx2::FileDialogHelper aDlg( (o_pbLink) ::sfx2::FileDialogHelper aDlg( (o_pbLink)
? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW ? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW
: ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); : ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
static const ::rtl::OUString aWildcard( "*." ); static const OUString aWildcard( "*." );
FilterNameVector aFilters; FilterNameVector aFilters;
const ::rtl::OUString aSeparator( ";" ); const OUString aSeparator( ";" );
::rtl::OUString aAllTypes; OUString aAllTypes;
aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink) aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) ); ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) );
@@ -279,7 +279,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
for( i = 0; i < aFilters.size(); ++i ) for( i = 0; i < aFilters.size(); ++i )
{ {
::rtl::OUString aTypes; OUString aTypes;
for( sal_Int32 nIndex = 0; nIndex >= 0; ) for( sal_Int32 nIndex = 0; nIndex >= 0; )
{ {
@@ -328,7 +328,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
} }
} }
else if( !rURL.isEmpty() ) else if( !rURL.isEmpty() )
rURL = ::rtl::OUString(); rURL = OUString();
return( !rURL.isEmpty() ); return( !rURL.isEmpty() );
} }
@@ -344,7 +344,7 @@ void MediaWindow::executeFormatErrorBox( Window* pParent )
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPreferredSizePixel ) bool MediaWindow::isMediaURL( const OUString& rURL, bool bDeep, Size* pPreferredSizePixel )
{ {
const INetURLObject aURL( rURL ); const INetURLObject aURL( rURL );
bool bRet = false; bool bRet = false;
@@ -378,7 +378,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
else else
{ {
FilterNameVector aFilters; FilterNameVector aFilters;
const ::rtl::OUString aExt( aURL.getExtension() ); const OUString aExt( aURL.getExtension() );
getMediaFilters( aFilters ); getMediaFilters( aFilters );
@@ -399,14 +399,14 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
uno::Reference< media::XPlayer > MediaWindow::createPlayer( const ::rtl::OUString& rURL ) uno::Reference< media::XPlayer > MediaWindow::createPlayer( const OUString& rURL )
{ {
return priv::MediaWindowImpl::createPlayer( rURL ); return priv::MediaWindowImpl::createPlayer( rURL );
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUString& rURL, uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const OUString& rURL,
bool bAllowToCreateReplacementGraphic, bool bAllowToCreateReplacementGraphic,
double fMediaTime ) double fMediaTime )
{ {

10
avmedia/source/viewer/mediawindowbase_impl.cxx
View File

@@ -60,7 +60,7 @@ MediaWindowBaseImpl::~MediaWindowBaseImpl()
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL ) uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const OUString& rURL )
{ {
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
uno::Reference< media::XPlayer > xPlayer; uno::Reference< media::XPlayer > xPlayer;
@@ -112,8 +112,8 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
return xPlayer; return xPlayer;
} }
void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL, void MediaWindowBaseImpl::setURL( const OUString& rURL,
::rtl::OUString const& rTempURL) OUString const& rTempURL)
{ {
if( rURL != getURL() ) if( rURL != getURL() )
{ {
@@ -127,7 +127,7 @@ void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL,
} }
mxPlayer.clear(); mxPlayer.clear();
mTempFileURL = ::rtl::OUString(); mTempFileURL = OUString();
if (rTempURL.getLength()) if (rTempURL.getLength())
{ {
@@ -158,7 +158,7 @@ void MediaWindowBaseImpl::onURLChanged()
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
const ::rtl::OUString& MediaWindowBaseImpl::getURL() const const OUString& MediaWindowBaseImpl::getURL() const
{ {
return maFileURL; return maFileURL;
} }