summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-06-01 09:43:50 +0200
committerDavid Tardon <dtardon@redhat.com>2013-06-03 14:31:56 +0200
commit67e87f8b88a5a6a741717cc4a8e64f65f9c9cd52 (patch)
treec168cda1250ec90917ccf0c99769439436314a41 /include
parenta3b384ee41f352b5b99ea1265018f2d14405df65 (diff)
fdo#62224 reconstruct border state for table dialog
Change-Id: I68a4cd1974579119a2d6dccba008441a9bec78df
Diffstat (limited to 'include')
-rw-r--r--include/editeng/borderline.hxx2
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx8
2 files changed, 9 insertions, 1 deletions
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index 067e216aaa9a..a7713b7edffb 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -160,7 +160,7 @@ namespace editeng {
static BorderWidthImpl getWidthImpl( SvxBorderStyle nStyle );
};
-// ============================================================================
+EDITENG_DLLPUBLIC bool operator!=( const SvxBorderLine& rLeft, const SvxBorderLine& rRight );
} // namespace editeng
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 5efdd875968e..2f4126c12efa 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -33,6 +33,8 @@
class SdrObjEditView;
class SdrObject;
class SfxItemSet;
+class SvxBoxInfoItem;
+class SvxBoxItem;
namespace sdr { namespace table {
@@ -78,6 +80,12 @@ public:
SVX_DLLPRIVATE void MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
SVX_DLLPRIVATE void SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bReplaceAll);
+ /** Fill the values that are common for all selected cells.
+ *
+ * This lets the Borders dialog to display the line arrangement
+ * properly.
+ */
+ SVX_DLLPRIVATE void FillCommonBorderAttrFromSelectedCells(SvxBoxItem& rBox, SvxBoxInfoItem& rBoxInfo) const;
SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const;
SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);