From 4b5ea19aa23b5dbb675b74614fa1e7a2cc33f0e0 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 23 Aug 2011 15:14:05 +0200 Subject: recreated tag libreoffice-3.3.3.1 which had these commits: commit 6f4f1c964ff6ea166412285a4cc0ea9f98da499e (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek Date: Tue May 31 17:39:06 2011 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit abdccb1813c5eb8d27bd7e7ee8a4731f8ca55fcf Author: Andras Timar Date: Mon May 30 00:07:50 2011 +0200 replace "seagull" icons to LibreOffice icons fdo#37617 Signed-off-by: Tor Lillqvist .../icons/hicolor/16x16/apps/printeradmin.png | Bin 963 -> 544 bytes .../icons/hicolor/32x32/apps/printeradmin.png | Bin 2534 -> 1104 bytes .../icons/hicolor/48x48/apps/printeradmin.png | Bin 4058 -> 1629 bytes .../icons/locolor/16x16/apps/printeradmin.png | Bin 395 -> 532 bytes .../icons/locolor/32x32/apps/printeradmin.png | Bin 618 -> 1126 bytes 5 files changed, 0 insertions(+), 0 deletions(-) commit 1a85a81e01b828881c09b76397dd06e121bbb824 Author: Andras Timar Date: Tue May 24 12:05:59 2011 +0200 fdo#37001 - updated license information Signed-off-by: Michael Meeks readlicense_oo/html/THIRDPARTYLICENSEREADME.html |17724 ++++++++++------------ readlicense_oo/odt/LICENSE.odt | Bin 154001 -> 115146 bytes readlicense_oo/txt/license.txt |11684 +++++++++------ 3 files changed, 15007 insertions(+), 14401 deletions(-) commit 2833c4cb4dc6c6def3d3cb3b134f22eda3a87207 Author: Michael Meeks Date: Fri Apr 1 15:55:42 2011 +0100 fix evolution local addressbook integration, which uses a new local: uri .../source/drivers/evoab2/NDatabaseMetaData.cxx | 13 +++++++------ connectivity/source/drivers/evoab2/NResultSet.cxx | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) commit 71bf17ecbaa46780b112b6307aab879a088910fe Author: Tor Lillqvist Date: Tue Mar 29 18:59:05 2011 +0300 Don't pass potentially bogus file: URIs to libxml2 libxml2 doesn't understand our syntax for file: URIs in the case of UNC paths. Fixes fdo#33970. Picked from OOo's fix for their issue i#109096. Signed-off-by: David Tardon .../source/deployment/registry/dp_backenddb.cxx | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 8424af3e1b69f00f442a5a49a964813ede2f09e7 Author: Luboš Luňák Date: Fri Mar 18 13:18:58 2011 +0100 use full path for kdefilepicker helper binary (bnc#31109) ack by pmladek fpicker/source/unx/kde_unx/UnxFilePicker.cxx | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) --- avmedia/source/viewer/mediawindow_impl.cxx | 102 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) (limited to 'avmedia/source/viewer/mediawindow_impl.cxx') diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 787a5087129b..3e4151037a35 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,14 +44,14 @@ #include #include -#define AVMEDIA_TOOLBOXITEM_PREV 0x0001 -#define AVMEDIA_TOOLBOXITEM_PLAY 0x0002 -#define AVMEDIA_TOOLBOXITEM_PAUSE 0x0004 -#define AVMEDIA_TOOLBOXITEM_STOP 0x0008 -#define AVMEDIA_TOOLBOXITEM_NEXT 0x0010 -#define AVMEDIA_TOOLBOXITEM_MUTE 0x0100 +#define AVMEDIA_TOOLBOXITEM_PREV 0x0001 +#define AVMEDIA_TOOLBOXITEM_PLAY 0x0002 +#define AVMEDIA_TOOLBOXITEM_PAUSE 0x0004 +#define AVMEDIA_TOOLBOXITEM_STOP 0x0008 +#define AVMEDIA_TOOLBOXITEM_NEXT 0x0010 +#define AVMEDIA_TOOLBOXITEM_MUTE 0x0100 -#define AVMEDIA_FFW_PLAYRATE 4 +#define AVMEDIA_FFW_PLAYRATE 4 using namespace ::com::sun::star; @@ -77,7 +77,7 @@ MediaWindowControl::~MediaWindowControl() void MediaWindowControl::update() { MediaItem aItem; - + static_cast< MediaWindowImpl* >( GetParent() )->updateMediaItem( aItem ); setState( aItem ); } @@ -114,7 +114,7 @@ void MediaChildWindow::MouseMove( const MouseEvent& rMEvt ) { const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ), rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() ); - + #ifdef GSTREAMER SystemChildWindow::MouseMove( rMEvt ); #else @@ -129,7 +129,7 @@ void MediaChildWindow::MouseButtonDown( const MouseEvent& rMEvt ) { const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ), rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() ); - + #ifdef GSTREAMER SystemChildWindow::MouseButtonDown( rMEvt ); #else @@ -183,7 +183,7 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt ) { const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ), rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() ); - + #ifdef GSTREAMER SystemChildWindow::Command( rCEvt ); #else @@ -209,7 +209,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo { maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); maChildWindow.Hide(); - + if( mpMediaWindowControl ) { mpMediaWindowControl->SetSizePixel( mpMediaWindowControl->getMinSizePixel() ); @@ -239,12 +239,12 @@ void MediaWindowImpl::cleanUp() xPlayerWindow->removeKeyListener( uno::Reference< awt::XKeyListener >( mxEventsIf, uno::UNO_QUERY ) ); xPlayerWindow->removeMouseListener( uno::Reference< awt::XMouseListener >( mxEventsIf, uno::UNO_QUERY ) ); xPlayerWindow->removeMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) ); - + uno::Reference< lang::XComponent > xComponent( xPlayerWindow, uno::UNO_QUERY ); - + if( xComponent.is() ) xComponent->dispose(); - + setPlayerWindow( NULL ); } @@ -260,13 +260,13 @@ void MediaWindowImpl::onURLChanged() uno::Sequence< uno::Any > aArgs( 3 ); uno::Reference< media::XPlayerWindow > xPlayerWindow; const Point aPoint; - const Size aSize( maChildWindow.GetSizePixel() ); + const Size aSize( maChildWindow.GetSizePixel() ); #ifndef GSTREAMER const sal_IntPtr nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() ); #else const sal_Int32 nWndHandle = 0; #endif - + aArgs[ 0 ] = uno::makeAny( nWndHandle ); aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) ); #ifdef GSTREAMER @@ -274,7 +274,7 @@ void MediaWindowImpl::onURLChanged() OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow ); aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow ); #endif - + try { #ifdef GSTREAMER @@ -288,7 +288,7 @@ void MediaWindowImpl::onURLChanged() { // happens eg, on MacOSX where Java frames cannot be created from X11 window handles } - + setPlayerWindow( xPlayerWindow ); if( xPlayerWindow.is() ) @@ -301,20 +301,20 @@ void MediaWindowImpl::onURLChanged() } else setPlayerWindow( NULL ); - + if( getPlayerWindow().is() ) maChildWindow.Show(); else maChildWindow.Hide(); - + if( mpMediaWindowControl ) { MediaItem aItem; - + updateMediaItem( aItem ); mpMediaWindowControl->setState( aItem ); } - + Invalidate(); } @@ -323,7 +323,7 @@ void MediaWindowImpl::onURLChanged() void MediaWindowImpl::update() { uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() ); - + if( xPlayerWindow.is() ) xPlayerWindow->update(); } @@ -339,26 +339,26 @@ void MediaWindowImpl::setPosSize( const Rectangle& rRect ) void MediaWindowImpl::setPointer( const Pointer& rPointer ) { - uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() ); - + uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() ); + SetPointer( rPointer ); maChildWindow.SetPointer( rPointer ); - + if( xPlayerWindow.is() ) { - + long nPointer; - + switch( rPointer.GetStyle() ) { case( POINTER_CROSS ): nPointer = awt::SystemPointer::CROSS; break; case( POINTER_HAND ): nPointer = awt::SystemPointer::HAND; break; case( POINTER_MOVE ): nPointer = awt::SystemPointer::MOVE; break; case( POINTER_WAIT ): nPointer = awt::SystemPointer::WAIT; break; - + default: nPointer = awt::SystemPointer::ARROW; break; } - + xPlayerWindow->setPointerType( nPointer ); } } @@ -381,23 +381,23 @@ bool MediaWindowImpl::hasInternalMediaControl() const void MediaWindowImpl::Resize() { - uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() ); - const Size aCurSize( GetOutputSizePixel() ); - const sal_Int32 nOffset( mpMediaWindowControl ? AVMEDIA_CONTROLOFFSET : 0 ); - Size aPlayerWindowSize( aCurSize.Width() - ( nOffset << 1 ), + uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() ); + const Size aCurSize( GetOutputSizePixel() ); + const sal_Int32 nOffset( mpMediaWindowControl ? AVMEDIA_CONTROLOFFSET : 0 ); + Size aPlayerWindowSize( aCurSize.Width() - ( nOffset << 1 ), aCurSize.Height() - ( nOffset << 1 ) ); - + if( mpMediaWindowControl ) { - const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height(); - const sal_Int32 nControlY = ::std::max( aCurSize.Height() - nControlHeight - nOffset, 0L ); - + const sal_Int32 nControlHeight = mpMediaWindowControl->GetSizePixel().Height(); + const sal_Int32 nControlY = ::std::max( aCurSize.Height() - nControlHeight - nOffset, 0L ); + aPlayerWindowSize.Height() = ( nControlY - ( nOffset << 1 ) ); mpMediaWindowControl->SetPosSizePixel( Point( nOffset, nControlY ), Size( aCurSize.Width() - ( nOffset << 1 ), nControlHeight ) ); } - + maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize ); - + if( xPlayerWindow.is() ) xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 ); } @@ -438,34 +438,34 @@ void MediaWindowImpl::StateChanged( StateChangedType eType ) void MediaWindowImpl::Paint( const Rectangle& ) { BitmapEx* pLogo = NULL; - + if( !getPlayer().is() ) { if( !mpEmptyBmpEx ) mpEmptyBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) ); - + pLogo = mpEmptyBmpEx; } else if ( !getPlayerWindow().is() ) { if( !mpAudioBmpEx ) mpAudioBmpEx = new BitmapEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) ); - + pLogo = mpAudioBmpEx; } const Point aBasePos( maChildWindow.GetPosPixel() ); - const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() ); - + const Rectangle aVideoRect( aBasePos, maChildWindow.GetSizePixel() ); + if( pLogo && !pLogo->IsEmpty() && ( aVideoRect.GetWidth() > 0 ) && ( aVideoRect.GetHeight() > 0 ) ) { - Size aLogoSize( pLogo->GetSizePixel() ); - const Color aBackgroundColor( 67, 67, 67 ); + Size aLogoSize( pLogo->GetSizePixel() ); + const Color aBackgroundColor( 67, 67, 67 ); SetLineColor( aBackgroundColor ); SetFillColor( aBackgroundColor ); DrawRect( aVideoRect ); - + if( ( aLogoSize.Width() > aVideoRect.GetWidth() || aLogoSize.Height() > aVideoRect.GetHeight() ) && ( aLogoSize.Height() > 0 ) ) { @@ -483,7 +483,7 @@ void MediaWindowImpl::Paint( const Rectangle& ) } } - DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ), + DrawBitmapEx( Point( aBasePos.X() + ( ( aVideoRect.GetWidth() - aLogoSize.Width() ) >> 1 ), aBasePos.Y() + ( ( aVideoRect.GetHeight() - aLogoSize.Height() ) >> 1 ) ), aLogoSize, *pLogo ); } -- cgit v1.2.3