toolkit/source/awt/vclxwindows.cxx | 35 +++++++++++++++++++++++++++-----
toolkit/source/controls/unocontrols.cxx | 4 ---
2 files changed, 31 insertions(+), 8 deletions(-)
New commits:
commit d2b3d162f627341690d489f50600de1d74c39219
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jul 16 11:40:44 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jul 20 11:36:20 2020 +0200
UnoControlCurrencyFieldModel ends up using a SVTXCurrencyField
so sync SVTXCurrencyField::ImplGetPropertyIds with
VCLXCurrencyField::ImplGetPropertyIds and use that instead
Change-Id: Ib1f2357cb4ad6b098bcd37f34d3fd680ac9f83f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98895
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 396fa5dade35..40c897b9db60 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -7743,10 +7743,6 @@ void SVTXFormattedField::ImplGetPropertyIds(
std::vector< sal_uInt16 > &rIds )
VCLXSpinField::ImplGetPropertyIds( rIds );
}
-
-
-
-
SVTXCurrencyField::SVTXCurrencyField()
{
}
@@ -7977,10 +7973,39 @@ css::uno::Any SVTXCurrencyField::getProperty( const
OUString& PropertyName )
void SVTXCurrencyField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
+ BASEPROPERTY_ALIGN,
+ BASEPROPERTY_BACKGROUNDCOLOR,
+ BASEPROPERTY_BORDER,
+ BASEPROPERTY_BORDERCOLOR,
BASEPROPERTY_CURRENCYSYMBOL,
BASEPROPERTY_CURSYM_POSITION,
+ BASEPROPERTY_DECIMALACCURACY,
+ BASEPROPERTY_DEFAULTCONTROL,
+ BASEPROPERTY_ENABLED,
+ BASEPROPERTY_ENABLEVISIBLE,
+ BASEPROPERTY_FONTDESCRIPTOR,
+ BASEPROPERTY_HELPTEXT,
+ BASEPROPERTY_HELPURL,
+ BASEPROPERTY_NUMSHOWTHOUSANDSEP,
+ BASEPROPERTY_PRINTABLE,
+ BASEPROPERTY_READONLY,
+ BASEPROPERTY_REPEAT,
+ BASEPROPERTY_REPEAT_DELAY,
+ BASEPROPERTY_SPIN,
+ BASEPROPERTY_STRICTFORMAT,
+ BASEPROPERTY_TABSTOP,
+ BASEPROPERTY_VALUEMAX_DOUBLE,
+ BASEPROPERTY_VALUEMIN_DOUBLE,
+ BASEPROPERTY_VALUESTEP_DOUBLE,
+ BASEPROPERTY_VALUE_DOUBLE,
+ BASEPROPERTY_ENFORCE_FORMAT,
+ BASEPROPERTY_HIDEINACTIVESELECTION,
+ BASEPROPERTY_VERTICALALIGN,
+ BASEPROPERTY_WRITING_MODE,
+ BASEPROPERTY_CONTEXT_WRITING_MODE,
+ BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR,
0);
- SVTXFormattedField::ImplGetPropertyIds( rIds );
+ VCLXWindow::ImplGetPropertyIds( rIds );
}
SVTXNumericField::SVTXNumericField()
diff --git a/toolkit/source/controls/unocontrols.cxx
b/toolkit/source/controls/unocontrols.cxx
index 6ad3af40c4a0..8a9988f386f2 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -4110,12 +4110,10 @@
stardiv_Toolkit_UnoNumericFieldControl_get_implementation(
return cppu::acquire(new UnoNumericFieldControl());
}
-
-
UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference<
XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXCurrencyField>();
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<SVTXCurrencyField>();
}
OUString UnoControlCurrencyFieldModel::getServiceName()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
