diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-08-05 14:46:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-08-06 13:09:49 +0200 |
| commit | 4d96e375c28f9fe2dded40cba4ee8c67f77817f3 (patch) | |
| tree | d5f3be07570199a4019863482d6b67a9e140a57a /toolkit/source/awt | |
| parent | 488b69db9844e40fb432b847a271a92fd9e7414a (diff) | |
move SVTXGridControl to toolkit
Change-Id: I513a2885027d0295f70e7c64269d1653a6c2642b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137870
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit/source/awt')
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 67e33e8bc3db..da81df17b2dd 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -89,6 +89,7 @@ #include <toolkit/helper/convert.hxx> #include <controls/filectrl.hxx> #include <controls/svmedit.hxx> +#include <controls/table/tablecontrol.hxx> #include <controls/treecontrolpeer.hxx> #include <vcl/toolkit/button.hxx> #include <vcl/toolkit/calendar.hxx> @@ -729,6 +730,7 @@ ComponentInfo const aComponentInfos [] = { std::u16string_view(u"formattedfield"), WindowType::CONTROL }, { std::u16string_view(u"frame"), WindowType::GROUPBOX }, { std::u16string_view(u"framewindow"), WindowType::TOOLKIT_FRAMEWINDOW }, + { std::u16string_view(u"grid"), WindowType::CONTROL }, { std::u16string_view(u"groupbox"), WindowType::GROUPBOX }, { std::u16string_view(u"helpbutton"), WindowType::HELPBUTTON }, { std::u16string_view(u"imagebutton"), WindowType::IMAGEBUTTON }, @@ -1835,6 +1837,11 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( rtl::Reference<VCLXWindow>* ppNewCom *ppNewComp = newComp; newComp->SetFormatter( static_cast<FormatterBase*>(static_cast<DateField*>(pNewWindow.get())) ); } + else if (aServiceName == "grid") + { + pNewWindow = VclPtr<::svt::table::TableControl>::Create(pParent, nWinBits); + *ppNewComp = new SVTXGridControl; + } break; default: OSL_ENSURE( false, "VCLXToolkit::ImplCreateWindow: unknown window type!" ); @@ -1907,7 +1914,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow( fnSvtCreateWindow = reinterpret_cast<FN_SvtCreateWindow>(osl_getFunctionSymbol( hSvToolsLib, aFunctionName.pData )); } #else - fnSvtCreateWindow = CreateWindow; + fnSvtCreateWindow = nullptr; #endif } // ask the SvTool creation function |