vbahelper/source/msforms/vbabutton.cxx | 2 +- vbahelper/source/msforms/vbacheckbox.cxx | 2 +- vbahelper/source/msforms/vbacontrol.cxx | 6 +++--- vbahelper/source/msforms/vbacontrol.hxx | 14 +++++++------- vbahelper/source/msforms/vbaframe.cxx | 2 +- vbahelper/source/msforms/vbalabel.cxx | 6 +++--- vbahelper/source/msforms/vbamultipage.cxx | 2 +- vbahelper/source/msforms/vbaprogressbar.cxx | 2 +- vbahelper/source/msforms/vbaradiobutton.cxx | 2 +- vbahelper/source/msforms/vbaradiobutton.hxx | 2 +- vbahelper/source/msforms/vbascrollbar.cxx | 2 +- vbahelper/source/msforms/vbaspinbutton.cxx | 2 +- vbahelper/source/msforms/vbasystemaxcontrol.hxx | 12 ++++++------ vbahelper/source/msforms/vbatogglebutton.cxx | 2 +- vbahelper/source/msforms/vbauserform.hxx | 16 ++++++++-------- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 2 +- vbahelper/source/vbahelper/vbadocumentsbase.cxx | 4 ++-- 17 files changed, 40 insertions(+), 40 deletions(-)
New commits: commit 89ac4f6255bc9734d1b34bc2994bf275fa1b011f Author: Noel Grandin <[email protected]> Date: Tue Nov 17 16:03:55 2015 +0200 com::sun::star->css in vbahelper/ Change-Id: I7ab89b01cf6817b365a02e73d4635dfdb5b40440 Reviewed-on: https://gerrit.libreoffice.org/20022 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/vbahelper/source/msforms/vbabutton.cxx b/vbahelper/source/msforms/vbabutton.cxx index 0738333..a7f1672 100644 --- a/vbahelper/source/msforms/vbabutton.cxx +++ b/vbahelper/source/msforms/vbabutton.cxx @@ -37,7 +37,7 @@ VbaButton::getCaption() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -VbaButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) +VbaButton::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) ); } diff --git a/vbahelper/source/msforms/vbacheckbox.cxx b/vbahelper/source/msforms/vbacheckbox.cxx index bd00682..e00270f 100644 --- a/vbahelper/source/msforms/vbacheckbox.cxx +++ b/vbahelper/source/msforms/vbacheckbox.cxx @@ -38,7 +38,7 @@ ScVbaCheckbox::getCaption() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaCheckbox::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaCheckbox::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) ); } diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 98f935d..a687bff 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -427,7 +427,7 @@ void SAL_CALL ScVbaControl::setTag( const OUString& aTag ) m_aControlTag = aTag; } -::sal_Int32 SAL_CALL ScVbaControl::getForeColor() throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL ScVbaControl::getForeColor() throw (css::uno::RuntimeException) { sal_Int32 nForeColor = -1; m_xProps->getPropertyValue( "TextColor" ) >>= nForeColor; @@ -491,7 +491,7 @@ static Pointer lcl_msoPointerToLOPointer( long msoPointerStyle ) } ::sal_Int32 SAL_CALL -ScVbaControl::getMousePointer() throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaControl::getMousePointer() throw (css::uno::RuntimeException, std::exception) { PointerStyle eType = PointerStyle::Arrow; // default ? vcl::Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); @@ -503,7 +503,7 @@ ScVbaControl::getMousePointer() throw (::com::sun::star::uno::RuntimeException, } void SAL_CALL -ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaControl::setMousePointer( ::sal_Int32 _mousepointer ) throw (css::uno::RuntimeException, std::exception) { vcl::Window* pWindow = VCLUnoHelper::GetWindow( getWindowPeer() ); if ( pWindow ) diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index 800ce39..36051a4 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -37,8 +37,8 @@ typedef InheritedHelperInterfaceWeakImpl< ov::msforms::XControl > ControlImpl_BA class ScVbaControl : public ControlImpl_BASE { private: - com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > m_xEventListener; - com::sun::star::uno::Reference< com::sun::star::awt::XControl > m_xEmptyFormControl; + css::uno::Reference< css::lang::XEventListener > m_xEventListener; + css::uno::Reference< css::awt::XControl > m_xEmptyFormControl; protected: // awt control has nothing similar to Tag property of Mso controls, // whether it is necessary is another question @@ -78,8 +78,8 @@ public: virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL SetFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Move( double Left, double Top, const ::com::sun::star::uno::Any& Width, const ::com::sun::star::uno::Any& Height ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL fireEvent( const css::script::ScriptEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Move( double Left, double Top, const css::uno::Any& Width, const css::uno::Any& Height ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL fireEvent( const css::script::ScriptEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getControlSource() throw (css::uno::RuntimeException, std::exception) override; @@ -94,11 +94,11 @@ public: virtual void SAL_CALL setTag( const OUString& aTag ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getTabIndex() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setTabIndex( sal_Int32 nTabIndex ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMousePointer() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getMousePointer() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMousePointer( ::sal_Int32 _mousepointer ) throw (css::uno::RuntimeException, std::exception) override; //remove resource because ooo.vba.excel.XControl is a wrapper of com.sun.star.drawing.XControlShape void removeResource() throw( css::uno::RuntimeException ); - virtual ::sal_Int32 SAL_CALL getForeColor() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getForeColor() throw (css::uno::RuntimeException); //XHelperInterface virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; diff --git a/vbahelper/source/msforms/vbaframe.cxx b/vbahelper/source/msforms/vbaframe.cxx index 756b82d..775b381 100644 --- a/vbahelper/source/msforms/vbaframe.cxx +++ b/vbahelper/source/msforms/vbaframe.cxx @@ -47,7 +47,7 @@ OUString SAL_CALL ScVbaFrame::getCaption() throw (css::uno::RuntimeException, st return Label; } -void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL ScVbaFrame::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) ); } diff --git a/vbahelper/source/msforms/vbalabel.cxx b/vbahelper/source/msforms/vbalabel.cxx index fc62e69..eb714c8 100644 --- a/vbahelper/source/msforms/vbalabel.cxx +++ b/vbahelper/source/msforms/vbalabel.cxx @@ -37,7 +37,7 @@ ScVbaLabel::getCaption() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaLabel::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaLabel::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) ); } @@ -48,7 +48,7 @@ ScVbaLabel::getValue() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaLabel::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaLabel::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) { OUString sCaption; _value >>= sCaption; @@ -63,7 +63,7 @@ ScVbaLabel::getAccelerator() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaLabel::setAccelerator( const OUString& /*_accelerator*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaLabel::setAccelerator( const OUString& /*_accelerator*/ ) throw (css::uno::RuntimeException, std::exception) { // #STUB } diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 4251c5a..605e1bc 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -78,7 +78,7 @@ ScVbaMultiPage::getValue() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaMultiPage::setValue( const sal_Int32 _value ) throw (css::uno::RuntimeException, std::exception) { // Openoffice 1 based tab index sal_Int32 nVal = _value + 1; diff --git a/vbahelper/source/msforms/vbaprogressbar.cxx b/vbahelper/source/msforms/vbaprogressbar.cxx index 8d223af..7d7bbf2 100644 --- a/vbahelper/source/msforms/vbaprogressbar.cxx +++ b/vbahelper/source/msforms/vbaprogressbar.cxx @@ -36,7 +36,7 @@ ScVbaProgressBar::getValue() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaProgressBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaProgressBar::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( SVALUE, _value ); } diff --git a/vbahelper/source/msforms/vbaradiobutton.cxx b/vbahelper/source/msforms/vbaradiobutton.cxx index 4f62e84..27984d7 100644 --- a/vbahelper/source/msforms/vbaradiobutton.cxx +++ b/vbahelper/source/msforms/vbaradiobutton.cxx @@ -37,7 +37,7 @@ ScVbaRadioButton::getCaption() throw (css::uno::RuntimeException, std::exception } void SAL_CALL -ScVbaRadioButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaRadioButton::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) ); } diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx index 7ee2059..d688430 100644 --- a/vbahelper/source/msforms/vbaradiobutton.hxx +++ b/vbahelper/source/msforms/vbaradiobutton.hxx @@ -33,7 +33,7 @@ public: virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue(const com::sun::star::uno::Any&) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setValue(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< ov::msforms::XNewFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; //XHelperInterface virtual OUString getServiceImplName() override; diff --git a/vbahelper/source/msforms/vbascrollbar.cxx b/vbahelper/source/msforms/vbascrollbar.cxx index c9c846f..520b0af 100644 --- a/vbahelper/source/msforms/vbascrollbar.cxx +++ b/vbahelper/source/msforms/vbascrollbar.cxx @@ -34,7 +34,7 @@ ScVbaScrollBar::getValue() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaScrollBar::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaScrollBar::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "ScrollValue", _value ); } diff --git a/vbahelper/source/msforms/vbaspinbutton.cxx b/vbahelper/source/msforms/vbaspinbutton.cxx index 440b072..7a6eda2 100644 --- a/vbahelper/source/msforms/vbaspinbutton.cxx +++ b/vbahelper/source/msforms/vbaspinbutton.cxx @@ -34,7 +34,7 @@ ScVbaSpinButton::getValue() throw (css::uno::RuntimeException, std::exception) } void SAL_CALL -ScVbaSpinButton::setValue( const uno::Any& _value ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaSpinButton::setValue( const uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "SpinValue", _value ); } diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index b2e85c7..5dde95a 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx @@ -35,12 +35,12 @@ public: VbaSystemAXControl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::uno::XInterface >& xControl, const css::uno::Reference< css::frame::XModel >& xModel, ov::AbstractGeometryAttributes* pGeomHelper ); // XInvocation - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - 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 ) 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 ) 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 ) override; - virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw ( css::uno::RuntimeException, std::exception ) 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 ) override; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw ( css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw ( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ) override; //XHelperInterface virtual OUString getServiceImplName() override; diff --git a/vbahelper/source/msforms/vbatogglebutton.cxx b/vbahelper/source/msforms/vbatogglebutton.cxx index f108bac..6a34fd7 100644 --- a/vbahelper/source/msforms/vbatogglebutton.cxx +++ b/vbahelper/source/msforms/vbatogglebutton.cxx @@ -44,7 +44,7 @@ ScVbaToggleButton::getCaption() throw (css::uno::RuntimeException, std::exceptio } void SAL_CALL -ScVbaToggleButton::setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) +ScVbaToggleButton::setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) { m_xProps->setPropertyValue( "Label", uno::makeAny( _caption ) ); } diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index 3419c7c..b08454c 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -47,17 +47,17 @@ public: virtual void SAL_CALL Show( ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getInnerWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInnerWidth( double fInnerWidth ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getInnerHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInnerHeight( double fInnerHeight ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getInnerWidth() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInnerWidth( double fInnerWidth ) throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getInnerHeight() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInnerHeight( double fInnerHeight ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL Hide( ) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL UnloadObject( ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL Controls( const css::uno::Any& index ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getVisible() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool bVis ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisible( sal_Bool bVis ) throw (css::uno::RuntimeException, std::exception) override; // XIntrospection virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) 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) override; diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 87249d8..003610c 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -266,7 +266,7 @@ public: // XElementAccess virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { return cppu::UnoType<XCommandBarControl>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override { return false; } }; diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index f83f549..c5a5477 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -112,8 +112,8 @@ public: // => ctor, createEnumeration & factory method need be defined ( to be called // by getByIndex, getByName ) typedef ::cppu::WeakImplHelper< container::XEnumerationAccess - , com::sun::star::container::XIndexAccess - , com::sun::star::container::XNameAccess + , css::container::XIndexAccess + , css::container::XNameAccess > DocumentsAccessImpl_BASE; class DocumentsAccessImpl : public DocumentsAccessImpl_BASE _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
