diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-19 13:00:36 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-19 17:10:51 +0100 |
| commit | 074e969a23be8bf2f5ef21d6997f7a0522c81369 (patch) | |
| tree | e68f8efa1445284f653728b22d4b203c1f32db10 /vcl/source | |
| parent | 2db9ef47478fa7faf4fbceb0791edf43a110fb4f (diff) | |
move VclBuilder::preload so desktop doesn't need to include that header
Change-Id: I72f2b21cb9ac0b39995887afcf41189f2e7ad284
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111219
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/builder.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 2717007b0318..470485c05301 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -23,6 +23,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/resmgr.hxx> #include <vcl/builder.hxx> +#include <vcl/dialoghelper.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/dialog.hxx> #include <vcl/toolkit/edit.hxx> @@ -1483,7 +1484,9 @@ static std::shared_ptr<NoAutoUnloadModule> g_pMergedLib = std::make_shared<NoAut #endif -void VclBuilder::preload() +namespace vcl { + +void VclBuilderPreload() { #ifndef DISABLE_DYNLOADING @@ -1506,6 +1509,8 @@ void VclBuilder::preload() #endif // DISABLE_DYNLOADING } +} + #if defined DISABLE_DYNLOADING && !HAVE_FEATURE_DESKTOP extern "C" VclBuilder::customMakeWidget lo_get_custom_widget_func(const char* name); #endif |