diff options
author | Yousuf Philips <philipz85@hotmail.com> | 2017-11-06 18:14:55 +0400 |
---|---|---|
committer | Yousuf Philips <philipz85@hotmail.com> | 2017-11-08 15:24:24 +0100 |
commit | 0ba318b895c164750dc3c7bac6948b04b606f2b8 (patch) | |
tree | 9b0a07ac349994a1b50e59639e4b012280c3ff56 | |
parent | e62b087fce09b8ce4bc33f2c7820130e4d72937b (diff) |
tdf#107554 New default table style
Change-Id: I7811ac11c0a92f85698fc5cd43016d85f4661b98
Reviewed-on: https://gerrit.libreoffice.org/44363
Reviewed-by: Heiko Tietze <tietze.heiko@googlemail.com>
Tested-by: Heiko Tietze <tietze.heiko@googlemail.com>
-rw-r--r-- | include/editeng/borderline.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 37 |
2 files changed, 4 insertions, 34 deletions
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index b873852fc7a0..848c4308ce33 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -35,6 +35,7 @@ #define DEF_LINE_WIDTH_3 80 #define DEF_LINE_WIDTH_4 100 #define DEF_LINE_WIDTH_5 10 +#define DEF_LINE_WIDTH_6 5 // 0.25pt // Abstracts over values from css::table::BorderLineStyle diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 8235c52f77dd..d8932eb774e5 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1234,44 +1234,13 @@ SwTableAutoFormatTable::SwTableAutoFormatTable() std::unique_ptr<SwTableAutoFormat> pNew(new SwTableAutoFormat( SwStyleNameMapper::GetUIName(RES_POOLTABSTYLE_DEFAULT, OUString()))); - SwBoxAutoFormat aNew; - sal_uInt8 i; - Color aColor( COL_BLUE ); - SvxBrushItem aBrushItem( aColor, RES_BACKGROUND ); - aNew.SetBackground( aBrushItem ); - aNew.SetColor( SvxColorItem(Color( COL_WHITE ), RES_CHRATR_COLOR) ); - - for( i = 0; i < 4; ++i ) - pNew->SetBoxFormat( aNew, i ); - - // 70% gray - aBrushItem.SetColor( RGB_COLORDATA( 0x4d, 0x4d, 0x4d ) ); - aNew.SetBackground( aBrushItem ); - for( i = 4; i <= 12; i += 4 ) - pNew->SetBoxFormat( aNew, i ); - - // 20% gray - aBrushItem.SetColor( RGB_COLORDATA( 0xcc, 0xcc, 0xcc ) ); - aNew.SetBackground( aBrushItem ); - aColor.SetColor( COL_BLACK ); - aNew.SetColor( SvxColorItem( aColor, RES_CHRATR_COLOR) ); - for( i = 7; i <= 15; i += 4 ) - pNew->SetBoxFormat( aNew, i ); - for( i = 13; i <= 14; ++i ) - pNew->SetBoxFormat( aNew, i ); - - aBrushItem.SetColor( Color( COL_WHITE ) ); - aNew.SetBackground( aBrushItem ); - for( i = 5; i <= 6; ++i ) - pNew->SetBoxFormat( aNew, i ); - for( i = 9; i <= 10; ++i ) - pNew->SetBoxFormat( aNew, i ); - + Color aColor( COL_BLACK ); SvxBoxItem aBox( RES_BOX ); + aBox.SetAllDistances(55); - SvxBorderLine aLn( &aColor, DEF_LINE_WIDTH_0 ); + SvxBorderLine aLn( &aColor, DEF_LINE_WIDTH_5 ); aBox.SetLine( &aLn, SvxBoxItemLine::LEFT ); aBox.SetLine( &aLn, SvxBoxItemLine::BOTTOM ); |