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 /reportdesign | |
| parent | ea83bf52953baa9b09771271e453a5f9a6c5280d (diff) | |
Avoid reserved identifier (_CreateShape -> CreateShape)
Change-Id: Idcdd35302e60392fae9f63de1828e1a41ab89610
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/inc/ReportDrawPage.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/core/sdr/ReportDrawPage.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index 532883037005..fa7127c4d9c2 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -33,7 +33,7 @@ namespace reportdesign protected: virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape ) 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; + virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; public: OReportDrawPage(SdrPage* pPage,const css::uno::Reference< css::report::XSection >& _xSection); virtual ~OReportDrawPage() throw(){} diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 9dab4d8b2be9..1ce18f7c5fb9 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -55,12 +55,12 @@ SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XSha return SvxDrawPage::CreateSdrObject_( xDescr ); } -uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const +uno::Reference< drawing::XShape > OReportDrawPage::CreateShape( SdrObject *pObj ) const throw (uno::RuntimeException, std::exception) { OObjectBase* pBaseObj = dynamic_cast<OObjectBase*>(pObj); if ( !pBaseObj ) - return SvxDrawPage::_CreateShape( pObj ); + return SvxDrawPage::CreateShape( pObj ); uno::Reference< report::XSection> xSection = m_xSection; uno::Reference< lang::XMultiServiceFactory> xFactory; @@ -130,7 +130,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb } if ( !xShape.is() ) - xShape.set( SvxDrawPage::_CreateShape( pObj ) ); + xShape.set( SvxDrawPage::CreateShape( pObj ) ); try { |