[Libreoffice-commits] core.git: include/toolkit toolkit/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 20 09:37:29 UTC 2020
include/toolkit/awt/vclxwindows.hxx | 50 ----
toolkit/source/awt/vclxwindows.cxx | 366 ------------------------------------
2 files changed, 416 deletions(-)
New commits:
commit c777c283faef8c82a73005a74c448670928bcadf
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jul 19 20:36:36 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 20 11:36:40 2020 +0200
drop unused VCLXCurrencyField
Change-Id: Ia2a44d64d4458c15e074522b022388e1da170e27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99014
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index af85219b7ef6..587cdded66f4 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -1085,55 +1085,7 @@ public:
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
-
-// class VCLXCurrencyField
-
-class VCLXCurrencyField final : public css::awt::XCurrencyField,
- public VCLXFormattedSpinField
-{
-public:
- VCLXCurrencyField();
- virtual ~VCLXCurrencyField() override;
-
- // css::uno::XInterface
- css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
- void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
- void SAL_CALL release() throw() override { OWeakObject::release(); }
-
- // css::lang::XTypeProvider
- css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
- css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
-
-
- // css::awt::XCurrencyField
- void SAL_CALL setValue( double Value ) override;
- double SAL_CALL getValue( ) override;
- void SAL_CALL setMin( double Value ) override;
- double SAL_CALL getMin( ) override;
- void SAL_CALL setMax( double Value ) override;
- double SAL_CALL getMax( ) override;
- void SAL_CALL setFirst( double Value ) override;
- double SAL_CALL getFirst( ) override;
- void SAL_CALL setLast( double Value ) override;
- double SAL_CALL getLast( ) override;
- void SAL_CALL setSpinSize( double Value ) override;
- double SAL_CALL getSpinSize( ) override;
- void SAL_CALL setDecimalDigits( sal_Int16 nDigits ) override;
- sal_Int16 SAL_CALL getDecimalDigits( ) override;
- void SAL_CALL setStrictFormat( sal_Bool bStrict ) override;
- sal_Bool SAL_CALL isStrictFormat( ) override;
-
- // css::awt::VclWindowPeer
- void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override;
- css::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) override;
-
- static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
- virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
-};
-
-
// class VCLXPatternField
-
class VCLXPatternField final : public css::awt::XPatternField,
public VCLXFormattedSpinField
{
@@ -1167,9 +1119,7 @@ public:
virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); }
};
-
// class VCLXToolBox
-
class VCLXToolBox final : public VCLXWindow
{
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 40c897b9db60..8baa6433e29a 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6004,372 +6004,6 @@ css::uno::Any VCLXMetricField::getProperty( const OUString& PropertyName )
return aProp;
}
-
-
-
-void VCLXCurrencyField::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);
- VCLXFormattedSpinField::ImplGetPropertyIds( rIds );
-}
-
-VCLXCurrencyField::VCLXCurrencyField()
-{
-}
-
-VCLXCurrencyField::~VCLXCurrencyField()
-{
-}
-
-// css::uno::XInterface
-css::uno::Any VCLXCurrencyField::queryInterface( const css::uno::Type & rType )
-{
- css::uno::Any aRet = ::cppu::queryInterface( rType,
- static_cast< css::awt::XCurrencyField* >(this) );
- return (aRet.hasValue() ? aRet : VCLXFormattedSpinField::queryInterface( rType ));
-}
-
-IMPL_IMPLEMENTATION_ID( VCLXCurrencyField )
-
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type > VCLXCurrencyField::getTypes()
-{
- static const ::cppu::OTypeCollection aTypeList(
- cppu::UnoType<css::lang::XTypeProvider>::get(),
- cppu::UnoType<css::awt::XCurrencyField>::get(),
- VCLXFormattedSpinField::getTypes()
- );
- return aTypeList.getTypes();
-}
-
-void VCLXCurrencyField::setValue( double Value )
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- if ( pCurrencyFormatter )
- {
- // shift long value using decimal digits
- // (e.g., input 105 using 2 digits returns 1,05)
- // Thus, to set a value of 1,05, insert 105 and 2 digits
- pCurrencyFormatter->SetValue(
- ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) );
-
- // #107218# Call same listeners like VCL would do after user interaction
- VclPtr< Edit > pEdit = GetAs< Edit >();
- if ( pEdit )
- {
- SetSynthesizingVCLEvent( true );
- pEdit->SetModifyFlag();
- pEdit->Modify();
- SetSynthesizingVCLEvent( false );
- }
- }
-}
-
-double VCLXCurrencyField::getValue()
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- return pCurrencyFormatter
- ? ImplCalcDoubleValue( static_cast<double>(pCurrencyFormatter->GetValue()), pCurrencyFormatter->GetDecimalDigits() )
- : 0;
-}
-
-void VCLXCurrencyField::setMin( double Value )
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- if ( pCurrencyFormatter )
- pCurrencyFormatter->SetMin(
- ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) );
-}
-
-double VCLXCurrencyField::getMin()
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- return pCurrencyFormatter
- ? ImplCalcDoubleValue( static_cast<double>(pCurrencyFormatter->GetMin()), pCurrencyFormatter->GetDecimalDigits() )
- : 0;
-}
-
-void VCLXCurrencyField::setMax( double Value )
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- if ( pCurrencyFormatter )
- pCurrencyFormatter->SetMax(
- ImplCalcLongValue( Value, pCurrencyFormatter->GetDecimalDigits() ) );
-}
-
-double VCLXCurrencyField::getMax()
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- return pCurrencyFormatter
- ? ImplCalcDoubleValue( static_cast<double>(pCurrencyFormatter->GetMax()), pCurrencyFormatter->GetDecimalDigits() )
- : 0;
-}
-
-void VCLXCurrencyField::setFirst( double Value )
-{
- SolarMutexGuard aGuard;
-
- VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
- if ( pCurrencyField )
- pCurrencyField->SetFirst(
- ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) );
-}
-
-double VCLXCurrencyField::getFirst()
-{
- SolarMutexGuard aGuard;
-
- VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
- return pCurrencyField
- ? ImplCalcDoubleValue( static_cast<double>(pCurrencyField->GetFirst()), pCurrencyField->GetDecimalDigits() )
- : 0;
-}
-
-void VCLXCurrencyField::setLast( double Value )
-{
- SolarMutexGuard aGuard;
-
- VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
- if ( pCurrencyField )
- pCurrencyField->SetLast(
- ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) );
-}
-
-double VCLXCurrencyField::getLast()
-{
- SolarMutexGuard aGuard;
-
- VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
- return pCurrencyField
- ? ImplCalcDoubleValue( static_cast<double>(pCurrencyField->GetLast()), pCurrencyField->GetDecimalDigits() )
- : 0;
-}
-
-void VCLXCurrencyField::setSpinSize( double Value )
-{
- SolarMutexGuard aGuard;
-
- VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
- if ( pCurrencyField )
- pCurrencyField->SetSpinSize(
- ImplCalcLongValue( Value, pCurrencyField->GetDecimalDigits() ) );
-}
-
-double VCLXCurrencyField::getSpinSize()
-{
- SolarMutexGuard aGuard;
-
- VclPtr< LongCurrencyField > pCurrencyField = GetAs< LongCurrencyField >();
- return pCurrencyField
- ? ImplCalcDoubleValue( static_cast<double>(pCurrencyField->GetSpinSize()), pCurrencyField->GetDecimalDigits() )
- : 0;
-}
-
-void VCLXCurrencyField::setStrictFormat( sal_Bool bStrict )
-{
- VCLXFormattedSpinField::setStrictFormat( bStrict );
-}
-
-sal_Bool VCLXCurrencyField::isStrictFormat()
-{
- return VCLXFormattedSpinField::isStrictFormat();
-}
-
-
-void VCLXCurrencyField::setDecimalDigits( sal_Int16 Value )
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- if ( pCurrencyFormatter )
- {
- double n = getValue();
- pCurrencyFormatter->SetDecimalDigits( Value );
- setValue( n );
- }
-}
-
-sal_Int16 VCLXCurrencyField::getDecimalDigits()
-{
- SolarMutexGuard aGuard;
-
- LongCurrencyFormatter* pCurrencyFormatter = static_cast<LongCurrencyFormatter*>(GetFormatter());
- return pCurrencyFormatter ? pCurrencyFormatter->GetDecimalDigits() : 0;
-}
-
-void VCLXCurrencyField::setProperty( const OUString& PropertyName, const css::uno::Any& Value)
-{
- SolarMutexGuard aGuard;
-
- if ( GetWindow() )
- {
- bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID;
-
- sal_uInt16 nPropType = GetPropertyId( PropertyName );
- switch ( nPropType )
- {
- case BASEPROPERTY_VALUE_DOUBLE:
- {
- if ( bVoid )
- {
- GetAs< LongCurrencyField >()->EnableEmptyFieldValue( true );
- GetAs< LongCurrencyField >()->SetEmptyFieldValue();
- }
- else
- {
- double d = 0;
- if ( Value >>= d )
- setValue( d );
- }
- }
- break;
- case BASEPROPERTY_VALUEMIN_DOUBLE:
- {
- double d = 0;
- if ( Value >>= d )
- setMin( d );
- }
- break;
- case BASEPROPERTY_VALUEMAX_DOUBLE:
- {
- double d = 0;
- if ( Value >>= d )
- setMax( d );
- }
- break;
- case BASEPROPERTY_VALUESTEP_DOUBLE:
- {
- double d = 0;
- if ( Value >>= d )
- setSpinSize( d );
- }
- break;
- case BASEPROPERTY_DECIMALACCURACY:
- {
- sal_Int16 n = sal_Int16();
- if ( Value >>= n )
- setDecimalDigits( n );
- }
- break;
- case BASEPROPERTY_CURRENCYSYMBOL:
- {
- OUString aString;
- if ( Value >>= aString )
- GetAs< LongCurrencyField >()->SetCurrencySymbol( aString );
- }
- break;
- case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
- {
- bool b = bool();
- if ( Value >>= b )
- GetAs< LongCurrencyField >()->SetUseThousandSep( b );
- }
- break;
- default:
- {
- VCLXFormattedSpinField::setProperty( PropertyName, Value );
- }
- }
- }
-}
-
-css::uno::Any VCLXCurrencyField::getProperty( const OUString& PropertyName )
-{
- SolarMutexGuard aGuard;
-
- css::uno::Any aProp;
- FormatterBase* pFormatter = GetFormatter();
- if ( pFormatter )
- {
- sal_uInt16 nPropType = GetPropertyId( PropertyName );
- switch ( nPropType )
- {
- case BASEPROPERTY_VALUE_DOUBLE:
- {
- aProp <<= getValue();
- }
- break;
- case BASEPROPERTY_VALUEMIN_DOUBLE:
- {
- aProp <<= getMin();
- }
- break;
- case BASEPROPERTY_VALUEMAX_DOUBLE:
- {
- aProp <<= getMax();
- }
- break;
- case BASEPROPERTY_VALUESTEP_DOUBLE:
- {
- aProp <<= getSpinSize();
- }
- break;
- case BASEPROPERTY_CURRENCYSYMBOL:
- {
- aProp <<= GetAs< LongCurrencyField >()->GetCurrencySymbol();
- }
- break;
- case BASEPROPERTY_NUMSHOWTHOUSANDSEP:
- {
- aProp <<= GetAs< LongCurrencyField >()->IsUseThousandSep();
- }
- break;
- default:
- {
- aProp = VCLXFormattedSpinField::getProperty( PropertyName );
- }
- }
- }
- return aProp;
-}
-
-
-
-
void VCLXPatternField::ImplGetPropertyIds( std::vector< sal_uInt16 > &rIds )
{
PushPropertyIds( rIds,
More information about the Libreoffice-commits
mailing list