diff options
Diffstat (limited to 'toolkit/source')
35 files changed, 667 insertions, 667 deletions
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 464522c70cc5..362719ed8ee0 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -106,7 +106,7 @@ namespace toolkit //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + OUString lcl_getHighContrastURL( OUString const& i_imageURL ) { INetURLObject aURL( i_imageURL ); @@ -127,7 +127,7 @@ namespace toolkit return composer.makeStringAndClear(); } - //-------------------------------------------------------------------------------------------------------------- + bool lcl_ensureImage_throw( Reference< XGraphicProvider > const& i_graphicProvider, const bool i_isHighContrast, const CachedImage& i_cachedImage ) { if ( !i_cachedImage.xGraphic.is() ) @@ -148,7 +148,7 @@ namespace toolkit return i_cachedImage.xGraphic.is(); } - //-------------------------------------------------------------------------------------------------------------- + Size lcl_getGraphicSizePixel( Reference< XGraphic > const& i_graphic ) { Size aSizePixel; @@ -167,7 +167,7 @@ namespace toolkit return aSizePixel; } - //-------------------------------------------------------------------------------------------------------------- + void lcl_init( Sequence< OUString > const& i_imageURLs, ::std::vector< CachedImage >& o_images ) { o_images.resize(0); @@ -179,7 +179,7 @@ namespace toolkit } } - //-------------------------------------------------------------------------------------------------------------- + void lcl_updateImageList_nothrow( AnimatedImagesPeer_Data& i_data ) { Throbber* pThrobber = dynamic_cast< Throbber* >( i_data.rAntiImpl.GetWindow() ); @@ -268,7 +268,7 @@ namespace toolkit } } - //-------------------------------------------------------------------------------------------------------------- + void lcl_updateImageList_nothrow( AnimatedImagesPeer_Data& i_data, const Reference< XAnimatedImages >& i_images ) { try @@ -295,19 +295,19 @@ namespace toolkit //================================================================================================================== //= AnimatedImagesPeer //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + AnimatedImagesPeer::AnimatedImagesPeer() :AnimatedImagesPeer_Base() ,m_pData( new AnimatedImagesPeer_Data( *this ) ) { } - //------------------------------------------------------------------------------------------------------------------ + AnimatedImagesPeer::~AnimatedImagesPeer() { } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::startAnimation( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -316,7 +316,7 @@ namespace toolkit pThrobber->start(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::stopAnimation( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -325,7 +325,7 @@ namespace toolkit pThrobber->stop(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL AnimatedImagesPeer::isAnimationRunning( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -335,7 +335,7 @@ namespace toolkit return sal_False; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::setProperty( const OUString& i_propertyName, const Any& i_value ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -382,7 +382,7 @@ namespace toolkit } } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL AnimatedImagesPeer::getProperty( const OUString& i_propertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -419,7 +419,7 @@ namespace toolkit return aReturn; } - //------------------------------------------------------------------------------------------------------------------ + void AnimatedImagesPeer::ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) { switch ( i_windowEvent.GetId() ) @@ -432,7 +432,7 @@ namespace toolkit AnimatedImagesPeer_Base::ProcessWindowEvent( i_windowEvent ); } - //------------------------------------------------------------------------------------------------------------------ + void AnimatedImagesPeer::impl_updateImages_nolck( const Reference< XInterface >& i_animatedImages ) { SolarMutexGuard aGuard; @@ -440,7 +440,7 @@ namespace toolkit lcl_updateImageList_nothrow( *m_pData, Reference< XAnimatedImages >( i_animatedImages, UNO_QUERY_THROW ) ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -463,7 +463,7 @@ namespace toolkit lcl_updateImageList_nothrow( *m_pData ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -482,7 +482,7 @@ namespace toolkit lcl_updateImageList_nothrow( *m_pData ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -505,19 +505,19 @@ namespace toolkit lcl_updateImageList_nothrow( *m_pData ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::disposing( const EventObject& i_event ) throw (RuntimeException) { VCLXWindow::disposing( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::modified( const EventObject& i_event ) throw (RuntimeException) { impl_updateImages_nolck( i_event.Source ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesPeer::dispose( ) throw(RuntimeException) { AnimatedImagesPeer_Base::dispose(); diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index a09f95f7af2e..91a7231fd833 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -68,7 +68,7 @@ namespace toolkit DECL_LINK( OnWindowEvent, const VclWindowEvent* ); }; - //------------------------------------------------------------------------------------------------------------------ + IMPL_LINK( WindowStyleSettings_Data, OnWindowEvent, const VclWindowEvent*, i_pEvent ) { if ( !i_pEvent || ( i_pEvent->GetId() != VCLEVENT_WINDOW_DATACHANGED ) ) @@ -107,7 +107,7 @@ namespace toolkit //================================================================================================================== //= WindowStyleSettings //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + WindowStyleSettings::WindowStyleSettings(::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow ) :m_pData( new WindowStyleSettings_Data(i_rListenerMutex, i_rOwningWindow ) ) { @@ -117,12 +117,12 @@ namespace toolkit pWindow->AddEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) ); } - //------------------------------------------------------------------------------------------------------------------ + WindowStyleSettings::~WindowStyleSettings() { } - //------------------------------------------------------------------------------------------------------------------ + void WindowStyleSettings::dispose() { StyleMethodGuard aGuard( *m_pData ); @@ -138,7 +138,7 @@ namespace toolkit m_pData->pOwningWindow = NULL; } - //------------------------------------------------------------------------------------------------------------------ + namespace { sal_Int32 lcl_getStyleColor( WindowStyleSettings_Data& i_rData, Color const & (StyleSettings::*i_pGetter)() const ) @@ -180,217 +180,217 @@ namespace toolkit } } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveBorderColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveBorderColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveBorderColor, _activebordercolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveColor( ::sal_Int32 _activecolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveColor, _activecolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTabColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTabColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTabColor, _activetabcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTextColor, _activetextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonRolloverTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonRolloverTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonRolloverTextColor, _buttonrollovertextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonTextColor, _buttontextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getCheckedColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetCheckedColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setCheckedColor( ::sal_Int32 _checkedcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetCheckedColor, _checkedcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDarkShadowColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetDarkShadowColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetDarkShadowColor, _darkshadowcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveBorderColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveBorderColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveBorderColor, _deactivebordercolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveColor, _deactivecolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveTextColor, _deactivetextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDialogColor( ::sal_Int32 _dialogcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogColor, _dialogcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogTextColor, _dialogtextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getDisableColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetDisableColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setDisableColor( ::sal_Int32 _disablecolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetDisableColor, _disablecolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetFaceColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFaceColor( ::sal_Int32 _facecolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetFaceColor, _facecolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceGradientColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); @@ -400,301 +400,301 @@ namespace toolkit return aStyleSettings.GetFaceGradientColor().GetColor(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldColor( ::sal_Int32 _fieldcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldColor, _fieldcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldRolloverTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldRolloverTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldRolloverTextColor, _fieldrollovertextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldTextColor, _fieldtextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getGroupTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetGroupTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetGroupTextColor, _grouptextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHelpColor( ::sal_Int32 _helpcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpColor, _helpcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpTextColor, _helptextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHighlightColor( ::sal_Int32 _highlightcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightColor, _highlightcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightTextColor, _highlighttextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getInactiveTabColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetInactiveTabColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetInactiveTabColor, _inactivetabcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getInfoTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetInfoTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetInfoTextColor, _infotextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getLabelTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetLabelTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetLabelTextColor, _labeltextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getLightColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetLightColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setLightColor( ::sal_Int32 _lightcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetLightColor, _lightcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarColor, _menubarcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarTextColor, _menubartextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBorderColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBorderColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBorderColor, _menubordercolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuColor( ::sal_Int32 _menucolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuColor, _menucolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightColor, _menuhighlightcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightTextColor, _menuhighlighttextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuTextColor, _menutextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getMonoColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetMonoColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMonoColor( ::sal_Int32 _monocolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetMonoColor, _monocolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getRadioCheckTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetRadioCheckTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetRadioCheckTextColor, _radiochecktextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getSeparatorColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); @@ -704,63 +704,63 @@ namespace toolkit return aStyleSettings.GetSeparatorColor().GetColor(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getShadowColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetShadowColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setShadowColor( ::sal_Int32 _shadowcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetShadowColor, _shadowcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setWindowColor( ::sal_Int32 _windowcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowColor, _windowcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowTextColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowTextColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowTextColor, _windowtextcolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL WindowStyleSettings::getWorkspaceColor() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleColor( *m_pData, &StyleSettings::GetWorkspaceColor ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleColor( *m_pData, &StyleSettings::SetWorkspaceColor, _workspacecolor ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); @@ -770,7 +770,7 @@ namespace toolkit return aStyleSettings.GetHighContrastMode(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHighContrastMode( ::sal_Bool _highcontrastmode ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); @@ -782,175 +782,175 @@ namespace toolkit pWindow->SetSettings( aAllSettings ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getApplicationFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetAppFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setApplicationFont( const FontDescriptor& _applicationfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetAppFont, &StyleSettings::GetAppFont, _applicationfont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getHelpFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetHelpFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setHelpFont( const FontDescriptor& _helpfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetHelpFont, &StyleSettings::GetHelpFont, _helpfont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getTitleFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetTitleFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setTitleFont( const FontDescriptor& _titlefont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetTitleFont, &StyleSettings::GetTitleFont, _titlefont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getFloatTitleFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetFloatTitleFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFloatTitleFont( const FontDescriptor& _floattitlefont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetFloatTitleFont, &StyleSettings::GetFloatTitleFont, _floattitlefont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getMenuFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetMenuFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setMenuFont( const FontDescriptor& _menufont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetMenuFont, &StyleSettings::GetMenuFont, _menufont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getToolFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetToolFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setToolFont( const FontDescriptor& _toolfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetToolFont, &StyleSettings::GetToolFont, _toolfont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getGroupFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetGroupFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setGroupFont( const FontDescriptor& _groupfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetGroupFont, &StyleSettings::GetGroupFont, _groupfont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getLabelFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetLabelFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setLabelFont( const FontDescriptor& _labelfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetLabelFont, &StyleSettings::GetLabelFont, _labelfont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getInfoFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetInfoFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setInfoFont( const FontDescriptor& _infofont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetInfoFont, &StyleSettings::GetInfoFont, _infofont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getRadioCheckFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetRadioCheckFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setRadioCheckFont( const FontDescriptor& _radiocheckfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetRadioCheckFont, &StyleSettings::GetRadioCheckFont, _radiocheckfont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getPushButtonFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetPushButtonFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setPushButtonFont( const FontDescriptor& _pushbuttonfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetPushButtonFont, &StyleSettings::GetPushButtonFont, _pushbuttonfont ); } - //------------------------------------------------------------------------------------------------------------------ + FontDescriptor SAL_CALL WindowStyleSettings::getFieldFont() throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); return lcl_getStyleFont( *m_pData, &StyleSettings::GetFieldFont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::setFieldFont( const FontDescriptor& _fieldfont ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); lcl_setStyleFont( *m_pData, &StyleSettings::SetFieldFont, &StyleSettings::GetFieldFont, _fieldfont ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::addStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); @@ -958,7 +958,7 @@ namespace toolkit m_pData->aStyleChangeListeners.addInterface( i_rListener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL WindowStyleSettings::removeStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException) { StyleMethodGuard aGuard( *m_pData ); diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index f2573db0a923..75e6ecc6cfc4 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -235,9 +235,9 @@ VCLXVirtualDevice::~VCLXVirtualDevice() } -// ----------------------------------------------------------------------------- + // Interface implementation of ::com::sun::star::awt::XUnitConversion -// ----------------------------------------------------------------------------- + ::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index a34b8f4a3614..7215dec464f9 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -42,7 +42,7 @@ namespace toolkit using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; - //-------------------------------------------------------------------- + namespace { void lcl_modifyStyle( Window* _pWindow, WinBits _nStyleBits, sal_Bool _bShouldBePresent ) @@ -60,26 +60,26 @@ namespace toolkit //= VCLXSpinButton //==================================================================== DBG_NAME( VCLXSpinButton ) - //-------------------------------------------------------------------- + VCLXSpinButton::VCLXSpinButton() :maAdjustmentListeners( *this ) { DBG_CTOR( VCLXSpinButton, NULL ); } - //-------------------------------------------------------------------- + VCLXSpinButton::~VCLXSpinButton() { DBG_DTOR( VCLXSpinButton, NULL ); } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXSpinButton, VCLXWindow, VCLXSpinButton_Base ) - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXSpinButton, VCLXWindow, VCLXSpinButton_Base ) - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::dispose( ) throw(RuntimeException) { { @@ -93,14 +93,14 @@ namespace toolkit VCLXWindow::dispose(); } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::addAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException) { if ( listener.is() ) maAdjustmentListeners.addInterface( listener ); } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::removeAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException) { if ( listener.is() ) @@ -135,13 +135,13 @@ namespace toolkit } } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::setValue( sal_Int32 n ) throw (RuntimeException) { lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValue, n ); } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -151,49 +151,49 @@ namespace toolkit setValue( currentValue ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXSpinButton::getValue( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValue ); } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::setMinimum( sal_Int32 minValue ) throw (RuntimeException) { lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMin, minValue ); } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::setMaximum( sal_Int32 maxValue ) throw (RuntimeException) { lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMax, maxValue ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXSpinButton::getMinimum( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMin ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXSpinButton::getMaximum( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMax ); } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException) { lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValueStep, spinIncrement ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXSpinButton::getSpinIncrement( ) throw (RuntimeException) { return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValueStep ); } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException) { SolarMutexGuard aGuard; @@ -201,7 +201,7 @@ namespace toolkit lcl_modifyStyle( GetWindow(), WB_HSCROLL, orientation == ScrollBarOrientation::HORIZONTAL ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXSpinButton::getOrientation( ) throw (RuntimeException) { return ( 0 != ( GetWindow()->GetStyle() & WB_HSCROLL ) ) @@ -209,7 +209,7 @@ namespace toolkit : ScrollBarOrientation::VERTICAL; } - //-------------------------------------------------------------------- + void VCLXSpinButton::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { SolarMutexClearableGuard aGuard; @@ -241,7 +241,7 @@ namespace toolkit } } - //-------------------------------------------------------------------- + void SAL_CALL VCLXSpinButton::setProperty( const OUString& PropertyName, const Any& Value ) throw(RuntimeException) { SolarMutexGuard aGuard; @@ -291,7 +291,7 @@ namespace toolkit } } - //-------------------------------------------------------------------- + Any SAL_CALL VCLXSpinButton::getProperty( const OUString& PropertyName ) throw(RuntimeException) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index e2697aeed071..cf11f2ad3eb5 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -161,7 +161,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c mxMenuBar = rxMenu; } -//-------------------------------------------------------------------- + ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException) { SolarMutexGuard aGuard; @@ -173,7 +173,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c return pWindow->IsMaximized(); } -//-------------------------------------------------------------------- + void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -185,7 +185,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro pWindow->Maximize( _ismaximized ); } -//-------------------------------------------------------------------- + ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException) { SolarMutexGuard aGuard; @@ -197,7 +197,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro return pWindow->IsMinimized(); } -//-------------------------------------------------------------------- + void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -209,7 +209,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro _isMinimized ? pWindow->Minimize() : pWindow->Restore(); } -//-------------------------------------------------------------------- + ::sal_Int32 SAL_CALL VCLXTopWindow_Base::getDisplay() throw (RuntimeException) { SolarMutexGuard aGuard; @@ -221,7 +221,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro return pWindow->GetScreenNumber(); } -//-------------------------------------------------------------------- + void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (RuntimeException, IndexOutOfBoundsException) { SolarMutexGuard aGuard; diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index a8b8981bed99..66ed80c97f6c 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -198,7 +198,7 @@ private: VCLXWindowImpl& operator=( const VCLXWindowImpl& ); // never implemented }; -//-------------------------------------------------------------------- + VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps ) :mrAntiImpl( _rAntiImpl ) ,mbDisposed( false ) @@ -234,7 +234,7 @@ VCLXWindowImpl::~VCLXWindowImpl() delete mpPropHelper; } -//-------------------------------------------------------------------- + void VCLXWindowImpl::disposing() { SolarMutexGuard aGuard; @@ -264,7 +264,7 @@ void VCLXWindowImpl::disposing() mxWindowStyleSettings.clear(); } -//-------------------------------------------------------------------- + void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback ) { DBG_TESTSOLARMUTEX(); @@ -277,7 +277,7 @@ void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback ) } } -//---------------------------------------------------------------------------------------------------------------------- + IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) { const Reference< uno::XInterface > xKeepAlive( mrAntiImpl ); @@ -313,19 +313,19 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks) return 0L; } -//-------------------------------------------------------------------- + void SAL_CALL VCLXWindowImpl::acquire() { mrAntiImpl.acquire(); } -//-------------------------------------------------------------------- + void SAL_CALL VCLXWindowImpl::release() { mrAntiImpl.release(); } -//-------------------------------------------------------------------- + Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings() { SolarMutexGuard aGuard; @@ -383,13 +383,13 @@ VCLXWindow::~VCLXWindow() } } -//---------------------------------------------------------------------------------------------------------------------- + void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const Callback& i_callback ) { mpImpl->callBackAsync( i_callback ); } -//---------------------------------------------------------------------------------------------------------------------- + ::toolkit::IAccessibleFactory& VCLXWindow::getAccessibleFactory() { return mpImpl->getAccessibleFactory().getFactory(); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 623c5eb0cecf..f7cefe668003 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -328,7 +328,7 @@ void VCLXGraphicControl::setProperty( const OUString& PropertyName, const ::com: return aProp; } -//-------------------------------------------------------------------- + // class VCLXButton // ---------------------------------------------------- diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 509d2ba78f27..56b13a0bd25f 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -43,25 +43,25 @@ namespace toolkit //==================================================================== //= OAccessibleControlContext //==================================================================== - //-------------------------------------------------------------------- + OAccessibleControlContext::OAccessibleControlContext() : OAccessibleControlContext_Base(new VCLExternalSolarLock) { // nothing to do here, we have a late ctor } - //-------------------------------------------------------------------- + OAccessibleControlContext::~OAccessibleControlContext() { ensureDisposed(); } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE3( OAccessibleControlContext, OAccessibleControlContext_Base, OAccessibleImplementationAccess, OAccessibleControlContext_IBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER3( OAccessibleControlContext, OAccessibleControlContext_Base, OAccessibleImplementationAccess, OAccessibleControlContext_IBase ) // (order matters: the first is the class name, the second is the class doing the ref counting) - //-------------------------------------------------------------------- + void OAccessibleControlContext::Init( const Reference< XAccessible >& _rxCreator ) SAL_THROW( ( Exception ) ) { OContextEntryGuard aGuard( this ); @@ -83,7 +83,7 @@ namespace toolkit OAccessibleControlContext_Base::lateInit( _rxCreator ); } - //-------------------------------------------------------------------- + OAccessibleControlContext* OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator ) SAL_THROW( ( ) ) { OAccessibleControlContext* pNew = NULL; @@ -99,7 +99,7 @@ namespace toolkit return pNew; } - //-------------------------------------------------------------------- + void OAccessibleControlContext::startModelListening( ) SAL_THROW( ( Exception ) ) { Reference< XComponent > xModelComp( m_xControlModel, UNO_QUERY ); @@ -108,7 +108,7 @@ namespace toolkit xModelComp->addEventListener( this ); } - //-------------------------------------------------------------------- + void OAccessibleControlContext::stopModelListening( ) SAL_THROW( ( Exception ) ) { Reference< XComponent > xModelComp( m_xControlModel, UNO_QUERY ); @@ -117,21 +117,21 @@ namespace toolkit xModelComp->removeEventListener( this ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) throw (RuntimeException) { // we do not have children return 0; } - //-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException) { // we do not have children throw IndexOutOfBoundsException(); } - //-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); @@ -141,33 +141,33 @@ namespace toolkit return implGetForeignControlledParent(); } - //-------------------------------------------------------------------- + sal_Int16 SAL_CALL OAccessibleControlContext::getAccessibleRole( ) throw (RuntimeException) { return AccessibleRole::SHAPE; } - //-------------------------------------------------------------------- + OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "HelpText" ); } - //-------------------------------------------------------------------- + OUString SAL_CALL OAccessibleControlContext::getAccessibleName( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return getModelStringProperty( "Name" ); } - //-------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet( ) throw (RuntimeException) { return NULL; } - //-------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -187,7 +187,7 @@ namespace toolkit return pStateSet; } - //-------------------------------------------------------------------- + void SAL_CALL OAccessibleControlContext::disposing( const EventObject& #if OSL_DEBUG_LEVEL > 0 _rSource @@ -204,7 +204,7 @@ namespace toolkit OAccessibleControlContext_Base::disposing(); } - //-------------------------------------------------------------------- + OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName ) { OUString sReturn; @@ -224,7 +224,7 @@ namespace toolkit return sReturn; } - //-------------------------------------------------------------------- + Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const { Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY ); @@ -239,7 +239,7 @@ namespace toolkit return pWindow; } - //-------------------------------------------------------------------- + awt::Rectangle SAL_CALL OAccessibleControlContext::implGetBounds( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -299,27 +299,27 @@ namespace toolkit return aBounds; } - //-------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) throw (RuntimeException) { // no children at all return NULL; } - //-------------------------------------------------------------------- + void SAL_CALL OAccessibleControlContext::grabFocus( ) throw (RuntimeException) { OSL_FAIL( "OAccessibleControlContext::grabFocus: !isFocusTraversable, but grabFocus!" ); } - //-------------------------------------------------------------------- + Any SAL_CALL OAccessibleControlContext::getAccessibleKeyBinding( ) throw (RuntimeException) { // we do not have any key bindings to activate a UNO control in design mode return Any(); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL OAccessibleControlContext::getForeground( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -345,7 +345,7 @@ namespace toolkit return nColor; } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL OAccessibleControlContext::getBackground( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 43f2199799d5..842072ce8cd2 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -86,13 +86,13 @@ public: { } - //------------------------------------------------------------------------------------------------------------------ + OUString AnimatedImagesControl::GetComponentServiceName() { return OUString( "AnimatedImages" ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControl::startAnimation( ) throw (RuntimeException) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); @@ -100,7 +100,7 @@ public: xAnimation->startAnimation(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControl::stopAnimation( ) throw (RuntimeException) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); @@ -108,7 +108,7 @@ public: xAnimation->stopAnimation(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning( ) throw (RuntimeException) { Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY ); @@ -117,13 +117,13 @@ public: return sal_False; } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL AnimatedImagesControl::getImplementationName( ) throw(RuntimeException) { return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServices( AnimatedImagesControl_Base::getSupportedServiceNames() ); @@ -132,7 +132,7 @@ public: return aServices; } - //------------------------------------------------------------------------------------------------------------------ + namespace { void lcl_updatePeer( Reference< XWindowPeer > const& i_peer, Reference< XControlModel > const& i_model ) @@ -147,7 +147,7 @@ public: } } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel ) throw ( RuntimeException ) { const Reference< XAnimatedImages > xOldContainer( getModel(), UNO_QUERY ); @@ -167,7 +167,7 @@ public: return sal_True; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer ) throw(RuntimeException) { AnimatedImagesControl_Base::createPeer( i_toolkit, i_parentPeer ); @@ -175,7 +175,7 @@ public: lcl_updatePeer( getPeer(), getModel() ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); @@ -183,7 +183,7 @@ public: xPeerListener->elementInserted( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); @@ -191,7 +191,7 @@ public: xPeerListener->elementRemoved( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException) { const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY ); @@ -199,7 +199,7 @@ public: xPeerListener->elementReplaced( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event ) throw (RuntimeException) { UnoControlBase::disposing( i_event ); @@ -258,44 +258,44 @@ namespace toolkit { ImplRegisterProperty( BASEPROPERTY_STEP_TIME ); } - //------------------------------------------------------------------------------------------------------------------ + AnimatedImagesControlModel::AnimatedImagesControlModel( const AnimatedImagesControlModel& i_copySource ) :AnimatedImagesControlModel_Base( i_copySource ) ,m_pData( new AnimatedImagesControlModel_Data( *i_copySource.m_pData ) ) { } - //------------------------------------------------------------------------------------------------------------------ + AnimatedImagesControlModel::~AnimatedImagesControlModel() { } - //------------------------------------------------------------------------------------------------------------------ + UnoControlModel* AnimatedImagesControlModel::Clone() const { return new AnimatedImagesControlModel( *this ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo( ) throw(RuntimeException) { static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException) { return OUString("com.sun.star.awt.AnimatedImagesControlModel"); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL AnimatedImagesControlModel::getImplementationName( ) throw(RuntimeException) { return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel"); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServiceNames(2); @@ -304,7 +304,7 @@ namespace toolkit { return aServiceNames; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value ) throw (Exception) { switch ( i_handle ) @@ -325,7 +325,7 @@ namespace toolkit { AnimatedImagesControlModel_Base::setFastPropertyValue_NoBroadcast( i_handle, i_value ); } - //------------------------------------------------------------------------------------------------------------------ + Any AnimatedImagesControlModel::ImplGetDefaultValue( sal_uInt16 i_propertyId ) const { switch ( i_propertyId ) @@ -350,7 +350,7 @@ namespace toolkit { } } - //------------------------------------------------------------------------------------------------------------------ + ::cppu::IPropertyArrayHelper& SAL_CALL AnimatedImagesControlModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; @@ -362,7 +362,7 @@ namespace toolkit { return *pHelper; } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime() throw (RuntimeException) { sal_Int32 nStepTime( 100 ); @@ -370,13 +370,13 @@ namespace toolkit { return nStepTime; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime ) throw (RuntimeException) { setPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ), makeAny( i_stepTime ) ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() throw (RuntimeException) { sal_Bool bAutoRepeat( sal_True ); @@ -384,13 +384,13 @@ namespace toolkit { return bAutoRepeat; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( ::sal_Bool i_autoRepeat ) throw (RuntimeException) { setPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ), makeAny( i_autoRepeat ) ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() throw (RuntimeException) { sal_Int16 nImageScaleMode( ImageScaleMode::ANISOTROPIC ); @@ -398,13 +398,13 @@ namespace toolkit { return nImageScaleMode; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode ) throw (IllegalArgumentException, RuntimeException) { setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ), makeAny( i_scaleMode ) ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount( ) throw (RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -414,7 +414,7 @@ namespace toolkit { return m_pData->aImageSets.size(); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -426,7 +426,7 @@ namespace toolkit { return m_pData->aImageSets[ i_index ]; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -443,7 +443,7 @@ namespace toolkit { lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementInserted, i_index, i_imageURLs, *this ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -460,7 +460,7 @@ namespace toolkit { lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementReplaced, i_index, i_imageURLs, *this ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -479,13 +479,13 @@ namespace toolkit { lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementRemoved, i_index, aRemovedElement, *this ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) { BrdcstHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) { BrdcstHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener ); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 54d26c3c7546..e9edfeb65ef2 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -83,7 +83,7 @@ struct LanguageDependentProp sal_Int32 nPropNameLength; }; -// ---------------------------------------------------------------------------- + namespace { static const Sequence< OUString >& lcl_getLanguageDependentProperties() @@ -104,7 +104,7 @@ namespace } } -// ---------------------------------------------------------------------------- + // functor for disposing a control model struct DisposeControlModel : public ::std::unary_function< Reference< XControlModel >, void > { @@ -121,7 +121,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo } }; -// ---------------------------------------------------------------------------- + // functor for searching control model by name struct FindControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, bool > { @@ -137,7 +137,7 @@ public: } }; -// ---------------------------------------------------------------------------- + // functor for cloning a control model, and insertion into a target list struct CloneControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, void > { @@ -160,7 +160,7 @@ public: } }; -// ---------------------------------------------------------------------------- + // functor for comparing a XControlModel with a given reference struct CompareControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, bool > { @@ -175,32 +175,32 @@ public: } }; -// ---------------------------------------------------------------------------- + static void lcl_throwIllegalArgumentException( ) { // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw IllegalArgumentException(); } -// ---------------------------------------------------------------------------- + static void lcl_throwNoSuchElementException( ) { // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw NoSuchElementException(); } -// ---------------------------------------------------------------------------- + static void lcl_throwElementExistException( ) { // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this .... throw ElementExistException(); } -// ---------------------------------------------------------------------------- + static const OUString& getTabIndexPropertyName( ) { static const OUString s_sTabIndexProperty( "TabIndex" ); return s_sTabIndexProperty; } -// ---------------------------------------------------------------------------- + static const OUString& getStepPropertyName( ) { static const OUString s_sStepProperty( "Step" ); @@ -666,19 +666,19 @@ void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSu implNotifyTabModelChange( aName ); } -// ---------------------------------------------------------------------------- + sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl( ) throw (RuntimeException) { return sal_True; } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException) { OSL_TRACE( "ControlModelContainerBase::setGroupControl: explicit grouping not supported" ); } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -715,7 +715,7 @@ void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Refer typedef ::std::multimap< sal_Int32, Reference< XControlModel >, ::std::less< sal_Int32 > > MapIndexToModel; -// ---------------------------------------------------------------------------- + Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -763,7 +763,7 @@ Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getCo return aReturn; } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) throw (RuntimeException) { // not supported. We have only implicit grouping: @@ -829,7 +829,7 @@ void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip ) m_sTooltip = _tooltip; } -// ---------------------------------------------------------------------------- + namespace { enum GroupingMachineState @@ -855,7 +855,7 @@ namespace } } -// ---------------------------------------------------------------------------- + sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -865,7 +865,7 @@ sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount( ) throw (RuntimeEx return maGroups.size(); } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -889,7 +889,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< } } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -898,19 +898,19 @@ void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, getGroup( _rName.toInt32( ), _rGroup, sDummyName ); } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException) { maChangeListeners.addInterface( _rxListener ); } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException) { maChangeListeners.removeInterface( _rxListener ); } -// ---------------------------------------------------------------------------- + void ControlModelContainerBase::implNotifyTabModelChange( const OUString& _rAccessor ) { // multiplex to our change listeners: @@ -933,7 +933,7 @@ void ControlModelContainerBase::implNotifyTabModelChange( const OUString& _rAcce } -// ---------------------------------------------------------------------------- + void ControlModelContainerBase::implUpdateGroupStructure() { if ( mbGroupsUpToDate ) @@ -1069,7 +1069,7 @@ void ControlModelContainerBase::implUpdateGroupStructure() mbGroupsUpToDate = sal_True; } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) { SolarMutexGuard aGuard; @@ -1095,12 +1095,12 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve implNotifyTabModelChange( sAccessor ); } -// ---------------------------------------------------------------------------- + void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ ) throw (RuntimeException) { } -// ---------------------------------------------------------------------------- + void ControlModelContainerBase::startControlListening( const Reference< XControlModel >& _rxChildModel ) { SolarMutexGuard aGuard; @@ -1114,7 +1114,7 @@ void ControlModelContainerBase::startControlListening( const Reference< XControl xModelProps->addPropertyChangeListener( getTabIndexPropertyName(), this ); } -// ---------------------------------------------------------------------------- + void ControlModelContainerBase::stopControlListening( const Reference< XControlModel >& _rxChildModel ) { SolarMutexGuard aGuard; diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index f61a3b8239fc..954619d0bd9f 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -945,7 +945,7 @@ void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement return ControlModelContainerBase::insertByName( aName, aElement ); } -// ---------------------------------------------------------------------------- + sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl( ) throw (RuntimeException) { return sal_True; @@ -1050,7 +1050,7 @@ uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo( ) t return xInfo; } -// ---------------------------------------------------------------------------- + sal_Bool SAL_CALL UnoPageModel::getGroupControl( ) throw (RuntimeException) { return sal_False; diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 57d1d0e7f0df..a7c44e88dfd0 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -40,7 +40,7 @@ namespace toolkit using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; - // ------------------------------------------------------------------- + namespace { // ............................................................... @@ -111,7 +111,7 @@ namespace toolkit // =================================================================== // = UnoControlFormattedFieldModel // =================================================================== - // ------------------------------------------------------------------- + UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XComponentContext >& rxContext ) :UnoControlModel( rxContext ) ,m_bRevokedAsClient( false ) @@ -157,18 +157,18 @@ namespace toolkit lcl_registerDefaultFormatsClient(); } - // ------------------------------------------------------------------- + UnoControlFormattedFieldModel::~UnoControlFormattedFieldModel() { } - // ------------------------------------------------------------------- + OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException) { return OUString::createFromAscii( szServiceName_UnoControlFormattedFieldModel ); } - // ------------------------------------------------------------------- + void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -190,7 +190,7 @@ namespace toolkit } } - // ------------------------------------------------------------------- + void UnoControlFormattedFieldModel::impl_updateTextFromValue_nothrow() { if ( !m_xCachedFormatter.is() ) @@ -225,7 +225,7 @@ namespace toolkit } } - // ------------------------------------------------------------------- + void UnoControlFormattedFieldModel::impl_updateCachedFormatter_nothrow() { Any aFormatsSupplier; @@ -251,7 +251,7 @@ namespace toolkit } } - // ------------------------------------------------------------------- + void UnoControlFormattedFieldModel::impl_updateCachedFormatKey_nothrow() { Any aFormatKey; @@ -259,7 +259,7 @@ namespace toolkit m_aCachedFormat = aFormatKey; } - // ------------------------------------------------------------------- + void UnoControlFormattedFieldModel::dispose( ) throw(RuntimeException) { UnoControlModel::dispose(); @@ -272,7 +272,7 @@ namespace toolkit } } - // ------------------------------------------------------------------- + void UnoControlFormattedFieldModel::ImplNormalizePropertySequence( const sal_Int32 _nCount, sal_Int32* _pHandles, Any* _pValues, sal_Int32* _pValidHandles ) const SAL_THROW(()) { @@ -281,7 +281,7 @@ namespace toolkit UnoControlModel::ImplNormalizePropertySequence( _nCount, _pHandles, _pValues, _pValidHandles ); } - // ------------------------------------------------------------------- + namespace { class ResetFlagOnExit @@ -301,7 +301,7 @@ namespace toolkit }; } - // ------------------------------------------------------------------- + void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { bool bSettingValue = false; @@ -323,7 +323,7 @@ namespace toolkit UnoControlModel::setPropertyValues( _rPropertyNames, _rValues ); } - // ------------------------------------------------------------------- + sal_Bool UnoControlFormattedFieldModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nPropId, const Any& rValue ) throw (IllegalArgumentException) @@ -372,7 +372,7 @@ namespace toolkit return UnoControlModel::convertFastPropertyValue( rConvertedValue, rOldValue, nPropId, rValue ); } - // ------------------------------------------------------------------- + Any UnoControlFormattedFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { Any aReturn; @@ -397,7 +397,7 @@ namespace toolkit return aReturn; } - // ------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& UnoControlFormattedFieldModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; @@ -410,7 +410,7 @@ namespace toolkit } // beans::XMultiPropertySet - // ------------------------------------------------------------------- + Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo( ) throw(RuntimeException) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); @@ -420,19 +420,19 @@ namespace toolkit // =================================================================== // = UnoFormattedFieldControl // =================================================================== - // ------------------------------------------------------------------- + UnoFormattedFieldControl::UnoFormattedFieldControl() :UnoSpinFieldControl() { } - // ------------------------------------------------------------------- + OUString UnoFormattedFieldControl::GetComponentServiceName() { return OUString("FormattedField"); } - // ------------------------------------------------------------------- + void UnoFormattedFieldControl::textChanged(const TextEvent& e) throw(RuntimeException) { Reference< XVclWindowPeer > xPeer(getPeer(), UNO_QUERY); diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index fca475abb0cb..d2010687745a 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -68,7 +68,7 @@ //==================================================================== //= OGeometryControlModel_Base //==================================================================== - //-------------------------------------------------------------------- + OGeometryControlModel_Base::OGeometryControlModel_Base(::com::sun::star::uno::XAggregation* _pAggregateInstance) :OPropertySetAggregationHelper( m_aBHelper ) ,OPropertyContainer( m_aBHelper ) @@ -100,7 +100,7 @@ registerProperties(); } - //-------------------------------------------------------------------- + OGeometryControlModel_Base::OGeometryControlModel_Base(Reference< XCloneable >& _rxAggregateInstance) :OPropertySetAggregationHelper( m_aBHelper ) ,OPropertyContainer( m_aBHelper ) @@ -133,7 +133,7 @@ registerProperties(); } - //-------------------------------------------------------------------- + Sequence< Type > SAL_CALL OGeometryControlModel_Base::getTypes( ) throw (RuntimeException) { // our own types @@ -166,7 +166,7 @@ return aTypes; } - //-------------------------------------------------------------------- + void OGeometryControlModel_Base::registerProperties() { // register our members for the property handling of the OPropertyContainer @@ -181,7 +181,7 @@ registerProperty(GCM_PROPERTY_RESOURCERESOLVER, GCM_PROPERTY_ID_RESOURCERESOLVER, DEFAULT_ATTRIBS(), &m_xStrResolver, ::getCppuType(&m_xStrResolver)); } - //-------------------------------------------------------------------- + ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) const { ::com::sun::star::uno::Any aDefault; @@ -203,7 +203,7 @@ return aDefault; } - //-------------------------------------------------------------------- + ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetPropertyValueByHandle(sal_Int32 nHandle) const { ::com::sun::star::uno::Any aValue; @@ -225,7 +225,7 @@ return aValue; } - //-------------------------------------------------------------------- + void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue) { switch ( nHandle ) @@ -243,7 +243,7 @@ } } - //-------------------------------------------------------------------- + Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) throw(RuntimeException) { Any aReturn; @@ -268,25 +268,25 @@ return aReturn; } - //-------------------------------------------------------------------- + Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType ) throw(RuntimeException) { return OGCM_Base::queryInterface(_rType); } - //-------------------------------------------------------------------- + void SAL_CALL OGeometryControlModel_Base::acquire( ) throw() { OGCM_Base::acquire(); } - //-------------------------------------------------------------------- + void SAL_CALL OGeometryControlModel_Base::release( ) throw() { OGCM_Base::release(); } - //-------------------------------------------------------------------- + void OGeometryControlModel_Base::releaseAggregation() { // release the aggregate (_before_ clearing m_xAggregate) @@ -295,26 +295,26 @@ setAggregation(NULL); } - //-------------------------------------------------------------------- + OGeometryControlModel_Base::~OGeometryControlModel_Base() { releaseAggregation(); } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL OGeometryControlModel_Base::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue) throw (IllegalArgumentException) { return OPropertyContainer::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue); } - //-------------------------------------------------------------------- + void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception) { OPropertyContainer::setFastPropertyValue_NoBroadcast(_nHandle, _rValue); } - //-------------------------------------------------------------------- + void SAL_CALL OGeometryControlModel_Base::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const { OPropertyArrayAggregationHelper& rPH = static_cast<OPropertyArrayAggregationHelper&>(const_cast<OGeometryControlModel_Base*>(this)->getInfoHelper()); @@ -327,7 +327,7 @@ OPropertyContainer::getFastPropertyValue(_rValue, _nHandle); } - //-------------------------------------------------------------------- + ::com::sun::star::beans::PropertyState OGeometryControlModel_Base::getPropertyStateByHandle(sal_Int32 nHandle) { ::com::sun::star::uno::Any aValue = ImplGetPropertyValueByHandle( nHandle ); @@ -336,25 +336,25 @@ return CompareProperties( aValue, aDefault ) ? ::com::sun::star::beans::PropertyState_DEFAULT_VALUE : ::com::sun::star::beans::PropertyState_DIRECT_VALUE; } - //-------------------------------------------------------------------- + void OGeometryControlModel_Base::setPropertyToDefaultByHandle(sal_Int32 nHandle) { ImplSetPropertyValueByHandle( nHandle , ImplGetDefaultValueByHandle( nHandle ) ); } - //-------------------------------------------------------------------- + ::com::sun::star::uno::Any OGeometryControlModel_Base::getPropertyDefaultByHandle( sal_Int32 nHandle ) const { return ImplGetDefaultValueByHandle( nHandle ); } - //-------------------------------------------------------------------- + Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo() throw(RuntimeException) { return OPropertySetAggregationHelper::createPropertySetInfo(getInfoHelper()); } - //-------------------------------------------------------------------- + Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone( ) throw(RuntimeException) { OSL_ENSURE(m_bCloneable, "OGeometryControlModel_Base::createClone: invalid call!"); @@ -416,7 +416,7 @@ return pOwnClone; } - //-------------------------------------------------------------------- + Reference< XNameContainer > SAL_CALL OGeometryControlModel_Base::getEvents() throw(RuntimeException) { if( !mxEventContainer.is() ) @@ -424,7 +424,7 @@ return mxEventContainer; } - //-------------------------------------------------------------------- + void SAL_CALL OGeometryControlModel_Base::disposing() { OGCM_Base::disposing(); @@ -438,7 +438,7 @@ //==================================================================== //= OCommonGeometryControlModel //==================================================================== - //-------------------------------------------------------------------- + typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int; typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > > PropSeqArray; @@ -463,7 +463,7 @@ // service specifier. - //-------------------------------------------------------------------- + OCommonGeometryControlModel::OCommonGeometryControlModel( Reference< XCloneable >& _rxAgg, const OUString& _rServiceSpecifier ) :OGeometryControlModel_Base( _rxAgg ) ,m_sServiceSpecifier( _rServiceSpecifier ) @@ -493,7 +493,7 @@ m_nPropertyMapId = aPropMapIdPos->second; } - //-------------------------------------------------------------------- + struct PropertyNameLess : public ::std::binary_function< Property, Property, bool > { bool operator()( const Property& _rLHS, const Property& _rRHS ) @@ -502,7 +502,7 @@ } }; - //-------------------------------------------------------------------- + struct PropertyNameEqual : public ::std::unary_function< Property, bool > { const OUString& m_rCompare; @@ -514,7 +514,7 @@ } }; - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OCommonGeometryControlModel::createArrayHelper( sal_Int32 _nId ) const { OSL_ENSURE( _nId == m_nPropertyMapId, "OCommonGeometryControlModel::createArrayHelper: invalid argument!" ); @@ -568,13 +568,13 @@ return new OPropertyArrayAggregationHelper(aProps, aAggregateProps); } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& SAL_CALL OCommonGeometryControlModel::getInfoHelper() { return *getArrayHelper( m_nPropertyMapId ); } - //-------------------------------------------------------------------- + OGeometryControlModel_Base* OCommonGeometryControlModel::createClone_Impl( Reference< XCloneable >& _rxAggregateInstance ) { return new OCommonGeometryControlModel( _rxAggregateInstance, m_sServiceSpecifier ); @@ -586,13 +586,13 @@ public rtl::Static< ::cppu::OImplementationId, theOCommonGeometryControlModelImplementationId > {}; } - //-------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId( ) throw (RuntimeException) { return theOCommonGeometryControlModelImplementationId::get().getImplementationId(); } - //-------------------------------------------------------------------- + struct Int32Equal : public ::std::unary_function< sal_Int32, bool > { sal_Int32 m_nCompare; @@ -604,7 +604,7 @@ } }; - //-------------------------------------------------------------------- + void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) { OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast( _nHandle, _rValue ); diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index 271b30d4b9bc..95ac0f9631a1 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -132,25 +132,25 @@ private: m_aColumns.swap( aColumns ); } - //------------------------------------------------------------------------------------------------------------------ + DefaultGridColumnModel::~DefaultGridColumnModel() { } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException) { return m_aColumns.size(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn( ) throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return new GridColumn(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn( const Reference< XGridColumn > & i_column ) throw (RuntimeException, css::lang::IllegalArgumentException) { @@ -176,7 +176,7 @@ private: return index; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridColumnModel::removeColumn( ::sal_Int32 i_columnIndex ) throw (RuntimeException, css::lang::IndexOutOfBoundsException) { @@ -226,14 +226,14 @@ private: } } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return ::comphelper::containerToSequence( m_aColumns ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::getColumn(::sal_Int32 index) throw (css::lang::IndexOutOfBoundsException, RuntimeException) { @@ -245,7 +245,7 @@ private: throw css::lang::IndexOutOfBoundsException(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (RuntimeException) { ::std::vector< ContainerEvent > aRemovedColumns; @@ -329,7 +329,7 @@ private: } } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL DefaultGridColumnModel::getImplementationName( ) throw (RuntimeException) { return OUString("stardiv.Toolkit.DefaultGridColumnModel"); @@ -347,21 +347,21 @@ private: return aSeq; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) { if ( i_listener.is() ) m_aContainerListeners.addInterface( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException) { if ( i_listener.is() ) m_aContainerListeners.removeInterface( i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridColumnModel::disposing() { DefaultGridColumnModel_Base::disposing(); @@ -391,7 +391,7 @@ private: m_aColumns.swap( aEmpty ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone( ) throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index 13936bcafb9d..614555e4ae0e 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -121,7 +121,7 @@ private: { } - //------------------------------------------------------------------------------------------------------------------ + DefaultGridDataModel::DefaultGridDataModel( DefaultGridDataModel const & i_copySource ) :cppu::BaseMutex() ,DefaultGridDataModel_Base( m_aMutex ) @@ -131,12 +131,12 @@ private: { } - //------------------------------------------------------------------------------------------------------------------ + DefaultGridDataModel::~DefaultGridDataModel() { } - //------------------------------------------------------------------------------------------------------------------ + void DefaultGridDataModel::broadcast( GridDataEvent const & i_event, void ( SAL_CALL XGridDataListener::*i_listenerMethod )( GridDataEvent const & ), ::comphelper::ComponentGuard & i_instanceLock ) { @@ -148,21 +148,21 @@ private: pListeners->notifyEach( i_listenerMethod, i_event ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getRowCount_nolck(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnCount; } - //------------------------------------------------------------------------------------------------------------------ + DefaultGridDataModel::CellData const & DefaultGridDataModel::impl_getCellData_throw( sal_Int32 const i_column, sal_Int32 const i_row ) const { if ( ( i_row < 0 ) || ( size_t( i_row ) > m_aData.size() ) @@ -178,7 +178,7 @@ private: return s_aEmpty; } - //------------------------------------------------------------------------------------------------------------------ + DefaultGridDataModel::RowData& DefaultGridDataModel::impl_getRowDataAccess_throw( sal_Int32 const i_rowIndex, size_t const i_requiredColumnCount ) { OSL_ENSURE( i_requiredColumnCount <= size_t( m_nColumnCount ), "DefaultGridDataModel::impl_getRowDataAccess_throw: invalid column count!" ); @@ -191,7 +191,7 @@ private: return rRowData; } - //------------------------------------------------------------------------------------------------------------------ + DefaultGridDataModel::CellData& DefaultGridDataModel::impl_getCellDataAccess_throw( sal_Int32 const i_columnIndex, sal_Int32 const i_rowIndex ) { if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= m_nColumnCount ) ) @@ -201,21 +201,21 @@ private: return rRowData[ i_columnIndex ]; } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getCellData_throw( i_column, i_row ).first; } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return impl_getCellData_throw( i_column, i_row ).second; } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -226,7 +226,7 @@ private: return m_aRowHeaders[ i_row ]; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -239,7 +239,7 @@ private: return resultData; } - //------------------------------------------------------------------------------------------------------------------ + void DefaultGridDataModel::impl_insertRow( sal_Int32 const i_position, Any const & i_heading, Sequence< Any > const & i_rowData, sal_Int32 const i_assumedColCount ) { OSL_PRECOND( ( i_assumedColCount <= 0 ) || ( i_assumedColCount >= i_rowData.getLength() ), @@ -258,19 +258,19 @@ private: m_aData.insert( m_aData.begin() + i_position, newRow ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException) { insertRow( getRowCount(), i_heading, i_data ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException) { insertRows( getRowCount(), i_headings, i_data ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -293,7 +293,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException) { if ( i_headings.getLength() != i_data.getLength() ) @@ -332,7 +332,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -350,7 +350,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::removeAllRows( ) throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -365,7 +365,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -379,7 +379,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -419,7 +419,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -436,14 +436,14 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); impl_getCellDataAccess_throw( i_columnIndex, i_rowIndex ).second = i_value; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -453,19 +453,19 @@ private: cell->second = i_value; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException) { rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException) { rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL DefaultGridDataModel::disposing() { ::com::sun::star::lang::EventObject aEvent; @@ -482,7 +482,7 @@ private: m_nColumnCount = 0; } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL DefaultGridDataModel::getImplementationName( ) throw (RuntimeException) { return OUString("stardiv.Toolkit.DefaultGridDataModel"); @@ -500,7 +500,7 @@ private: return aSeq; } - //------------------------------------------------------------------------------------------------------------------ + Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone( ) throw (RuntimeException) { return new DefaultGridDataModel( *this ); diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 644d9cd1aa5d..b4d78179aeab 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -37,7 +37,7 @@ namespace toolkit //================================================================================================================== //= DefaultGridColumnModel //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + GridColumn::GridColumn() :GridColumn_Base( m_aMutex ) ,m_aIdentifier() @@ -52,7 +52,7 @@ namespace toolkit { } - //------------------------------------------------------------------------------------------------------------------ + GridColumn::GridColumn( GridColumn const & i_copySource ) :cppu::BaseMutex() ,GridColumn_Base( m_aMutex ) @@ -70,12 +70,12 @@ namespace toolkit { } - //------------------------------------------------------------------------------------------------------------------ + GridColumn::~GridColumn() { } - //------------------------------------------------------------------------------------------------------------------ + void GridColumn::broadcast_changed( sal_Char const * const i_asciiAttributeName, Any i_oldValue, Any i_newValue, ::comphelper::ComponentGuard& i_Guard ) { @@ -92,106 +92,106 @@ namespace toolkit pIter->notifyEach( &XGridColumnListener::columnChanged, aEvent ); } - //------------------------------------------------------------------------------------------------------------------ + ::com::sun::star::uno::Any SAL_CALL GridColumn::getIdentifier() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_aIdentifier; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); m_aIdentifier = value; } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nColumnWidth; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_nColumnWidth, value, "ColumnWidth" ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMaxWidth; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_nMaxWidth, value, "MaxWidth" ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nMinWidth; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_nMinWidth, value, "MinWidth" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sTitle; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_sTitle, value, "Title" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_sHelpText; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException) { impl_set( m_sHelpText, value, "HelpText" ); } - //------------------------------------------------------------------------------------------------------------------ + sal_Bool SAL_CALL GridColumn::getResizeable() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_bResizeable; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_bResizeable, value, "Resizeable" ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GridColumn::getFlexibility() throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nFlexibility; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException) { if ( i_value < 0 ) @@ -199,32 +199,32 @@ namespace toolkit impl_set( m_nFlexibility, i_value, "Flexibility" ); } - //------------------------------------------------------------------------------------------------------------------ + HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_eHorizontalAlign; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException) { impl_set( m_eHorizontalAlign, align, "HorizontalAlign" ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException) { rBHelper.addListener( cppu::UnoType<XGridColumnListener>::get(), xListener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException) { rBHelper.removeListener( cppu::UnoType<XGridColumnListener>::get(), xListener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -232,34 +232,34 @@ namespace toolkit m_sTitle = m_sHelpText = OUString(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GridColumn::getIndex() throw (RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nIndex; } - //------------------------------------------------------------------------------------------------------------------ + void GridColumn::setIndex( sal_Int32 const i_index ) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); m_nIndex = i_index; } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() throw(RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); return m_nDataColumnIndex; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(RuntimeException) { impl_set( m_nDataColumnIndex, i_dataColumnIndex, "DataColumnIndex" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL GridColumn::getImplementationName( ) throw (RuntimeException) { return OUString( "org.openoffice.comp.toolkit.GridColumn" ); @@ -277,13 +277,13 @@ namespace toolkit return aSeq; } - //------------------------------------------------------------------------------------------------------------------ + Reference< XCloneable > SAL_CALL GridColumn::createClone( ) throw (RuntimeException) { return new GridColumn( *this ); } - //------------------------------------------------------------------------------------------------------------------ + sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) throw(RuntimeException) { if ( ( i_identifier.getLength() == 16 ) && ( i_identifier == getUnoTunnelId() ) ) @@ -291,14 +291,14 @@ namespace toolkit return 0; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< sal_Int8 > GridColumn::getUnoTunnelId() throw() { static ::cppu::OImplementationId const aId; return aId.getImplementationId(); } - //------------------------------------------------------------------------------------------------------------------ + GridColumn* GridColumn::getImplementation( const Reference< XInterface >& i_component ) { Reference< XUnoTunnel > const xTunnel( i_component, UNO_QUERY ); diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 84b6000ccfa7..ce2df3a18d4b 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -67,7 +67,7 @@ namespace } } -//---------------------------------------------------------------------------------------------------------------------- + UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ) :UnoControlModel( rxContext ) { @@ -109,7 +109,7 @@ UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun:: ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN ); } -//---------------------------------------------------------------------------------------------------------------------- + UnoGridModel::UnoGridModel( const UnoGridModel& rModel ) :UnoControlModel( rModel ) { @@ -154,13 +154,13 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel ) osl_atomic_decrement( &m_refCount ); } -//---------------------------------------------------------------------------------------------------------------------- + UnoControlModel* UnoGridModel::Clone() const { return new UnoGridModel( *this ); } -//---------------------------------------------------------------------------------------------------------------------- + namespace { void lcl_dispose_nothrow( const Any& i_component ) @@ -177,7 +177,7 @@ namespace } } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridModel::dispose( ) throw(RuntimeException) { lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ) ); @@ -186,7 +186,7 @@ void SAL_CALL UnoGridModel::dispose( ) throw(RuntimeException) UnoControlModel::dispose(); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) { Any aOldSubModel; @@ -207,13 +207,13 @@ void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, lcl_dispose_nothrow( aOldSubModel ); } -//---------------------------------------------------------------------------------------------------------------------- + OUString UnoGridModel::getServiceName() throw(RuntimeException) { return OUString("com.sun.star.awt.grid.UnoControlGridModel"); } -//---------------------------------------------------------------------------------------------------------------------- + Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { switch( nPropId ) @@ -246,7 +246,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const } -//---------------------------------------------------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; @@ -258,7 +258,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return *pHelper; } -//---------------------------------------------------------------------------------------------------------------------- + // XMultiPropertySet Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo( ) throw(RuntimeException) { @@ -277,18 +277,18 @@ UnoGridControl::UnoGridControl() { } -//---------------------------------------------------------------------------------------------------------------------- + UnoGridControl::~UnoGridControl() { } -//---------------------------------------------------------------------------------------------------------------------- + OUString UnoGridControl::GetComponentServiceName() { return OUString("Grid"); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException) { lang::EventObject aEvt; @@ -297,7 +297,7 @@ void SAL_CALL UnoGridControl::dispose( ) throw(RuntimeException) UnoControl::dispose(); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer > & rParentPeer ) throw(uno::RuntimeException) { UnoControlBase::createPeer( rxToolkit, rParentPeer ); @@ -306,7 +306,7 @@ void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > xGrid->addSelectionListener( &m_aSelectionListeners ); } -//---------------------------------------------------------------------------------------------------------------------- + namespace { void lcl_setEventForwarding( const Reference< XControlModel >& i_gridControlModel, const ::boost::scoped_ptr< toolkit::GridEventForwarder >& i_listener, @@ -346,7 +346,7 @@ namespace } } -//---------------------------------------------------------------------------------------------------------------------- + sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) throw(RuntimeException) { lcl_setEventForwarding( getModel(), m_pEventForwarder, false ); @@ -356,90 +356,90 @@ sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_ return sal_True; } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getRowAtPoint( x, y ); } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getColumnAtPoint( x, y ); } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn( ) throw (RuntimeException) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getCurrentColumn(); } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow( ) throw (RuntimeException) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); return xGrid->getCurrentRow(); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException) { Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW ); xGrid->goToCell( i_columnIndex, i_rowIndex ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException ) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectRow( i_rowIndex ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::selectAllRows() throw (::com::sun::star::uno::RuntimeException) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectAllRows(); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException ) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectRow( i_rowIndex ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException) { Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectAllRows(); } -//---------------------------------------------------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (::com::sun::star::uno::RuntimeException) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->getSelectedRows(); } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (::com::sun::star::uno::RuntimeException) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->hasSelectedRows(); } -//---------------------------------------------------------------------------------------------------------------------- + ::sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException) { return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->isRowSelected( index ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException) { m_aSelectionListeners.addInterface( listener ); } -//---------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException) { m_aSelectionListeners.removeInterface( listener ); diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx index 06508169374b..cad7956ac29f 100644 --- a/toolkit/source/controls/grid/grideventforwarder.cxx +++ b/toolkit/source/controls/grid/grideventforwarder.cxx @@ -43,30 +43,30 @@ namespace toolkit //================================================================================================================== //= GridEventForwarder //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + GridEventForwarder::GridEventForwarder( UnoGridControl& i_parent ) :m_parent( i_parent ) { } - //------------------------------------------------------------------------------------------------------------------ + GridEventForwarder::~GridEventForwarder() { } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::acquire() throw() { m_parent.acquire(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::release() throw() { m_parent.release(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); @@ -74,7 +74,7 @@ namespace toolkit xPeer->rowsInserted( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); @@ -82,7 +82,7 @@ namespace toolkit xPeer->rowsRemoved( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); @@ -90,7 +90,7 @@ namespace toolkit xPeer->dataChanged( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException) { Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY ); @@ -98,7 +98,7 @@ namespace toolkit xPeer->rowHeadingChanged( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); @@ -106,7 +106,7 @@ namespace toolkit xPeer->elementInserted( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); @@ -114,7 +114,7 @@ namespace toolkit xPeer->elementRemoved( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException) { Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY ); @@ -122,7 +122,7 @@ namespace toolkit xPeer->elementReplaced( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) throw (RuntimeException) { Reference< XEventListener > xPeer( m_parent.getPeer(), UNO_QUERY ); diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx index fc53ea7c492b..1ddd53e36f3e 100644 --- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx +++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx @@ -207,7 +207,7 @@ private: return static_cast< const SortableGridDataModel* >( _pInstance )->checkInvariants(); } - //------------------------------------------------------------------------------------------------------------------ + const char* SortableGridDataModel::checkInvariants() const { if ( m_publicToPrivateRowIndex.size() != m_privateToPublicRowIndex.size() ) @@ -247,7 +247,7 @@ private: #define DBG_CHECK_ME() \ DBG_CHKTHIS( SortableGridDataModel, SortableGridDataModel_checkInvariants ) - //------------------------------------------------------------------------------------------------------------------ + namespace { template< class STLCONTAINER > @@ -262,7 +262,7 @@ private: //= SortableGridDataModel //================================================================================================================== DBG_NAME( SortableGridDataModel ) - //------------------------------------------------------------------------------------------------------------------ + SortableGridDataModel::SortableGridDataModel( Reference< XComponentContext > const & rxContext ) :SortableGridDataModel_Base( m_aMutex ) ,SortableGridDataModel_PrivateBase() @@ -278,7 +278,7 @@ private: DBG_CTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants ); } - //------------------------------------------------------------------------------------------------------------------ + SortableGridDataModel::SortableGridDataModel( SortableGridDataModel const & i_copySource ) :cppu::BaseMutex() ,SortableGridDataModel_Base( m_aMutex ) @@ -299,7 +299,7 @@ private: m_delegator.set( i_copySource.m_delegator->createClone(), UNO_QUERY_THROW ); } - //------------------------------------------------------------------------------------------------------------------ + SortableGridDataModel::~SortableGridDataModel() { if ( !rBHelper.bDisposed ) @@ -311,7 +311,7 @@ private: DBG_DTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants ); } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) throw (RuntimeException) { Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) ); @@ -320,33 +320,33 @@ private: return aReturn; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::acquire( ) throw () { SortableGridDataModel_Base::acquire(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::release( ) throw () { SortableGridDataModel_Base::release(); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Type > SAL_CALL SortableGridDataModel::getTypes( ) throw (RuntimeException) { return SortableGridDataModel_Base::getTypes(); // don't expose the types got via SortableGridDataModel_PrivateBase - they're private, after all } - //------------------------------------------------------------------------------------------------------------------ + Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId( ) throw (RuntimeException) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); } - //------------------------------------------------------------------------------------------------------------------ + namespace { Reference< XCollator > lcl_loadDefaultCollator_throw( const Reference<XComponentContext> & rxContext ) @@ -357,7 +357,7 @@ private: } } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException) { ::comphelper::ComponentGuard aGuard( *this, rBHelper ); @@ -393,7 +393,7 @@ private: m_isInitialized = true; } - //------------------------------------------------------------------------------------------------------------------ + GridDataEvent SortableGridDataModel::impl_createPublicEvent( GridDataEvent const & i_originalEvent ) const { GridDataEvent aEvent( i_originalEvent ); @@ -403,7 +403,7 @@ private: return aEvent; } - //------------------------------------------------------------------------------------------------------------------ + void SortableGridDataModel::impl_broadcast( void ( SAL_CALL XGridDataListener::*i_listenerMethod )( const GridDataEvent & ), GridDataEvent const & i_publicEvent, MethodGuard& i_instanceLock ) { @@ -415,7 +415,7 @@ private: pListeners->notifyEach( i_listenerMethod, i_publicEvent ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -433,7 +433,7 @@ private: impl_broadcast( &XGridDataListener::rowsInserted, aEvent, aGuard ); } - //------------------------------------------------------------------------------------------------------------------ + namespace { void lcl_decrementValuesGreaterThan( ::std::vector< ::sal_Int32 > & io_indexMap, sal_Int32 const i_threshold ) @@ -449,7 +449,7 @@ private: } } - //------------------------------------------------------------------------------------------------------------------ + void SortableGridDataModel::impl_rebuildIndexesAndNotify( MethodGuard& i_instanceLock ) { OSL_PRECOND( impl_isSorted_nothrow(), "SortableGridDataModel::impl_rebuildIndexesAndNotify: illegal call!" ); @@ -475,7 +475,7 @@ private: impl_broadcast( &XGridDataListener::rowsInserted, aAdditionEvent, i_instanceLock ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -536,7 +536,7 @@ private: impl_broadcast( &XGridDataListener::rowsRemoved, aEvent, aGuard ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -546,7 +546,7 @@ private: impl_broadcast( &XGridDataListener::dataChanged, aEvent, aGuard ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -556,14 +556,14 @@ private: impl_broadcast( &XGridDataListener::rowHeadingChanged, aEvent, aGuard ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::disposing( const EventObject& i_event ) throw (RuntimeException) { // not interested in OSL_UNUSED( i_event ); } - //------------------------------------------------------------------------------------------------------------------ + namespace { class CellDataLessComparison : public ::std::binary_function< sal_Int32, sal_Int32, bool > @@ -604,7 +604,7 @@ private: }; } - //------------------------------------------------------------------------------------------------------------------ + bool SortableGridDataModel::impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, sal_Bool const i_sortAscending ) { ::sal_Int32 const rowCount( getRowCount() ); @@ -650,7 +650,7 @@ private: return true; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, ::sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -672,7 +672,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SortableGridDataModel::impl_removeColumnSort_noBroadcast() { lcl_clear( m_publicToPrivateRowIndex ); @@ -682,7 +682,7 @@ private: m_sortAscending = sal_True; } - //------------------------------------------------------------------------------------------------------------------ + void SortableGridDataModel::impl_removeColumnSort( MethodGuard& i_instanceLock ) { impl_removeColumnSort_noBroadcast(); @@ -693,7 +693,7 @@ private: ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::removeColumnSort( ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -701,7 +701,7 @@ private: impl_removeColumnSort( aGuard ); } - //------------------------------------------------------------------------------------------------------------------ + css::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder( ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -710,7 +710,7 @@ private: return css::beans::Pair< ::sal_Int32, ::sal_Bool >( m_currentSortColumn, m_sortAscending ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -721,7 +721,7 @@ private: delegator->addRow( i_heading, i_data ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -732,7 +732,7 @@ private: delegator->addRows( i_headings, i_data ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException) { MethodGuard aGuard( *this, rBHelper ); @@ -746,7 +746,7 @@ private: delegator->insertRow( rowIndex, i_heading, i_data ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -760,7 +760,7 @@ private: delegator->insertRows( rowIndex, i_headings, i_data ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -773,7 +773,7 @@ private: delegator->removeRow( rowIndex ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::removeAllRows( ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -784,7 +784,7 @@ private: delegator->removeAllRows(); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -797,7 +797,7 @@ private: delegator->updateCellData( i_columnIndex, rowIndex, i_value ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -810,7 +810,7 @@ private: delegator->updateRowData( i_columnIndexes, rowIndex, i_values ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -823,7 +823,7 @@ private: delegator->updateRowHeading( rowIndex, i_heading ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -836,7 +836,7 @@ private: delegator->updateCellToolTip( i_columnIndex, rowIndex, i_value ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -849,19 +849,19 @@ private: delegator->updateRowToolTip( rowIndex, i_value ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException) { rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException) { rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener ); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -872,7 +872,7 @@ private: return delegator->getRowCount(); } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -883,7 +883,7 @@ private: return delegator->getColumnCount(); } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -896,7 +896,7 @@ private: return delegator->getCellData( i_columnIndex, rowIndex ); } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -909,7 +909,7 @@ private: return delegator->getCellToolTip( i_columnIndex, rowIndex ); } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -922,7 +922,7 @@ private: return delegator->getRowHeading( rowIndex ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -935,7 +935,7 @@ private: return delegator->getRowData( rowIndex ); } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL SortableGridDataModel::disposing() { m_currentSortColumn = -1; @@ -954,7 +954,7 @@ private: lcl_clear( m_privateToPublicRowIndex ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone( ) throw (RuntimeException) { MethodGuard aGuard( *this, rBHelper ); @@ -963,7 +963,7 @@ private: return new SortableGridDataModel( *this ); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL SortableGridDataModel::getImplementationName( ) throw (RuntimeException) { return OUString( "org.openoffice.comp.toolkit.SortableGridDataModel" ); @@ -981,7 +981,7 @@ private: return aServiceNames; } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SortableGridDataModel::impl_getPrivateRowIndex_throw( ::sal_Int32 const i_publicRowIndex ) const { if ( ( i_publicRowIndex < 0 ) || ( i_publicRowIndex >= m_delegator->getRowCount() ) ) @@ -999,7 +999,7 @@ private: return m_publicToPrivateRowIndex[ i_publicRowIndex ]; } - //------------------------------------------------------------------------------------------------------------------ + ::sal_Int32 SortableGridDataModel::impl_getPublicRowIndex_nothrow( ::sal_Int32 const i_privateRowIndex ) const { if ( !impl_isSorted_nothrow() ) diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index 56bb561517bf..38c20c01c77c 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -52,7 +52,7 @@ static void lcl_throwIndexOutOfBoundsException( ) // =================================================================== // = UnoControlRoadmapModel // =================================================================== - // ------------------------------------------------------------------- + UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XComponentContext >& i_factory ) :UnoControlRoadmapModel_Base( i_factory ) ,maContainerListeners( *this ) @@ -74,14 +74,14 @@ static void lcl_throwIndexOutOfBoundsException( ) ImplRegisterProperty( BASEPROPERTY_TEXT ); } - // ------------------------------------------------------------------- + OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException) { return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel ); } - // ------------------------------------------------------------------- + Any UnoControlRoadmapModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { Any aReturn; @@ -131,7 +131,7 @@ static void lcl_throwIndexOutOfBoundsException( ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, UnoControlRoadmapModel_IBase ) - // ------------------------------------------------------------------- + ::com::sun::star::uno::Any SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) { Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType ); @@ -141,7 +141,7 @@ static void lcl_throwIndexOutOfBoundsException( ) } - // ------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& UnoControlRoadmapModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; @@ -155,7 +155,7 @@ static void lcl_throwIndexOutOfBoundsException( ) // beans::XMultiPropertySet - // ------------------------------------------------------------------- + Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo( ) throw(RuntimeException) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); @@ -356,7 +356,7 @@ static void lcl_throwIndexOutOfBoundsException( ) // =================================================================== // = UnoRoadmapControl // =================================================================== - // ------------------------------------------------------------------- + UnoRoadmapControl::UnoRoadmapControl() :UnoControlRoadmap_Base() ,maItemListeners( *this ) @@ -385,7 +385,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >& } - // ------------------------------------------------------------------- + OUString UnoRoadmapControl::GetComponentServiceName() { return OUString("Roadmap"); diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx index 1e01e24287d6..28c0bb3c02b8 100644 --- a/toolkit/source/controls/roadmapentry.cxx +++ b/toolkit/source/controls/roadmapentry.cxx @@ -59,7 +59,7 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( ) // which has been built from the registered property of _one_ instance. } -//-------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelper::OPropertyContainer ); IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelper::OPropertyContainer ); // order matters: @@ -68,7 +68,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe // the third up to n-th (when using IMPLEMENT_FORWARD_*3 and so on) are other base classes // whose XInterface and XTypeProvider implementations should be merged -//-------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star:: beans::XPropertySetInfo > SAL_CALL ORoadmapEntry::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) @@ -95,13 +95,13 @@ sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName ) pArray[0] = "com.sun.star.awt.RoadmapItem"; return aRet; } -//-------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& ORoadmapEntry::getInfoHelper() { return *getArrayHelper(); } -//-------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* ORoadmapEntry::createArrayHelper() const { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx index a9d207d8c9b1..c93362eff131 100644 --- a/toolkit/source/controls/spinningprogress.cxx +++ b/toolkit/source/controls/spinningprogress.cxx @@ -77,43 +77,43 @@ protected: osl_atomic_decrement( &m_refCount ); } - //------------------------------------------------------------------------------------------------------------------ + SpinningProgressControlModel::SpinningProgressControlModel( const SpinningProgressControlModel& i_copySource ) :SpinningProgressControlModel_Base( i_copySource ) { } - //------------------------------------------------------------------------------------------------------------------ + SpinningProgressControlModel::~SpinningProgressControlModel() { } - //------------------------------------------------------------------------------------------------------------------ + UnoControlModel* SpinningProgressControlModel::Clone() const { return new SpinningProgressControlModel( *this ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo( ) throw(RuntimeException) { static Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException) { return OUString("com.sun.star.awt.SpinningProgressControlModel"); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL SpinningProgressControlModel::getImplementationName( ) throw(RuntimeException) { return OUString("org.openoffice.comp.toolkit.SpinningProgressControlModel"); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServiceNames(3); diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 7ddecc262ef8..63532b33f838 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -168,7 +168,7 @@ void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex throw IllegalArgumentException( OUString( WRONG_TYPE_EXCEPTION ), (OWeakObject *)this, 2 ); } -// ----------------------------------------------------------------------------- + void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { } @@ -176,14 +176,14 @@ void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Inde void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { } -// ----------------------------------------------------------------------------- + // XIndexAccess ::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount( ) throw (uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return sal_Int32( m_aTabPageVector.size()); } -// ----------------------------------------------------------------------------- + uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -191,13 +191,13 @@ uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nInde throw lang::IndexOutOfBoundsException(); return uno::makeAny(m_aTabPageVector[nIndex]); } -// ----------------------------------------------------------------------------- + // XElementAccess uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType( ) throw (uno::RuntimeException) { return ::getCppuType(static_cast< Reference< com::sun::star::awt::XControlModel>* >(NULL)); } -// ----------------------------------------------------------------------------- + ::sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements( ) throw (uno::RuntimeException) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -245,7 +245,7 @@ void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit xTPContainer->addTabPageContainerListener(&m_aTabPageListeners); } -// ------------------------------------------------------------------- + // XTabPageContainer ::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID() throw (RuntimeException) diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index c541fea8a594..5debe2d77c32 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -35,20 +35,20 @@ namespace toolkit //==================================================================== //= UnoControlScrollBarModel //==================================================================== - //-------------------------------------------------------------------- + UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) { UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXScrollBar ); } - //-------------------------------------------------------------------- + OUString UnoControlScrollBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException) { return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel ); } - //-------------------------------------------------------------------- + uno::Any UnoControlScrollBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { switch ( nPropId ) @@ -63,7 +63,7 @@ namespace toolkit } } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& UnoControlScrollBarModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; @@ -75,7 +75,7 @@ namespace toolkit return *pHelper; } - //-------------------------------------------------------------------- + uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo( ) throw(uno::RuntimeException) { static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index 871f29d8a315..7cde541f6758 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -114,7 +114,7 @@ public: //==================================================================== //= UnoSpinButtonModel //==================================================================== - //-------------------------------------------------------------------- + UnoSpinButtonModel::UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory ) :UnoControlModel( i_factory ) { @@ -140,13 +140,13 @@ public: ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE ); } - //-------------------------------------------------------------------- + OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException) { return OUString("com.sun.star.awt.UnoControlSpinButtonModel"); } - //-------------------------------------------------------------------- + Any UnoSpinButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { switch ( nPropId ) @@ -165,7 +165,7 @@ public: } } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& UnoSpinButtonModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; @@ -177,20 +177,20 @@ public: return *pHelper; } - //-------------------------------------------------------------------- + Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo( ) throw(RuntimeException) { static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } - //-------------------------------------------------------------------- + OUString SAL_CALL UnoSpinButtonModel::getImplementationName( ) throw(RuntimeException) { return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonModel" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() ); @@ -202,20 +202,20 @@ public: //==================================================================== //= UnoSpinButtonControl //==================================================================== - //-------------------------------------------------------------------- + UnoSpinButtonControl::UnoSpinButtonControl() :UnoControlBase() ,maAdjustmentListeners( *this ) { } - //-------------------------------------------------------------------- + OUString UnoSpinButtonControl::GetComponentServiceName() { return OUString("SpinButton"); } - //-------------------------------------------------------------------- + Any UnoSpinButtonControl::queryAggregation( const Type & rType ) throw(RuntimeException) { Any aRet = UnoControlBase::queryAggregation( rType ); @@ -224,10 +224,10 @@ public: return aRet; } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoSpinButtonControl, UnoControlBase, UnoSpinButtonControl_Base ) - //-------------------------------------------------------------------- + void UnoSpinButtonControl::dispose() throw(RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -247,13 +247,13 @@ public: UnoControl::dispose(); } - //-------------------------------------------------------------------- + OUString SAL_CALL UnoSpinButtonControl::getImplementationName( ) throw(RuntimeException) { return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonControl" ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException) { Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() ); @@ -262,7 +262,7 @@ public: return aServices; } - //-------------------------------------------------------------------- + void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw(RuntimeException) { UnoControl::createPeer( rxToolkit, rParentPeer ); @@ -272,7 +272,7 @@ public: xSpinnable->addAdjustmentListener( this ); } - //-------------------------------------------------------------------- + void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent ) throw(RuntimeException) { switch ( rEvent.Type ) @@ -294,27 +294,27 @@ public: } } - //-------------------------------------------------------------------- + void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); maAdjustmentListeners.addInterface( listener ); } - //-------------------------------------------------------------------- + void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); maAdjustmentListeners.removeInterface( listener ); } - //-------------------------------------------------------------------- + void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), sal_True ); } - //-------------------------------------------------------------------- + void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True ); @@ -322,7 +322,7 @@ public: ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( currentValue ), sal_True ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL UnoSpinButtonControl::getValue( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -335,19 +335,19 @@ public: return nValue; } - //-------------------------------------------------------------------- + void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True ); } - //-------------------------------------------------------------------- + void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -360,7 +360,7 @@ public: return nMin; } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -373,13 +373,13 @@ public: return nMax; } - //-------------------------------------------------------------------- + void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), sal_True ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -392,13 +392,13 @@ public: return nIncrement; } - //-------------------------------------------------------------------- + void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException) { ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), sal_True ); } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 2bd588879a6f..657cbd0c2511 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -200,23 +200,23 @@ OUString UnoTreeControl::GetComponentServiceName() return OUString("Tree"); } -// ------------------------------------------------------------------- + // ::com::sun::star::view::XSelectionSupplier -// ------------------------------------------------------------------- + sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->select( rSelection ); } -// ------------------------------------------------------------------- + Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelection(); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException) { @@ -230,7 +230,7 @@ void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSele } } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException) { @@ -244,16 +244,16 @@ void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XS maSelectionListeners.removeInterface( xListener ); } -// ------------------------------------------------------------------- + // ::com::sun::star::view::XMultiSelectionSupplier -// ------------------------------------------------------------------- + sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->addSelection(rSelection); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException) { @@ -261,7 +261,7 @@ void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (Il Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->removeSelection(rSelection); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException) { @@ -269,37 +269,37 @@ void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException) Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->clearSelection(); } -// ------------------------------------------------------------------- + sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelectionCount(); } -// ------------------------------------------------------------------- + Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createSelectionEnumeration(); } -// ------------------------------------------------------------------- + Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createReverseSelectionEnumeration(); } -// -------------------------------------------------------------------- + // XTreeControl -// -------------------------------------------------------------------- + OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultExpandedGraphicURL(); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException) { @@ -307,14 +307,14 @@ void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _def Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->setDefaultExpandedGraphicURL(_defaultexpansiongraphicurl); } -// ------------------------------------------------------------------- + OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultCollapsedGraphicURL(); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException) { @@ -322,21 +322,21 @@ void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _de Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->setDefaultCollapsedGraphicURL(_defaultcollapsedgraphicurl); } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeExpanded(xNode); } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeCollapsed(xNode); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { @@ -344,14 +344,14 @@ void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNo Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->makeNodeVisible(xNode); } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeVisible(xNode); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { @@ -359,7 +359,7 @@ void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->expandNode(xNode); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException) { @@ -367,7 +367,7 @@ void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->collapseNode(xNode); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException) { @@ -381,7 +381,7 @@ void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeEx } } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException) { @@ -395,42 +395,42 @@ void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTre maTreeExpansionListeners.removeInterface( xListener ); } -// ------------------------------------------------------------------- + Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeForLocation(x,y); } -// ------------------------------------------------------------------- + Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getClosestNodeForLocation(x,y); } -// ------------------------------------------------------------------- + awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeRect( Node ); } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL UnoTreeControl::isEditing( ) throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isEditing(); } -// ------------------------------------------------------------------- + sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException) { return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->stopEditing(); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException) { @@ -438,7 +438,7 @@ void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException) Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->cancelEditing(); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException) { @@ -446,7 +446,7 @@ void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->startEditingAtNode(xNode); } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException) { @@ -460,7 +460,7 @@ void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditLis } } -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException) { @@ -474,9 +474,9 @@ void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEdit maTreeEditListeners.removeInterface( xListener ); } -// ------------------------------------------------------------------- + // XComponent -// ------------------------------------------------------------------- + void SAL_CALL UnoTreeControl::dispose( ) throw(RuntimeException) { diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index 2a06319dcfc3..503a4c284785 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -1443,7 +1443,7 @@ Sequence< OUString > UnoControl::getSupportedServiceNames( ) throw(RuntimeExcep return Sequence< OUString >( &sName, 1 ); } -// ------------------------------------------------------------------------ + Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext( ) throw (RuntimeException) { // creation of the context will certainly require the SolarMutex ... @@ -1501,7 +1501,7 @@ void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XMod throw NoSupportException( ); } -//---------------------------------------------------------------------------------------------------------------------- + awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException) { Reference< XUnitConversion > xPeerConversion; @@ -1514,7 +1514,7 @@ awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, return awt::Point( ); } -//---------------------------------------------------------------------------------------------------------------------- + awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException) { Reference< XUnitConversion > xPeerConversion; @@ -1527,7 +1527,7 @@ awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, return awt::Point( ); } -//---------------------------------------------------------------------------------------------------------------------- + awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException) { Reference< XUnitConversion > xPeerConversion; @@ -1540,7 +1540,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sa return awt::Size( ); } -//---------------------------------------------------------------------------------------------------------------------- + awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException) { Reference< XUnitConversion > xPeerConversion; @@ -1553,7 +1553,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sa return awt::Size( ); } -//---------------------------------------------------------------------------------------------------------------------- + uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() throw (RuntimeException) { Reference< awt::XStyleSettingsSupplier > xPeerSupplier; diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx index 8c3d99ae8a5f..03f961295752 100644 --- a/toolkit/source/controls/unocontrolcontainer.cxx +++ b/toolkit/source/controls/unocontrolcontainer.cxx @@ -166,23 +166,23 @@ private: OUString impl_getFreeName_throw(); }; -//------------------------------------------------------------------------ + UnoControlHolderList::UnoControlHolderList() { } -//------------------------------------------------------------------------ + UnoControlHolderList::~UnoControlHolderList() { } -//------------------------------------------------------------------------ + UnoControlHolderList::ControlIdentifier UnoControlHolderList::addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName ) { return impl_addControl( _rxControl, _pName ); } -//------------------------------------------------------------------------ + size_t UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XControl > >& _out_rControls ) const { _out_rControls.realloc( maControls.size() ); @@ -195,7 +195,7 @@ size_t UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XC return maControls.size(); } -//------------------------------------------------------------------------ + size_t UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rIdentifiers ) const { _out_rIdentifiers.realloc( maControls.size() ); @@ -208,7 +208,7 @@ size_t UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rI return maControls.size(); } -//------------------------------------------------------------------------ + uno::Reference< awt::XControl > UnoControlHolderList::getControlForName( const OUString& _rName ) const { for ( ControlMap::const_iterator loop = maControls.begin(); @@ -220,7 +220,7 @@ uno::Reference< awt::XControl > UnoControlHolderList::getControlForName( const O return uno::Reference< awt::XControl >(); } -//------------------------------------------------------------------------ + UnoControlHolderList::ControlIdentifier UnoControlHolderList::getControlIdentifier( const uno::Reference< awt::XControl >& _rxControl ) { for ( ControlMap::iterator loop = maControls.begin(); @@ -234,7 +234,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::getControlIdentifi return -1; } -//------------------------------------------------------------------------ + bool UnoControlHolderList::getControlForIdentifier( UnoControlHolderList::ControlIdentifier _nIdentifier, uno::Reference< awt::XControl >& _out_rxControl ) const { ControlMap::const_iterator pos = maControls.find( _nIdentifier ); @@ -244,7 +244,7 @@ bool UnoControlHolderList::getControlForIdentifier( UnoControlHolderList::Contro return true; } -//------------------------------------------------------------------------ + void UnoControlHolderList::removeControlById( UnoControlHolderList::ControlIdentifier _nId ) { ControlMap::iterator pos = maControls.find( _nId ); @@ -255,7 +255,7 @@ void UnoControlHolderList::removeControlById( UnoControlHolderList::ControlIdent maControls.erase( pos ); } -//------------------------------------------------------------------------ + void UnoControlHolderList::replaceControlById( ControlIdentifier _nId, const uno::Reference< awt::XControl >& _rxNewControl ) { DBG_ASSERT( _rxNewControl.is(), "UnoControlHolderList::replaceControlById: invalid new control!" ); @@ -268,7 +268,7 @@ void UnoControlHolderList::replaceControlById( ControlIdentifier _nId, const uno pos->second.reset( new UnoControlHolder( pos->second->getName(), _rxNewControl ) ); } -//------------------------------------------------------------------------ + UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName ) { DBG_ASSERT( _rxControl.is(), "UnoControlHolderList::impl_addControl: invalid control!" ); @@ -280,7 +280,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_addControl( c return nId; } -//------------------------------------------------------------------------ + UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdentifier_throw() { for ( ControlIdentifier candidateId = 0; candidateId < ::std::numeric_limits< ControlIdentifier >::max(); ++candidateId ) @@ -292,7 +292,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti throw uno::RuntimeException("out of identifiers", NULL ); } -//------------------------------------------------------------------------ + OUString UnoControlHolderList::impl_getFreeName_throw() { OUString name( "control_" ); diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 0dcc3e0c22e1..ce0bbef0eb8c 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -1040,7 +1040,7 @@ sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw( return Sequence< OUString >( &sName, 1 ); } -// ------------------------------------------------------------------ + template <class TYPE> sal_Bool convertType(Any& _rConvertedValue, const Any& _rNewValueTest, const TYPE* /* _pTypeDisambiguation */) { diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index 62413d6f1139..b0057fee227d 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -1985,7 +1985,7 @@ private: // ===================================================================================================================== // = UnoControlListBoxModel // ===================================================================================================================== -// --------------------------------------------------------------------------------------------------------------------- + UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XComponentContext >& rxContext, ConstructorMode const i_mode ) :UnoControlListBoxModel_Base( rxContext ) ,m_pData( new UnoControlListBoxModel_Data( *this ) ) @@ -1996,7 +1996,7 @@ UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XComponentConte UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox ); } } -// --------------------------------------------------------------------------------------------------------------------- + UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource ) :UnoControlListBoxModel_Base( i_rSource ) ,m_pData( new UnoControlListBoxModel_Data( *this ) ) @@ -2008,13 +2008,13 @@ UnoControlListBoxModel::~UnoControlListBoxModel() { } IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel ) -// --------------------------------------------------------------------------------------------------------------------- + OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException) { return OUString::createFromAscii( szServiceName_UnoControlListBoxModel ); } -// --------------------------------------------------------------------------------------------------------------------- + uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const { if ( nPropId == BASEPROPERTY_DEFAULTCONTROL ) @@ -2026,7 +2026,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return UnoControlModel::ImplGetDefaultValue( nPropId ); } -// --------------------------------------------------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& UnoControlListBoxModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; @@ -2038,7 +2038,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const return *pHelper; } -// --------------------------------------------------------------------------------------------------------------------- + // beans::XMultiPropertySet uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo( ) throw(uno::RuntimeException) { @@ -2046,7 +2046,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySet return xInfo; } -// --------------------------------------------------------------------------------------------------------------------- + namespace { struct CreateListItem : public ::std::unary_function< OUString, ListItem > @@ -2058,7 +2058,7 @@ namespace }; } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception) { UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue ); @@ -2100,7 +2100,7 @@ void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int3 } } -// --------------------------------------------------------------------------------------------------------------------- + void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCount, sal_Int32* _pHandles, uno::Any* _pValues, sal_Int32* _pValidHandles ) const SAL_THROW(()) { @@ -2111,14 +2111,14 @@ void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCo UnoControlModel::ImplNormalizePropertySequence( _nCount, _pHandles, _pValues, _pValidHandles ); } -// --------------------------------------------------------------------------------------------------------------------- + ::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount() throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); return m_pData->getItemCount(); } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2131,7 +2131,7 @@ void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2143,7 +2143,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, c // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2155,7 +2155,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2166,7 +2166,7 @@ void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) thro // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (::com::sun::star::uno::RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2177,7 +2177,7 @@ void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (::com::sun::star // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2189,7 +2189,7 @@ void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, cons // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2201,7 +2201,7 @@ void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, con // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2214,7 +2214,7 @@ void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPositi // <----- SYNCHRONIZED } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, const Any& i_rDataValue ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2222,7 +2222,7 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons rItem.ItemData = i_rDataValue; } -// --------------------------------------------------------------------------------------------------------------------- + OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -2230,7 +2230,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) return rItem.ItemText; } -// --------------------------------------------------------------------------------------------------------------------- + OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -2238,7 +2238,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition return rItem.ItemImageURL; } -// --------------------------------------------------------------------------------------------------------------------- + beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); @@ -2246,7 +2246,7 @@ beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAn return beans::Pair< OUString, OUString >( rItem.ItemText, rItem.ItemImageURL ); } -// --------------------------------------------------------------------------------------------------------------------- + Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( GetMutex() ); @@ -2254,28 +2254,28 @@ Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) thro return rItem.ItemData; } -// --------------------------------------------------------------------------------------------------------------------- + Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( GetMutex() ); return m_pData->getAllItems(); } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException) { if ( i_Listener.is() ) m_aItemListListeners.addInterface( i_Listener ); } -// --------------------------------------------------------------------------------------------------------------------- + void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException) { if ( i_Listener.is() ) m_aItemListListeners.removeInterface( i_Listener ); } -// --------------------------------------------------------------------------------------------------------------------- + void UnoControlListBoxModel::impl_getStringItemList( ::std::vector< OUString >& o_rStringItems ) const { Sequence< OUString > aStringItemList; @@ -2291,7 +2291,7 @@ void UnoControlListBoxModel::impl_getStringItemList( ::std::vector< OUString >& ); } -// --------------------------------------------------------------------------------------------------------------------- + void UnoControlListBoxModel::impl_setStringItemList_nolck( const ::std::vector< OUString >& i_rStringItems ) { Sequence< OUString > aStringItems( i_rStringItems.size() ); @@ -2313,7 +2313,7 @@ void UnoControlListBoxModel::impl_setStringItemList_nolck( const ::std::vector< m_pData->m_bSettingLegacyProperty = false; } -// --------------------------------------------------------------------------------------------------------------------- + void UnoControlListBoxModel::impl_handleInsert( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText, const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify ) { @@ -2336,7 +2336,7 @@ void UnoControlListBoxModel::impl_handleInsert( const sal_Int32 i_nItemPosition, impl_notifyItemListEvent_nolck( i_nItemPosition, i_rItemText, i_rItemImageURL, &XItemListListener::listItemInserted ); } -// --------------------------------------------------------------------------------------------------------------------- + void UnoControlListBoxModel::impl_handleRemove( const sal_Int32 i_nItemPosition, ::osl::ClearableMutexGuard& i_rClearBeforeNotify ) { // SYNCHRONIZED -----> @@ -2374,7 +2374,7 @@ void UnoControlListBoxModel::impl_handleRemove( const sal_Int32 i_nItemPosition, } } -// --------------------------------------------------------------------------------------------------------------------- + void UnoControlListBoxModel::impl_handleModify( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText, const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify ) { @@ -2404,7 +2404,7 @@ void UnoControlListBoxModel::impl_handleModify( const sal_Int32 i_nItemPosition, impl_notifyItemListEvent_nolck( i_nItemPosition, i_rItemText, i_rItemImageURL, &XItemListListener::listItemModified ); } -// --------------------------------------------------------------------------------------------------------------------- + void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText, const ::boost::optional< OUString >& i_rItemImageURL, void ( SAL_CALL XItemListListener::*NotificationMethod )( const ItemListEvent& ) ) @@ -2882,7 +2882,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; } -// --------------------------------------------------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& UnoControlComboBoxModel::getInfoHelper() { static UnoPropertyArrayHelper* pHelper = NULL; diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 9ab29d0a4e75..e9d9535ed43c 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -143,23 +143,23 @@ namespace toolkit } }; - //-------------------------------------------------------------------- + AccessibleDummyFactory::AccessibleDummyFactory() { } - //-------------------------------------------------------------------- + AccessibleDummyFactory::~AccessibleDummyFactory() { } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL AccessibleDummyFactory::acquire() { return osl_atomic_increment( &m_refCount ); } - //-------------------------------------------------------------------- + oslInterlockedCount SAL_CALL AccessibleDummyFactory::release() { if ( 0 == osl_atomic_decrement( &m_refCount ) ) @@ -173,13 +173,13 @@ namespace toolkit //==================================================================== //= AccessibilityClient //==================================================================== - //-------------------------------------------------------------------- + AccessibilityClient::AccessibilityClient() :m_bInitialized( false ) { } - //-------------------------------------------------------------------- + #ifndef DISABLE_DYNLOADING extern "C" { static void SAL_CALL thisModule() {} } #else @@ -240,7 +240,7 @@ namespace toolkit m_bInitialized = true; } - //-------------------------------------------------------------------- + AccessibilityClient::~AccessibilityClient() { if ( m_bInitialized ) @@ -262,7 +262,7 @@ namespace toolkit } } - //-------------------------------------------------------------------- + IAccessibleFactory& AccessibilityClient::getFactory() { ensureInitialized(); diff --git a/toolkit/source/helper/externallock.cxx b/toolkit/source/helper/externallock.cxx index fe9081d706c7..4e4e5e92ca16 100644 --- a/toolkit/source/helper/externallock.cxx +++ b/toolkit/source/helper/externallock.cxx @@ -21,14 +21,14 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -// ----------------------------------------------------------------------------- + // class VCLExternalSolarLock -// ----------------------------------------------------------------------------- + void VCLExternalSolarLock::acquire() { Application::GetSolarMutex().acquire(); } -// ----------------------------------------------------------------------------- + void VCLExternalSolarLock::release() { Application::GetSolarMutex().release(); diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 8fc3b9695806..4a4fdf813158 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -58,7 +58,7 @@ namespace toolkitform namespace { - //-------------------------------------------------------------------- + /** determines the FormComponentType of a form control */ sal_Int16 classifyFormControl( const Reference< XPropertySet >& _rxModel ) SAL_THROW(( Exception )) @@ -77,7 +77,7 @@ namespace toolkitform return nControlType; } - //-------------------------------------------------------------------- + /** (default-)creates a PDF widget according to a given FormComponentType */ ::vcl::PDFWriter::AnyWidget* createDefaultWidget( sal_Int16 _nFormComponentType ) @@ -107,7 +107,7 @@ namespace toolkitform return NULL; } - //-------------------------------------------------------------------- + /** determines a unique number for the radio group which the given radio button model belongs to @@ -238,7 +238,7 @@ namespace toolkitform return -1; } - //-------------------------------------------------------------------- + /** copies a StringItemList to a PDF widget's list */ void getStringItemVector( const Reference< XPropertySet >& _rxModel, ::std::vector< OUString >& _rVector ) @@ -251,7 +251,7 @@ namespace toolkitform } } - //-------------------------------------------------------------------- + /** creates a PDF compatible control descriptor for the given control */ void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl, @@ -280,7 +280,7 @@ namespace toolkitform // ================================ // set the common widget properties - // -------------------------------- + // Name, Description, Text OSL_VERIFY( xModelProps->getPropertyValue( OUString(FM_PROP_NAME) ) >>= _rpDescriptor->Name ); static const OUString FM_PROP_HELPTEXT("HelpText"); @@ -295,13 +295,13 @@ namespace toolkitform if ( aText.hasValue() ) OSL_VERIFY( aText >>= _rpDescriptor->Text ); - // -------------------------------- + // readonly static const OUString FM_PROP_READONLY("ReadOnly"); if ( xPSI->hasPropertyByName( FM_PROP_READONLY ) ) OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_READONLY ) >>= _rpDescriptor->ReadOnly ); - // -------------------------------- + // border { static const OUString FM_PROP_BORDER("Border"); @@ -323,7 +323,7 @@ namespace toolkitform } } - // -------------------------------- + // background color static const OUString FM_PROP_BACKGROUNDCOLOR("BackgroundColor"); if ( xPSI->hasPropertyByName( FM_PROP_BACKGROUNDCOLOR ) ) @@ -334,7 +334,7 @@ namespace toolkitform _rpDescriptor->BackgroundColor = Color( nBackColor ); } - // -------------------------------- + // text color static const OUString FM_PROP_TEXTCOLOR("TextColor"); if ( xPSI->hasPropertyByName( FM_PROP_TEXTCOLOR ) ) @@ -344,7 +344,7 @@ namespace toolkitform _rpDescriptor->TextColor = Color( nTextColor ); } - // -------------------------------- + // text style _rpDescriptor->TextStyle = 0; // ............................ @@ -416,7 +416,7 @@ namespace toolkitform // ================================ // special widget properties - // -------------------------------- + // edits if ( _rpDescriptor->getType() == ::vcl::PDFWriter::Edit ) { @@ -452,7 +452,7 @@ namespace toolkitform } } - // -------------------------------- + // buttons if ( _rpDescriptor->getType() == ::vcl::PDFWriter::PushButton ) { @@ -516,7 +516,7 @@ namespace toolkitform pButtonWidget->TextStyle = TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER; } - // -------------------------------- + // check boxes static const OUString FM_PROP_STATE("State"); if ( _rpDescriptor->getType() == ::vcl::PDFWriter::CheckBox ) @@ -527,7 +527,7 @@ namespace toolkitform pCheckBoxWidget->Checked = ( nState != 0 ); } - // -------------------------------- + // radio buttons if ( _rpDescriptor->getType() == ::vcl::PDFWriter::RadioButton ) { @@ -547,7 +547,7 @@ namespace toolkitform } } - // -------------------------------- + // list boxes if ( _rpDescriptor->getType() == ::vcl::PDFWriter::ListBox ) { @@ -581,7 +581,7 @@ namespace toolkitform } } - // -------------------------------- + // combo boxes if ( _rpDescriptor->getType() == ::vcl::PDFWriter::ComboBox ) { @@ -595,7 +595,7 @@ namespace toolkitform // ================================ // some post-processing - // -------------------------------- + // text line ends // some controls may (always or dependent on other settings) return UNIX line ends _rpDescriptor->Text = convertLineEnd(_rpDescriptor->Text, LINEEND_CRLF); diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 38b016e9fa64..290502e0f0b5 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -292,7 +292,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow ) } } -// ---------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > UnoWrapper::CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar ) { return maAccessibleFactoryAccess.getFactory().createAccessible( pMenu, bIsMenuBar ); diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 5c03a72c331c..6b1090225aa5 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -519,13 +519,13 @@ namespace //======================================================================== //= MeasurementUnitConversion //======================================================================== -//------------------------------------------------------------------------ + sal_Int16 VCLUnoHelper::ConvertToMeasurementUnit( FieldUnit _nFieldUnit, sal_Int16 _nUNOToFieldValueFactor ) { return convertMeasurementUnit( (sal_Int16)_nFieldUnit, FieldUnitToMeasurementUnit, _nUNOToFieldValueFactor ); } -//------------------------------------------------------------------------ + FieldUnit VCLUnoHelper::ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int16& _rFieldToUNOValueFactor ) { return (FieldUnit)convertMeasurementUnit( _nMeasurementUnit, MeasurementUnitToFieldUnit, _rFieldToUNOValueFactor ); |