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 /sw | |
| parent | ea83bf52953baa9b09771271e453a5f9a6c5280d (diff) | |
Avoid reserved identifier (_CreateShape -> CreateShape)
Change-Id: Idcdd35302e60392fae9f63de1828e1a41ab89610
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unodraw.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 21b4ba8b2d3a..fc79a53ea05e 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -64,7 +64,7 @@ public: // The following method is called when a SvxShape-object is to be created. // Derived classes may obtain at this point a derivation or an object // that is aggregating a SvxShape. - virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; }; typedef cppu::WeakAggImplHelper4 diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index cf724ef3e72a..6c83023b4a9c 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -300,7 +300,7 @@ SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape return SvxFmDrawPage::CreateSdrObject_( xShape ); } -uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const +uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) const throw (uno::RuntimeException, std::exception) { uno::Reference< drawing::XShape > xRet; @@ -336,7 +336,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) } else { - OSL_FAIL( "<SwFmDrawPage::_CreateShape(..)> - could not retrieve type. Thus, no shape created." ); + OSL_FAIL( "<SwFmDrawPage::CreateShape(..)> - could not retrieve type. Thus, no shape created." ); return xRet; } } @@ -346,7 +346,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) // own block - temporary object has to be destroyed before // the delegator is set #81670# { - xRet = SvxFmDrawPage::_CreateShape( pObj ); + xRet = SvxFmDrawPage::CreateShape( pObj ); } uno::Reference< XUnoTunnel > xShapeTunnel(xRet, uno::UNO_QUERY); //don't create an SwXShape if it already exists |