cui/source/dialogs/sdrcelldlg.cxx | 7 ++++---
cui/source/inc/border.hxx | 1 +
cui/source/tabpages/border.cxx | 5 ++++-
svx/source/table/tablecontroller.cxx | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 0241a464fc5a142f368d1c2eb3da6f8cf420b26a
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Jun 3 14:11:39 2014 +0200
bnc#882627: Allow to edit spacing to contents even with no borders visible.
SfxItemSet::MergeValue changes some items from SFX_ITEM_DEFAULT state to
SFX_ITEM_SET which I think is a bug but this patch avoids the problem too.
The issue was: visible changes in some tables, after changing e.g.
borders spacing, because the cells had wrong SfxItemSet after the process.
(cherry picked from commit b1d8df61b47e84bf0de64342556049673dd9c543)
Signed-off-by: Andras Timar <andras.ti...@collabora.com>
Conflicts:
cui/source/dialogs/sdrcelldlg.cxx
cui/source/inc/border.hxx
cui/source/inc/sdrcelldlg.hxx
cui/source/tabpages/border.cxx
svx/source/table/tablecontroller.cxx
Change-Id: I676b211e1a4a1d7341c385d63503aa740718ed5d
diff --git a/cui/source/dialogs/sdrcelldlg.cxx
b/cui/source/dialogs/sdrcelldlg.cxx
index 2a2a982..547f7b1 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 8f66e5d..f4a4c2a 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 8c43623..a8d8686 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 a2f68bd..c03ebbc 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
