summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-05-30 23:01:04 +0200
committerMichael Stahl <mstahl@redhat.com>2016-05-30 23:20:24 +0200
commit7b042d2865c5bb2c2dde1dd47de124bc0df61ae8 (patch)
treeb409bf7c5e0ffcc97667bbfd67f6012c6b4475f0 /sw/inc
parentee8c883d8d65f77ec0dbd27948cbc49f30986cc6 (diff)
tdf#98226: fix undo of table AutoFormat
The new call to SwTable::SetTableStyleName() was not recorded in SwUndoTableAutoFormat and hence persisted even after Undo. (regression from 73f4a06c0bce51c7c8b9ae9adfdc7ffac27d06b4) Change-Id: Ia7f769dafa62f02ff8e4b0596b48266190c7a69b
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/inc/fesh.hxx3
2 files changed, 3 insertions, 2 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index afed50ad5089..e9b3be56b8dc 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1246,7 +1246,7 @@ public:
/// AutoFormat for table/table selection.
/// @param bResetDirect Reset direct formatting that might be applied to the cells.
- bool SetTableAutoFormat(const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew, bool bResetDirect = false);
+ bool SetTableAutoFormat(const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew, bool bResetDirect = false, bool isSetStyleName = false);
// Query attributes.
bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet );
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index edb6ff5d01ae..c66cb9a7da42 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -727,7 +727,8 @@ public:
/// Update the direct formatting according to the current table style.
/// @param pTableNode Table node to update. When nullptr, current cursor position is used.
/// @param bResetDirect Reset direct formatting that might be applied to the cells.
- bool UpdateTableStyleFormatting(SwTableNode *pTableNode = nullptr, bool bResetDirect = false);
+ /// @param pStyleName new style to apply
+ bool UpdateTableStyleFormatting(SwTableNode *pTableNode = nullptr, bool bResetDirect = false, OUString const* pStyleName = nullptr);
bool GetTableAutoFormat( SwTableAutoFormat& rGet );