summaryrefslogtreecommitdiffstats
path: root/avmedia/source/viewer/mediawindow_impl.cxx
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-09-24 18:14:43 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-09-25 15:15:39 +0100
commitd20469c1b041ef24f2372a5898cf318b3fe6af70 (patch)
tree2fbee8a678afc910d7cbf5e41fb29cba229c57b0 /avmedia/source/viewer/mediawindow_impl.cxx
parentfdo#55019: Cope with empty TrustedAuthor entries (diff)
downloadcore-d20469c1b041ef24f2372a5898cf318b3fe6af70.tar.gz
core-d20469c1b041ef24f2372a5898cf318b3fe6af70.zip
re-base on ALv2 code. Includes:
Ocke Janssen impress210: #i115617# set zoom to fit_to_window Ocke Janssen impress210: #i78386# looping sound for windows cleanup createPlayer fallback code & java parameter. Change-Id: I56f06d08c66a1f754292a0c5b1abc32824e391c5
Diffstat (limited to 'avmedia/source/viewer/mediawindow_impl.cxx')
-rw-r--r--avmedia/source/viewer/mediawindow_impl.cxx40
1 files changed, 14 insertions, 26 deletions
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index f77334132734..274f58a2729a 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -1,30 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
+/*
+ * This file is part of the LibreOffice project.
*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
*
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
#include "mediawindow_impl.hxx"
#include "mediaevent_impl.hxx"
@@ -204,7 +195,6 @@ void MediaWindowImpl::cleanUp()
xPlayerWindow->removeMouseMotionListener( uno::Reference< awt::XMouseMotionListener >( mxEventsIf, uno::UNO_QUERY ) );
uno::Reference< lang::XComponent > xComponent( xPlayerWindow, uno::UNO_QUERY );
-
if( xComponent.is() )
xComponent->dispose();
@@ -264,8 +254,6 @@ void MediaWindowImpl::onURLChanged()
updateMediaItem( aItem );
mpMediaWindowControl->setState( aItem );
}
-
- Invalidate();
}
// ---------------------------------------------------------------------