From 940b4d1848e8c70ab7642901a68594e8016caffc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 18:51:28 +0200 Subject: Adding upstream version 1:7.0.4. Signed-off-by: Daniel Baumann --- sd/inc/undo/undofactory.hxx | 43 +++++++++++ sd/inc/undo/undomanager.hxx | 65 ++++++++++++++++ sd/inc/undo/undoobjects.hxx | 178 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 286 insertions(+) create mode 100644 sd/inc/undo/undofactory.hxx create mode 100644 sd/inc/undo/undomanager.hxx create mode 100644 sd/inc/undo/undoobjects.hxx (limited to 'sd/inc/undo') diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx new file mode 100644 index 000000000..6341b006a --- /dev/null +++ b/sd/inc/undo/undofactory.hxx @@ -0,0 +1,43 @@ +/* -*- 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 . + */ + +#ifndef INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX +#define INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX + +#include + +namespace sd +{ + +class UndoFactory final : public SdrUndoFactory +{ +public: + virtual std::unique_ptr CreateUndoRemoveObject(SdrObject& rObject) override; + virtual std::unique_ptr CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false) override; + virtual std::unique_ptr CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) override; + virtual std::unique_ptr CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject ) override; + virtual std::unique_ptr CreateUndoGeoObject( SdrObject& rObject ) override; + virtual std::unique_ptr CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) override; +}; + +} + +#endif // INCLUDED_SD_INC_UNDO_UNDOFACTORY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx new file mode 100644 index 000000000..57df73cd1 --- /dev/null +++ b/sd/inc/undo/undomanager.hxx @@ -0,0 +1,65 @@ +/* -*- 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 . + */ + +#ifndef INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX +#define INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX + +#include +#include + +namespace sd +{ + +class UndoManager final : public SdrUndoManager +{ +public: + UndoManager(); + + virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, ViewShellId nViewShellId) override; + + virtual void AddUndoAction( std::unique_ptr pAction, bool bTryMerg=false ) override; + + /** Set or reset the undo manager linked with the called undo manager. + */ + void SetLinkedUndoManager (SfxUndoManager* pLinkedUndoManager); + +private: + using SdrUndoManager::Undo; + using SdrUndoManager::Redo; + + /** Used when the outline view is visible as a last resort to + synchronize the undo managers. + */ + SfxUndoManager* mpLinkedUndoManager; + + /** Call ClearRedo() at the linked undo manager, when present. + + It should not be necessary to call ClearRedo() explicitly, but the + synchronization between the under managers of the document and the + outline view seems to have a bug. Therefore this method is called + whenever a new undo action is added. + */ + void ClearLinkedRedoActions(); +}; + +} + +#endif // INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx new file mode 100644 index 000000000..be3c5584c --- /dev/null +++ b/sd/inc/undo/undoobjects.hxx @@ -0,0 +1,178 @@ +/* -*- 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 . + */ + +#ifndef INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX +#define INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX + +#include +#include +#include +#include + +class SdrObjUserCall; +class SdPage; + +namespace sd +{ + +class UndoRemovePresObjectImpl +{ +protected: + UndoRemovePresObjectImpl( SdrObject& rObject ); + virtual ~UndoRemovePresObjectImpl(); + + virtual void Undo(); + virtual void Redo(); + +private: + std::unique_ptr mpUndoUsercall; + std::unique_ptr mpUndoAnimation; + std::unique_ptr mpUndoPresObj; +}; + +class UndoRemoveObject final : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl +{ +public: + UndoRemoveObject(SdrObject& rObject); + + virtual void Undo() override; + virtual void Redo() override; + +private: + ::tools::WeakReference mxSdrObject; +}; + +class UndoDeleteObject final : public SdrUndoDelObj, public UndoRemovePresObjectImpl +{ +public: + UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ); + + virtual void Undo() override; + virtual void Redo() override; + +private: + ::tools::WeakReference mxSdrObject; +}; + +class UndoReplaceObject final : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl +{ +public: + UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject ); + + virtual void Undo() override; + virtual void Redo() override; + +private: + ::tools::WeakReference 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 mpUndoAnimation; + bool mbNewEmptyPresObj; + ::tools::WeakReference 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; + ::tools::WeakReference 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; + ::tools::WeakReference mxPage; + ::tools::WeakReference 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: + ::tools::WeakReference mxPage; +}; + +class UndoGeoObject final : public SdrUndoGeoObj +{ +public: + UndoGeoObject( SdrObject& rNewObj ); + + virtual void Undo() override; + virtual void Redo() override; + +private: + ::tools::WeakReference mxPage; + ::tools::WeakReference mxSdrObject; +}; + +class UndoAttrObject final : public SdrUndoAttrObj +{ +public: + UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ); + + virtual void Undo() override; + virtual void Redo() override; + +private: + ::tools::WeakReference mxPage; + ::tools::WeakReference mxSdrObject; +}; + +} // namespace sd + +#endif // INCLUDED_SD_INC_UNDO_UNDOOBJECTS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3