diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-13 12:23:36 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-02 11:24:38 +0200 |
| commit | 0f3be2e19fa408d7069d586ccf04cb3f3eccd6b9 (patch) | |
| tree | 7cd14806e1098bdc08cfc84f0e00480f8d09dc68 /vcl/inc | |
| parent | 3af4e1a0825c5b11ae4ef58fc411378aab669387 (diff) | |
Unify sal plugin loaders
Change-Id: Ic099761eaff80349e985ccf62e3f4aa6b2e98022
Reviewed-on: https://gerrit.libreoffice.org/61103
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/osx/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/salinst.hxx | 7 | ||||
| -rw-r--r-- | vcl/inc/win/saldata.hxx | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index f813118803d2..483902ff21cf 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -57,7 +57,7 @@ class SystemFontList; #define INVALID_CURSOR_PTR reinterpret_cast<NSCursor*>(0xdeadbeef) // Singleton, instantiated from Application::Application() in -// vcl/source/app/svapp.cxx through InitSalData(). +// vcl/source/app/svapp.cxx. class SalData { diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 1418ef4ef859..b365fe6545ca 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -77,7 +77,7 @@ enum class SalFrameStyleFlags; typedef struct _cairo_font_options cairo_font_options_t; -class VCL_PLUGIN_PUBLIC SalInstance +class VCL_DLLPUBLIC SalInstance { private: rtl::Reference< vcl::DisplayConnectionDispatch > m_pEventInst; @@ -211,11 +211,6 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore ); VCL_DLLPUBLIC const OUString& SalGetDesktopEnvironment(); -void InitSalData(); // called from Application-Ctor -void DeInitSalData(); // called from Application-Dtor - -void InitSalMain(); - #endif // INCLUDED_VCL_INC_SALINST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx index 8f5a3b87b415..ae43b12af4ab 100644 --- a/vcl/inc/win/saldata.hxx +++ b/vcl/inc/win/saldata.hxx @@ -118,7 +118,6 @@ public: std::set< HMENU > mhMenuSet; // keeps track of menu handles created by VCL, used by IsKnownMenuHandle() std::map< UINT,sal_uInt16 > maVKMap; // map some dynamic VK_* entries - // must be deleted before exit(), so delete it in DeInitSalData() std::unique_ptr<TextOutRenderer> m_pD2DWriteTextOutRenderer; // tdf#107205 need 2 instances because D2DWrite can't rotate text std::unique_ptr<TextOutRenderer> m_pExTextOutRenderer; |