svx/source/svdraw/svdomedia.cxx | 34 ---------------------------------- 1 file changed, 34 deletions(-)
New commits: commit ee947932eadd08682bb37eb265a6fdd0672d0888 Author: Zolnai Tamás <tamas.zol...@collabora.com> Date: Fri Apr 4 23:38:06 2014 +0200 Remove some extra empty line diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 8bc8f4d..b7f5956 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdomedia.hxx> #include <rtl/ustring.hxx> @@ -47,7 +46,6 @@ using namespace ::com::sun::star; // - SdrMediaObj - - // Note: the temp file is read only, until it is deleted! // It may be shared between multiple documents in case of copy/paste, // hence the shared_ptr. @@ -78,36 +76,26 @@ SdrMediaObj::SdrMediaObj() { } - - SdrMediaObj::SdrMediaObj( const Rectangle& rRect ) : SdrRectObj( rRect ) , m_pImpl( new Impl() ) { } - - SdrMediaObj::~SdrMediaObj() { } - - bool SdrMediaObj::HasTextEdit() const { return false; } - - sdr::contact::ViewContact* SdrMediaObj::CreateObjectSpecificViewContact() { return new ::sdr::contact::ViewContactOfSdrMediaObj( *this ); } - - void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const { rInfo.bSelectAllowed = true; @@ -132,15 +120,11 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const rInfo.bCanConvToPolyLineToArea = false; } - - sal_uInt16 SdrMediaObj::GetObjIdentifier() const { return sal_uInt16( OBJ_MEDIA ); } - - OUString SdrMediaObj::TakeObjNameSingul() const { OUStringBuffer sName(ImpGetResStr(STR_ObjNameSingulMEDIA)); @@ -158,15 +142,11 @@ OUString SdrMediaObj::TakeObjNameSingul() const return sName.makeStringAndClear(); } - - OUString SdrMediaObj::TakeObjNamePlural() const { return ImpGetResStr(STR_ObjNamePluralMEDIA); } - - SdrMediaObj* SdrMediaObj::Clone() const { return CloneHelper< SdrMediaObj >(); @@ -196,8 +176,6 @@ uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() return m_pImpl->m_xCachedSnapshot; } - - void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly /* = false */ ) { Size aSize( Application::GetDefaultDevice()->PixelToLogic( getPreferredSize(), MAP_100TH_MM ) ); @@ -242,8 +220,6 @@ void SdrMediaObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly / } } - - void SdrMediaObj::setURL( const OUString& rURL, const OUString& rReferer, const OUString& rMimeType ) { ::avmedia::MediaItem aURLItem; @@ -253,37 +229,27 @@ void SdrMediaObj::setURL( const OUString& rURL, const OUString& rReferer, const setMediaProperties( aURLItem ); } - - const OUString& SdrMediaObj::getURL() const { return m_pImpl->m_MediaProperties.getURL(); } - - void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState ) { mediaPropertiesChanged( rState ); static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).executeMediaItem( getMediaProperties() ); } - - const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const { return m_pImpl->m_MediaProperties; } - - Size SdrMediaObj::getPreferredSize() const { return static_cast< ::sdr::contact::ViewContactOfSdrMediaObj& >( GetViewContact() ).getPreferredSize(); } - - uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() { if (!m_pImpl->m_pTempFile)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits