diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
| commit | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (patch) | |
| tree | 31528d76013d09428fad98a3dbc6265345dbbeb9 /sw/inc/fchrfmt.hxx | |
| parent | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (diff) | |
| parent | 9730661364792059168a06bfbaacf47fc8daf53c (diff) | |
CWS swlayoutrefactoring: resync to m100
Diffstat (limited to 'sw/inc/fchrfmt.hxx')
| -rw-r--r-- | sw/inc/fchrfmt.hxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index a84c6e4cd04c..0fa469cbd046 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -72,11 +72,16 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // an das SwTxtCharFmt weiterleiten (vom SwClient) +<<<<<<< local virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; +======= + virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; +>>>>>>> other void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); } |