Skip to content

C
core
Kaydet (Commit) 19a5374b authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Avoid reserved identifiers 

Change-Id: I52cab3f30c5a1365dd51d7db2c2cf2b3a609fa11
üst e4602e54
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
include/toolkit/controls/roadmapcontrol.hxx
Dosyayı görüntüle @ 19a5374b
...@@ -81,7 +81,7 @@ namespace toolkit ...@@ -81,7 +81,7 @@ namespace toolkit
void MakeRMItemValidation( sal_Int32 Index, css::uno::Reference< XInterface > xRoadmapItem ); void MakeRMItemValidation( sal_Int32 Index, css::uno::Reference< XInterface > xRoadmapItem );
css::container::ContainerEvent GetContainerEvent(sal_Int32 Index, css::uno::Reference< XInterface > ); 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 ); static sal_Int16 GetCurrentItemID( css::uno::Reference< css::beans::XPropertySet > xPropertySet );
sal_Int32 GetUniqueID(); sal_Int32 GetUniqueID();
...@@ -116,9 +116,9 @@ namespace toolkit ...@@ -116,9 +116,9 @@ namespace toolkit
sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; 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 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 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 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; virtual void SAL_CALL removeContainerListener( const css::uno::Reference< css::container::XContainerListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
......
toolkit/source/controls/roadmapcontrol.cxx
Dosyayı görüntüle @ 19a5374b
...@@ -274,13 +274,13 @@ static void lcl_throwIndexOutOfBoundsException( ) ...@@ -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 ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{ {
if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0)) if ( ( Index >= ( (sal_Int32)maRoadmapItems.size() + 1 ) ) || (Index < 0))
lcl_throwIndexOutOfBoundsException( ); lcl_throwIndexOutOfBoundsException( );
Reference< XInterface > xRoadmapItem; Reference< XInterface > xRoadmapItem;
_Element >>= xRoadmapItem; Element >>= xRoadmapItem;
MakeRMItemValidation( Index, xRoadmapItem); MakeRMItemValidation( Index, xRoadmapItem);
SetRMItemDefaultProperties( Index, xRoadmapItem ); SetRMItemDefaultProperties( Index, xRoadmapItem );
maRoadmapItems.insert( maRoadmapItems.begin() + Index, xRoadmapItem); maRoadmapItems.insert( maRoadmapItems.begin() + Index, xRoadmapItem);
...@@ -328,11 +328,11 @@ static void lcl_throwIndexOutOfBoundsException( ) ...@@ -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 ) throw (IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception )
{ {
Reference< XInterface > xRoadmapItem; Reference< XInterface > xRoadmapItem;
_Element >>= xRoadmapItem; Element >>= xRoadmapItem;
MakeRMItemValidation( Index, xRoadmapItem); MakeRMItemValidation( Index, xRoadmapItem);
SetRMItemDefaultProperties( Index, xRoadmapItem ); SetRMItemDefaultProperties( Index, xRoadmapItem );
maRoadmapItems.erase( maRoadmapItems.begin() + Index ); maRoadmapItems.erase( maRoadmapItems.begin() + Index );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment