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 /sc | |
| parent | ea83bf52953baa9b09771271e453a5f9a6c5280d (diff) | |
Avoid reserved identifier (_CreateShape -> CreateShape)
Change-Id: Idcdd35302e60392fae9f63de1828e1a41ab89610
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/pageuno.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/pageuno.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index ebf3b0a8142b..08f087ef145a 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -30,7 +30,7 @@ public: ScPageObj(SdrPage* pPage); virtual ~ScPageObj() throw(); - virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const + virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 6ba7b31534cb..a1566c7d397c 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -33,10 +33,10 @@ ScPageObj::~ScPageObj() throw() { } -uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) const +uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) { - uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::_CreateShape( pObj )); + uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::CreateShape( pObj )); new ScShapeObj( xShape ); // aggregates object and modifies xShape |