undomanager.cxx (79aad27f) | undomanager.cxx (69ffbee1) |
---|---|
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 --- 9 unchanged lines hidden (view full) --- 18 * under the License. 19 * 20 *************************************************************/ 21 22 23 24// MARKER(update_precomp.py): autogen include statement, do not remove 25#include "precompiled_sd.hxx" | 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 --- 9 unchanged lines hidden (view full) --- 18 * under the License. 19 * 20 *************************************************************/ 21 22 23 24// MARKER(update_precomp.py): autogen include statement, do not remove 25#include "precompiled_sd.hxx" |
26 |
|
26#include <tools/debug.hxx> | 27#include <tools/debug.hxx> |
27#include "undo/undomanager.hxx" | 28#include <undo/undomanager.hxx> |
28 29using namespace sd; 30 31UndoManager::UndoManager( sal_uInt16 nMaxUndoActionCount /* = 20 */ ) | 29 30using namespace sd; 31 32UndoManager::UndoManager( sal_uInt16 nMaxUndoActionCount /* = 20 */ ) |
32: SfxUndoManager( nMaxUndoActionCount ) | 33: SdrUndoManager( nMaxUndoActionCount ) |
33, mpLinkedUndoManager(NULL) 34{ 35} 36 37void UndoManager::EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId /* =0 */) 38{ 39 if( !IsDoing() ) 40 { 41 ClearLinkedRedoActions(); | 34, mpLinkedUndoManager(NULL) 35{ 36} 37 38void UndoManager::EnterListAction(const UniString &rComment, const UniString& rRepeatComment, sal_uInt16 nId /* =0 */) 39{ 40 if( !IsDoing() ) 41 { 42 ClearLinkedRedoActions(); |
42 SfxUndoManager::EnterListAction( rComment, rRepeatComment, nId ); | 43 SdrUndoManager::EnterListAction( rComment, rRepeatComment, nId ); |
43 } 44} 45 46void UndoManager::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg /* = sal_False */ ) 47{ 48 if( !IsDoing() ) 49 { 50 ClearLinkedRedoActions(); | 44 } 45} 46 47void UndoManager::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg /* = sal_False */ ) 48{ 49 if( !IsDoing() ) 50 { 51 ClearLinkedRedoActions(); |
51 SfxUndoManager::AddUndoAction( pAction, bTryMerg ); | 52 SdrUndoManager::AddUndoAction( pAction, bTryMerg ); |
52 } 53 else 54 { 55 delete pAction; 56 } 57} 58 59 --- 13 unchanged lines hidden --- | 53 } 54 else 55 { 56 delete pAction; 57 } 58} 59 60 --- 13 unchanged lines hidden --- |