editeng/CppunitTest_editeng_editeng.mk | 3 +-- editeng/inc/editdoc.hxx | 2 +- editeng/source/editeng/eeobj.hxx | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 03f4b87a6f1214f33e61a25091c73ab70155bd8c Author: Miklos Vajna <vmik...@collabora.com> AuthorDate: Thu Jul 31 13:39:18 2025 +0200 Commit: Miklos Vajna <vmik...@collabora.com> CommitDate: Fri Aug 1 09:56:40 2025 +0200 CppunitTest_editeng_editeng: avoid gb_CppunitTest_use_library_objects It leads to ODR violation since 006c8f2d7517965657a9caca1fa7afd757f2f4c5 (tdf#166882 - sd odf clipboard: fix missing copy/pasted graphic bullets, 2025-07-30), see <https://gerrit.libreoffice.org/c/core/+/188532/7#message-87c0be80800615710c3411e7adf686c6ac1eb36f>. Change-Id: Ia9ef2fb970d05873d7d40f460c8ed09fb709e4c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188655 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergm...@collabora.com> Reviewed-by: Miklos Vajna <vmik...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188730 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> diff --git a/editeng/CppunitTest_editeng_editeng.mk b/editeng/CppunitTest_editeng_editeng.mk index 38cbc9543db6..073ea92f86fa 100644 --- a/editeng/CppunitTest_editeng_editeng.mk +++ b/editeng/CppunitTest_editeng_editeng.mk @@ -15,14 +15,13 @@ $(eval $(call gb_CppunitTest_add_exception_objects,editeng_editeng, \ editeng/qa/editeng/editeng \ )) -$(eval $(call gb_CppunitTest_use_library_objects,editeng_editeng,editeng)) - $(eval $(call gb_CppunitTest_use_libraries,editeng_editeng, \ basegfx \ comphelper \ cppu \ cppuhelper \ docmodel \ + editeng \ i18nlangtag \ i18nutil \ lng \ diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx index 5a8aa8054b8f..291aba8f4fb5 100644 --- a/editeng/inc/editdoc.hxx +++ b/editeng/inc/editdoc.hxx @@ -223,7 +223,7 @@ inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, std::siz void CheckOrderedList(const CharAttribList::AttribsType& rAttribs); #endif -class EditEngineItemPool final : public SfxItemPool +class EDITENG_DLLPUBLIC EditEngineItemPool final : public SfxItemPool { public: EditEngineItemPool(); diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx index de06f1b703da..3f5fcc388d7c 100644 --- a/editeng/source/editeng/eeobj.hxx +++ b/editeng/source/editeng/eeobj.hxx @@ -19,12 +19,13 @@ #pragma once +#include <editeng/editengdllapi.h> #include <cppuhelper/implbase.hxx> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <tools/stream.hxx> -class EditDataObject : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable> +class EDITENG_DLLPUBLIC EditDataObject : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable> { private: SvMemoryStream maRTFData;