From ea83bf52953baa9b09771271e453a5f9a6c5280d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 15 Apr 2016 15:23:08 +0200 Subject: Avoid reserved identifier (_CreateSdrObject -> CreateSdrObject_) Change-Id: Iee63999e4953a083783cb5c9811640150616472d --- reportdesign/source/core/inc/ReportDrawPage.hxx | 2 +- reportdesign/source/core/sdr/ReportDrawPage.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'reportdesign/source') diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index bf096cd5331c..532883037005 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -31,7 +31,7 @@ namespace reportdesign OReportDrawPage(const OReportDrawPage&) = delete; void operator =(const OReportDrawPage&) = delete; protected: - 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; virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override; public: diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 72225117554b..9dab4d8b2be9 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -46,13 +46,13 @@ OReportDrawPage::OReportDrawPage(SdrPage* _pPage { } -SdrObject* OReportDrawPage::_CreateSdrObject(const uno::Reference< drawing::XShape > & xDescr) +SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XShape > & xDescr) throw (uno::RuntimeException, std::exception) { uno::Reference< report::XReportComponent> xReportComponent(xDescr,uno::UNO_QUERY); if ( xReportComponent.is() ) return OObjectBase::createObject(xReportComponent); - return SvxDrawPage::_CreateSdrObject( xDescr ); + return SvxDrawPage::CreateSdrObject_( xDescr ); } uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const -- cgit v1.2.3