diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-14 10:23:57 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-14 10:46:14 +0000 |
| commit | 431f2ce81893db21f23572926e8a5b045c67e9ae (patch) | |
| tree | 6ea4842720498966bbf22d135756a64ee9505280 /include/framework | |
| parent | 48c4810edf302c1f0593328535f065ed338e0a18 (diff) | |
framework: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I6acff50f23bcbac58c689caf2a7f07dbd5404e57
Reviewed-on: https://gerrit.libreoffice.org/17734
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/framework')
| -rw-r--r-- | include/framework/interaction.hxx | 5 | ||||
| -rw-r--r-- | include/framework/preventduplicateinteraction.hxx | 4 | ||||
| -rw-r--r-- | include/framework/titlehelper.hxx | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx index aa43a855ed36..f3cbe3d1b3e4 100644 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <rtl/ustring.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <framework/fwedllapi.h> @@ -55,8 +54,6 @@ namespace framework{ @implements XInteractionRequest - @base WeakImplHelper1 - @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ @@ -81,8 +78,6 @@ class FWE_DLLPUBLIC RequestFilterSelect @implements XInteractionRequest - @base WeakImplHelper1 - @devstatus ready to use @threadsafe no (used on once position only!) *//*-*************************************************************************************************************/ diff --git a/include/framework/preventduplicateinteraction.hxx b/include/framework/preventduplicateinteraction.hxx index 449e07eb8203..99e3a03fa32f 100644 --- a/include/framework/preventduplicateinteraction.hxx +++ b/include/framework/preventduplicateinteraction.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; @@ -52,7 +52,7 @@ struct ThreadHelpBase2 }; class FWE_DLLPUBLIC PreventDuplicateInteraction : private ThreadHelpBase2 - ,public ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 > + ,public ::cppu::WeakImplHelper< css::task::XInteractionHandler2 > { // structs, types etc. diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index 817c8ecb5ab0..b239ec53ae30 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/weakref.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustrbuf.hxx> @@ -51,7 +51,7 @@ namespace framework{ @threadsafe */ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex - , public ::cppu::WeakImplHelper5< css::frame::XTitle , + , public ::cppu::WeakImplHelper< css::frame::XTitle , css::frame::XTitleChangeBroadcaster, css::frame::XTitleChangeListener , css::frame::XFrameActionListener , |