diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-17 10:50:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-17 10:21:15 +0000 |
| commit | 40da0a9d1cea08fae38c6bc478d1a69f8faaf627 (patch) | |
| tree | d514ddb5e51af23e7978d9133a13a24ab27427f0 /include/avmedia | |
| parent | 0f732c41bc4edd7075ff68a81c0ca299e3e913c9 (diff) | |
com::sun::uno->css in avmedia and animations
Change-Id: Ie4365a488728c39fedacae7650b4b90260e7e44a
Reviewed-on: https://gerrit.libreoffice.org/17153
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/avmedia')
| -rw-r--r-- | include/avmedia/mediawindow.hxx | 8 | ||||
| -rw-r--r-- | include/avmedia/modeltools.hxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx index 3eeb7078552b..72e2ecb64a57 100644 --- a/include/avmedia/mediawindow.hxx +++ b/include/avmedia/mediawindow.hxx @@ -103,9 +103,9 @@ namespace avmedia static void executeFormatErrorBox( vcl::Window* pParent ); static bool isMediaURL( const OUString& rURL, const OUString& rReferer, bool bDeep = false, Size* pPreferredSizePixel = NULL ); - static ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); + static css::uno::Reference< css::media::XPlayer > createPlayer( const OUString& rURL, const OUString& rReferer, const OUString* pMimeType = 0 ); - static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > grabFrame( const OUString& rURL, const OUString& rReferer, + static css::uno::Reference< css::graphic::XGraphic > grabFrame( const OUString& rURL, const OUString& rReferer, const OUString& sMimeType, double fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME ); static BitmapEx getAudioLogo(); @@ -115,8 +115,8 @@ namespace avmedia MediaWindow(const MediaWindow&) SAL_DELETED_FUNCTION; MediaWindow& operator =( const MediaWindow& ) SAL_DELETED_FUNCTION; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace; - VclPtr<priv::MediaWindowImpl> mpImpl; + css::uno::Reference< css::uno::XInterface > mxIFace; + VclPtr<priv::MediaWindowImpl> mpImpl; }; } diff --git a/include/avmedia/modeltools.hxx b/include/avmedia/modeltools.hxx index 590e8d0f1525..541c5d3c4d58 100644 --- a/include/avmedia/modeltools.hxx +++ b/include/avmedia/modeltools.hxx @@ -23,7 +23,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput); #endif bool AVMEDIA_DLLPUBLIC Embed3DModel( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& xModel, + const css::uno::Reference< css::frame::XModel>& xModel, const OUString& rSourceURL, OUString& o_rEmbeddedURL); bool AVMEDIA_DLLPUBLIC IsModel(const OUString& rMimeType); |