From de60fd06b84bc1aa080ef209b0eeb36914bd8b32 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 17 Dec 2010 09:02:23 +0100 Subject: CWS swlayoutrefactoring: #i115510#: first step to clean up the SwClient mess --- sw/inc/usrfld.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sw/inc/usrfld.hxx') diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index b755cbc1631b..433af9eae145 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -61,8 +61,6 @@ public: inline BOOL IsValid() const; inline void ChgValid( BOOL bNew ); - virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); - double GetValue(SwCalc& rCalc); // Member nValue neu berrechnen inline double GetValue() const; inline void SetValue(const double nVal); @@ -75,6 +73,8 @@ public: 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 ); }; inline BOOL SwUserFieldType::IsValid() const -- cgit From 749c27fafbe1e57b7ba25f759272c02de20469e0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 9 Feb 2011 15:55:27 +0100 Subject: CWS swlayoutrefactoring: fix merge conflicts --- sw/inc/usrfld.hxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'sw/inc/usrfld.hxx') 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 -- cgit