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/usrfld.hxx | |
parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/inc/usrfld.hxx')
-rw-r--r-- | sw/inc/usrfld.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 75e717122150..11d1db177c84 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -71,15 +71,11 @@ public: sal_Bool IsDeleted() const { return bDeleted; } void SetDeleted( sal_Bool b ) { bDeleted = b; } -<<<<<<< local - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); -protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); -======= virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); ->>>>>>> other + +protected: + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); }; inline sal_Bool SwUserFieldType::IsValid() const |