diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-13 12:49:53 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-02 11:24:17 +0200 |
| commit | 3af4e1a0825c5b11ae4ef58fc411378aab669387 (patch) | |
| tree | 93ade9e533d4b034ea42460e2b3f0e003edf85a0 /vcl/inc | |
| parent | 1698debed2993fc5f262aa3ebbdb32fc112ac556 (diff) | |
Implement MacOSX VCL backend as plugin
Change-Id: Ie90af62eff146064c3b066a8f7ca1c3a69f44c39
Reviewed-on: https://gerrit.libreoffice.org/61102
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/bmpfast.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/salinst.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/vclpluginapi.h | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/vcl/inc/bmpfast.hxx b/vcl/inc/bmpfast.hxx index 6e5e22544c5d..f9a1f891bb47 100644 --- a/vcl/inc/bmpfast.hxx +++ b/vcl/inc/bmpfast.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_VCL_INC_BMPFAST_HXX #define INCLUDED_VCL_INC_BMPFAST_HXX +#include <vcl/dllapi.h> + class BitmapWriteAccess; class BitmapReadAccess; struct BitmapBuffer; @@ -29,7 +31,7 @@ struct SalTwoRect; // the bmpfast functions have signatures with good compatibility to // their canonic counterparts, which employ the GetPixel/SetPixel methods -bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc, +VCL_DLLPUBLIC bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc, const SalTwoRect& rTwoRect ); bool ImplFastBitmapBlending( BitmapWriteAccess const & rDst, diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 9f20394fe4e6..1418ef4ef859 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -216,10 +216,6 @@ void DeInitSalData(); // called from Application-Dtor void InitSalMain(); -#ifdef MACOSX -void postInitVCLinitNSApp(); -#endif - #endif // INCLUDED_VCL_INC_SALINST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h index 88defd3972d6..fb3350e43a1f 100644 --- a/vcl/inc/vclpluginapi.h +++ b/vcl/inc/vclpluginapi.h @@ -47,6 +47,12 @@ #define VCLPLUG_KDE5_PUBLIC SAL_DLLPUBLIC_IMPORT #endif +#if defined VCLPLUG_OSX_IMPLEMENTATION +#define VCLPLUG_OSX_PUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define VCLPLUG_OSX_PUBLIC SAL_DLLPUBLIC_IMPORT +#endif + #if defined VCLPLUG_QT5_IMPLEMENTATION #define VCLPLUG_QT5_PUBLIC SAL_DLLPUBLIC_EXPORT #else |