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/txtatr.hxx | |
| parent | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (diff) | |
| parent | 9730661364792059168a06bfbaacf47fc8daf53c (diff) | |
CWS swlayoutrefactoring: resync to m100
Diffstat (limited to 'sw/inc/txtatr.hxx')
| -rw-r--r-- | sw/inc/txtatr.hxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index da925ea1b886..ee41569cf50a 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -39,21 +39,27 @@ class SwCharFmt; class SwTxtCharFmt : public SwTxtAttrEnd { SwTxtNode * m_pTxtNode; - USHORT m_nSortNumber; + sal_uInt16 m_nSortNumber; 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; } - void SetSortNumber( USHORT nSortNumber ) { m_nSortNumber = nSortNumber; } - USHORT GetSortNumber() const { return m_nSortNumber; } + void SetSortNumber( sal_uInt16 nSortNumber ) { m_nSortNumber = nSortNumber; } + sal_uInt16 GetSortNumber() const { return m_nSortNumber; } }; @@ -95,7 +101,12 @@ 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); |