diff options
| -rw-r--r-- | cui/source/dialogs/sdrcelldlg.cxx | 7 | ||||
| -rw-r--r-- | cui/source/inc/border.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/border.cxx | 5 | ||||
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx index 2a2a982d6c47..547f7b12dbba 100644 --- a/cui/source/dialogs/sdrcelldlg.cxx +++ b/cui/source/dialogs/sdrcelldlg.cxx @@ -62,9 +62,10 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) ( (SvxAreaTabPage&) rPage ).SetPos( 0 ); ( (SvxAreaTabPage&) rPage ).Construct(); ( (SvxAreaTabPage&) rPage ).ActivatePage( mrOutAttrs ); - - break; - + break; + case RID_SVXPAGE_BORDER: + ( (SvxBorderTabPage&) rPage ).SetTableMode(); + break; default: SfxTabDialog::PageCreated( nId, rPage ); break; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 8f66e5d97784..f4a4c2ad1d0f 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -50,6 +50,7 @@ public: void HideShadowControls(); virtual void PageCreated (SfxAllItemSet aSet); + void SetTableMode(); protected: virtual int DeactivatePage( SfxItemSet* pSet = 0 ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 8c436233f3c1..a8d868695acb 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1194,6 +1194,9 @@ void SvxBorderTabPage::PageCreated (SfxAllItemSet aSet) HideShadowControls(); } -// ============================================================================ +void SvxBorderTabPage::SetTableMode() +{ + nSWMode = SW_BORDER_MODE_TABLE; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index a1bf2a921bd3..a926891f4e7d 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -735,7 +735,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) SvxBoxInfoItem aBoxInfoItem( static_cast< const SvxBoxInfoItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) ); - MergeAttrFromSelectedCells(aNewAttr, sal_False); + MergeAttrFromSelectedCells(aNewAttr, sal_True); FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem ); aNewAttr.Put( aBoxItem ); aNewAttr.Put( aBoxInfoItem ); |