diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-15 15:27:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-18 15:30:07 +0200 |
| commit | 277193b12217e6ec1b49719d15a7e11d177f1a5c (patch) | |
| tree | 3677d0bd849ee06203bd151daa1d9c5ad291fb06 /sd | |
| parent | ea83bf52953baa9b09771271e453a5f9a6c5280d (diff) | |
Avoid reserved identifier (_CreateShape -> CreateShape)
Change-Id: Idcdd35302e60392fae9f63de1828e1a41ab89610
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/unopage.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index c741e586c849..b2f5b67cff77 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -108,7 +108,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; // SvxFmDrawPage - virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const + virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const throw (css::uno::RuntimeException, std::exception) override; // XInterface diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index ea57ad8bacfd..1170d73bda57 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -1408,11 +1408,11 @@ void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUSt { } -Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) const +Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) const throw (RuntimeException, std::exception) { - DBG_ASSERT( GetPage(), "SdGenericDrawPage::_CreateShape(), can't create shape for disposed page!" ); - DBG_ASSERT( pObj, "SdGenericDrawPage::_CreateShape(), invalid call with pObj == 0!" ); + DBG_ASSERT( GetPage(), "SdGenericDrawPage::CreateShape(), can't create shape for disposed page!" ); + DBG_ASSERT( pObj, "SdGenericDrawPage::CreateShape(), invalid call with pObj == 0!" ); if (!pObj) return Reference< drawing::XShape >(); @@ -1452,7 +1452,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c Reference< drawing::XShape > xShape( pShape ); if(!xShape.is()) - xShape = SvxFmDrawPage::_CreateShape( pObj ); + xShape = SvxFmDrawPage::CreateShape( pObj ); if( eKind != PRESOBJ_NONE ) { @@ -1535,7 +1535,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c } else { - return SvxFmDrawPage::_CreateShape( pObj ); + return SvxFmDrawPage::CreateShape( pObj ); } } |