diff options
Diffstat (limited to 'svx/source/svdraw/svdedxv.cxx')
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 2657375f311a..7a7ed5fc3219 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -2225,9 +2225,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); } } } @@ -2375,8 +2374,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); + if (pTable->getActiveCell().is() && mxSelectionController.is()) { + mxSelectionController->SetAttributes(rFormatSet, false); } } } |