diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
| commit | 749c27fafbe1e57b7ba25f759272c02de20469e0 (patch) | |
| tree | d6bc9b5fe3a595ee6e0edd5ef07b042bd61992f0 /sw/inc/fchrfmt.hxx | |
| parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) | |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/inc/fchrfmt.hxx')
| -rw-r--r-- | sw/inc/fchrfmt.hxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 0fa469cbd046..53de41c11e3b 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -75,13 +75,7 @@ public: 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(); } |