[Libreoffice-commits] core.git: include/toolkit toolkit/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 23 12:26:18 UTC 2019
include/toolkit/controls/unocontrolmodel.hxx | 13 +++++-------
toolkit/source/controls/tkscrollbar.cxx | 2 -
toolkit/source/controls/unocontrols.cxx | 28 +++++++++++++--------------
3 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit cfda0e43b7c31d31bb4a93e04afa10cd563318d5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jan 23 11:31:28 2019 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jan 23 13:25:53 2019 +0100
Replace macro with template
Change-Id: I0b444eae51b65caf740e625e65137ff9ff8ce4da
Reviewed-on: https://gerrit.libreoffice.org/66782
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index aa358a927246..28f834b220df 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -98,6 +98,12 @@ protected:
sal_Int32 _nSecondHandle /// second handle, which should supersede _nFirstHandle in the sequence
);
+ template<typename T> void UNO_CONTROL_MODEL_REGISTER_PROPERTIES() {
+ std::vector< sal_uInt16 > aIds;
+ T::ImplGetPropertyIds( aIds );
+ ImplRegisterProperties( aIds );
+ }
+
protected:
#ifdef _MSC_VER
UnoControlModel() //do not use! needed by MSVC at compile time to satisfy WeakAggImplHelper7
@@ -173,13 +179,6 @@ public:
void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, const css::uno::Sequence< css::uno::Any >& Values ) override;
};
-#define UNO_CONTROL_MODEL_REGISTER_PROPERTIES(a) \
- do { \
- std::vector< sal_uInt16 > aIds; \
- a::ImplGetPropertyIds( aIds ); \
- ImplRegisterProperties( aIds ); \
- } while (false)
-
#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index fef9117e0e00..d28872057a2f 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -41,7 +41,7 @@ namespace toolkit
UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< uno::XComponentContext >& i_factory )
:UnoControlModel( i_factory )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXScrollBar );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXScrollBar>();
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index f9aac462f571..6c01ea0736be 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -107,7 +107,7 @@ ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL )
UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXEdit>();
}
OUString UnoControlEditModel::getServiceName( )
@@ -676,7 +676,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext >& rxContext )
:GraphicControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXButton );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXButton>();
osl_atomic_increment( &m_refCount );
{
@@ -909,7 +909,7 @@ UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComp
:GraphicControlModel( rxContext )
,mbAdjustingImageScaleMode( false )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXImageControl>();
}
OUString UnoControlImageControlModel::getServiceName()
@@ -1079,7 +1079,7 @@ stardiv_Toolkit_UnoImageControlControl_get_implementation(
UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XComponentContext >& rxContext )
:GraphicControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXRadioButton>();
}
OUString UnoControlRadioButtonModel::getServiceName()
@@ -1321,7 +1321,7 @@ stardiv_Toolkit_UnoRadioButtonControl_get_implementation(
UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentContext >& rxContext )
:GraphicControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXCheckBox>();
}
OUString UnoControlCheckBoxModel::getServiceName()
@@ -1535,7 +1535,7 @@ stardiv_Toolkit_UnoCheckBoxControl_get_implementation(
UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXFixedHyperlink>();
}
OUString UnoControlFixedHyperlinkModel::getServiceName()
@@ -1721,7 +1721,7 @@ stardiv_Toolkit_UnoFixedHyperlinkControl_get_implementation(
UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXFixedText>();
}
OUString UnoControlFixedTextModel::getServiceName()
@@ -2100,7 +2100,7 @@ UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XComponentConte
{
if ( i_mode == ConstructDefault )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXListBox>();
}
}
@@ -2976,7 +2976,7 @@ stardiv_Toolkit_UnoListBoxControl_get_implementation(
UnoControlComboBoxModel::UnoControlComboBoxModel( const Reference< XComponentContext >& rxContext )
:UnoControlListBoxModel( rxContext, ConstructWithoutProperties )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXComboBox );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXComboBox>();
}
OUString UnoControlComboBoxModel::getImplementationName()
@@ -3478,7 +3478,7 @@ void UnoSpinFieldControl::enableRepeat( sal_Bool bRepeat )
UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXDateField>();
}
OUString UnoControlDateFieldModel::getServiceName()
@@ -3748,7 +3748,7 @@ stardiv_Toolkit_UnoDateFieldControl_get_implementation(
UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXTimeField>();
}
OUString UnoControlTimeFieldModel::getServiceName()
@@ -3977,7 +3977,7 @@ stardiv_Toolkit_UnoTimeFieldControl_get_implementation(
UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXNumericField>();
}
OUString UnoControlNumericFieldModel::getServiceName()
@@ -4197,7 +4197,7 @@ stardiv_Toolkit_UnoNumericFieldControl_get_implementation(
UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXCurrencyField>();
}
OUString UnoControlCurrencyFieldModel::getServiceName()
@@ -4421,7 +4421,7 @@ stardiv_Toolkit_UnoCurrencyFieldControl_get_implementation(
UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComponentContext >& rxContext )
:UnoControlModel( rxContext )
{
- UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField );
+ UNO_CONTROL_MODEL_REGISTER_PROPERTIES<VCLXPatternField>();
}
OUString UnoControlPatternFieldModel::getServiceName()
More information about the Libreoffice-commits
mailing list