7a641c71f8
In SdrObjEditView::SdrEndTextEdit(), pSdrUndoManager->Redo() was invoked until all the redo actions created after text edit began were converted to undo actions. Without checking, all the redo actions include the ones created before text edit began were moved to undo stack, and caused the SdrTextObj to be destroyed in SdrUndoManager::SetEndTextEditHdl when removing the undo actions and a use after release problem. The patch add GetRedoActionCountBeforeTextEdit() so the program won't invoke pSdrUndoManager->Redo() on actions created before text edit begin. Change-Id: Ic010bc6e71ee78ef2cb20a5259dc9d6d6579ccaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114102 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
73 lines
2.7 KiB
C++
73 lines
2.7 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 .
|
|
*/
|
|
#ifndef INCLUDED_SVX_SDRUNDOMANAGER_HXX
|
|
#define INCLUDED_SVX_SDRUNDOMANAGER_HXX
|
|
|
|
#include <svx/svxdllapi.h>
|
|
#include <editeng/editund2.hxx>
|
|
#include <tools/link.hxx>
|
|
|
|
class SfxObjectShell;
|
|
|
|
class SVXCORE_DLLPUBLIC SdrUndoManager : public EditUndoManager
|
|
{
|
|
private:
|
|
using EditUndoManager::Undo;
|
|
using EditUndoManager::Redo;
|
|
|
|
Link<SdrUndoManager*, void> maEndTextEditHdl;
|
|
SfxUndoAction* mpLastUndoActionBeforeTextEdit;
|
|
size_t mnRedoActionCountBeforeTextEdit;
|
|
bool mbEndTextEditTriggeredFromUndo;
|
|
|
|
SfxObjectShell* m_pDocSh;
|
|
|
|
protected:
|
|
// call to check for TextEdit active
|
|
bool isTextEditActive() const;
|
|
virtual void EmptyActionsChanged() override;
|
|
|
|
public:
|
|
SdrUndoManager();
|
|
virtual ~SdrUndoManager() override;
|
|
|
|
/// react depending on edit mode and if no more undo is possible
|
|
virtual bool Undo() override;
|
|
virtual bool Redo() override;
|
|
|
|
// #i123350#
|
|
virtual void Clear() override;
|
|
|
|
// Call for the view which starts the interactive text edit. Use link to
|
|
// activate (start text edit) and empty link to reset (end text edit). On
|
|
// reset all text edit actions will be removed from this undo manager to
|
|
// restore the state before activation
|
|
void SetEndTextEditHdl(const Link<SdrUndoManager*, void>& rLink);
|
|
|
|
// check from outside if we are inside a callback for ending text edit. This
|
|
// is needed to detect inside end text edit if it is a regular one or triggered
|
|
// by a last undo during text edit
|
|
bool isEndTextEditTriggeredFromUndo() const { return mbEndTextEditTriggeredFromUndo; }
|
|
void SetDocShell(SfxObjectShell* pDocShell);
|
|
size_t GetRedoActionCountBeforeTextEdit() const { return mnRedoActionCountBeforeTextEdit; }
|
|
};
|
|
|
|
#endif // INCLUDED_SVX_SDRUNDOMANAGER_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|