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 /sw | |
| parent | d9adda92cc6328cd44bf09753caefe23b028a81b (diff) | |
Avoid reserved identifier (_CreateSdrObject -> CreateSdrObject_)
Change-Id: Iee63999e4953a083783cb5c9811640150616472d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/unodraw.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 1f66b81c81f0..21b4ba8b2d3a 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -46,7 +46,7 @@ protected: // Create a SdrObject according to a description. Can be used by derived classes to // support own css::drawing::Shapes (e.g. controls). - 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; public: diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index fa52bebce2bc..cf724ef3e72a 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -293,11 +293,11 @@ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj return xShape; } -SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape ) +SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape > & xShape ) throw (uno::RuntimeException, std::exception) { //FIXME: just a redirect call - can this method be deleted? - return SvxFmDrawPage::_CreateSdrObject( xShape ); + return SvxFmDrawPage::CreateSdrObject_( xShape ); } uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const |