diff options
author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-06-12 14:34:59 +0200 |
---|---|---|
committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-06-13 10:28:50 +0200 |
commit | bc29ba506838a01322c55524dc2deb4f4a3dd3cc (patch) | |
tree | 4c5f75ba84d48d984eaa7c024337b1a5ce2b1d09 /svx | |
parent | 5aa3c571d3d60a75b09a83f2f52b47b759b02edb (diff) |
tdf#108480: Undo from clone formating does not remove vertical alignment
In the related change:
d36aa2ba3132ce62a370b7260ca620642cbf7dbf
wrong method was used to set cell properties, which does
not handle undo actions, so use the proper function.
Other issue was related to undo handling of vertical text
alignment in general. In some cases undo actions were lost
after user clicked out of the cell. It is because vertical
alignment is not affecting the outliner and so the related
undo actions were just dropped in EndTextEdit() method.
Reviewed-on: https://gerrit.libreoffice.org/38699
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 37d8ac12902506f4185e10f1de4f566dbaf53e42)
Change-Id: I3a6a95fac711056a658a3dee616733939cd13330
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 9 | ||||
-rw-r--r-- | svx/source/table/svdotable.cxx | 19 |
2 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 9a55be46c27e..30bbb2e34564 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2236,9 +2236,8 @@ void SdrObjEditView::TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rForma if( pObj && (pObj->GetObjInventor() == SdrInventor::Default ) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) { auto pTable = static_cast<const sdr::table::SdrTableObj*>(pObj); - if (pTable->getActiveCell().is()) { - SfxItemSet const & rSet = pTable->GetActiveCellItemSet(); - rFormatSet->Put(rSet); + if (mxSelectionController.is() && pTable->getActiveCell().is()) { + mxSelectionController->GetAttributes(*rFormatSet, false); } } } @@ -2385,8 +2384,8 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar if( pObj && (pObj->GetObjInventor() == SdrInventor::Default) && (pObj->GetObjIdentifier() == OBJ_TABLE) ) { auto pTable = static_cast<sdr::table::SdrTableObj*>(pObj); - if (pTable->getActiveCell().is()) { - pTable->SetMergedItemSetAndBroadcastOnActiveCell(rFormatSet, false/*bClearAllItems*/); + if (pTable->getActiveCell().is() && mxSelectionController.is()) { + mxSelectionController->SetAttributes(rFormatSet, false); } } } diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index a4374b9a7633..99b9a4c9f941 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1774,18 +1774,19 @@ bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) { - if(rOutl.IsModified()) + + if (GetModel() && GetModel()->IsUndoEnabled() && !mpImpl->maUndos.empty()) { - if( GetModel() && GetModel()->IsUndoEnabled() ) - { - // These actions should be on the undo stack after text edit. - for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos) - GetModel()->AddUndo(pAction.release()); - mpImpl->maUndos.clear(); + // These actions should be on the undo stack after text edit. + for (std::unique_ptr<SdrUndoAction>& pAction : mpImpl->maUndos) + GetModel()->AddUndo(pAction.release()); + mpImpl->maUndos.clear(); - GetModel()->AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this) ); - } + GetModel()->AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*this)); + } + if(rOutl.IsModified()) + { OutlinerParaObject* pNewText = nullptr; Paragraph* p1stPara = rOutl.GetParagraph( 0 ); sal_Int32 nParaAnz = rOutl.GetParagraphCount(); |