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 /framework/source/uifactory | |
| 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 'framework/source/uifactory')
4 files changed, 8 insertions, 8 deletions
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 713f95cc32c0..2b2653ba8f2c 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <rtl/ref.hxx> @@ -51,7 +51,7 @@ using namespace framework; namespace { -class AddonsToolBarFactory : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo , +class AddonsToolBarFactory : public ::cppu::WeakImplHelper< css::lang::XServiceInfo , css::ui::XUIElementFactory > { public: diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index c962987aa069..3cacf9078ebc 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -26,7 +26,7 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> using namespace css::uno; @@ -38,7 +38,7 @@ using namespace framework; namespace { -typedef ::cppu::WeakComponentImplHelper2< +typedef ::cppu::WeakComponentImplHelper< css::lang::XServiceInfo, css::frame::XUIControllerFactory > UIControllerFactory_BASE; diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index 39483ee956f3..e4dc53875c61 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -36,7 +36,7 @@ #include <rtl/ustrbuf.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> @@ -347,7 +347,7 @@ bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aEleme namespace { -typedef ::cppu::WeakComponentImplHelper2< +typedef ::cppu::WeakComponentImplHelper< css::lang::XServiceInfo, css::ui::XUIElementFactoryManager> UIElementFactoryManager_BASE; diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index a72fae45bf6e..699042ae83bd 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/diagnose_ex.h> @@ -40,7 +40,7 @@ using namespace framework; namespace { -typedef ::cppu::WeakComponentImplHelper2< +typedef ::cppu::WeakComponentImplHelper< com::sun::star::lang::XServiceInfo, com::sun::star::lang::XSingleComponentFactory > WindowContentFactoryManager_BASE; |