diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-07-07 20:33:40 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2013-07-26 07:16:39 +0200 |
| commit | 7b776bc01911e7b3ff0044bf88cfed9bcd1d97d8 (patch) | |
| tree | 03f53aa4409a8108b922177a936fbe14120b6ab0 /sw/inc | |
| parent | 9bb7349bdbcb00ce73c50d37ffe55476939751c1 (diff) | |
CharBrd 2: new character attribute
- Add new character attribute id
- Update attribute set and attribute stack
- Convert character set item to general item and back
when execute "Borders" tab page.
- Add new SwFont attributes for different borders
(top, bottom, right, left) This will be used for
painting.
Change-Id: I344babc3645931537cfa37d64f1f6c6c02c1cee3
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/charatr.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/format.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/hintids.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/swatrset.hxx | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 886437a665dd..5ac0b3401b14 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -99,6 +99,8 @@ inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( sal_Bool bInP ) const { return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); } inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( sal_Bool bInP ) const { return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); } +inline const SvxBoxItem &SwAttrSet::GetCharBorder( sal_Bool bInP ) const + { return (const SvxBoxItem&)Get( RES_CHRATR_BOX, bInP ); } // implementation of the character attribute methods of SwFmt @@ -160,6 +162,8 @@ inline const SvxCharReliefItem &SwFmt::GetCharRelief( sal_Bool bInP ) const { return aSet.GetCharRelief(bInP); } inline const SvxCharHiddenItem &SwFmt::GetCharHidden( sal_Bool bInP ) const { return aSet.GetCharHidden(bInP); } +inline const SvxBoxItem &SwFmt::GetCharBorder( sal_Bool bInP ) const + { return aSet.GetCharBorder(bInP); } #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index bf565f4dde6e..09dde2718b44 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -209,6 +209,7 @@ public: inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; + inline const SvxBoxItem &GetCharBorder( sal_Bool = sal_True ) const; /// Frame-attributes - implemented in frmatr.hxx. inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 1cc585720845..37d5a396cde0 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -87,8 +87,8 @@ RES_CHRATR_BEGIN = HINT_BEGIN, RES_CHRATR_RELIEF, // 36 RES_CHRATR_HIDDEN, // 37 RES_CHRATR_OVERLINE, // 38 - RES_CHRATR_RSID, // 39 - RES_CHRATR_DUMMY1, // 40 + RES_CHRATR_RSID, // 39 + RES_CHRATR_BOX, // 40 RES_CHRATR_END }; diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 51d7afd4da6a..492bd11bb484 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -252,6 +252,7 @@ public: inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; + inline const SvxBoxItem &GetCharBorder( sal_Bool = sal_True ) const; // Frame attributes. Implementation in frmatr.hxx. inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; |