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>
175 lines
4.4 KiB
C++
175 lines
4.4 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include <svx/svdundo.hxx>
|
|
#include <pres.hxx>
|
|
#include <tools/weakbase.hxx>
|
|
#include <unotools/weakref.hxx>
|
|
|
|
class SdrObjUserCall;
|
|
class SdPage;
|
|
|
|
namespace sd
|
|
{
|
|
class UndoRemovePresObjectImpl
|
|
{
|
|
protected:
|
|
UndoRemovePresObjectImpl(SdrObject& rObject);
|
|
virtual ~UndoRemovePresObjectImpl();
|
|
|
|
virtual void Undo();
|
|
virtual void Redo();
|
|
|
|
private:
|
|
std::unique_ptr<SfxUndoAction> mpUndoUsercall;
|
|
std::unique_ptr<SfxUndoAction> mpUndoAnimation;
|
|
std::unique_ptr<SfxUndoAction> mpUndoPresObj;
|
|
};
|
|
|
|
class UndoRemoveObject final : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl
|
|
{
|
|
public:
|
|
UndoRemoveObject(SdrObject& rObject);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
class UndoDeleteObject final : public SdrUndoDelObj, public UndoRemovePresObjectImpl
|
|
{
|
|
public:
|
|
UndoDeleteObject(SdrObject& rObject, bool bOrdNumDirect);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
class UndoReplaceObject final : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl
|
|
{
|
|
public:
|
|
UndoReplaceObject(SdrObject& rOldObject, SdrObject& rNewObject);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
class UndoObjectSetText final : public SdrUndoObjSetText
|
|
{
|
|
public:
|
|
UndoObjectSetText(SdrObject& rNewObj, sal_Int32 nText);
|
|
virtual ~UndoObjectSetText() override;
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
std::unique_ptr<SfxUndoAction> mpUndoAnimation;
|
|
bool mbNewEmptyPresObj;
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
// Undo for SdrObject::SetUserCall()
|
|
|
|
class UndoObjectUserCall final : public SdrUndoObj
|
|
{
|
|
public:
|
|
UndoObjectUserCall(SdrObject& rNewObj);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
SdrObjUserCall* mpOldUserCall;
|
|
SdrObjUserCall* mpNewUserCall;
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
// Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj()
|
|
|
|
class UndoObjectPresentationKind final : public SdrUndoObj
|
|
{
|
|
public:
|
|
UndoObjectPresentationKind(SdrObject& rObject);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
PresObjKind meOldKind;
|
|
PresObjKind meNewKind;
|
|
::unotools::WeakReference<SdPage> mxPage;
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
// Restores correct position and size for presentation shapes with user call
|
|
// on undo
|
|
|
|
class UndoAutoLayoutPosAndSize final : public SfxUndoAction
|
|
{
|
|
public:
|
|
UndoAutoLayoutPosAndSize(SdPage& rPage);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
::unotools::WeakReference<SdPage> mxPage;
|
|
};
|
|
|
|
class UndoGeoObject final : public SdrUndoGeoObj
|
|
{
|
|
public:
|
|
UndoGeoObject(SdrObject& rNewObj);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
::unotools::WeakReference<SdPage> mxPage;
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
class UndoAttrObject final : public SdrUndoAttrObj
|
|
{
|
|
public:
|
|
UndoAttrObject(SdrObject& rObject, bool bStyleSheet1, bool bSaveText);
|
|
|
|
virtual void Undo() override;
|
|
virtual void Redo() override;
|
|
|
|
private:
|
|
::unotools::WeakReference<SdPage> mxPage;
|
|
::unotools::WeakReference<SdrObject> mxSdrObject;
|
|
};
|
|
|
|
} // namespace sd
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|