[Libreoffice-commits] core.git: include/unotools

[Stephan Bergmann (via logerrit)]

 include/unotools/ZipPackageHelper.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a9d7625d215d9f9417a2207327a741618d3de82
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jul 28 09:38:09 2021 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 28 10:54:07 2021 +0200

    ZipPackageHelper is now used in Library_cui outside Library_merged
    
    ...since 6cb3c79b84e396959a982070f6fc4d439a9c396d "Added the feature to store
    VCL test results as a zip file", see e.g. failed
    <https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1627450201.2981>:
    
    > 61078         /tinderbox/buildslave/build/workdir/CxxObject/cui/source/dialogs/GraphicTestsDialog.o: In function `GraphicsTestsDialog::HandleDownloadRequest(weld::Button&)´:
    > 61079         /tinderbox/buildslave/source/libo-master/cui/source/dialogs/GraphicTestsDialog.cxx:87: undefined reference to `utl::ZipPackageHelper::ZipPackageHelper(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, rtl::OUString const&)´
    > 61080         /tinderbox/buildslave/source/libo-master/cui/source/dialogs/GraphicTestsDialog.cxx:88: undefined reference to `utl::ZipPackageHelper::getRootFolder()´
    > 61081         /tinderbox/buildslave/source/libo-master/cui/source/dialogs/GraphicTestsDialog.cxx:88: undefined reference to `utl::ZipPackageHelper::addFolderWithContent(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, rtl::OUString const&)´
    > 61082         /tinderbox/buildslave/source/libo-master/cui/source/dialogs/GraphicTestsDialog.cxx:89: undefined reference to `utl::ZipPackageHelper::savePackage()´
    > 61083 NEXT    collect2: error: ld returned 1 exit status
    > 61084 NEXT    make[1]: *** [/tinderbox/buildslave/source/libo-master/cui/Library_cui.mk:10: /tinderbox/buildslave/build/instdir/program/libcuilo.so] Error 1
    
    Change-Id: Ia7af3bd4ed23adb8cadd66fb20ce8914040eb901
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119582
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx
index f647fed4083a..69eb7205cd8a 100644
--- a/include/unotools/ZipPackageHelper.hxx
+++ b/include/unotools/ZipPackageHelper.hxx
@@ -30,7 +30,7 @@ namespace com::sun::star::uno { class XComponentContext; }
 
 namespace utl {
 
-class UNLESS_MERGELIBS(UNOTOOLS_DLLPUBLIC) ZipPackageHelper
+class UNOTOOLS_DLLPUBLIC ZipPackageHelper
 {
 public:
     ZipPackageHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext,