diff options
| author | Heiko Tietze <tietze.heiko@gmail.com> | 2019-07-30 14:28:11 +0200 |
|---|---|---|
| committer | Heiko Tietze <heiko.tietze@documentfoundation.org> | 2019-08-08 09:22:09 +0200 |
| commit | 52e574ffd2450956645939abc50c83637c89df01 (patch) | |
| tree | 89504a88c3883917c7053785d1b38f9443cd6204 | |
| parent | a0ef5c62ce8b5cac634aaf785f67a514ec334aa5 (diff) | |
Resolves tdf#124206 - Default style not applied
TableStyle name set correctly
Preselected table style None to satisfy ui tests
Change-Id: I00be482a24aaf9efa480226d6d6df56a7366f94f
Reviewed-on: https://gerrit.libreoffice.org/76599
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
| -rw-r--r-- | sw/source/ui/table/instable.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index f2d7f6f3c305..4d1225af9a27 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -147,7 +147,7 @@ void SwInsTableDlg::InitAutoTableFormat() // Change this min variable if you add autotable manually. minTableIndexInLb = 1; maxTableIndexInLb = minTableIndexInLb + static_cast<sal_uInt8>(pTableTable->size()); - lbIndex = 1; + lbIndex = 0; m_xLbFormat->select( lbIndex ); tbIndex = lbIndexToTableIndex(lbIndex); diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 287006ee13e9..8b1e5e39fe4c 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -2742,7 +2742,6 @@ void SwBaseShell::InsertTable( SfxRequest& _rRequest ) rSh.GetTableFormat()->SetName( aTableName ); if( pTAFormat != nullptr && !aAutoName.isEmpty() - && aAutoName != SwStyleNameMapper::GetUIName( RES_POOLTABSTYLE_DEFAULT, OUString() ) && aAutoName != SwViewShell::GetShellRes()->aStrNone ) { SwTableNode* pTableNode = const_cast<SwTableNode*>( rSh.IsCursorInTable() ); |