svdedxv.cxx (edf077ab) | svdedxv.cxx (a840a559) |
---|---|
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 --- 754 unchanged lines hidden (view full) --- 763 GetModel()->Broadcast(aHint); 764 } 765 766 pTextEditOutliner->setVisualizedPage(0); 767 768 if( mxSelectionController.is() ) 769 mxSelectionController->onSelectionHasChanged(); 770 | 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 --- 754 unchanged lines hidden (view full) --- 763 GetModel()->Broadcast(aHint); 764 } 765 766 pTextEditOutliner->setVisualizedPage(0); 767 768 if( mxSelectionController.is() ) 769 mxSelectionController->onSelectionHasChanged(); 770 |
771 if(IsUndoEnabled()) | 771 if(IsUndoEnabled() && GetModel() && !GetModel()->GetDisableTextEditUsesCommonUndoManager()) |
772 { 773 SdrUndoManager* pSdrUndoManager = getSdrUndoManagerForEnhancedTextEdit(); 774 775 if(pSdrUndoManager) 776 { 777 // we have an outliner, undo manager and it's an EditUndoManager, exchange 778 // the document undo manager and the default one from the outliner and tell 779 // it that text edit starts by setting a callback if it needs to end text edit mode. --- 69 unchanged lines hidden (view full) --- 849 SdrTextObj* pTEObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); 850 Window* pTEWin =pTextEditWin; 851 SdrOutliner* pTEOutliner =pTextEditOutliner; 852 OutlinerView* pTEOutlinerView=pTextEditOutlinerView; 853 Cursor* pTECursorMerker=pTextEditCursorMerker; 854 SdrUndoManager* pUndoEditUndoManager = 0; 855 bool bNeedToUndoSavedRedoTextEdit(false); 856 | 772 { 773 SdrUndoManager* pSdrUndoManager = getSdrUndoManagerForEnhancedTextEdit(); 774 775 if(pSdrUndoManager) 776 { 777 // we have an outliner, undo manager and it's an EditUndoManager, exchange 778 // the document undo manager and the default one from the outliner and tell 779 // it that text edit starts by setting a callback if it needs to end text edit mode. --- 69 unchanged lines hidden (view full) --- 849 SdrTextObj* pTEObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); 850 Window* pTEWin =pTextEditWin; 851 SdrOutliner* pTEOutliner =pTextEditOutliner; 852 OutlinerView* pTEOutlinerView=pTextEditOutlinerView; 853 Cursor* pTECursorMerker=pTextEditCursorMerker; 854 SdrUndoManager* pUndoEditUndoManager = 0; 855 bool bNeedToUndoSavedRedoTextEdit(false); 856 |
857 if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner) | 857 if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner && !GetModel()->GetDisableTextEditUsesCommonUndoManager()) |
858 { 859 // change back the UndoManager to the remembered original one 860 ::svl::IUndoManager* pOriginal = pTEOutliner->SetUndoManager(mpOldTextEditUndoManager); 861 mpOldTextEditUndoManager = 0; 862 863 if(pOriginal) 864 { 865 // check if we got back our document undo manager --- 1424 unchanged lines hidden --- | 858 { 859 // change back the UndoManager to the remembered original one 860 ::svl::IUndoManager* pOriginal = pTEOutliner->SetUndoManager(mpOldTextEditUndoManager); 861 mpOldTextEditUndoManager = 0; 862 863 if(pOriginal) 864 { 865 // check if we got back our document undo manager --- 1424 unchanged lines hidden --- |