diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-09-26 23:54:22 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2015-09-27 22:48:21 +0200 |
| commit | 09fc6fef2d03ca8558dd6f0eec45d61ceb282cb5 (patch) | |
| tree | 415848b211033db9596e6b39e5d565a4ad533e79 /sw/inc/doc.hxx | |
| parent | 73f4a06c0bce51c7c8b9ae9adfdc7ffac27d06b4 (diff) | |
sw table styles: Direct formatting takes precedence over table style.
Make sure we don't reset the direct formatting with the table style when
updating.
Change-Id: I07b4a687fd0403bd80d73732a66101b967398507
Diffstat (limited to 'sw/inc/doc.hxx')
| -rw-r--r-- | sw/inc/doc.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 51631a337a22..f3383480a441 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1255,8 +1255,9 @@ public: void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet ); - // AutoFormat for table/table selection. - bool SetTableAutoFormat( const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew ); + /// 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); // Query attributes. bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet ); |