diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 09:49:44 +0100 |
| commit | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (patch) | |
| tree | 31528d76013d09428fad98a3dbc6265345dbbeb9 /sw/source/core/unocore/unoredlines.cxx | |
| parent | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (diff) | |
| parent | 9730661364792059168a06bfbaacf47fc8daf53c (diff) | |
CWS swlayoutrefactoring: resync to m100
Diffstat (limited to 'sw/source/core/unocore/unoredlines.cxx')
| -rw-r--r-- | sw/source/core/unocore/unoredlines.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 2cb95a75835d..9061d6b9af5d 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -75,7 +75,7 @@ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) uno::Any aRet; if(rRedTbl.Count() > nIndex && nIndex >= 0) { - uno::Reference <beans::XPropertySet> xRet = SwXRedlines::GetObject( *rRedTbl.GetObject((USHORT)nIndex), *GetDoc() ); + uno::Reference <beans::XPropertySet> xRet = SwXRedlines::GetObject( *rRedTbl.GetObject((sal_uInt16)nIndex), *GetDoc() ); aRet <<= xRet; } else @@ -111,11 +111,16 @@ 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"); - return FALSE; + return sal_False; } uno::Sequence< OUString > SwXRedlines::getSupportedServiceNames(void) @@ -152,7 +157,12 @@ SwXRedlineEnumeration::~SwXRedlineEnumeration() { } +<<<<<<< local BOOL SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) +======= + -----------------------------------------------------------------------*/ +sal_Bool SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) +>>>>>>> other { if(!pDoc) throw uno::RuntimeException(); @@ -178,9 +188,14 @@ 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 FALSE; + return sal_False; } uno::Sequence< OUString > SwXRedlineEnumeration::getSupportedServiceNames(void) throw( uno::RuntimeException ) |