toolkit/source/awt/vclxtoolkit.cxx | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 4d41b22135904e81f847c1cbf00abc82a414095f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Jul 20 15:29:29 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 20 20:38:55 2020 +0200
SVTXDateField is preferred ahead of VCLXDateField
SVTXDateField is supposed to intercept and get used before
VCLXDateField
Change-Id: Ia1ff2cd362e86a6a1118bc24dff8b6bce50e8bf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99083
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index eb5273cde27d..267a9fced788 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -701,7 +701,7 @@ ComponentInfo const aComponentInfos [] =
{ OUStringLiteral("currencybox"), WindowType::CURRENCYBOX },
{ OUStringLiteral("currencyfield"), WindowType::CURRENCYFIELD },
{ OUStringLiteral("datebox"), WindowType::DATEBOX },
- { OUStringLiteral("datefield"), WindowType::DATEFIELD },
+ { OUStringLiteral("datefield"), WindowType::CONTROL },
{ OUStringLiteral("dialog"), WindowType::DIALOG },
{ OUStringLiteral("dockingarea"), WindowType::DOCKINGAREA },
{ OUStringLiteral("dockingwindow"), WindowType::DOCKINGWINDOW },
@@ -1460,12 +1460,6 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow**
ppNewComp,
case WindowType::DATEBOX:
pNewWindow = VclPtr<DateBox>::Create( pParent, nWinBits );
break;
- case WindowType::DATEFIELD:
- pNewWindow = VclPtr<DateField>::Create( pParent, nWinBits );
-
static_cast<DateField*>(pNewWindow.get())->EnableEmptyFieldValue( true );
- *ppNewComp = new VCLXDateField;
-
static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter(
static_cast<FormatterBase*>(static_cast<DateField*>(pNewWindow.get())) );
- break;
case WindowType::DOCKINGAREA:
pNewWindow = VclPtr<DockingAreaWindow>::Create( pParent );
break;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
