789a737ac9
There are some CrashReports in 7.6 which have
DeleteItemOnIdle on the stack, but there is nothing
reproducable. So I took a look...
I first thought it's a MCGR regression, due to classes
on the stack. But the Item involved is just random, can
happen with any Item.
Then I thought it may have to do with ITEM refactorings,
but it happens with DeleteItemOnIdle involved, so also
not the case. I already saw DeleteItemOnIdle when doing
these and qualified as 'hack' in the way. already
It is only on Windows and DeleteItemOnIdle is involved.
This again (took a deeper look now) is an old hack to
keep an SfxPoolItem 'alive' for some 'time'. For that,
it triggers an async reschedule which then deletes the
Item when being called. If the Item will be used after
that is pure coincidence - seems to work in most cases.
It seems as if for Windows the timing slightly changed
for some scenarios, so a reschedule is too early. This
can happen with this hack anytime.
DeleteItemOnIdle is used in scenarios where SfxPoolItem*
is e.g. returned, but is *not* anchored, so e.g. not
member of an SfxItemSet. Or in short: Lifetime is not
safe.
DeleteItemOnIdle exists since 1st import, but was
changed to AsyncEvent ca. 4 months ago (see
57145acf9e), so that may
have caused it. It is possible that these errors happen
on Windows since then. Before something more complicated
was used to delete it late, but surely also not really
safe.
Due to ITEM refactor I have the knowledge/tooling to
solve this. It will not be a 1-5 lines fix, but it is
a hack and in the way for further ITEM refactor anyways.
What we have nowadays is a SfxPoolItemHolder -> it's
like an SfxItemSet for a single Item. It safely holds/
controls the lifetime of an SfxPoolItem. It is already
used in quite some places. It helps to solve many hacks,
also the ones putting Items directly to the Pool - due
to there never was an alternative for that. In principle
the ItemPool/ItemSet/Item paradigm was never complete
without SfxPoolItemHolder.
Thus I started to fix that (and remove that hack for
good, sooo many changes over the years, sigh), but as
said is not straightforward. Will have to change
retvals of involved stuff to SfxPoolItemHolder - it's
just two pointers and designed to be copied (one is a
Pool, needed to cleanup when destructing).
CopyConstruct/destroy just counts the RefCnt up/down,
so cheap.
1st version compiling, let's check on gerrit...
Corrected one error in QueryState for securitypage, also
added some security features/asserts.
Change-Id: Ida49fd35ca88ead84b11d93e18b978cb9e395090
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161083
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>
146 lines
3.9 KiB
C++
146 lines
3.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* 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/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* 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 <avmedia/mediaplayer.hxx>
|
|
#include <avmedia/mediawindow.hxx>
|
|
#include <avmedia/mediaitem.hxx>
|
|
#include <mediamisc.hxx>
|
|
#include <strings.hrc>
|
|
#include <helpids.h>
|
|
|
|
#include <svl/stritem.hxx>
|
|
#include <svl/itemset.hxx>
|
|
#include <sfx2/sfxsids.hrc>
|
|
#include <sfx2/bindings.hxx>
|
|
#include <sfx2/dispatch.hxx>
|
|
|
|
namespace avmedia
|
|
{
|
|
|
|
MediaPlayer::MediaPlayer( vcl::Window* _pParent, sal_uInt16 nId, SfxBindings* _pBindings, SfxChildWinInfo* pInfo ) :
|
|
SfxChildWindow( _pParent, nId )
|
|
{
|
|
SetWindow( VclPtr<MediaFloater>::Create( _pBindings, this, _pParent ) );
|
|
static_cast< MediaFloater* >( GetWindow() )->Initialize( pInfo );
|
|
};
|
|
|
|
|
|
MediaPlayer::~MediaPlayer()
|
|
{
|
|
}
|
|
|
|
|
|
SFX_IMPL_DOCKINGWINDOW_WITHID( MediaPlayer, SID_AVMEDIA_PLAYER )
|
|
|
|
|
|
MediaFloater::MediaFloater( SfxBindings* _pBindings, SfxChildWindow* pCW, vcl::Window* pParent ) :
|
|
SfxDockingWindow( _pBindings, pCW, pParent, WB_CLOSEABLE | WB_MOVEABLE | WB_SIZEABLE | WB_DOCKABLE ),
|
|
mpMediaWindow( new MediaWindow( this, true ) )
|
|
{
|
|
const Size aSize( mpMediaWindow->getPreferredSize() );
|
|
|
|
SetPosSizePixel( Point( 0, 0 ), aSize );
|
|
SetMinOutputSizePixel( aSize );
|
|
SetText( AvmResId( AVMEDIA_STR_MEDIAPLAYER ) );
|
|
mpMediaWindow->show();
|
|
}
|
|
|
|
|
|
MediaFloater::~MediaFloater()
|
|
{
|
|
disposeOnce();
|
|
}
|
|
|
|
void MediaFloater::dispose()
|
|
{
|
|
if (IsFloatingMode())
|
|
{
|
|
Show(false, ShowFlags::NoFocusChange);
|
|
SetFloatingMode(false);
|
|
}
|
|
mpMediaWindow.reset();
|
|
SfxDockingWindow::dispose();
|
|
}
|
|
|
|
void MediaFloater::Resize()
|
|
{
|
|
SfxDockingWindow::Resize();
|
|
|
|
if( mpMediaWindow )
|
|
mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) );
|
|
}
|
|
|
|
void MediaFloater::ToggleFloatingMode()
|
|
{
|
|
::avmedia::MediaItem aRestoreItem;
|
|
|
|
if (mpMediaWindow)
|
|
mpMediaWindow->updateMediaItem( aRestoreItem );
|
|
mpMediaWindow.reset();
|
|
|
|
SfxDockingWindow::ToggleFloatingMode();
|
|
|
|
if (isDisposed())
|
|
return;
|
|
|
|
mpMediaWindow.reset( new MediaWindow( this, true ) );
|
|
|
|
mpMediaWindow->setPosSize( tools::Rectangle( Point(), GetOutputSizePixel() ) );
|
|
mpMediaWindow->executeMediaItem( aRestoreItem );
|
|
|
|
vcl::Window* pWindow = mpMediaWindow->getWindow();
|
|
|
|
if( pWindow )
|
|
pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW );
|
|
|
|
mpMediaWindow->show();
|
|
}
|
|
|
|
|
|
void MediaFloater::setURL( const OUString& rURL, const OUString& rReferer, bool bPlayImmediately )
|
|
{
|
|
if( mpMediaWindow )
|
|
{
|
|
mpMediaWindow->setURL( rURL, rReferer );
|
|
|
|
if( mpMediaWindow->isValid() && bPlayImmediately )
|
|
mpMediaWindow->start();
|
|
}
|
|
}
|
|
|
|
|
|
void MediaFloater::dispatchCurrentURL()
|
|
{
|
|
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
|
|
|
|
if( pDispatcher )
|
|
{
|
|
OUString url;
|
|
if (mpMediaWindow != nullptr) {
|
|
url = mpMediaWindow->getURL();
|
|
}
|
|
const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, url );
|
|
pDispatcher->ExecuteList(SID_INSERT_AVMEDIA, SfxCallMode::RECORD,
|
|
{ &aMediaURLItem });
|
|
}
|
|
}
|
|
|
|
} // namespace avmedia
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|