[Libreoffice-commits] .: avmedia/inc avmedia/source
avmedia/inc/avmedia/mediaitem.hxx|8
avmedia/source/framework/mediaitem.cxx | 12 ++--
avmedia/source/gstreamer/gstframegrabber.cxx | 10 +-
avmedia/source/gstreamer/gstframegrabber.hxx | 10 +-
avmedia/source/win/player.hxx|4 ++--
5 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 9b65ecc37f8e3cdd81bdb3399c5f72496394df9d
Author: Ricardo Montania
Date: Tue Sep 25 21:31:26 2012 -0300
sal_Bool to bool and some rtl::OUStrings in avmedia
Change-Id: Id58fd5d04f47302983782eb57736ff29d8f5303e
Reviewed-on: https://gerrit.libreoffice.org/697
Tested-by: Noel Power
Reviewed-by: Noel Power
diff --git a/avmedia/inc/avmedia/mediaitem.hxx
b/avmedia/inc/avmedia/mediaitem.hxx
index 6cf0063..c6d0f5b 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -93,11 +93,11 @@ public:
voidsetTime( double fTime );
double getTime() const;
-voidsetLoop( sal_Bool bLoop );
-sal_BoolisLoop() const;
+voidsetLoop( bool bLoop );
+boolisLoop() const;
-voidsetMute( sal_Bool bMute );
-sal_BoolisMute() const;
+voidsetMute( bool bMute );
+boolisMute() const;
voidsetVolumeDB( sal_Int16 nDB );
sal_Int16 getVolumeDB() const;
diff --git a/avmedia/source/framework/mediaitem.cxx
b/avmedia/source/framework/mediaitem.cxx
index 15c3aba..2776809 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -58,8 +58,8 @@ struct MediaItem::Impl
double m_fTime;
double m_fDuration;
sal_Int16 m_nVolumeDB;
-sal_Boolm_bLoop;
-sal_Boolm_bMute;
+boolm_bLoop;
+boolm_bMute;
::com::sun::star::media::ZoomLevel m_eZoom;
Impl(sal_uInt32 const nMaskSet)
@@ -302,7 +302,7 @@ double MediaItem::getTime() const
//
-void MediaItem::setLoop( sal_Bool bLoop )
+void MediaItem::setLoop( bool bLoop )
{
m_pImpl->m_bLoop = bLoop;
m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_LOOP;
@@ -310,14 +310,14 @@ void MediaItem::setLoop( sal_Bool bLoop )
//
-sal_Bool MediaItem::isLoop() const
+bool MediaItem::isLoop() const
{
return m_pImpl->m_bLoop;
}
//
-void MediaItem::setMute( sal_Bool bMute )
+void MediaItem::setMute( bool bMute )
{
m_pImpl->m_bMute = bMute;
m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_MUTE;
@@ -325,7 +325,7 @@ void MediaItem::setMute( sal_Bool bMute )
//
-sal_Bool MediaItem::isMute() const
+bool MediaItem::isMute() const
{
return m_pImpl->m_bMute;
}
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx
b/avmedia/source/gstreamer/gstframegrabber.cxx
index 05d4d87..d9a4ed1 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -201,22 +201,22 @@ uno::Reference< graphic::XGraphic > SAL_CALL
FrameGrabber::grabFrame( double fMe
return xRet;
}
-::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
+OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
-return ::rtl::OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
+return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
-sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString&
ServiceName )
+sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_GST_FRAMEGRABBER_SERVICENAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL
FrameGrabber::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames()
throw (uno::RuntimeException)
{
-uno::Sequence< ::rtl::OUString > aRet(1);
+uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_GST_FRAMEGRABBER_SERVICENAME;
return aRet;
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx
b/avmedia/source/gstreamer/gstframegrabber.hxx
index af23cca..0b87c74 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -39,7 +39,7 @@ class FrameGrabber : public FrameGrabber_BASE
void disposePipeline();
public:
// static create method instead of public Ctor
-static FrameGrabber* create( const rtl::OUString &rURL );
+static FrameGr
[Libreoffice-commits] .: avmedia/inc avmedia/source
avmedia/inc/avmedia/mediaitem.hxx | 12 ++--
avmedia/inc/avmedia/mediaplayer.hxx |4 ++--
avmedia/inc/avmedia/mediawindow.hxx | 14 +++---
avmedia/source/framework/mediacontrol.cxx |2 +-
4 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit cbc44df67cfd13849f3de85edcdd39b5fec8b06c
Author: Ricardo Montania
Date: Thu Sep 13 12:17:40 2012 -0300
::rtl::OUString to OUString in avmedia
Change-Id: If4a7bef339a626fbfa9f0c1cc76801e77626f38f
Reviewed-on: https://gerrit.libreoffice.org/609
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/avmedia/inc/avmedia/mediaitem.hxx
b/avmedia/inc/avmedia/mediaitem.hxx
index c4121a1..d286edd 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -114,11 +114,11 @@ public:
voidsetZoom( ::com::sun::star::media::ZoomLevel eZoom
);
::com::sun::star::media::ZoomLevel getZoom() const;
-voidsetURL( const ::rtl::OUString& rURL,
-::rtl::OUString const*const pTempURL);
-const ::rtl::OUString& getURL() const;
+voidsetURL( const OUString& rURL,
+OUString const*const pTempURL);
+const OUString& getURL() const;
-const ::rtl::OUString& getTempURL() const;
+const OUString& getTempURL() const;
private:
@@ -131,8 +131,8 @@ typedef ::avmedia::MediaItem avmedia_MediaItem;
bool AVMEDIA_DLLPUBLIC EmbedMedia(
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>
const& xModel,
-::rtl::OUString const& rSourceURL,
-::rtl::OUString & o_rEmbeddedURL);
+OUString const& rSourceURL,
+OUString & o_rEmbeddedURL);
}
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx
b/avmedia/inc/avmedia/mediaplayer.hxx
index b7d262f..d54565d 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -72,8 +72,8 @@ public:
MediaFloater( SfxBindings* pBindings,
SfxChildWindow* pCW, Window* pParent );
~MediaFloater();
-voidsetURL( const ::rtl::OUString& rURL, bool
bPlayImmediately );
-const ::rtl::OUString& getURL() const;
+voidsetURL( const OUString& rURL, bool
bPlayImmediately );
+const OUString& getURL() const;
voiddispatchCurrentURL();
diff --git a/avmedia/inc/avmedia/mediawindow.hxx
b/avmedia/inc/avmedia/mediawindow.hxx
index ab9bae2..696e2e4 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -63,7 +63,7 @@ namespace rtl { class OUString; }
namespace avmedia
{
-typedef ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > >
FilterNameVector;
+typedef ::std::vector< ::std::pair< OUString, OUString > >
FilterNameVector;
class MediaItem;
@@ -79,8 +79,8 @@ namespace avmedia
MediaWindow( Window* parent, bool
bInternalMediaControl );
virtual ~MediaWindow();
-voidsetURL( const ::rtl::OUString& rURL );
-const ::rtl::OUString& getURL() const;
+voidsetURL( const OUString& rURL );
+const OUString& getURL() const;
boolisValid() const;
SizegetPreferredSize() const;
@@ -121,13 +121,13 @@ namespace avmedia
/// @param o_pbLink if not 0, this is an "insert" dialog: display link
/// checkbox and store its state in *o_pbLink
static bool executeMediaURLDialog( Window* pParent,
-::rtl::OUString& rURL, bool *const o_pbLink );
+OUString& rURL, bool *const o_pbLink );
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,
double fMedia
