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/txtinet.hxx | |
| parent | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (diff) | |
| parent | 9730661364792059168a06bfbaacf47fc8daf53c (diff) | |
CWS swlayoutrefactoring: resync to m100
Diffstat (limited to 'sw/inc/txtinet.hxx')
| -rw-r--r-- | sw/inc/txtinet.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index a62a9d6273d9..c5459453604e 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -50,7 +50,12 @@ public: virtual ~SwTxtINetFmt(); 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 InitINetFmt(SwTxtNode & rNode); @@ -69,7 +74,7 @@ public: bool IsVisitedValid() const { return m_bVisitedValid; } void SetVisitedValid( bool bNew ) { m_bVisitedValid = bNew; } - BOOL IsProtect() const; + sal_Bool IsProtect() const; }; inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const |