diff options
| author | Armin Le Grand <alg@apache.org> | 2013-06-27 10:23:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-27 16:09:32 +0100 |
| commit | ecccfa73b9c69a5d9645a2647f20a37588a63a8e (patch) | |
| tree | 7fa7ae50294316c343a4694d8fc41e75f5f0aca9 /svx | |
| parent | 21eeeccfa64a4c03554c1fe3715d38c1695245ab (diff) | |
Resolves: #i121008# corrected calc cell comment stuff
(cherry picked from commit fb1dc1d963e192e588731cce3a3ba20996c4e589)
Conflicts:
sc/source/core/data/drwlayer.cxx
svx/inc/svx/svdmodel.hxx
svx/source/svdraw/svdmodel.cxx
svx/source/svdraw/svdundo.cxx
Change-Id: I10b644aa44ae8c1eb0a027aeeaf27790ec455fa2
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdundo.cxx | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 150cc25ecd77..8ed8c24c9032 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -745,7 +745,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if( mxSelectionController.is() ) mxSelectionController->onSelectionHasChanged(); - if(IsUndoEnabled()) + if(IsUndoEnabled() && GetModel() && !GetModel()->GetDisableTextEditUsesCommonUndoManager()) { SdrUndoManager* pSdrUndoManager = getSdrUndoManagerForEnhancedTextEdit(); @@ -827,7 +827,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) SdrUndoManager* pUndoEditUndoManager = 0; bool bNeedToUndoSavedRedoTextEdit(false); - if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner) + if(IsUndoEnabled() && GetModel() && pTEObj && pTEOutliner && !GetModel()->GetDisableTextEditUsesCommonUndoManager()) { // change back the UndoManager to the remembered original one ::svl::IUndoManager* pOriginal = pTEOutliner->SetUndoManager(mpOldTextEditUndoManager); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 886064ca105b..06119bb91e52 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -167,6 +167,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbAddExtLeading = sal_False; mnHandoutPageCount = 0; + mbDisableTextEditUsesCommonUndoManager = false; + mnCharCompressType = officecfg::Office::Common::AsianLayout::CompressCharacterDistance:: get(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index e2111226ef15..4ff6730d8561 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1167,6 +1167,7 @@ void SdrUndoObjSetText::Undo() // copy text for Undo, because the original now belongs to SetOutlinerParaObject() OutlinerParaObject* pText1 = pOldText ? new OutlinerParaObject(*pOldText) : NULL; pText->SetOutlinerParaObject(pText1); + static_cast< SdrTextObj* >( pObj )->NbcSetOutlinerParaObjectForText( pText1, pText ); } pObj->SetEmptyPresObj( bEmptyPresObj ); |