basctl/source/basicide/basidectrlr.cxx | 2 +- comphelper/source/property/propertycontainer.cxx | 2 +- connectivity/source/drivers/evoab2/NResultSet.cxx | 2 +- dbaccess/source/core/api/column.cxx | 2 +- include/comphelper/interaction.hxx | 2 +- include/comphelper/propagg.hxx | 2 +- include/comphelper/propertycontainer.hxx | 2 +- include/comphelper/proxyaggregation.hxx | 2 +- include/svtools/toolbarmenu.hxx | 5 +++-- include/toolkit/controls/geometrycontrolmodel.hxx | 8 ++++---- svtools/source/control/toolbarmenu.cxx | 3 +-- svtools/source/uno/genericunodialog.cxx | 2 +- svtools/source/uno/toolboxcontroller.cxx | 2 +- svx/source/tbxctrls/extrusioncontrols.cxx | 8 ++++---- svx/source/tbxctrls/extrusioncontrols.hxx | 8 ++++---- svx/source/tbxctrls/fontworkgallery.cxx | 8 ++++---- toolkit/source/controls/geometrycontrolmodel.cxx | 2 +- vcl/source/window/layout.cxx | 1 - 18 files changed, 31 insertions(+), 32 deletions(-)
New commits: commit edab999feb2a51068725c69e8add9a897539e78a Author: Stephan Bergmann <[email protected]> Date: Fri Mar 14 17:57:04 2014 +0100 Remove SAL_INFO that was meant as a temporary SAL_DEBUG Change-Id: I6d3b822c7a44a2cddb842266494a387ed693fd61 diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index d8ab4c6..4da3a8f 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2208,7 +2208,6 @@ bool MessageDialog::set_property(const OString &rKey, const OString &rValue) } else if (rKey == "buttons") { - SAL_INFO("vcl.layout", "buttons type mode " << rValue); VclButtonsType eMode = VCL_BUTTONS_NONE; if (rValue.equals("none")) eMode = VCL_BUTTONS_NONE; commit e1d99bc0d52a7f03597a8d5400a3578dacf54bbf Author: Stephan Bergmann <[email protected]> Date: Fri Mar 14 17:56:03 2014 +0100 ToolbarMenu does not implement XStatusListener Change-Id: Ia0195e794ac5e23905035738f0ab7e658c3bb92b diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 52e4318..61853ac 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -100,8 +100,9 @@ protected: bool IsInPopupMode(); void EndPopupMode(); - // XStatusListener (subclasses must override this one to get the status updates - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + // Forwared from XStatusListener (subclasses must override this one to get + // the status updates): + virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); void StateChanged( StateChangedType nType ); void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 9efa518..6fa1785 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1568,8 +1568,7 @@ void ToolbarMenu::AddStatusListener( const OUString& rCommandURL ) -// XStatusListener (subclasses must override this one to get the status updates -void SAL_CALL ToolbarMenu::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& /*Event*/ ) throw ( ::com::sun::star::uno::RuntimeException ) +void ToolbarMenu::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& /*Event*/ ) throw ( ::com::sun::star::uno::RuntimeException ) { } diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index c94dec0..1ae9cd8 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -168,7 +168,7 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE -void SAL_CALL ExtrusionDirectionWindow::statusChanged( +void ExtrusionDirectionWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { @@ -387,7 +387,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) -void SAL_CALL ExtrusionDepthWindow::statusChanged( +void ExtrusionDepthWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { @@ -658,7 +658,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) -void SAL_CALL ExtrusionLightingWindow::statusChanged( +void ExtrusionLightingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { @@ -853,7 +853,7 @@ void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) -void SAL_CALL ExtrusionSurfaceWindow::statusChanged( +void ExtrusionSurfaceWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 70b703f..4697bf6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -42,7 +42,7 @@ class ExtrusionDirectionWindow : public svtools::ToolbarMenu public: ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); private: @@ -108,7 +108,7 @@ private: public: ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -159,7 +159,7 @@ private: public: ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -200,7 +200,7 @@ private: public: ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 3cbcae1..29cfb35 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -309,7 +309,7 @@ class FontworkAlignmentWindow : public ToolbarMenu public: FontworkAlignmentWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ); - virtual void SAL_CALL statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ); + virtual void statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); private: @@ -368,7 +368,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled ) -void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ) +void FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException ) { if( Event.FeatureURL.Main.equals( msFontworkAlignment ) ) { @@ -503,7 +503,7 @@ class FontworkCharacterSpacingWindow : public ToolbarMenu public: FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); private: svt::ToolboxController& mrController; @@ -581,7 +581,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool b -void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) ) { commit 462a2ef92a7136e93d1d58045b176ad46b62348b Author: Stephan Bergmann <[email protected]> Date: Fri Mar 14 17:18:33 2014 +0100 Mark overriding OGeometryControlModel class template mem funs as SAL_OVERRIDE Change-Id: I24947b132c3579a5dee33becd11e0059558eecbd diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx index 302b642..3c71444 100644 --- a/include/toolkit/controls/geometrycontrolmodel.hxx +++ b/include/toolkit/controls/geometrycontrolmodel.hxx @@ -195,17 +195,17 @@ namespace com { namespace sun { namespace star { virtual void fillProperties( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rProps, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& _rAggregateProps - ) const; + ) const SAL_OVERRIDE; // OPropertySetAggregationHelper overridables - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OGeometryControlModel_Base virtual OGeometryControlModel_Base* createClone_Impl( - ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance); + ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable >& _rxAggregateInstance) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; commit ffbe0107e70184079d1042446a7c47cd260b6b43 Author: Stephan Bergmann <[email protected]> Date: Fri Mar 14 16:56:14 2014 +0100 No need for OPropertySetAggregationHelper::disposing() to be virtual ("overriding" OPropertyStateHelper::disposing(), which is likewise non-virtual) Change-Id: I767225afb4a07ae4d93493e7b894979eb98e294b diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index 8ec9e4d..75eb1e1 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -259,7 +259,7 @@ protected: ~OPropertySetAggregationHelper(); virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; - virtual void SAL_CALL disposing(); + void disposing(); sal_Int32 getOriginalHandle( sal_Int32 _nHandle ) const; OUString getPropertyName( sal_Int32 _nHandle ) const; commit 98666e8625de06dbd78d208dff71a9891a62b700 Author: Stephan Bergmann <[email protected]> Date: Fri Mar 14 16:33:46 2014 +0100 No need for a virtual OPropertyContainer::getTypes (and rename to getBaseTypes for clarity) Change-Id: Icfe6202eea9b1f4ec2e46ade3fc8e001ca6b649f diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index 1ed82b4..c20d4b3 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.cxx @@ -82,7 +82,7 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::ex { Sequence< Type > aTypes = ::comphelper::concatSequences( SfxBaseController::getTypes(), - OPropertyContainer::getTypes() + getBaseTypes() ); return aTypes; diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index b2e5fed..83a6eae 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -52,7 +52,7 @@ OPropertyContainer::~OPropertyContainer() } -Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std::exception) { // just the types from our one and only base class ::cppu::OTypeCollection aTypes( diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index a79eb5b..a4f67af 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -732,7 +732,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException, { return ::comphelper::concatSequences( OResultSet_BASE::getTypes(), - ::comphelper::OPropertyContainer::getTypes() + getBaseTypes() ); } diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index b998686..fb5e449 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -80,7 +80,7 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException, std::exception) { return ::comphelper::concatSequences( OColumnBase::getTypes(), - ::comphelper::OPropertyContainer::getTypes() + getBaseTypes() ); } diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx index 2f620e9..a674e2b 100644 --- a/include/comphelper/propertycontainer.hxx +++ b/include/comphelper/propertycontainer.hxx @@ -49,7 +49,7 @@ protected: OPropertyContainer(::cppu::OBroadcastHelper& _rBHelper); /// for scripting : the types of the interfaces supported by this class - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > getBaseTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); // OPropertySetHelper overridables virtual sal_Bool SAL_CALL convertFastPropertyValue( diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index ba58a62..7714200 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -93,7 +93,7 @@ Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes( ) throw(RuntimeException, { return ::comphelper::concatSequences( OGenericUnoDialogBase::getTypes(), - ::comphelper::OPropertyContainer::getTypes() + getBaseTypes() ); } diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 95addd7..a7ebe11 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -153,7 +153,7 @@ css::uno::Sequence<css::uno::Type> ToolboxController::getTypes() throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence<css::uno::Type> s1(ToolboxController_Base::getTypes()); - css::uno::Sequence<css::uno::Type> s2(OPropertyContainer::getTypes()); + css::uno::Sequence<css::uno::Type> s2(getBaseTypes()); sal_Int32 n = s1.getLength(); s1.realloc(n + s2.getLength()); for (sal_Int32 i = 0; i != s2.getLength(); ++i) { diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx index 650b631..786e0b3 100644 --- a/toolkit/source/controls/geometrycontrolmodel.cxx +++ b/toolkit/source/controls/geometrycontrolmodel.cxx @@ -139,7 +139,7 @@ // our own types Sequence< Type > aTypes = ::comphelper::concatSequences( OPropertySetAggregationHelper::getTypes(), - OPropertyContainer::getTypes(), + getBaseTypes(), OGCM_Base::getTypes() ); commit 849fb80648a95048e20f54d9411b7f7b405eaa25 Author: Stephan Bergmann <[email protected]> Date: Fri Mar 14 16:05:48 2014 +0100 Mark overriding OInteraction class template member function as SAL_OVERRIDE Change-Id: I1fe694c38b583b9169ee246cdcb9cbeb9bd31542 diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx index 2031772..9fbfb2d 100644 --- a/include/comphelper/interaction.hxx +++ b/include/comphelper/interaction.hxx @@ -73,7 +73,7 @@ namespace comphelper OInteraction() { } // XInteractionContinuation - virtual void SAL_CALL select( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL select( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; }; commit 92e7274891966c95b827793b599dc094ddd48c5e Author: Stephan Bergmann <[email protected]> Date: Fri Mar 14 15:36:36 2014 +0100 A minimal improvement ...in the mess that is OComponentProxyAggregationHelper and its derived classes dispose/disposing functions. Change-Id: Ic22ab85e86ad6657a5e06027d4fd8ea600367891 diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx index 8f95f71..ad950dc 100644 --- a/include/comphelper/proxyaggregation.hxx +++ b/include/comphelper/proxyaggregation.hxx @@ -168,7 +168,7 @@ namespace comphelper virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; private: COMPHELPER_DLLPRIVATE OComponentProxyAggregationHelper( ); // never implemented _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
