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: If4a7bef339a626fbfa9f0c1cc76801e77626f38f
Reviewed-on: https://gerrit.libreoffice.org/609
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
This commit is contained in:
Ricardo Montania
2012-09-13 12:17:40 -03:00
committed by Olivier Hallot
parent 45c86d8a7b
commit cbc44df67c
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
avmedia/inc/avmedia/mediaitem.hxx
View File

@@ -114,11 +114,11 @@ public:
void setZoom( ::com::sun::star::media::ZoomLevel eZoom ); void setZoom( ::com::sun::star::media::ZoomLevel eZoom );
::com::sun::star::media::ZoomLevel getZoom() const; ::com::sun::star::media::ZoomLevel getZoom() const;
void setURL( const ::rtl::OUString& rURL, void setURL( const OUString& rURL,
::rtl::OUString const*const pTempURL); OUString const*const pTempURL);
const ::rtl::OUString& getURL() const; const OUString& getURL() const;
const ::rtl::OUString& getTempURL() const; const OUString& getTempURL() const;
private: private:
@@ -131,8 +131,8 @@ typedef ::avmedia::MediaItem avmedia_MediaItem;
bool AVMEDIA_DLLPUBLIC EmbedMedia( bool AVMEDIA_DLLPUBLIC EmbedMedia(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>
const& xModel, const& xModel,
::rtl::OUString const& rSourceURL, OUString const& rSourceURL,
::rtl::OUString & o_rEmbeddedURL); OUString & o_rEmbeddedURL);
} }

4
avmedia/inc/avmedia/mediaplayer.hxx
View File

@@ -72,8 +72,8 @@ public:
MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent ); MediaFloater( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent );
~MediaFloater(); ~MediaFloater();
void setURL( const ::rtl::OUString& rURL, bool bPlayImmediately ); void setURL( const OUString& rURL, bool bPlayImmediately );
const ::rtl::OUString& getURL() const; const OUString& getURL() const;
void dispatchCurrentURL(); void dispatchCurrentURL();

14
avmedia/inc/avmedia/mediawindow.hxx
View File

@@ -63,7 +63,7 @@ namespace rtl { class OUString; }
namespace avmedia namespace avmedia
{ {
typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > FilterNameVector; typedef ::std::vector< ::std::pair< OUString, OUString > > FilterNameVector;
class MediaItem; class MediaItem;
@@ -79,8 +79,8 @@ namespace avmedia
MediaWindow( Window* parent, bool bInternalMediaControl ); MediaWindow( Window* parent, bool bInternalMediaControl );
virtual ~MediaWindow(); virtual ~MediaWindow();
void setURL( const ::rtl::OUString& rURL ); void setURL( const OUString& rURL );
const ::rtl::OUString& getURL() const; const OUString& getURL() const;
bool isValid() const; bool isValid() const;
Size getPreferredSize() const; Size getPreferredSize() const;
@@ -121,13 +121,13 @@ namespace avmedia
/// @param o_pbLink if not 0, this is an "insert" dialog: display link /// @param o_pbLink if not 0, this is an "insert" dialog: display link
/// checkbox and store its state in *o_pbLink /// checkbox and store its state in *o_pbLink
static bool executeMediaURLDialog( Window* pParent, static bool executeMediaURLDialog( Window* pParent,
::rtl::OUString& rURL, bool *const o_pbLink ); OUString& rURL, bool *const o_pbLink );
static void executeFormatErrorBox( Window* pParent ); static void executeFormatErrorBox( Window* pParent );
static bool isMediaURL( const ::rtl::OUString& rURL, bool bDeep = false, Size* pPreferredSizePixel = NULL ); static bool isMediaURL( const OUString& rURL, bool bDeep = false, Size* pPreferredSizePixel = NULL );
static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const ::rtl::OUString& rURL ); static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL );
static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const ::rtl::OUString& rURL, static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const OUString& rURL,
bool bAllowToCreateReplacementGraphic = false, bool bAllowToCreateReplacementGraphic = false,
double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME ); double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME );

2
avmedia/source/framework/mediacontrol.cxx
View File

@@ -497,7 +497,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
{ {
case( AVMEDIA_TOOLBOXITEM_OPEN ): case( AVMEDIA_TOOLBOXITEM_OPEN ):
{ {
::rtl::OUString aURL; OUString aURL;
if (::avmedia::MediaWindow::executeMediaURLDialog( if (::avmedia::MediaWindow::executeMediaURLDialog(
GetParent(), aURL, 0)) GetParent(), aURL, 0))