strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix windows --enable-mergelibs build

Browse source 
after
    commit b663d94cf6
    Author: Noel Grandin <noel.grandin@collabora.co.uk>
    Date:   Mon Feb 5 08:50:24 2024 +0200
    create --enable-mergelibs=more

Change-Id: Ib9f0b3b28df70a9bab10d9bb0aa77a2b2decc616
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163308
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-02-13 16:15:43 +02:00 committed by Noel Grandin
parent 29c9587df7
commit 34a09df2d1
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
comphelper/source/misc/errcode.cxx
View file

@ -21,7 +21,7 @@
#include <rtl/ustrbuf.hxx>
#include <o3tl/runtimetooustring.hxx>
COMPHELPER_DLLPUBLIC OUString ErrCode::toString() const
UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OUString ErrCode::toString() const
{
std::u16string_view pWarningError;
if (IsWarning())
@ -150,7 +150,7 @@ COMPHELPER_DLLPUBLIC std::ostream& operator<<(std::ostream& os, const ErrCode& e
return os;
}
COMPHELPER_DLLPUBLIC OUString ErrCodeMsg::toString() const
UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OUString ErrCodeMsg::toString() const
{
OUString s = mnCode.toString();
if (!maArg1.isEmpty())

3
include/basegfx/utils/systemdependentdata.hxx
View file

@ -9,7 +9,6 @@
#pragma once
#include <config_options.h>
#include <sal/types.h>
#include <basegfx/basegfxdllapi.h>
#include <memory>
@ -42,7 +41,7 @@ namespace basegfx
virtual void flushAll() = 0;
};
class UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) SystemDependentData
class BASEGFX_DLLPUBLIC SystemDependentData
{
private:
// noncopyable

2
include/comphelper/seqstream.hxx
View file

@ -33,7 +33,7 @@ namespace comphelper
{
/** Base class for wrappers around memory data that want to be exposed as an XInputStream */
class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) MemoryInputStream
class COMPHELPER_DLLPUBLIC MemoryInputStream
: public ::cppu::WeakImplHelper< css::io::XInputStream, css::io::XSeekable >,
public comphelper::ByteReader
{

2
include/editeng/unoedsrc.hxx
View file

@ -138,7 +138,7 @@ public:
SvxEditSource::UpdateData(). This copies back the data to the model's
EditTextObject/OutlinerParaObject.
*/
class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) SvxTextForwarder
class EDITENG_DLLPUBLIC SvxTextForwarder
{
public:
virtual ~SvxTextForwarder() COVERITY_NOEXCEPT_FALSE;

2
include/vcl/toolkit/field.hxx
View file

@ -160,7 +160,7 @@ private:
};
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) MetricFormatter : public NumericFormatter
class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter
{
public:
virtual ~MetricFormatter() override;

2
vcl/inc/headless/CairoCommon.hxx
View file

@ -20,7 +20,7 @@
#pragma once
#include <sal/config.h>
#include <config_options.h>
#include <cairo.h>
#include <vcl/dllapi.h>