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/txtatr.hxx | |
| parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) | |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/inc/txtatr.hxx')
| -rw-r--r-- | sw/inc/txtatr.hxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index ee41569cf50a..6990f07c42a5 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -45,15 +45,9 @@ public: SwTxtCharFmt( SwFmtCharFmt& rAttr, xub_StrLen nStart, xub_StrLen nEnd ); virtual ~SwTxtCharFmt( ); -<<<<<<< local // werden vom SwFmtCharFmt hierher weitergeleitet (no derivation from SwClient!) void ModifyNotification( const SfxPoolItem*, const SfxPoolItem* ); bool GetInfo( SfxPoolItem& rInfo ) const; -======= - // werden vom SwFmtCharFmt hierher weitergeleitet - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); // SwClient - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; ->>>>>>> other // get and set TxtNode pointer void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } @@ -101,12 +95,7 @@ public: virtual ~SwTxtRuby(); TYPEINFO(); -<<<<<<< local - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; -======= - virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; ->>>>>>> other SW_DLLPRIVATE void InitRuby(SwTxtNode & rNode); |