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 /svx | |
| parent | ea83bf52953baa9b09771271e453a5f9a6c5280d (diff) | |
Avoid reserved identifier (_CreateShape -> CreateShape)
Change-Id: Idcdd35302e60392fae9f63de1828e1a41ab89610
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmdpage.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unopage.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index e2a12d9b3118..01aaed5f777e 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -79,7 +79,7 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw } -css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const +css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) { if( FmFormInventor == pObj->GetObjInventor() ) @@ -88,7 +88,7 @@ css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObj return xShape; } else - return SvxDrawPage::_CreateShape( pObj ); + return SvxDrawPage::CreateShape( pObj ); } // XFormsSupplier diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 6ae45eb021b7..612855ee1ec6 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2895,7 +2895,7 @@ css::uno::Reference< css::uno::XInterface > SdrObject::getUnoShape() if( pDrawPage ) { // create one - xShape = pDrawPage->_CreateShape( this ); + xShape = pDrawPage->CreateShape( this ); impl_setUnoShape( xShape ); } } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 70e98fd05c93..9e56776a7715 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -785,7 +785,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 } default: // unknown inventor { - OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()"); + OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::CreateShape()"); break; } } @@ -821,7 +821,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 return pRet; } -Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const +Reference< drawing::XShape > SvxDrawPage::CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) { Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(), |