8611f6e259
Which means we can get rid of the majestic hack of ScCaptionPtr Previously, SdrObject was manually managed, and the ownership passed around in very complicated fashion. Notes: (*) SvxShape has a strong reference to SdrObject, where previously it had a weak reference. It is now strong since otherwise the SdrObject will go away very eagerly. (*) SdrObject still has a weak reference to SvxShape (*) In the existing places that an SdrObject is being deleted, we now just clear the reference (*) instead of SwVirtFlyDrawObj removing itself from the page that contains inside it's destructor, make the call site do the removing from the page. (*) Needed to take the SolarMutex in UndoManagerHelper_Impl::impl_clear because this can be called from UNO (e.g. sfx2_complex JUnit test) and the SdrObjects need the SolarMutex when destructing. (*) handle a tricky situation with SwDrawVirtObj in the SwDrawModel destructor because the existing code wants mpDrawObj in SwAnchoredObject to be sometimes owning, sometimes not, which results in a cycle with the new code. Change-Id: I4d79df1660e386388e5d51030653755bca02a163 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138837 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
64 lines
1.5 KiB
C++
64 lines
1.5 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/.
|
|
*/
|
|
|
|
#ifndef INCLUDED_SVX_EXTEDIT_HXX
|
|
#define INCLUDED_SVX_EXTEDIT_HXX
|
|
|
|
#include <svx/svxdllapi.h>
|
|
#include <svl/lstner.hxx>
|
|
#include <rtl/ustring.hxx>
|
|
#include <rtl/ref.hxx>
|
|
#include <memory>
|
|
|
|
class Graphic;
|
|
class GraphicObject;
|
|
class FileChangedChecker;
|
|
|
|
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC ExternalToolEdit
|
|
{
|
|
protected:
|
|
OUString m_aFileName;
|
|
|
|
::std::unique_ptr<FileChangedChecker> m_pChecker;
|
|
|
|
public:
|
|
|
|
ExternalToolEdit();
|
|
virtual ~ExternalToolEdit();
|
|
|
|
virtual void Update( Graphic& aGraphic ) = 0;
|
|
void Edit(GraphicObject const*const pGraphic);
|
|
|
|
void StartListeningEvent();
|
|
|
|
static void HandleCloseEvent( ExternalToolEdit* pData );
|
|
};
|
|
|
|
class FmFormView;
|
|
class SdrObject;
|
|
class SdrGrafObj;
|
|
|
|
class SAL_WARN_UNUSED SVXCORE_DLLPUBLIC SdrExternalToolEdit final
|
|
: public ExternalToolEdit
|
|
,public SfxListener
|
|
{
|
|
private:
|
|
FmFormView* m_pView;
|
|
rtl::Reference<SdrGrafObj> m_pObj;
|
|
|
|
SAL_DLLPRIVATE virtual void Update(Graphic&) override;
|
|
SAL_DLLPRIVATE virtual void Notify(SfxBroadcaster&, const SfxHint&) override;
|
|
|
|
public:
|
|
SdrExternalToolEdit(
|
|
FmFormView* pView,
|
|
SdrGrafObj* pObj);
|
|
};
|
|
|
|
#endif
|