chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 12 +++++++++++-
sc/source/ui/drawfunc/fuins2.cxx | 5 ++++-
vcl/jsdialog/enabled.cxx | 7 +++++++
3 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit f74cf38f9da1f01c26717fe75708466e08c79b26
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Mar 2 16:11:14 2023 +0100
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Tue Mar 7 09:17:06 2023 +0000
jsdialog: enable chart wizard
Change-Id: I7d6f4b4e6022507a57224ad40785f5f4f4537ea8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148133
Tested-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 288f097c6038..3a1fa1386f7a 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -24,6 +24,7 @@
#include <TimerTriggeredControllerLock.hxx>
#include <utility>
#include <vcl/svapp.hxx>
+#include <vcl/weldutils.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
@@ -32,6 +33,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <sfx2/viewsh.hxx>
+
namespace chart
{
using namespace ::com::sun::star;
@@ -167,10 +169,18 @@ void CreationWizardUnoDlg::createDialogOnDemand()
m_xParentWindow = xFrame->getContainerWindow();
}
}
+
+ weld::Window* pParent(Application::GetFrameWeld(m_xParentWindow));
+ if (!pParent)
+ {
+ if (weld::TransportAsXWindow* pTunnel =
dynamic_cast<weld::TransportAsXWindow*>(m_xParentWindow.get()))
+ pParent = dynamic_cast<weld::Window*>(pTunnel->getWidget());
+ }
+
uno::Reference< XComponent > xKeepAlive( this );
if( m_xChartModel.is() )
{
- m_xDialog =
std::make_shared<CreationWizard>(Application::GetFrameWeld(m_xParentWindow),
m_xChartModel, m_xCC);
+ m_xDialog = std::make_shared<CreationWizard>(pParent, m_xChartModel,
m_xCC);
}
}
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index ba7c2cba3573..f35b77e82fce 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -42,6 +42,7 @@
#include <scmod.hxx>
#include <sal/log.hxx>
#include <comphelper/diagnose_ex.hxx>
+#include <vcl/weldutils.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/storagehelper.hxx>
@@ -631,9 +632,11 @@ FuInsertChart::FuInsertChart(ScTabViewShell& rViewSh,
vcl::Window* pWin, ScDrawV
uno::Reference< lang::XInitialization > xInit( xDialog,
uno::UNO_QUERY );
if( xChartModel.is() && xInit.is() )
{
+ css::uno::Reference< css::awt::XWindow > xParent
+ = new weld::TransportAsXWindow(pWin->GetFrameWeld());
uno::Sequence<uno::Any>
aSeq(comphelper::InitAnyPropertySequence(
{
- {"ParentWindow", uno::Any(uno::Reference< awt::XWindow
>())},
+ {"ParentWindow", uno::Any(xParent)},
{"ChartModel", uno::Any(xChartModel)}
}));
xInit->initialize( aSeq );
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 42a22b70efa0..70674c5523b1 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -82,6 +82,11 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/scalc/ui/ttestdialog.ui"
|| rUIFile == u"modules/scalc/ui/ungroupdialog.ui"
|| rUIFile == u"modules/scalc/ui/ztestdialog.ui"
+ // schart
+ || rUIFile == u"modules/schart/ui/tp_ChartType.ui"
+ || rUIFile == u"modules/schart/ui/tp_RangeChooser.ui"
+ || rUIFile == u"modules/schart/ui/tp_DataSource.ui"
+ || rUIFile == u"modules/schart/ui/wizelementspage.ui"
// swriter
|| rUIFile == u"modules/swriter/ui/captionoptions.ui"
|| rUIFile == u"modules/swriter/ui/characterproperties.ui"
@@ -110,6 +115,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"svx/ui/fontworkgallerydialog.ui"
// uui
|| rUIFile == u"uui/ui/macrowarnmedium.ui"
+ // vcl
+ || rUIFile == u"vcl/ui/wizard.ui"
// xmlsec
|| rUIFile == u"filter/ui/pdfgeneralpage.ui"
|| rUIFile == u"filter/ui/pdflinkspage.ui"
