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/docufld.hxx | |
| parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) | |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/inc/docufld.hxx')
| -rw-r--r-- | sw/inc/docufld.hxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 70dbd5c0576e..4889288caf09 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -688,15 +688,7 @@ protected: public: SwRefPageGetFieldType( SwDoc* pDoc ); virtual SwFieldType* Copy() const; -<<<<<<< local - USHORT MakeSetList( _SetGetExpFlds& rTmpLst ); -======= - - // ueberlagert, um alle RefPageGet-Felder zu updaten - virtual void Modify( SfxPoolItem *, SfxPoolItem * ); sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst ); - ->>>>>>> other SwDoc* GetDoc() const { return pDoc; } }; |