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/source/core/unocore/unoredlines.cxx | |
parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/source/core/unocore/unoredlines.cxx')
-rw-r--r-- | sw/source/core/unocore/unoredlines.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 9061d6b9af5d..666c80a17bc7 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -111,12 +111,7 @@ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException ) return C2U("SwXRedlines"); } -<<<<<<< local -BOOL SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) ->>>>>>> other throw( uno::RuntimeException ) { DBG_ERROR("not implemented"); @@ -157,12 +152,7 @@ SwXRedlineEnumeration::~SwXRedlineEnumeration() { } -<<<<<<< local -BOOL SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) ->>>>>>> other { if(!pDoc) throw uno::RuntimeException(); @@ -188,12 +178,7 @@ rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::Run return C2U("SwXRedlineEnumeration"); } -<<<<<<< local -BOOL SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) ->>>>>>> other { return sal_False; } |