diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-09 18:19:31 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-10 18:32:09 +0100 |
commit | 19a5374b063551e448aa4ece115d6f711fc0772b (patch) | |
tree | 4859784f1fa468d8171eebf8dc0211c072db8c8b | |
parent | e4602e54af8777dbee3e420ac806556293f13ac7 (diff) |
Avoid reserved identifiers
Change-Id: I52cab3f30c5a1365dd51d7db2c2cf2b3a609fa11
-rw-r--r-- | include/toolkit/controls/roadmapcontrol.hxx | 6 | ||||
-rw-r--r-- | toolkit/source/controls/roadmapcontrol.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx index e7eedd0096bc..f948dc2e08c7 100644 --- a/include/toolkit/controls/roadmapcontrol.hxx +++ b/include/toolkit/controls/roadmapcontrol.hxx @@ -81,7 +81,7 @@ namespace toolkit void MakeRMItemValidation( sal_Int32 Index, css::uno::Reference< XInterface > xRoadmapItem ); css::container::ContainerEvent GetContainerEvent(sal_Int32 Index, css::uno::Reference< XInterface > ); - void SetRMItemDefaultProperties( const sal_Int32 _Index, css::uno::Reference< XInterface > ); + void SetRMItemDefaultProperties( const sal_Int32 Index, css::uno::Reference< XInterface > ); static sal_Int16 GetCurrentItemID( css::uno::Reference< css::beans::XPropertySet > xPropertySet ); sal_Int32 GetUniqueID(); @@ -116,9 +116,9 @@ namespace toolkit sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL insertByIndex( sal_Int32 Index, const css::uno::Any & Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & _Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const css::uno::Any & Element) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index aaf8ee27effc..83476bd46872 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -274,13 +274,13 @@ static void lcl_throwIndexOutOfBoundsException( ) } - void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& _Element) + void SAL_CALL UnoControlRoadmapModel::insertByIndex( const sal_Int32 Index, const Any& Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0)) lcl_throwIndexOutOfBoundsException( ); Reference< XInterface > xRoadmapItem; - _Element >>= xRoadmapItem; + Element >>= xRoadmapItem; MakeRMItemValidation( Index, xRoadmapItem); SetRMItemDefaultProperties( Index, xRoadmapItem ); maRoadmapItems.insert( maRoadmapItems.begin() + Index, xRoadmapItem); @@ -328,11 +328,11 @@ static void lcl_throwIndexOutOfBoundsException( ) } - void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& _Element) + void SAL_CALL UnoControlRoadmapModel::replaceByIndex( const sal_Int32 Index, const Any& Element) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { Reference< XInterface > xRoadmapItem; - _Element >>= xRoadmapItem; + Element >>= xRoadmapItem; MakeRMItemValidation( Index, xRoadmapItem); SetRMItemDefaultProperties( Index, xRoadmapItem ); maRoadmapItems.erase( maRoadmapItems.begin() + Index ); |