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/format.hxx | |
| parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) | |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/inc/format.hxx')
| -rw-r--r-- | sw/inc/format.hxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 64a8aa1dc5d9..b553c9eadbd2 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -111,13 +111,8 @@ public: virtual sal_uInt16 ResetAllFmtAttr(); // <-- -<<<<<<< local inline SwFmt* DerivedFrom() const { return (SwFmt*)GetRegisteredIn(); } - inline BOOL IsDefault() const { return DerivedFrom() == 0; } -======= - inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; } inline sal_Bool IsDefault() const { return DerivedFrom() == 0; } ->>>>>>> other inline const String& GetName() const { return aFmtName; } void SetName( const String& rNewName, sal_Bool bBroadcast=sal_False ); |