summaryrefslogtreecommitdiff
path: root/sw/source/core/unocore/unodraw.cxx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-02-09 15:55:27 +0100
committerMathias Bauer <mba@openoffice.org>2011-02-09 15:55:27 +0100
commit749c27fafbe1e57b7ba25f759272c02de20469e0 (patch)
treed6bc9b5fe3a595ee6e0edd5ef07b042bd61992f0 /sw/source/core/unocore/unodraw.cxx
parent53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff)
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/source/core/unocore/unodraw.cxx')
-rw-r--r--sw/source/core/unocore/unodraw.cxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index f3fc03148bbe..449559b5272a 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -489,12 +489,7 @@ rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeExcept
return C2U("SwXDrawPage");
}
-<<<<<<< local
-BOOL SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException )
-=======
- ---------------------------------------------------------------------------*/
sal_Bool SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException )
->>>>>>> other
{
return C2U("com.sun.star.drawing.GenericDrawPage") == rServiceName;
}