diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-20 16:01:07 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-06-26 10:10:14 +0200 |
| commit | 78d7aec108cd9d979ff00d4376ad2f12dd867f05 (patch) | |
| tree | 45d81ac95bb07525fa9ea6ea6910e47123a5657a /desktop | |
| parent | eaafb80e02dddb8d7c8c00d338e827cdaf427f01 (diff) | |
most of jsdialogbuilder is not used outside vcl
so split it into the bit that is needed and just include that.
add missing license headers
Change-Id: I875f91176e6881e830fee6a58368d0b28ce9a0f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96774
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97118
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 9867c88709ab..0434818c7845 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -156,7 +156,7 @@ #include <vcl/abstdlg.hxx> #include <tools/diagnose_ex.h> #include <vcl/uitest/uiobject.hxx> -#include <vcl/jsdialog/jsdialogbuilder.hxx> +#include <vcl/jsdialog/builder.hxx> // Needed for getUndoManager() #include <com/sun/star/document/XUndoManager.hpp> @@ -3603,10 +3603,10 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long try { OString sControlId = OUStringToOString(aMap["id"], RTL_TEXTENCODING_ASCII_US); - weld::Widget* pWidget = JSInstanceBuilder::FindWeldWidgetsMap(nWindowId, sControlId); + weld::Widget* pWidget = jsdialog::FindWeldWidgetsMap(nWindowId, sControlId); if (!pWidget && nWindowId == 0) { - pWidget = JSInstanceBuilder::FindWeldWidgetsMap(reinterpret_cast<sal_uInt64>(SfxViewShell::Current()), sControlId); + pWidget = jsdialog::FindWeldWidgetsMap(reinterpret_cast<sal_uInt64>(SfxViewShell::Current()), sControlId); } bIsWeldedDialog = pWidget != nullptr; |