diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-15 15:23:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-18 15:30:07 +0200 |
| commit | ea83bf52953baa9b09771271e453a5f9a6c5280d (patch) | |
| tree | b4dd61920aa82fcfc967c6049686fd1393697782 /sd | |
| parent | d9adda92cc6328cd44bf09753caefe23b028a81b (diff) | |
Avoid reserved identifier (_CreateSdrObject -> CreateSdrObject_)
Change-Id: Iee63999e4953a083783cb5c9811640150616472d
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/unopage.hxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index f9f83c4e581d..c741e586c849 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -104,7 +104,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // this is called whenever a SdrObject must be created for a empty api shape wrapper - virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape ) + virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) override; // SvxFmDrawPage diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index d09b0566a853..ea57ad8bacfd 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -388,7 +388,7 @@ SdXImpressDocument* SdGenericDrawPage::GetModel() const } // this is called whenever a SdrObject must be created for a empty api shape wrapper -SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShape >& xShape ) +SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShape >& xShape ) throw (css::uno::RuntimeException, std::exception) { if( nullptr == SvxFmDrawPage::mpPage || !xShape.is() ) @@ -398,7 +398,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap const OUString aPrefix( "com.sun.star.presentation." ); if( !aType.startsWith( aPrefix ) ) { - SdrObject* pObj = SvxFmDrawPage::_CreateSdrObject( xShape ); + SdrObject* pObj = SvxFmDrawPage::CreateSdrObject_( xShape ); if( pObj && ( (pObj->GetObjInventor() != SdrInventor) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) ) { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); @@ -510,7 +510,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap SdrObject *pPresObj = nullptr; if( (eObjKind == PRESOBJ_TABLE) || (eObjKind == PRESOBJ_MEDIA) ) { - pPresObj = SvxFmDrawPage::_CreateSdrObject( xShape ); + pPresObj = SvxFmDrawPage::CreateSdrObject_( xShape ); if( pPresObj ) { SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel()); |