From 5babf1b9037eb283798322eecd8334e6ff1db655 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 3 Apr 2014 13:52:06 +0200 Subject: remove unnecessary scope qualifier from sal_Bool uses i.e. convert "::sal_Bool" to "sal_Bool" Change-Id: Ie5943aee4fee617bf2670655558927ed25b7e067 --- vbahelper/source/msforms/vbacontrols.cxx | 6 +++--- vbahelper/source/msforms/vbamultipage.cxx | 2 +- vbahelper/source/msforms/vbasystemaxcontrol.cxx | 4 ++-- vbahelper/source/msforms/vbasystemaxcontrol.hxx | 4 ++-- vbahelper/source/msforms/vbauserform.cxx | 4 ++-- vbahelper/source/msforms/vbauserform.hxx | 4 ++-- vbahelper/source/vbahelper/vbaapplicationbase.cxx | 4 ++-- vbahelper/source/vbahelper/vbacommandbar.cxx | 12 ++++++------ vbahelper/source/vbahelper/vbacommandbar.hxx | 16 ++++++++-------- vbahelper/source/vbahelper/vbacommandbarcontrol.cxx | 10 +++++----- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 12 ++++++------ vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 2 +- vbahelper/source/vbahelper/vbadocumentsbase.cxx | 6 +++--- vbahelper/source/vbahelper/vbashaperange.cxx | 10 +++++----- vbahelper/source/vbahelper/vbashapes.cxx | 2 +- 15 files changed, 49 insertions(+), 49 deletions(-) (limited to 'vbahelper') diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index bd73c504904b..effbe48dc133 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -118,7 +118,7 @@ public: return cppu::UnoType::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !mControls.empty() ); } @@ -136,7 +136,7 @@ public: return msNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { ControlIndexMap::iterator it = mIndices.find( aName ); return it != mIndices.end(); @@ -186,7 +186,7 @@ public: mfOffsetY( fOffsetY ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index c072df9ea91f..0bacf378c7f8 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -47,7 +47,7 @@ public: //return cppu::UnoType::get(); return cppu::UnoType::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mnPages > 0 ); } diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx index a0fd441cb955..016224a05755 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx @@ -57,14 +57,14 @@ uno::Any SAL_CALL VbaSystemAXControl::getValue( const OUString& aPropertyName ) } -::sal_Bool SAL_CALL VbaSystemAXControl::hasMethod( const OUString& aName ) +sal_Bool SAL_CALL VbaSystemAXControl::hasMethod( const OUString& aName ) throw ( uno::RuntimeException, std::exception ) { return m_xControlInvocation->hasMethod( aName ); } -::sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const OUString& aName ) +sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const OUString& aName ) throw ( uno::RuntimeException, std::exception ) { return m_xControlInvocation->hasProperty( aName ); diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index a201b63546fa..e6fcdae8c917 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx @@ -39,8 +39,8 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams, ::com::sun::star::uno::Sequence< ::sal_Int16 >& aOutParamIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw ( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; diff --git a/vbahelper/source/msforms/vbauserform.cxx b/vbahelper/source/msforms/vbauserform.cxx index 85a12654cb5a..1fbb096492aa 100644 --- a/vbahelper/source/msforms/vbauserform.cxx +++ b/vbahelper/source/msforms/vbauserform.cxx @@ -272,7 +272,7 @@ ScVbaUserForm::getValue( const OUString& aPropertyName ) throw (beans::UnknownPr return aResult; } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaUserForm::hasMethod( const OUString& /*aName*/ ) throw (uno::RuntimeException, std::exception) { return sal_False; @@ -289,7 +289,7 @@ ScVbaUserForm::Controls( const uno::Any& index ) throw (uno::RuntimeException, s return uno::makeAny( xControls ); } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaUserForm::hasProperty( const OUString& aName ) throw (uno::RuntimeException, std::exception) { uno::Reference< awt::XControl > xControl( m_xDialog, uno::UNO_QUERY ); diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index f9d41df2bba7..2684f8ea96db 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -61,8 +61,8 @@ public: // XIntrospection virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence getServiceNames() SAL_OVERRIDE; diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 450f7b156b4a..af4febcc537d 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -239,7 +239,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: return; } -::sal_Bool SAL_CALL VbaApplicationBase::getInteractive() +sal_Bool SAL_CALL VbaApplicationBase::getInteractive() throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); @@ -249,7 +249,7 @@ VbaApplicationBase::setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (uno:: return xWindow->isEnabled(); } -void SAL_CALL VbaApplicationBase::setInteractive( ::sal_Bool bInteractive ) +void SAL_CALL VbaApplicationBase::setInteractive( sal_Bool bInteractive ) throw (uno::RuntimeException, std::exception) { uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW ); diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index 73079d1741cb..47fedfabdb69 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -73,7 +73,7 @@ ScVbaCommandBar::setName( const OUString& _name ) throw (uno::RuntimeException, pCBarHelper->ApplyChange( m_sResourceUrl, m_xBarSettings ); } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaCommandBar::getVisible() throw (uno::RuntimeException, std::exception) { // menu bar is always visible in OOo @@ -97,7 +97,7 @@ ScVbaCommandBar::getVisible() throw (uno::RuntimeException, std::exception) return bVisible; } void SAL_CALL -ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException, std::exception) +ScVbaCommandBar::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) { try { @@ -119,7 +119,7 @@ ScVbaCommandBar::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException, } } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaCommandBar::getEnabled() throw (uno::RuntimeException, std::exception) { // emulated with Visible @@ -209,18 +209,18 @@ void SAL_CALL VbaDummyCommandBar::setName( const OUString& _name ) throw (uno::R maName = _name; } -::sal_Bool SAL_CALL VbaDummyCommandBar::getVisible() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VbaDummyCommandBar::getVisible() throw (uno::RuntimeException, std::exception) { // #STUB return sal_True; } -void SAL_CALL VbaDummyCommandBar::setVisible( ::sal_Bool /*_visible*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL VbaDummyCommandBar::setVisible( sal_Bool /*_visible*/ ) throw (uno::RuntimeException, std::exception) { // #STUB } -::sal_Bool SAL_CALL VbaDummyCommandBar::getEnabled() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VbaDummyCommandBar::getEnabled() throw (uno::RuntimeException, std::exception) { // emulated with Visible return getVisible(); diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index 04b1c8d93eec..bb7dce3bb4c8 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -48,10 +48,10 @@ public: // Attributes virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -77,10 +77,10 @@ public: // Attributes virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx index 08dbbf8d4d19..af58dc43b897 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.cxx @@ -75,7 +75,7 @@ ScVbaCommandBarControl::setOnAction( const OUString& _onaction ) throw (uno::Run } } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException, std::exception) { sal_Bool bVisible = sal_True; @@ -85,7 +85,7 @@ ScVbaCommandBarControl::getVisible() throw (uno::RuntimeException, std::exceptio return bVisible; } void SAL_CALL -ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException, std::exception) +ScVbaCommandBarControl::setVisible( sal_Bool _visible ) throw (uno::RuntimeException, std::exception) { uno::Any aValue = getPropertyValue( m_aPropertyValues, ITEM_DESCRIPTOR_ISVISIBLE ); if( aValue.hasValue() ) @@ -95,7 +95,7 @@ ScVbaCommandBarControl::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeExc } } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaCommandBarControl::getEnabled() throw (uno::RuntimeException, std::exception) { sal_Bool bEnabled = sal_True; @@ -129,7 +129,7 @@ ScVbaCommandBarControl::setEnabled( sal_Bool _enabled ) throw (uno::RuntimeExcep } } -::sal_Bool SAL_CALL +sal_Bool SAL_CALL ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException, std::exception) { // TODO: need to check if the item before this item is of type 'separator' @@ -138,7 +138,7 @@ ScVbaCommandBarControl::getBeginGroup() throw (css::uno::RuntimeException, std:: } void SAL_CALL -ScVbaCommandBarControl::setBeginGroup( ::sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception) +ScVbaCommandBarControl::setBeginGroup( sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception) { if( getBeginGroup() != _begin ) { diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index 1c96499cc057..bde9de7e458e 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -53,12 +53,12 @@ public: virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getBeginGroup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setBeginGroup( ::sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnabled( sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getBeginGroup() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBeginGroup( sal_Bool _begin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ov::office::MsoControlType::msoControlButton; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 2dc1b1dc072d..a12250489e6a 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -261,7 +261,7 @@ public: // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return false; } }; diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 9981fd4023f3..5d0efd42a75a 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -93,7 +93,7 @@ public: m_it = m_documents.begin(); } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_it != m_documents.end(); } @@ -170,7 +170,7 @@ public: return cppu::UnoType::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return (!m_documents.empty()); } @@ -196,7 +196,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index 7a2b965ac093..3ae554b6c434 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -34,7 +34,7 @@ class VbShapeRangeEnumHelper : public EnumerationHelper_BASE sal_Int32 nIndex; public: VbShapeRangeEnumHelper( const uno::Reference< XCollection >& xParent, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } @@ -244,7 +244,7 @@ uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() t throw uno::RuntimeException(); } -::sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaShapeRange::getLockAspectRatio() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -255,7 +255,7 @@ uno::Reference< ov::msforms::XFillFormat > SAL_CALL ScVbaShapeRange::getFill() t throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaShapeRange::setLockAspectRatio( sal_Bool _lockaspectratio ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) @@ -265,7 +265,7 @@ void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) } } -::sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScVbaShapeRange::getLockAnchor() throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; /* ++index unreachable */ ) @@ -276,7 +276,7 @@ void SAL_CALL ScVbaShapeRange::setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw uno::RuntimeException(); } -void SAL_CALL ScVbaShapeRange::setLockAnchor( ::sal_Bool _lockanchor ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScVbaShapeRange::setLockAnchor( sal_Bool _lockanchor ) throw (uno::RuntimeException, std::exception) { sal_Int32 nLen = getCount(); for ( sal_Int32 index = 1; index <= nLen; ++index ) diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 1f3287c6052b..b630eca180f0 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -49,7 +49,7 @@ class VbShapeEnumHelper : public EnumerationHelper_BASE sal_Int32 nIndex; public: VbShapeEnumHelper( const uno::Reference< msforms::XShapes >& xParent, const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } -- cgit v1.2.3