diff options
| author | Alex Ivan <alexnivan@yahoo.com> | 2013-08-05 12:19:52 +0300 |
|---|---|---|
| committer | Alex Ivan <alexnivan@yahoo.com> | 2013-08-05 12:19:52 +0300 |
| commit | 873220ff9607f25e1b58073e881f7881a33e8f3c (patch) | |
| tree | ac3997bcfd51d282ad8a6b90f04a5eba2cc49a75 /sw/source/core/docnode/ndtbl.cxx | |
| parent | 59e9d983b8fe4ccb3b752a615ab8d291602447af (diff) | |
Fix borders on insert table
Checking borders in Insert Table dialog will no longer
prevent the borders of the table style from being correctly
displayed.
Change-Id: Ie9fd2ca19e7ba6355e2de6b9f8d7c954ca3a9c76
Diffstat (limited to 'sw/source/core/docnode/ndtbl.cxx')
| -rw-r--r-- | sw/source/core/docnode/ndtbl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index 8b117c5d35e6..1cf358556254 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -442,7 +442,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, std::vector<SwTableBoxFmt*> aBoxFmtArr; SwTableBoxFmt* pBoxFmt = 0; - if( !bDfltBorders ) + if( !bDfltBorders || pTAFmt ) { pBoxFmt = MakeTableBoxFmt(); pBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX / nCols, 0 )); @@ -460,7 +460,7 @@ const SwTable* SwDoc::InsertTable( const SwInsertTableOptions& rInsTblOpts, for( sal_uInt16 i = 0; i < nCols; ++i ) { SwTableBoxFmt *pBoxF; - if( bDfltBorders ) + if( !pTAFmt && bDfltBorders ) { sal_uInt8 nBoxId = (i < nCols - 1 ? 0 : 1) + (n ? 2 : 0 ); pBoxF = new SwTableBoxFmt( *::lcl_CreateDfltBoxFmt( *this, aBoxFmtArr, nCols, nBoxId) ); |