diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-13 09:14:39 +0000 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-11-02 17:58:08 +0100 |
| commit | c5f85e8229852cf3edcef6836880a113658ef1c2 (patch) | |
| tree | 81ee543f566fb06445b8b2ead44b467e85b84f11 | |
| parent | 25e9f0b9a6689c5f77d01cd23634c36975637245 (diff) | |
rework SfxCharmapCtrl to be a PopupWindowController
With MSVC, the changes to include/sfx2/charmappopup.hxx would cause spurious
> isvt.lib(svtlo.dll) : error LNK2005: "public: virtual class com::sun::star::uno::Any __cdecl cppu::ImplInheritanceHelper<class svt::ToolboxController,class com::sun::star::lang::XServiceInfo>::queryInterface(class com::sun::star::uno::Type const &)" (?queryInterface@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z) already defined in classificationcontroller.o
> isvt.lib(svtlo.dll) : error LNK2005: "public: virtual void __cdecl cppu::ImplInheritanceHelper<class svt::ToolboxController,class com::sun::star::lang::XServiceInfo>::acquire(void)" (?acquire@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAAXXZ) already defined in classificationcontroller.o
> isvt.lib(svtlo.dll) : error LNK2005: "public: virtual void __cdecl cppu::ImplInheritanceHelper<class svt::ToolboxController,class com::sun::star::lang::XServiceInfo>::release(void)" (?release@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAAXXZ) already defined in classificationcontroller.o
when linking Library_sfx (and which appears to be unrelated to the (implicit)
/INCREMENTAL since 9739c37d8ad7c6fca269709674a6975fa7ebd191 "enable incremental
linking on windows"), which requires the HACK in
include/svtools/popupwindowcontroller.hxx.
(cherry picked from commit 94c1f5cfb96a826220b64608cf0ada76d3bdde31)
[ Picked just the MSVC hack, nothing else, this seems to be needed for
my local MSVC build, but strangely it's not needed on Jenkins. ]
Change-Id: I74c4318e6216001f18d0cf5ed63e78ba2ab13cd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105187
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | include/svtools/popupwindowcontroller.hxx | 10 | ||||
| -rw-r--r-- | svtools/source/uno/popupwindowcontroller.cxx | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/svtools/popupwindowcontroller.hxx b/include/svtools/popupwindowcontroller.hxx index 41de1cbee9c7..719f79f6200c 100644 --- a/include/svtools/popupwindowcontroller.hxx +++ b/include/svtools/popupwindowcontroller.hxx @@ -36,8 +36,14 @@ namespace svt { class PopupWindowControllerImpl; -class SVT_DLLPUBLIC PopupWindowController : public cppu::ImplInheritanceHelper< svt::ToolboxController, - css::lang::XServiceInfo > +//HACK to avoid duplicate ImplInheritanceHelper symbols with MSVC: +class SAL_DLLPUBLIC_TEMPLATE PopupWindowController_Base: + public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo> +{ + using ImplInheritanceHelper::ImplInheritanceHelper; +}; + +class SVT_DLLPUBLIC PopupWindowController : public PopupWindowController_Base { public: PopupWindowController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 14f1cfc382f5..a909de5eda04 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -156,7 +156,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin PopupWindowController::PopupWindowController( const Reference< uno::XComponentContext >& rxContext, const Reference< frame::XFrame >& xFrame, const OUString& aCommandURL ) -: ImplInheritanceHelper( rxContext, xFrame, aCommandURL ) +: PopupWindowController_Base( rxContext, xFrame, aCommandURL ) , mxImpl( new PopupWindowControllerImpl() ) { } |