sdrundomanager.cxx (3d9b0034) sdrundomanager.cxx (31b2f7b2)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 71 unchanged lines hidden (view full) ---

80 {
81 // no redo triggered up to now, trigger local one
82 bRetval = SfxUndoManager::Redo();
83 }
84
85 return bRetval;
86}
87
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 71 unchanged lines hidden (view full) ---

80 {
81 // no redo triggered up to now, trigger local one
82 bRetval = SfxUndoManager::Redo();
83 }
84
85 return bRetval;
86}
87
88void SdrUndoManager::Clear()
89{
90 if(isTextEditActive())
91 {
92 while(GetUndoActionCount() && mpLastUndoActionBeforeTextEdit != GetUndoAction(0))
93 {
94 RemoveLastUndoAction();
95 }
96
97 // urgently needed: RemoveLastUndoAction does NOT correct the Redo stack by itself (!)
98 ClearRedo();
99 }
100 else
101 {
102 // call parent
103 EditUndoManager::Clear();
104 }
105}
106
88void SdrUndoManager::SetEndTextEditHdl(const Link& rLink)
89{
90 maEndTextEditHdl = rLink;
91
92 if(isTextEditActive())
93 {
94 // text edit start, remember last non-textedit action for later cleanup
95 mpLastUndoActionBeforeTextEdit = GetUndoActionCount() ? GetUndoAction(0) : 0;

--- 26 unchanged lines hidden --- 		107void SdrUndoManager::SetEndTextEditHdl(const Link& rLink)
108{
109 maEndTextEditHdl = rLink;
110
111 if(isTextEditActive())
112 {
113 // text edit start, remember last non-textedit action for later cleanup
114 mpLastUndoActionBeforeTextEdit = GetUndoActionCount() ? GetUndoAction(0) : 0;

--- 26 unchanged lines hidden ---