diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:59:09 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 12:59:09 +0000 |
| commit | 75705031f885c6d5856633740f14dec40cc9336d (patch) | |
| tree | c794656bf64de8a2dfbab070a83e7d1dea30a986 /avmedia | |
| parent | 7aff79f60aee8be5369b4c504afbb8cf928ac848 (diff) | |
INTEGRATION: CWS warnings01 (1.5.10); FILE MERGED
2006/05/23 18:02:58 sb 1.5.10.2: RESYNC: (1.5-1.6); FILE MERGED
2005/11/28 12:46:26 cl 1.5.10.1: warning free code fixes
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 950ff01ba03f..25435a22cbd3 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mediawindow_impl.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2006-04-07 16:18:16 $ + * last change: $Author: hr $ $Date: 2006-06-19 13:59:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -179,10 +179,10 @@ void MediaChildWindow::Command( const CommandEvent& rCEvt ) MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bool bInternalMediaControl ) : Control( pParent ), MediaWindowBaseImpl( pMediaWindow ), - maChildWindow( this ), DropTargetHelper( this ), DragSourceHelper( this ), mxEventsIf( static_cast< ::cppu::OWeakObject* >( mpEvents = new MediaEventListenersImpl( maChildWindow ) ) ), + maChildWindow( this ), mpMediaWindowControl( bInternalMediaControl ? new MediaWindowControl( this ) : NULL ), mpEmptyBmpEx( NULL ), mpAudioBmpEx( NULL ) |