summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2024-07-17 19:01:27 +0200
committerAndras Timar <andras.timar@collabora.com>2024-08-23 11:17:11 +0200
commit266192097ea1f5ab19c13ceca1b5c8757e16c2d6 (patch)
treec9d999d70b87cc8ce3510f4c5eb6a9966e90cb43 /sw/inc
parent4636d81f0b39d35e6298d319eafb598481c8b5c4 (diff)
(related tdf#126008) sw: allow removing table autoformat from a table
... via the Table->AutoFormat Styles... dialog: add a "None" option like already exists in Table->Insert Table... Change-Id: I41d5cb0a7dcd1bfe3e93fe56f0f42765149ff42b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170641 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit a7c1163684fa5c0376efebe8dc6225a7dfb8e700) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170695 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/inc/fesh.hxx1
2 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 946c96fd29db..b5028561fb66 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1255,7 +1255,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 isSetStyleName = false);
+ bool SetTableAutoFormat(const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew, bool bResetDirect = false, OUString const* pStyleNameToSet = nullptr);
// Query attributes.
bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet );
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 3d2ba0308ce2..974d8120474b 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -734,6 +734,7 @@ public:
/// Set table style of the current table.
void SetTableStyle(const OUString& rStyleName);
bool SetTableStyle(const SwTableAutoFormat& rNew);
+ bool ResetTableStyle();
/// Update the direct formatting according to the current table style.
/// @param pTableNode Table node to update. When nullptr, current cursor position is used.