comphelper/source/misc/ihwrapnofilter.cxx | 10 ------- include/comphelper/ihwrapnofilter.hxx | 11 -------- include/comphelper/weakeventlistener.hxx | 4 +-- include/toolkit/awt/vclxgraphics.hxx | 12 ++++----- toolkit/source/awt/vclxwindow.cxx | 27 ++------------------- ucb/source/sorter/sortdynres.cxx | 4 +-- ucb/source/sorter/sortdynres.hxx | 4 +-- writerfilter/source/dmapper/TextEffectsHandler.cxx | 4 +++ 8 files changed, 19 insertions(+), 57 deletions(-)
New commits: commit d7c1a65dd64504e7a910150e577c10ef3658d08b Author: Stephan Bergmann <[email protected]> Date: Thu Mar 13 12:49:37 2014 +0100 Missing include Change-Id: I98c098f45bcc9f1c250826c371d52b7524aa59e7 diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index 36db317..7c1aa24 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -8,6 +8,10 @@ * */ +#include <sal/config.h> + +#include <map> + #include <TextEffectsHandler.hxx> #include <rtl/ustrbuf.hxx> commit 81c9fe933e4aed25b0fe801c1fea856f02381282 Author: Stephan Bergmann <[email protected]> Date: Thu Mar 13 12:07:50 2014 +0100 Getter members of VCLXGraphics not in XGraphics need not be virtual Change-Id: Ia67fc51120068d5ae0f6d47d7716e7fb6f62c748 diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 9b60927..dea8264 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -95,17 +95,17 @@ public: // ::com::sun::star::awt::XGraphics Attributes virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTextColor() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 getTextColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTextFillColor() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 getTextFillColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLineColor() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 getLineColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getFillColor() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 getFillColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::RasterOperation SAL_CALL getRasterOp() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::RasterOperation getRasterOp() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > getFont() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& _font ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception); commit 6e469f76bb94ae08b758f8a0e1acbf8ee9d51c3f Author: Stephan Bergmann <[email protected]> Date: Thu Mar 13 12:04:04 2014 +0100 Remove unused VCLXWindowImpl parts Change-Id: I6b26243e9669c791fdf1bd68193675ca780d41ee diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index ee84c9a..9b5ff6b 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -60,6 +60,7 @@ #include <toolkit/helper/unopropertyarrayhelper.hxx> #include <boost/bind.hpp> +#include <boost/noncopyable.hpp> using namespace ::com::sun::star; @@ -84,7 +85,7 @@ namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior; //= VCLXWindowImpl -class VCLXWindowImpl +class VCLXWindowImpl: private boost::noncopyable { private: typedef ::std::vector< VCLXWindow::Callback > CallbackArray; @@ -183,19 +184,10 @@ public: inline VclContainerListenerMultiplexer& getContainerListeners() { return maContainerListeners; } inline TopWindowListenerMultiplexer& getTopWindowListeners() { return maTopWindowListeners; } - virtual ~VCLXWindowImpl(); - -protected: - virtual void SAL_CALL acquire(); - virtual void SAL_CALL release(); + ~VCLXWindowImpl(); private: DECL_LINK( OnProcessCallbacks, void* ); - -private: - VCLXWindowImpl(); // never implemented - VCLXWindowImpl( const VCLXWindowImpl& ); // never implemented - VCLXWindowImpl& operator=( const VCLXWindowImpl& ); // never implemented }; @@ -313,19 +305,6 @@ 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; commit fb542379d4242f278af1f13f866bf11fbc651ab5 Author: Stephan Bergmann <[email protected]> Date: Wed Mar 12 18:00:54 2014 +0100 Mark overriding OWeakListenerAdapter class template mem funs as SAL_OVERRIDE Change-Id: I8cfc2eeb8b9fd7f00c17e03871d1fed504c0bbf6 diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx index 7ed2bb8..89876fa 100644 --- a/include/comphelper/weakeventlistener.hxx +++ b/include/comphelper/weakeventlistener.hxx @@ -117,12 +117,12 @@ namespace comphelper } // XEventListener overridables - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: // OComponentHelper overridables // to be overridden, again - the derived class should revoke the listener from the broadcaster - virtual void SAL_CALL disposing( ) = 0; + virtual void SAL_CALL disposing( ) SAL_OVERRIDE = 0; }; commit 61c44a9929f496c4e5cd14c3647cb75391d83e0b Author: Stephan Bergmann <[email protected]> Date: Wed Mar 12 17:04:03 2014 +0100 comphelper::OIHWrapNoFilterDialog does not implement XInitialization Change-Id: Idce153607c3deb3f0a1809b9d18cbcc6f30cf04d diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx index 4f9d5f5..c0fa0b8 100644 --- a/comphelper/source/misc/ihwrapnofilter.cxx +++ b/comphelper/source/misc/ihwrapnofilter.cxx @@ -89,16 +89,6 @@ namespace comphelper } } - - // XInitialization - - void SAL_CALL OIHWrapNoFilterDialog::initialize( const uno::Sequence< uno::Any >& ) - throw ( uno::Exception, - uno::RuntimeException, - frame::DoubleInitializationException ) - { - } - // XServiceInfo OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName() throw ( uno::RuntimeException, std::exception ) diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx index db29268..d7fb2a8 100644 --- a/include/comphelper/ihwrapnofilter.hxx +++ b/include/comphelper/ihwrapnofilter.hxx @@ -23,9 +23,7 @@ #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/frame/DoubleInitializationException.hpp> #include <cppuhelper/implbase2.hxx> #include <comphelper/comphelperdllapi.h> @@ -61,15 +59,6 @@ namespace comphelper { throw( com::sun::star::uno::RuntimeException, std::exception ); - // XInitialization - - - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw ( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, - ::com::sun::star::frame::DoubleInitializationException ) ; - - // XServiceInfo commit 86fc293a4fea63d21e5afe717c18ee9419211fe3 Author: Stephan Bergmann <[email protected]> Date: Wed Mar 12 16:58:32 2014 +0100 No need for SortedDynamicResultSet::impl_* to be virtual Change-Id: Ib9b84b7ac3205498c0502945b26c40a75e97c935 diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 07f7dc6..c222638 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -287,7 +287,7 @@ sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities() update call at once is, while he disposes his broadcaster or while he is removing himsef as listener (otherwise you deadlock)!!! */ -void SAL_CALL SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) +void SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) throw( RuntimeException ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -417,7 +417,7 @@ void SAL_CALL SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) // XEventListener -void SAL_CALL SortedDynamicResultSet::impl_disposing( const EventObject& ) +void SortedDynamicResultSet::impl_disposing( const EventObject& ) throw( RuntimeException ) { mxListener.clear(); diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index eb5bbb6..ba05cb9 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -126,10 +126,10 @@ public: // own methods: - virtual void SAL_CALL impl_disposing( const css::lang::EventObject& Source ) + void impl_disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException ); - virtual void SAL_CALL impl_notify( const css::ucb::ListEvent& Changes ) + void impl_notify( const css::ucb::ListEvent& Changes ) throw( css::uno::RuntimeException ); }; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
