vcl/Library_vclplug_qt5.mk | 4 +--
vcl/inc/fontselect.hxx | 2 -
vcl/inc/fontsubset.hxx | 2 -
vcl/inc/helpwin.hxx | 2 -
vcl/inc/opengl/FixedTextureAtlas.hxx | 3 ++
vcl/inc/opengl/PackedTextureAtlas.hxx | 3 ++
vcl/inc/qt5/Qt5Frame.hxx | 2 +
vcl/inc/qt5/Qt5Graphics.hxx | 4 +++
vcl/inc/qt5/Qt5Instance.hxx | 35 +++++++++++++++++++++++++++++++---
vcl/inc/qt5/Qt5Printer.hxx | 2 +
vcl/inc/qt5/Qt5System.hxx | 14 ++++++++++++-
vcl/inc/salprn.hxx | 3 ++
vcl/inc/salsys.hxx | 2 -
vcl/inc/sft.hxx | 10 ++++-----
vcl/inc/svdata.hxx | 2 -
vcl/inc/unx/geninst.h | 5 ++++
vcl/inc/vclpluginapi.h | 6 +++++
vcl/inc/win/salprn.h | 2 -
vcl/inc/win/salsys.h | 4 ++-
vcl/qt5/Qt5Instance.cxx | 28 +++++++++++++++++++++++++++
vcl/qt5/Qt5Instance_Print.cxx | 14 +++++--------
vcl/qt5/Qt5Printer.cxx | 5 ++--
vcl/win/app/salinst.cxx | 8 ++++++-
vcl/win/plugadapt/salplug.cxx | 7 ------
24 files changed, 134 insertions(+), 35 deletions(-)
New commits:
commit af83477ea96c26029a170fe8d88dbf773cff2084
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Sep 10 18:43:36 2018 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Sep 10 18:43:46 2018 +0200
more link and compile fixes
initial working win plugin, still crashes on shutdown.
Change-Id: If8d69fcd8807215617d0604bf89f834602dde4ee
diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 491c10985a34..c46856d5db9f 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -97,13 +97,13 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_qt5,\
vcl/qt5/Qt5Menu \
vcl/qt5/Qt5Object \
vcl/qt5/Qt5Painter \
- vcl/qt5/Qt5System \
+ vcl/qt5/Qt5Printer \
+ $(if $(USING_X11),vcl/qt5/Qt5System) \
vcl/qt5/Qt5Timer \
vcl/qt5/Qt5Tools \
vcl/qt5/Qt5VirtualDevice \
vcl/qt5/Qt5Widget \
))
-# vcl/qt5/Qt5Printer \
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_qt5,\
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 3821627c17ae..626b36521f78 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -114,7 +114,9 @@ public:
void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32
nExtentsWidth,
sal_Int32 nExtentsHeight) const;
+#ifndef _WIN32
virtual void InitSvpSalGraphics(SvpSalGraphics* pSvpSalGraphics);
+#endif
virtual SalGraphics* AcquireGraphics() override;
virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index e68e55e8a5ef..5064e2677640 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <vclpluginapi.h>
-#include <unx/geninst.h>
#include <salusereventlist.hxx>
#include <osl/conditn.hxx>
@@ -31,8 +30,27 @@ class QApplication;
class SalYieldMutex;
class SalFrame;
+#ifndef _WIN32
+#include <unx/geninst.h>
+#else
+#include <salinst.hxx>
+#include <comphelper/solarmutex.hxx>
+
+class SalYieldMutex : public comphelper::SolarMutex
+{
+ SalYieldMutex( const SalYieldMutex& ) = delete;
+ SalYieldMutex& operator=( const SalYieldMutex& ) = delete;
+
+public:
+ SalYieldMutex();
+};
+
+#endif
+
class VCLPLUG_QT5_PUBLIC Qt5Instance : public QObject,
- public SalGenericInstance,
+// moc doesn't understand _WIN32
+// public SalGenericInstance,
+ public SalInstance,
public SalUserEventList
{
Q_OBJECT
@@ -41,6 +59,10 @@ class VCLPLUG_QT5_PUBLIC Qt5Instance : public QObject,
int m_postUserEventId;
const bool m_bUseCairo;
+#ifdef _WIN32
+ std::unique_ptr<SalYieldMutex> m_pSalYieldMutex;
+#endif
+
public:
std::unique_ptr<QApplication> m_pQApplication;
std::unique_ptr<char* []> m_pFakeArgvFreeable;
@@ -78,7 +100,13 @@ public:
virtual void GetPrinterQueueState(SalPrinterQueueInfo* pInfo) override;
virtual void DeletePrinterQueueInfo(SalPrinterQueueInfo* pInfo) override;
virtual OUString GetDefaultPrinter() override;
+#ifndef _WIN32
virtual void PostPrintersChanged() override;
+#endif
+
+ virtual comphelper::SolarMutex* GetYieldMutex() override;
+ virtual sal_uInt32 ReleaseYieldMutexAll() override;
+ virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 )
override;
virtual std::unique_ptr<SalMenu> CreateMenu(bool, Menu*) override;
virtual std::unique_ptr<SalMenuItem> CreateMenuItem(const SalItemParams&)
override;
@@ -96,8 +124,9 @@ public:
virtual void AddToRecentDocumentList(const OUString& rFileUrl, const
OUString& rMimeType,
const OUString& rDocumentService)
override;
-
+#ifndef _WIN32
virtual GenPspGraphics* CreatePrintGraphics() override;
+#endif
virtual bool IsMainThread() const override;
diff --git a/vcl/inc/qt5/Qt5Printer.hxx b/vcl/inc/qt5/Qt5Printer.hxx
index cca670231dcc..4fcae075fe3c 100644
--- a/vcl/inc/qt5/Qt5Printer.hxx
+++ b/vcl/inc/qt5/Qt5Printer.hxx
@@ -22,9 +22,11 @@
#ifndef _WIN32
#include <unx/genprn.h>
#else
+#include <WinDef.h>
#include <win/salprn.h>
#endif
+class Point;
class SalFrame;
class Qt5Printer
diff --git a/vcl/inc/qt5/Qt5System.hxx b/vcl/inc/qt5/Qt5System.hxx
index 0d51bb29f358..6bd732956137 100644
--- a/vcl/inc/qt5/Qt5System.hxx
+++ b/vcl/inc/qt5/Qt5System.hxx
@@ -10,15 +10,27 @@
#pragma once
#include <vcl/sysdata.hxx>
+
+#ifndef _WIN32
#include <unx/gensys.h>
+#else
+#include <win/salsys.h>
+#endif
-class Qt5System : public SalGenericSystem
+class Qt5System
+#ifndef _WIN32
+ : public SalGenericSystem
+#else
+ : public WinSalSystem
+#endif
{
public:
+#ifndef _WIN32
virtual unsigned int GetDisplayScreenCount() override;
virtual tools::Rectangle GetDisplayScreenPosSizePixel(unsigned int
nScreen) override;
virtual int ShowNativeDialog(const OUString& rTitle, const OUString&
rMessage,
const std::vector<OUString>& rButtons)
override;
+#endif
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 014f61179b47..d9669793655d 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -86,6 +86,9 @@ public:
class VCL_PLUGIN_PUBLIC SalPrinter
{
+ SalPrinter( const SalPrinter& ) = delete;
+ SalPrinter& operator=( const SalPrinter& ) = delete;
+
public:
SalPrinter() {}
virtual ~SalPrinter();
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index e7ed0efb2498..3105ab341b02 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -26,7 +26,10 @@
#include <vclpluginapi.h>
#include <salinst.hxx>
#include <saldatabasic.hxx>
+
+#ifndef _WIN32
#include <unx/genprn.h>
+#endif
class VCL_DLLPUBLIC SalYieldMutex : public comphelper::SolarMutex
{
@@ -78,9 +81,11 @@ public:
static void RegisterFontSubstitutors( PhysicalFontCollection*
pFontCollection );
protected:
+#ifndef _WIN32
static void configurePspInfoPrinter( PspSalInfoPrinter* pInfoPrinter,
SalPrinterQueueInfo const *
pQueueInfo,
ImplJobSetup* pSetupData );
+#endif
};
inline SalGenericInstance *GetGenericInstance()
diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h
index e8677d239937..88defd3972d6 100644
--- a/vcl/inc/vclpluginapi.h
+++ b/vcl/inc/vclpluginapi.h
@@ -59,6 +59,12 @@
#define VCLPLUG_SVP_PUBLIC SAL_DLLPUBLIC_IMPORT
#endif
+#if defined VCLPLUG_WIN_IMPLEMENTATION
+#define VCLPLUG_WIN_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_WIN_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
#if defined DESKTOP_DETECTOR_IMPLEMENTATION
#define DESKTOP_DETECTOR_PUBLIC SAL_DLLPUBLIC_EXPORT
#else
diff --git a/vcl/inc/win/salprn.h b/vcl/inc/win/salprn.h
index c0c6e7fb7932..ef8737acc1f4 100644
--- a/vcl/inc/win/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -70,7 +70,7 @@ public:
};
-class WinSalPrinter : public SalPrinter
+class SAL_DLLPUBLIC_EXPORT WinSalPrinter : public SalPrinter
{
public:
WinSalGraphics* mpGraphics; // current Printer graphics
diff --git a/vcl/inc/win/salsys.h b/vcl/inc/win/salsys.h
index 03f627b5abb2..2563ee422777 100644
--- a/vcl/inc/win/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -25,7 +25,7 @@
#include <vector>
#include <map>
-class WinSalSystem : public SalSystem
+class SAL_DLLPUBLIC_EXPORT WinSalSystem : public SalSystem
{
public:
struct DisplayMonitor
@@ -41,10 +41,12 @@ public:
{
}
};
+
private:
std::vector<DisplayMonitor> m_aMonitors;
std::map<OUString, unsigned int> m_aDeviceNameToMonitor;
unsigned int m_nPrimary;
+
public:
WinSalSystem() : m_nPrimary( 0 ) {}
virtual ~WinSalSystem() override;
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 0a3b6b0bce86..7f2372ad96ae 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -43,10 +43,21 @@
#include <headless/svpbmp.hxx>
+#ifdef _WIN32
+SalYieldMutex::SalYieldMutex() {}
+#endif
+
Qt5Instance::Qt5Instance(std::unique_ptr<SalYieldMutex> pMutex, bool bUseCairo)
+#ifndef _WIN32
: SalGenericInstance(std::move(pMutex))
+#else
+ : SalInstance()
+#endif
, m_postUserEventId(-1)
, m_bUseCairo(bUseCairo)
+#ifdef _WIN32
+ , m_pSalYieldMutex( std::move(pMutex) )
+#endif
{
ImplSVData* pSVData = ImplGetSVData();
if (bUseCairo)
@@ -71,6 +82,21 @@ Qt5Instance::~Qt5Instance()
free(m_pFakeArgvFreeable[i]);
}
+comphelper::SolarMutex* Qt5Instance::GetYieldMutex()
+{
+ return m_pSalYieldMutex.get();
+}
+
+sal_uInt32 Qt5Instance::ReleaseYieldMutexAll()
+{
+ return m_pSalYieldMutex.get()->release( true/*bUnlockAll*/ );
+}
+
+void Qt5Instance::AcquireYieldMutex( sal_uInt32 nCount )
+{
+ m_pSalYieldMutex.get()->acquire( nCount );
+}
+
SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/,
SalFrameStyleFlags nStyle)
{
return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
@@ -133,9 +159,11 @@ SalSystem* Qt5Instance::CreateSalSystem() { return new
Qt5System; }
std::shared_ptr<SalBitmap> Qt5Instance::CreateSalBitmap()
{
+#ifndef _WIN32
if (m_bUseCairo)
return std::make_shared<SvpSalBitmap>();
else
+#endif
return std::make_shared<Qt5Bitmap>();
}
diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/Qt5Instance_Print.cxx
index c6b468f801f2..c8ae674857c0 100644
--- a/vcl/qt5/Qt5Instance_Print.cxx
+++ b/vcl/qt5/Qt5Instance_Print.cxx
@@ -18,22 +18,22 @@
*/
#include <Qt5Instance.hxx>
-// #include <Qt5Printer.hxx>
+#include <Qt5Printer.hxx>
+#ifndef _WIN32
#include <vcl/svapp.hxx>
#include <vcl/timer.hxx>
-#include <printerinfomanager.hxx>
#include <jobset.h>
#include <print.h>
-#include <salptype.hxx>
#include <saldatabasic.hxx>
-#ifndef _WIN32
+#include <salptype.hxx>
+#include <printerinfomanager.hxx>
#include <unx/genpspgraphics.h>
-#endif
using namespace psp;
+#endif
/*
* static helpers
@@ -142,12 +142,10 @@ OUString Qt5Instance::GetDefaultPrinter()
#endif
}
+#ifndef _WIN32
void Qt5Instance::PostPrintersChanged() {}
-#ifndef _WIN32
GenPspGraphics* Qt5Instance::CreatePrintGraphics() { return new
GenPspGraphics(); }
-#else
-GenPspGraphics* Qt5Instance::CreatePrintGraphics() { return nullptr; }
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Printer.cxx b/vcl/qt5/Qt5Printer.cxx
index 72828be26903..2f30b3b53720 100644
--- a/vcl/qt5/Qt5Printer.cxx
+++ b/vcl/qt5/Qt5Printer.cxx
@@ -20,13 +20,14 @@
#include <svsys.h>
#include <salptype.hxx>
+#include <tools/gen.hxx>
#include <Qt5Printer.hxx>
-Qt5Printer::Qt5Printer(SalInfoPrinter* pInfoPrinter)
+Qt5Printer::Qt5Printer(SalInfoPrinter* /* pInfoPrinter */)
#ifndef _WIN32
: PspSalPrinter(pInfoPrinter)
#else
- : WinSalPrinter(pInfoPrinter)
+ : WinSalPrinter()
#endif
{
}
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index d45735f270d0..ff88ada5f3fb 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -32,6 +32,7 @@
#include <vcl/opengl/OpenGLHelper.hxx>
#include <vcl/opengl/OpenGLContext.hxx>
#include <vcl/timer.hxx>
+#include <vclpluginapi.h>
#include <opengl/salbmp.hxx>
#include <opengl/win/gdiimpl.hxx>
@@ -345,8 +346,12 @@ void InitSalMain()
}
}
-SalInstance* CreateSalInstance()
+extern "C" {
+VCLPLUG_WIN_PUBLIC SalInstance* create_SalInstance()
{
+ InitSalData();
+ InitSalMain();
+
SalData* pSalData = GetSalData();
pSalData->mnAppThreadId = GetCurrentThreadId();
@@ -405,6 +410,7 @@ SalInstance* CreateSalInstance()
return pInst;
}
+}
void DestroySalInstance( SalInstance* pInst )
{
diff --git a/vcl/win/plugadapt/salplug.cxx b/vcl/win/plugadapt/salplug.cxx
index 2d4bcd8a9cdb..17124cc23e98 100644
--- a/vcl/win/plugadapt/salplug.cxx
+++ b/vcl/win/plugadapt/salplug.cxx
@@ -126,12 +126,7 @@ SalInstance *CreateSalInstance()
SalInstance *pInst = nullptr;
OUString aUsePlugin;
- if( IsHeadlessModeRequested() )
- aUsePlugin = "svp";
- else
- {
- rtl::Bootstrap::get( "SAL_USE_VCLPLUGIN", aUsePlugin );
- }
+ rtl::Bootstrap::get( "SAL_USE_VCLPLUGIN", aUsePlugin );
if( !aUsePlugin.isEmpty() )
pInst = tryInstance( aUsePlugin, true );
commit 239abc3f84612872e91098d513c74f5379445a58
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Sep 10 16:04:59 2018 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Sep 10 16:04:59 2018 +0200
Compile fixes
Change-Id: Ibdfe0d6cd27edb7377445de05cf2973037591bb5
diff --git a/vcl/inc/fontselect.hxx b/vcl/inc/fontselect.hxx
index 9707ba4e5fa9..51f70997ac53 100644
--- a/vcl/inc/fontselect.hxx
+++ b/vcl/inc/fontselect.hxx
@@ -34,7 +34,7 @@ class LogicalFontInstance;
class PhysicalFontFace;
class Size;
-class FontSelectPattern : public FontAttributes
+class VCL_DLLPUBLIC FontSelectPattern : public FontAttributes
{
public:
FontSelectPattern( const vcl::Font&, const OUString&
rSearchName,
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 66368b7cbcb9..76551c29d89d 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -44,7 +44,7 @@ namespace o3tl {
template<> struct typed_flags<FontType> : is_typed_flags<FontType,
(1<<8)-1> {};
}
-class FontSubsetInfo final
+class VCL_DLLPUBLIC FontSubsetInfo final
{
public:
explicit FontSubsetInfo();
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 09fed59b7138..765dac0508e5 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -74,7 +74,7 @@ public:
void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle,
QuickHelpFlags nStyle,
const OUString& rHelpText, const OUString& rStatusText,
const Point& rScreenPos, const tools::Rectangle& rHelpArea );
-void ImplDestroyHelpWindow( bool bUpdateHideTime );
+VCL_DLLPUBLIC void ImplDestroyHelpWindow( bool bUpdateHideTime );
void ImplSetHelpWindowPos( vcl::Window* pHelpWindow, sal_uInt16 nHelpWinStyle,
QuickHelpFlags nStyle,
const Point& rPos, const tools::Rectangle&
rHelpArea );
diff --git a/vcl/inc/opengl/FixedTextureAtlas.hxx
b/vcl/inc/opengl/FixedTextureAtlas.hxx
index 58896d855af8..3187789fcdf0 100644
--- a/vcl/inc/opengl/FixedTextureAtlas.hxx
+++ b/vcl/inc/opengl/FixedTextureAtlas.hxx
@@ -26,6 +26,9 @@ class FixedTextureAtlasManager final
void CreateNewTexture();
+ FixedTextureAtlasManager( const FixedTextureAtlasManager& ) = delete;
+ FixedTextureAtlasManager& operator=( const FixedTextureAtlasManager& ) =
delete;
+
public:
FixedTextureAtlasManager(int nWidthFactor, int nHeightFactor, int
nTextureSize);
~FixedTextureAtlasManager();
diff --git a/vcl/inc/opengl/PackedTextureAtlas.hxx
b/vcl/inc/opengl/PackedTextureAtlas.hxx
index a90d2401fc51..ea812440ea4e 100644
--- a/vcl/inc/opengl/PackedTextureAtlas.hxx
+++ b/vcl/inc/opengl/PackedTextureAtlas.hxx
@@ -35,6 +35,9 @@ class VCL_DLLPUBLIC PackedTextureAtlasManager final
void CreateNewTexture();
+ PackedTextureAtlasManager( const PackedTextureAtlasManager& ) = delete;
+ PackedTextureAtlasManager& operator=( const PackedTextureAtlasManager& ) =
delete;
+
public:
/**
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index 7753df5c4c7e..b2c09af93f31 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -30,6 +30,10 @@
#include "Qt5Data.hxx"
#include "Qt5Graphics_Controls.hxx"
+#ifdef _WIN32
+#include <QtWidgets/QPushButton>
+#endif
+
class PhysicalFontCollection;
class QImage;
class QPushButton;
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 5e3478e45b2b..fc80e90d0ca9 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -83,7 +83,7 @@ public:
};
-SalSystem* ImplGetSalSystem();
+VCL_DLLPUBLIC SalSystem* ImplGetSalSystem();
#endif // INCLUDED_VCL_INC_SALSYS_HXX
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index c09834adeaef..b8df52622dfe 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -343,7 +343,7 @@ namespace vcl
* @ingroup sft
*
*/
- SFErrCodes CreateTTFromTTGlyphs(TrueTypeFont *ttf,
+ VCL_DLLPUBLIC SFErrCodes CreateTTFromTTGlyphs(TrueTypeFont *ttf,
const char *fname,
sal_uInt16 const *glyphArray,
sal_uInt8 const *encoding,
@@ -386,7 +386,7 @@ namespace vcl
* @ingroup sft
*
*/
- TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont const *ttf,
const sal_uInt16 *glyphArray, int nGlyphs, bool vertical);
+ VCL_DLLPUBLIC TTSimpleGlyphMetrics *GetTTSimpleGlyphMetrics(TrueTypeFont
const *ttf, const sal_uInt16 *glyphArray, int nGlyphs, bool vertical);
#if defined(_WIN32) || defined(MACOSX) || defined(IOS)
/**
@@ -398,7 +398,7 @@ namespace vcl
* @return glyph ID, if the character is missing in the font, the return value
is 0.
* @ingroup sft
*/
- sal_uInt16 MapChar(TrueTypeFont const *ttf, sal_uInt16 ch);
+ VCL_DLLPUBLIC sal_uInt16 MapChar(TrueTypeFont const *ttf, sal_uInt16 ch);
#endif
/**
@@ -410,7 +410,7 @@ namespace vcl
* @ingroup sft
*
*/
- void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info);
+ VCL_DLLPUBLIC void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo
*info);
/**
* Returns fonts metrics.
@@ -429,7 +429,7 @@ namespace vcl
/**
* returns the number of glyphs in a font
*/
- int GetTTGlyphCount( TrueTypeFont const * ttf );
+ VCL_DLLPUBLIC int GetTTGlyphCount( TrueTypeFont const * ttf );
/**
* provide access to the raw data of a SFNT-container's subtable
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 679debce188e..b591409bdf08 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -379,7 +379,7 @@ VCL_PLUGIN_PUBLIC OUString VclResId(const char* pId);
DockingManager* ImplGetDockingManager();
BlendFrameCache* ImplGetBlendFrameCache();
-bool ImplCallPreNotify( NotifyEvent& rEvt );
+VCL_DLLPUBLIC bool ImplCallPreNotify( NotifyEvent& rEvt );
VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData();
VCL_PLUGIN_PUBLIC void ImplHideSplash();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
