summaryrefslogtreecommitdiff
path: root/cui/source/inc/border.hxx
diff options
context:
space:
mode:
authorDennis Francis <dennisfrancis.in@gmail.com>2015-11-01 03:49:38 +0530
committerEike Rathke <erack@redhat.com>2015-12-07 13:49:53 +0000
commit2e512174f2116d86682037459fd5ab5164e9f510 (patch)
treef28b135f29c1246a7a1f6a766de1214ab49f3bf6 /cui/source/inc/border.hxx
parent1a032dcfebc2702f0612c470d6b9c3e3cf4fb637 (diff)
tdf#34449 : ability of deleting borders of a cell from adjacent cell
Change-Id: Ieb13a9ea88faa220d1ee352b0e47268a7fda5f38 Reviewed-on: https://gerrit.libreoffice.org/19715 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'cui/source/inc/border.hxx')
-rw-r--r--cui/source/inc/border.hxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 81fee6486a53..ba780e1aa41a 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -98,6 +98,7 @@ private:
VclPtr<CheckBox> m_pMergeWithNextCB;
// #i29550#
VclPtr<CheckBox> m_pMergeAdjacentBordersCB;
+ VclPtr<CheckBox> m_pRemoveAdjcentCellBordersCB;
ImageList aShadowImgLstH;
ImageList aShadowImgLst;
@@ -113,6 +114,8 @@ private:
bool mbBLTREnabled; ///< true = Bottom-left to top-right border enabled.
bool mbUseMarginItem;
bool mbSync;
+ bool mbRemoveAdjacentCellBorders;
+ bool bIsCalcDoc;
std::set<sal_Int16> maUsedBorderStyles;
@@ -125,6 +128,7 @@ private:
DECL_LINK_TYPED( ModifyDistanceHdl_Impl, Edit&, void);
DECL_LINK_TYPED( ModifyWidthHdl_Impl, Edit&, void);
DECL_LINK_TYPED( SyncHdl_Impl, Button*, void);
+ DECL_LINK_TYPED( RemoveAdjacentCellBorderHdl_Impl, Button*, void);
sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const;
@@ -142,6 +146,7 @@ private:
bool bValid );
bool IsBorderLineStyleAllowed( sal_Int16 nStyle ) const;
+ void UpdateRemoveAdjCellBorderCB( sal_uInt16 nPreset );
};