basic/source/basmgr/basmgr.cxx | 2 basic/source/classes/eventatt.cxx | 2 basic/source/classes/sbunoobj.cxx | 12 ++-- basic/source/runtime/runtime.cxx | 8 +- chart2/source/model/main/DataPoint.cxx | 2 chart2/source/model/main/DataSeries.cxx | 2 chart2/source/model/template/CandleStickChartType.cxx | 2 chart2/source/tools/OPropertySet.cxx | 2 cli_ure/source/climaker/climaker_emit.cxx | 2 comphelper/qa/unit/variadictemplates.cxx | 2 comphelper/source/eventattachermgr/eventattachermgr.cxx | 4 - comphelper/source/misc/namedvaluecollection.cxx | 4 - comphelper/source/property/propertycontainerhelper.cxx | 2 configmgr/source/type.cxx | 4 - connectivity/source/commontools/DateConversion.cxx | 14 ++--- connectivity/source/commontools/FValue.cxx | 2 connectivity/source/commontools/dbtools.cxx | 8 +- connectivity/source/drivers/postgresql/pq_connection.cxx | 2 cppu/qa/cppumaker/test_cppumaker.cxx | 2 cppu/qa/test_any.cxx | 2 dbaccess/source/ui/browser/formadapter.cxx | 6 +- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 desktop/source/deployment/manager/dp_manager.cxx | 2 desktop/source/deployment/registry/dp_backend.cxx | 2 eventattacher/source/eventattacher.cxx | 4 - extensions/source/ole/unoconversionutilities.hxx | 6 +- extensions/source/ole/unoobjw.cxx | 4 - extensions/source/propctrlr/formcomponenthandler.cxx | 6 +- extensions/source/propctrlr/handlerhelper.cxx | 2 extensions/source/propctrlr/stringrepresentation.cxx | 2 forms/source/component/Columns.cxx | 4 - forms/source/component/ComboBox.cxx | 8 +- forms/source/component/Currency.cxx | 4 - forms/source/component/DatabaseForm.cxx | 4 - forms/source/component/Edit.cxx | 2 forms/source/component/EditBase.cxx | 10 +-- forms/source/component/File.cxx | 2 forms/source/component/FormattedField.cxx | 12 ++-- forms/source/component/Grid.cxx | 8 +- forms/source/component/Hidden.cxx | 2 forms/source/component/ImageControl.cxx | 2 forms/source/component/ListBox.cxx | 6 +- forms/source/component/Numeric.cxx | 2 forms/source/component/clickableimage.cxx | 6 +- forms/source/misc/InterfaceContainer.cxx | 2 framework/source/recording/dispatchrecorder.cxx | 2 include/comphelper/unwrapargs.hxx | 2 include/cppuhelper/proptypehlp.hxx | 20 +++---- pyuno/source/module/pyuno_except.cxx | 4 - pyuno/source/module/pyuno_runtime.cxx | 6 +- pyuno/source/module/pyuno_struct.cxx | 4 - reportdesign/source/ui/inspection/GeometryHandler.cxx | 2 sc/source/ui/unoobj/cellvaluebinding.cxx | 2 sc/source/ui/vba/vbawsfunction.cxx | 2 sd/source/filter/eppt/pptexanimations.cxx | 2 sd/source/filter/eppt/pptx-animations.cxx | 4 - sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 11 +-- static/source/unoembindhelpers/PrimaryBindings.cxx | 2 stoc/source/corereflection/crarray.cxx | 8 +- stoc/source/corereflection/crcomp.cxx | 6 +- stoc/source/corereflection/dump.cxx | 2 stoc/source/defaultregistry/defaultregistry.cxx | 4 - stoc/source/implementationregistration/implreg.cxx | 12 ++-- stoc/source/inspect/introspection.cxx | 8 +- stoc/source/loader/dllcomponentloader.cxx | 2 stoc/source/servicemanager/servicemanager.cxx | 4 - stoc/test/testconv.cxx | 4 - stoc/test/testintrosp.cxx | 2 svx/source/fmcomp/fmgridcl.cxx | 4 - svx/source/fmcomp/fmgridif.cxx | 6 +- svx/source/fmcomp/gridcell.cxx | 14 ++--- svx/source/form/fmtextcontrolshell.cxx | 2 sw/source/core/unocore/unostyle.cxx | 2 sw/source/uibase/uno/unotxdoc.cxx | 2 testtools/source/bridgetest/bridgetest.cxx | 8 +- toolkit/source/awt/vclxcontainer.cxx | 2 toolkit/source/awt/vclxwindow.cxx | 2 toolkit/source/awt/vclxwindows.cxx | 42 +++++++-------- toolkit/source/controls/unocontrolmodel.cxx | 10 +-- vbahelper/source/vbahelper/vbahelper.cxx | 4 - vcl/unx/generic/dtrans/config.cxx | 2 xmloff/source/forms/propertyexport.cxx | 2 82 files changed, 203 insertions(+), 204 deletions(-)
New commits: commit 56f3dbffdf5b3264c1c71201733e3ff6bb5e48cb Author: Mike Kaganski <[email protected]> AuthorDate: Thu Nov 7 01:07:51 2024 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Nov 8 05:34:20 2024 +0100 Simplify a bit Change-Id: I618b0f8bcb2e8032ee12367c73e1136685f66b3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176183 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 4173ad9c694c..5784697e6f47 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1381,7 +1381,7 @@ void BasicManager::SetGlobalUNOConstant( const OUString& rName, const uno::Any& if ( pVariable ) *pOldValue = sbxToUnoValue( pVariable ); } - SbxObjectRef xUnoObj = GetSbUnoObject( _rValue.getValueType ().getTypeName () , _rValue ); + SbxObjectRef xUnoObj = GetSbUnoObject( _rValue.getValueTypeName () , _rValue ); xUnoObj->SetName(rName); xUnoObj->SetFlag( SbxFlagBits::DontStore ); pStandardLib->Insert( xUnoObj.get() ); diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index b7ffebb0e983..2dbb00aa76ff 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -423,7 +423,7 @@ void RTL_Impl_CreateUnoDialog( SbxArray& rPar ) return; } Any aAnyISP = pUnoObj->getUnoAny(); - TypeClass eType = aAnyISP.getValueType().getTypeClass(); + TypeClass eType = aAnyISP.getValueTypeClass(); if( eType != TypeClass_INTERFACE ) { diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 77e3541cf157..3199340e8b89 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -2302,7 +2302,7 @@ SbUnoObject::SbUnoObject( const OUString& aName_, const Any& aUnoObj_ ) Remove( u"Parent"_ustr, SbxClassType::DontCare ); // check the type of the objects - TypeClass eType = aUnoObj_.getValueType().getTypeClass(); + TypeClass eType = aUnoObj_.getValueTypeClass(); Reference< XInterface > x; if( eType == TypeClass_INTERFACE ) { @@ -2353,7 +2353,7 @@ SbUnoObject::SbUnoObject( const OUString& aName_, const Any& aUnoObj_ ) // insert the real name of the class if( aName_.isEmpty() ) { - aClassName_ = aUnoObj_.getValueType().getTypeName(); + aClassName_ = aUnoObj_.getValueTypeName(); bSetClassName = true; } StructRefInfo aThisStruct( maTmpUnoObj, maTmpUnoObj.getValueType(), 0 ); @@ -3127,7 +3127,7 @@ void RTL_Impl_IsUnoStruct( SbxArray& rPar ) return; } Any aAny = obj->getUnoAny(); - TypeClass eType = aAny.getValueType().getTypeClass(); + TypeClass eType = aAny.getValueTypeClass(); if( eType == TypeClass_STRUCT ) { refVar->PutBool( true ); @@ -3160,7 +3160,7 @@ void RTL_Impl_EqualUnoObjects( SbxArray& rPar ) return; } Any aAny1 = obj1->getUnoAny(); - TypeClass eType1 = aAny1.getValueType().getTypeClass(); + TypeClass eType1 = aAny1.getValueTypeClass(); if( eType1 != TypeClass_INTERFACE ) { return; @@ -3180,7 +3180,7 @@ void RTL_Impl_EqualUnoObjects( SbxArray& rPar ) return; } Any aAny2 = obj2->getUnoAny(); - TypeClass eType2 = aAny2.getValueType().getTypeClass(); + TypeClass eType2 = aAny2.getValueTypeClass(); if( eType2 != TypeClass_INTERFACE ) { return; @@ -3377,7 +3377,7 @@ SbxVariable* SbUnoClass::Find( const OUString& rName, SbxClassType ) try { Any aValue = xHarryName->getByHierarchicalName( aNewName ); - TypeClass eType = aValue.getValueType().getTypeClass(); + TypeClass eType = aValue.getValueTypeClass(); // Interface located? Then it is a class if( eType == TypeClass_INTERFACE ) diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index d6417e4322c4..aa1863387418 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1642,7 +1642,7 @@ static bool checkUnoStructCopy( bool bVBA, SbxVariableRef const & refVal, SbxVar aAny = pUnoVal ? pUnoVal->getUnoAny() : pUnoStructVal->getUnoAny(); else return false; - if ( aAny.getValueType().getTypeClass() != TypeClass_STRUCT ) + if ( aAny.getValueTypeClass() != TypeClass_STRUCT ) return false; refVar->SetType( SbxOBJECT ); @@ -3866,7 +3866,7 @@ void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 ) { Any aAny = pUnoObj->getUnoAny(); - if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE ) + if( aAny.getValueTypeClass() == TypeClass_INTERFACE ) { Reference< XDefaultMethod > xDfltMethod( aAny, UNO_QUERY ); @@ -3995,7 +3995,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem ) { Any aAny = pUnoObj->getUnoAny(); - if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE ) + if( aAny.getValueTypeClass() == TypeClass_INTERFACE ) { Reference< XIndexAccess > xIndexAccess( aAny, UNO_QUERY ); if ( !bVBAEnabled ) @@ -4061,7 +4061,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem ) pUnoObj = pSbObj; Any aUnoAny = pUnoObj->getUnoAny(); - if( aUnoAny.getValueType().getTypeClass() == TypeClass_INTERFACE ) + if( aUnoAny.getValueTypeClass() == TypeClass_INTERFACE ) x = aUnoAny; pElem = pDflt; } diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index b83d5a40752d..3e224d6523de 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -170,7 +170,7 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder ); } - OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); + OSL_ASSERT( rValue.getValueTypeClass() == uno::TypeClass_INTERFACE ); if( rValue.hasValue() && (rValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 2650bb69c281..247c3178c27e 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -279,7 +279,7 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder ); } - OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); + OSL_ASSERT( rValue.getValueTypeClass() == uno::TypeClass_INTERFACE ); if( rValue.hasValue() && (rValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 1ba2a597b291..4e1f08f05679 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -267,7 +267,7 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( ModifyListenerHelper::removeListener( xBroadcaster, m_xModifyEventForwarder ); } - OSL_ASSERT( rValue.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ); + OSL_ASSERT( rValue.getValueTypeClass() == uno::TypeClass_INTERFACE ); if( rValue.hasValue() && (rValue >>= xBroadcaster) && xBroadcaster.is()) diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index b35584e12171..dd042698cc8e 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -66,7 +66,7 @@ OPropertySet::OPropertySet( const OPropertySet & rOther ) : for(auto& rProp : m_aProperties) { if( rProp.second.hasValue() && - rProp.second.getValueType().getTypeClass() == uno::TypeClass_INTERFACE ) + rProp.second.getValueTypeClass() == uno::TypeClass_INTERFACE ) { Reference< util::XCloneable > xCloneable; if( rProp.second >>= xCloneable ) diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 1bec774f5ff4..edde6a04db57 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -86,7 +86,7 @@ static inline ::System::Object ^ to_cli_constant( Any const & value ) default: throw RuntimeException( "unexpected constant type " + - value.getValueType().getTypeName() ); + value.getValueTypeName() ); } } diff --git a/comphelper/qa/unit/variadictemplates.cxx b/comphelper/qa/unit/variadictemplates.cxx index e2a282193a41..2865fbac9f1e 100644 --- a/comphelper/qa/unit/variadictemplates.cxx +++ b/comphelper/qa/unit/variadictemplates.cxx @@ -52,7 +52,7 @@ void extract( if (! fromAny(seq[nArg], &v)) { throw ::com::sun::star::lang::IllegalArgumentException( "Cannot extract ANY { " - + seq[nArg].getValueType().getTypeName() + + seq[nArg].getValueTypeName() + " } to " + ::cppu::UnoType<T>::get().getTypeName(), xErrorContext, static_cast<sal_Int16>(nArg) ); diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 46c7b78d41a7..bb6789e031d2 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -194,7 +194,7 @@ void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rRetType ) { // no return value? Set to the specified values - if( rRet.getValueType().getTypeClass() == TypeClass_VOID ) + if( rRet.getValueTypeClass() == TypeClass_VOID ) { switch( rRetType.getTypeClass() ) { @@ -267,7 +267,7 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even convertToEventReturn( aRet, aRetType ); } - switch( aRet.getValueType().getTypeClass() ) + switch( aRet.getValueTypeClass() ) { case TypeClass_INTERFACE: { diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 11ef15b30854..af4cb3985518 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -197,7 +197,7 @@ namespace comphelper throw IllegalArgumentException( "Invalid value type for '" + _rValueName + "'. Expected: " + _rExpectedValueType.getTypeName() - + " Found: " + pos->second.getValueType().getTypeName(), + + " Found: " + pos->second.getValueTypeName(), nullptr, 0 ); } @@ -223,7 +223,7 @@ namespace comphelper throw IllegalArgumentException( OUString::Concat("Invalid value type for '") + _rValueName + "'. Expected: " + _rExpectedValueType.getTypeName() - + " Found: " + rPropVal.Value.getValueType().getTypeName(), + + " Found: " + rPropVal.Value.getValueTypeName(), nullptr, 0 ); } } diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 1085e49c5003..58e4105d6bd0 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -199,7 +199,7 @@ namespace throw IllegalArgumentException( "The given value cannot be converted to the required property type." " (property name \"" + _rProperty.aProperty.Name - + "\", found value type \"" + _rValue.getValueType().getTypeName() + + "\", found value type \"" + _rValue.getValueTypeName() + "\", required property type \"" + _rProperty.aProperty.Type.getTypeName() + "\")", nullptr, 4 ); diff --git a/configmgr/source/type.cxx b/configmgr/source/type.cxx index 329762313f30..aab5d0f86cd5 100644 --- a/configmgr/source/type.cxx +++ b/configmgr/source/type.cxx @@ -99,7 +99,7 @@ css::uno::Type const & mapType(Type type) { } Type getDynamicType(css::uno::Any const & value) { - switch (value.getValueType().getTypeClass()) { + switch (value.getValueTypeClass()) { case css::uno::TypeClass_VOID: return TYPE_NIL; case css::uno::TypeClass_BOOLEAN: @@ -125,7 +125,7 @@ Type getDynamicType(css::uno::Any const & value) { return TYPE_STRING; case css::uno::TypeClass_SEQUENCE: //TODO { - OUString name(value.getValueType().getTypeName()); + OUString name(value.getValueTypeName()); if ( name == "[]byte" ) { return TYPE_HEXBINARY; } else if (name == "[]boolean") diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 896d7a85455c..30e9a323dc12 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -62,7 +62,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, case DataType::BOOLEAN: case DataType::TINYINT: case DataType::SMALLINT: - if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_BOOLEAN) + if (_rVal.getValueTypeClass() == css::uno::TypeClass_BOOLEAN) { if (::cppu::any2bool(_rVal)) aRet.append("1"); @@ -104,14 +104,14 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, { DateTime aDateTime; bool bOk = false; - if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE) + if (_rVal.getValueTypeClass() == css::uno::TypeClass_DOUBLE) { double nValue = 0.0; _rVal >>= nValue; aDateTime = DBTypeConversion::toDateTime(nValue); bOk = true; } - else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING) + else if (_rVal.getValueTypeClass() == css::uno::TypeClass_STRING) { OUString sValue; _rVal >>= sValue; @@ -136,14 +136,14 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, { Date aDate; bool bOk = false; - if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE) + if (_rVal.getValueTypeClass() == css::uno::TypeClass_DOUBLE) { double nValue = 0.0; _rVal >>= nValue; aDate = DBTypeConversion::toDate(nValue); bOk = true; } - else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING) + else if (_rVal.getValueTypeClass() == css::uno::TypeClass_STRING) { OUString sValue; _rVal >>= sValue; @@ -161,14 +161,14 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, { css::util::Time aTime; bool bOk = false; - if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE) + if (_rVal.getValueTypeClass() == css::uno::TypeClass_DOUBLE) { double nValue = 0.0; _rVal >>= nValue; aTime = DBTypeConversion::toTime(nValue); bOk = true; } - else if (_rVal.getValueType().getTypeClass() == css::uno::TypeClass_STRING) + else if (_rVal.getValueTypeClass() == css::uno::TypeClass_STRING) { OUString sValue; _rVal >>= sValue; diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 9ec39d8dd94d..cd47492326c9 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -2299,7 +2299,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det void ORowSetValue::fill(const Any& _rValue) { - switch (_rValue.getValueType().getTypeClass()) + switch (_rValue.getValueTypeClass()) { case TypeClass_VOID: setNull(); break; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 3dc306245ccf..33f1ecd14a7b 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1030,7 +1030,7 @@ try { // Unlike the ValueMin the EffectiveMin can be void if (hasProperty(sPropValueMin, xNewProps)) { - OSL_ENSURE(aEffectiveMin.getValueType().getTypeClass() == TypeClass_DOUBLE, + OSL_ENSURE(aEffectiveMin.getValueTypeClass() == TypeClass_DOUBLE, "TransferFormComponentProperties : invalid property type !"); xNewProps->setPropertyValue(sPropValueMin, aEffectiveMin); } @@ -1040,7 +1040,7 @@ try { // analog if (hasProperty(sPropValueMax, xNewProps)) { - OSL_ENSURE(aEffectiveMax.getValueType().getTypeClass() == TypeClass_DOUBLE, + OSL_ENSURE(aEffectiveMax.getValueTypeClass() == TypeClass_DOUBLE, "TransferFormComponentProperties : invalid property type !"); xNewProps->setPropertyValue(sPropValueMax, aEffectiveMax); } @@ -1050,8 +1050,8 @@ try Any aEffectiveDefault( xOldProps->getPropertyValue(sPropEffectiveDefault) ); if (aEffectiveDefault.hasValue()) { - bool bIsString = aEffectiveDefault.getValueType().getTypeClass() == TypeClass_STRING; - OSL_ENSURE(bIsString || aEffectiveDefault.getValueType().getTypeClass() == TypeClass_DOUBLE, + bool bIsString = aEffectiveDefault.getValueTypeClass() == TypeClass_STRING; + OSL_ENSURE(bIsString || aEffectiveDefault.getValueTypeClass() == TypeClass_DOUBLE, "TransferFormComponentProperties : invalid property type !"); // The Effective-Properties should always be void or string or double... diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 9a9754014d90..74402197a0a5 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -439,7 +439,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) { throw IllegalArgumentException( "pq_driver: expected string as first argument, got " - + aArguments[0].getValueType().getTypeName(), + + aArguments[0].getValueTypeName(), *this, 0 ); } diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 7d611ab10a52..292f5b433cba 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -477,7 +477,7 @@ void Test::testPolyStruct() { u"test.codemaker.cppumaker.Struct<char,short>"_ustr, (css::uno::Any( test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()). - getValueType().getTypeName())); + getValueTypeName())); css::uno::Sequence< css::uno::Sequence< css::uno::Any > > aEmptySequence; diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 9b54462a5fd2..64ea4b9218bf 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -2154,7 +2154,7 @@ void Test::testStruct() { void Test::testPoly() { css::uno::Any a; a <<= Poly< css::uno::Sequence< ::sal_Unicode > >(); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "type name", u"Poly<[]char>"_ustr, a.getValueType().getTypeName() ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "type name", u"Poly<[]char>"_ustr, a.getValueTypeName() ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "constructor", css::uno::Any(Poly< css::uno::Sequence< ::sal_Unicode > >()), a); diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 2d5d526ba9c1..e0288c51dc38 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1293,7 +1293,7 @@ void SAL_CALL SbaXFormAdapter::setFastPropertyValue(sal_Int32 nHandle, const Any if (m_nNamePropHandle == nHandle) { - if (aValue.getValueType().getTypeClass() != TypeClass_STRING) + if (aValue.getValueTypeClass() != TypeClass_STRING) { throw css::lang::IllegalArgumentException(); } @@ -1593,7 +1593,7 @@ void SAL_CALL SbaXFormAdapter::removeResetListener(const css::uno::Reference< cs void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OUString* pNewElName) { // extract the form component - if (aElement.getValueType().getTypeClass() != TypeClass_INTERFACE) + if (aElement.getValueTypeClass() != TypeClass_INTERFACE) { throw css::lang::IllegalArgumentException(); } @@ -1757,7 +1757,7 @@ void SAL_CALL SbaXFormAdapter::replaceByIndex(sal_Int32 _rIndex, const Any& Elem throw css::lang::IndexOutOfBoundsException(); // extract the form component - if (Element.getValueType().getTypeClass() != TypeClass_INTERFACE) + if (Element.getValueTypeClass() != TypeClass_INTERFACE) { throw css::lang::IllegalArgumentException(); } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 2a137566c379..bb2286ffef3e 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -896,7 +896,7 @@ template<class T> static bool checkItemType(const SfxPoolItem* pItem){ return dy void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet, sal_Int32 _nId, const Any& _rValue ) { - switch ( _rValue.getValueType().getTypeClass() ) + switch ( _rValue.getValueTypeClass() ) { case TypeClass_STRING: if ( implCheckItemType( _rSet, _nId, checkItemType<SfxStringItem> ) ) diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 574470068da1..99996531af5e 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -441,7 +441,7 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create( Any exc( ::cppu::getCaughtException() ); throw lang::WrappedTargetRuntimeException( ("[context=\"" + context + "\"] caught unexpected " - + exc.getValueType().getTypeName() + ": " + e.Message), + + exc.getValueTypeName() + ": " + e.Message), Reference<XInterface>(), exc ); } } diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 4071fee4600b..9ffa9e1607d9 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -663,7 +663,7 @@ void Package::processPackage_impl( (doRegisterPackage ? DpResId(RID_STR_ERROR_WHILE_REGISTERING) : DpResId(RID_STR_ERROR_WHILE_REVOKING)) - + getDisplayName() + ": " + exc.getValueType().getTypeName() + " \"" + e.Message + + getDisplayName() + ": " + exc.getValueTypeName() + " \"" + e.Message + "\"", static_cast<OWeakObject *>(this), exc ); } diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 1ced171df9d3..998ef72d7965 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -296,7 +296,7 @@ void SAL_CALL EventAttacherImpl::initialize(const Sequence< Any >& Arguments) // get services from the argument list for( const Any& arg : Arguments ) { - if( arg.getValueType().getTypeClass() != TypeClass_INTERFACE ) + if( arg.getValueTypeClass() != TypeClass_INTERFACE ) throw IllegalArgumentException(); // InvocationAdapter service ? @@ -435,7 +435,7 @@ void SAL_CALL FilterAllListenerImpl::firing(const AllEventObject& Event) void FilterAllListenerImpl::convertToEventReturn( Any & rRet, const Type & rRetType ) { // no return value? Set to the specified values - if( rRet.getValueType().getTypeClass() == TypeClass_VOID ) + if( rRet.getValueTypeClass() == TypeClass_VOID ) { switch( rRetType.getTypeClass() ) { diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index e2d68dbe5359..26b8896267c4 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -673,7 +673,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny, throw BridgeRuntimeError( "[automation bridge]UnoConversionUtilities<T>::anyToVariant " "Conversion of any with " + - rAny.getValueType().getTypeName() + + rAny.getValueTypeName() + " to VARIANT with type: " + OUString::number(static_cast<sal_Int32>(type)) + " failed! Error code: " + OUString::number(hr)); @@ -1007,7 +1007,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny) { throw IllegalArgumentException( "[automation bridge]UnoConversionUtilities<T>::anyToVariant " - "The provided any of type\" " + rAny.getValueType().getTypeName() + + "The provided any of type\" " + rAny.getValueTypeName() + "\" is unappropriate for conversion!", Reference<XInterface>(), -1); } @@ -1055,7 +1055,7 @@ SAFEARRAY* UnoConversionUtilities<T>::createUnoSequenceWrapper(const Any& rSeq, SAFEARRAY* pArray= nullptr; // Get the dimensions. This is done by examining the type name string // The count of brackets determines the dimensions. - OUString sTypeName= rSeq.getValueType().getTypeName(); + OUString sTypeName= rSeq.getValueTypeName(); sal_Int32 dims=0; for(sal_Int32 lastIndex=0;(lastIndex= sTypeName.indexOf( L'[', lastIndex)) != -1; lastIndex++,dims++); diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index cd84c0c6b91b..eada13aa6386 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -2035,7 +2035,7 @@ HRESULT InterfaceOleWrapper::doInvoke( DISPPARAMS * pdispparams, VARIANT * pvarR Exception excTarget; org >>= excTarget; OUString message= - org.getValueType().getTypeName() + ": " + excTarget.Message; + org.getValueTypeName() + ": " + excTarget.Message; writeExcepinfo(pexcepinfo, message); ret = DISP_E_EXCEPTION; } @@ -2126,7 +2126,7 @@ HRESULT InterfaceOleWrapper::doSetProperty( DISPPARAMS * /*pdispparams*/, VARIAN pexcepinfo->wCode = UNO_2_OLE_EXCEPTIONCODE; pexcepinfo->bstrSource = SysAllocString(L"any ONE component"); pexcepinfo->bstrDescription = SysAllocString( - o3tl::toW(org.getValueType().getTypeName().getStr())); + o3tl::toW(org.getValueTypeName().getStr())); } ret = DISP_E_EXCEPTION; } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 86acd8a1e483..6f29f131f711 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -214,7 +214,7 @@ namespace pcr const Any& _rPropertyValue ) { Reference< resource::XStringResourceResolver > xRet; - const TypeClass eType = _rPropertyValue.getValueType().getTypeClass(); + const TypeClass eType = _rPropertyValue.getValueTypeClass(); if ( (eType == TypeClass_STRING || eType == TypeClass_SEQUENCE) && lcl_isLanguageDependentProperty( _rPropertyName ) ) { @@ -253,7 +253,7 @@ namespace pcr = lcl_getStringResourceResolverForProperty( m_xComponent, _rPropertyName, aPropertyValue ); if( xStringResourceResolver.is() ) { - TypeClass eType = aPropertyValue.getValueType().getTypeClass(); + TypeClass eType = aPropertyValue.getValueTypeClass(); if( eType == TypeClass_STRING ) { OUString aPropStr; @@ -347,7 +347,7 @@ namespace pcr if( xStringResourceManager.is() ) { Any aPropertyValue( m_xComponent->getPropertyValue( _rPropertyName ) ); - TypeClass eType = aPropertyValue.getValueType().getTypeClass(); + TypeClass eType = aPropertyValue.getValueTypeClass(); if( eType == TypeClass_STRING ) { OUString aPropStr; diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index d810ab4aa711..e310ee11482d 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -181,7 +181,7 @@ namespace pcr // nothing to do, type is already as desired return aPropertyValue; - if ( _rControlValue.getValueType().getTypeClass() == TypeClass_STRING ) + if ( _rControlValue.getValueTypeClass() == TypeClass_STRING ) { OUString sControlValue; _rControlValue >>= sControlValue; diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 198d867d5739..673ddd5dca27 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -160,7 +160,7 @@ OUString SAL_CALL StringRepresentation::convertToControlValue(const uno::Any & P if ( sReturn.isEmpty() && PropertyValue.hasValue() ) { SAL_WARN( "extensions.propctrlr", "StringRepresentation::convertPropertyValueToStringRepresentation: cannot convert values of type '" - << PropertyValue.getValueType().getTypeName() + << PropertyValue.getValueTypeName() << "'!" ); } #endif diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index f6fa631003a9..930cb356ed97 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -413,7 +413,7 @@ void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any switch (nHandle) { case PROPERTY_ID_LABEL: - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_STRING, "invalid type" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_STRING, "invalid type" ); rValue >>= m_aLabel; break; case PROPERTY_ID_WIDTH: @@ -477,7 +477,7 @@ void OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream) _rxOutStream->writeShort(0x0002); sal_uInt16 nAnyMask = 0; - if (m_aWidth.getValueType().getTypeClass() == TypeClass_LONG) + if (m_aWidth.getValueTypeClass() == TypeClass_LONG) nAnyMask |= WIDTH; if (m_aAlign.getValueTypeClass() == TypeClass_SHORT) diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 9e2d60a7d75b..1e5c327539a0 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -203,7 +203,7 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const break; case PROPERTY_ID_LISTSOURCE : - DBG_ASSERT(_rValue.getValueType().getTypeClass() == TypeClass_STRING, + DBG_ASSERT(_rValue.getValueTypeClass() == TypeClass_STRING, "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); _rValue >>= m_aListSource; // The ListSource has changed -> reload @@ -217,13 +217,13 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const break; case PROPERTY_ID_EMPTY_IS_NULL : - DBG_ASSERT(_rValue.getValueType().getTypeClass() == TypeClass_BOOLEAN, + DBG_ASSERT(_rValue.getValueTypeClass() == TypeClass_BOOLEAN, "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); _rValue >>= m_bEmptyIsNull; break; case PROPERTY_ID_DEFAULT_TEXT : - DBG_ASSERT(_rValue.getValueType().getTypeClass() == TypeClass_STRING, + DBG_ASSERT(_rValue.getValueTypeClass() == TypeClass_STRING, "OComboBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); _rValue >>= m_aDefaultText; resetNoBroadcast(); @@ -339,7 +339,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<css::io::XObjectOutputStream // Mask for Any sal_uInt16 nAnyMask = 0; - if (m_aBoundColumn.getValueType().getTypeClass() == TypeClass_SHORT) + if (m_aBoundColumn.getValueTypeClass() == TypeClass_SHORT) nAnyMask |= BOUNDCOLUMN; _rxOutStream << nAnyMask; diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index edd86eeabd8a..fa106da8483e 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -184,7 +184,7 @@ bool OCurrencyModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) Any aControlValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) ); if ( aControlValue != m_aSaveValue ) { - if ( aControlValue.getValueType().getTypeClass() == TypeClass_VOID ) + if ( aControlValue.getValueTypeClass() == TypeClass_VOID ) m_xColumnUpdate->updateNull(); else { @@ -216,7 +216,7 @@ Any OCurrencyModel::translateDbColumnToControlValue() Any OCurrencyModel::getDefaultForReset() const { Any aValue; - if ( m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE ) + if ( m_aDefault.getValueTypeClass() == TypeClass_DOUBLE ) aValue = m_aDefault; return aValue; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index ce12e1c4f184..e68551c9fd5b 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -622,7 +622,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc // Special treatment for multiline edit only if we have a control for it Any aTmp = xComponentSet->getPropertyValue( PROPERTY_MULTILINE ); bool bMulti = rxSubmitButton.is() - && (aTmp.getValueType().getTypeClass() == TypeClass_BOOLEAN) + && (aTmp.getValueTypeClass() == TypeClass_BOOLEAN) && getBOOL(aTmp); OUString sText; if ( bMulti ) // For multiline edit, get the text at the control @@ -1398,7 +1398,7 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any if (pnHandles[nPos] == PROPERTY_ID_ISMODIFIED) break; - if ((nPos < nCount) && (pNewValues[nPos].getValueType().getTypeClass() == TypeClass_BOOLEAN) && getBOOL(pNewValues[nPos])) + if ((nPos < nCount) && (pNewValues[nPos].getValueTypeClass() == TypeClass_BOOLEAN) && getBOOL(pNewValues[nPos])) { // yeah, we found it, and it changed to TRUE if (nPos == 0) { // just cut the first element diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index e4d477bdd020..c474c168fed0 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -541,7 +541,7 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) if (m_xAggregateSet.is()) { Any aDefaultControl = m_xAggregateSet->getPropertyValue(PROPERTY_DEFAULTCONTROL); - if ( (aDefaultControl.getValueType().getTypeClass() == TypeClass_STRING) + if ( (aDefaultControl.getValueTypeClass() == TypeClass_STRING) && (getString(aDefaultControl) == STARDIV_ONE_FORM_CONTROL_TEXTFIELD ) ) { diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index 251c54b147c3..41c256e9c120 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -96,9 +96,9 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) // Masking for any sal_uInt16 nAnyMask = 0; - if (m_aDefault.getValueType().getTypeClass() == TypeClass_LONG) + if (m_aDefault.getValueTypeClass() == TypeClass_LONG) nAnyMask |= DEFAULT_LONG; - else if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE) + else if (m_aDefault.getValueTypeClass() == TypeClass_DOUBLE) nAnyMask |= DEFAULT_DOUBLE; else if (m_aDefault.getValueType() == cppu::UnoType<util::Time>::get()) nAnyMask |= DEFAULT_TIME; @@ -322,16 +322,16 @@ void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const switch (nHandle) { case PROPERTY_ID_EMPTY_IS_NULL: - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_BOOLEAN, "invalid type" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_BOOLEAN, "invalid type" ); m_bEmptyIsNull = getBOOL(rValue); break; case PROPERTY_ID_FILTERPROPOSAL: - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_BOOLEAN, "invalid type" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_BOOLEAN, "invalid type" ); m_bFilterProposal = getBOOL(rValue); break; // Changing the default values causes a reset case PROPERTY_ID_DEFAULT_TEXT: - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_STRING, "invalid type" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_STRING, "invalid type" ); rValue >>= m_aDefaultText; resetNoBroadcast(); break; diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 51e1ac47e970..a4533403c129 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -151,7 +151,7 @@ void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons switch (nHandle) { case PROPERTY_ID_DEFAULT_TEXT : - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_STRING, "OFileControlModel::setFastPropertyValue_NoBroadcast : invalid type !" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_STRING, "OFileControlModel::setFastPropertyValue_NoBroadcast : invalid type !" ); rValue >>= m_sDefaultValue; break; default: diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 33d698c6de26..520bdffc7799 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -420,7 +420,7 @@ void OFormattedModel::_propertyChanged( const css::beans::PropertyChangeEvent& e if ( evt.PropertyName == PROPERTY_FORMATKEY ) { - if ( evt.NewValue.getValueType().getTypeClass() == TypeClass_LONG ) + if ( evt.NewValue.getValueTypeClass() == TypeClass_LONG ) { try { @@ -634,7 +634,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) if (m_xAggregateSet.is()) { Any aSupplier = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATSSUPPLIER); - if (aSupplier.getValueType().getTypeClass() != TypeClass_VOID) + if (aSupplier.getValueTypeClass() != TypeClass_VOID) { OSL_VERIFY( aSupplier >>= xSupplier ); } @@ -687,7 +687,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) } { OStreamSection aDownCompat2(_rxOutStream); - switch (aEffectiveValue.getValueType().getTypeClass()) + switch (aEffectiveValue.getValueTypeClass()) { case TypeClass_STRING: _rxOutStream->writeShort(0x0000); @@ -809,7 +809,7 @@ bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) // empty string + EmptyIsNull = void if ( !aControlValue.hasValue() - || ( ( aControlValue.getValueType().getTypeClass() == TypeClass_STRING ) + || ( ( aControlValue.getValueTypeClass() == TypeClass_STRING ) && getString( aControlValue ).isEmpty() && m_bEmptyIsNull ) @@ -820,13 +820,13 @@ bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) try { double f = 0.0; - if ( aControlValue.getValueType().getTypeClass() == TypeClass_DOUBLE || (aControlValue >>= f)) // #i110323 + if ( aControlValue.getValueTypeClass() == TypeClass_DOUBLE || (aControlValue >>= f)) // #i110323 { DBTypeConversion::setValue( m_xColumnUpdate, m_aNullDate, getDouble( aControlValue ), m_nKeyType ); } else { - DBG_ASSERT( aControlValue.getValueType().getTypeClass() == TypeClass_STRING, "OFormattedModel::commitControlValueToDbColumn: invalid value type!" ); + DBG_ASSERT( aControlValue.getValueTypeClass() == TypeClass_STRING, "OFormattedModel::commitControlValueToDbColumn: invalid value type!" ); m_xColumnUpdate->updateString( getString( aControlValue ) ); } } diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 6040549af736..18e52ff7eb9d 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -512,7 +512,7 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& case PROPERTY_ID_CURSORCOLOR: if (!rValue.hasValue() || !m_aCursorColor.hasValue()) { - if (rValue.hasValue() && (TypeClass_LONG != rValue.getValueType().getTypeClass())) + if (rValue.hasValue() && (TypeClass_LONG != rValue.getValueTypeClass())) { throw IllegalArgumentException(); } @@ -790,15 +790,15 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream // 4. Attributes // Masking for all 'any' types sal_uInt16 nAnyMask = 0; - if (m_aRowHeight.getValueType().getTypeClass() == TypeClass_LONG) + if (m_aRowHeight.getValueTypeClass() == TypeClass_LONG) nAnyMask |= ROWHEIGHT; if ( getFont() != getDefaultFont() ) nAnyMask |= FONTATTRIBS | FONTSIZE | FONTTYPE | FONTDESCRIPTOR; - if (m_aTabStop.getValueType().getTypeClass() == TypeClass_BOOLEAN) + if (m_aTabStop.getValueTypeClass() == TypeClass_BOOLEAN) nAnyMask |= TABSTOP; if ( hasTextColor() ) nAnyMask |= TEXTCOLOR; - if (m_aBackgroundColor.getValueType().getTypeClass() == TypeClass_LONG) + if (m_aBackgroundColor.getValueTypeClass() == TypeClass_LONG) nAnyMask |= BACKGROUNDCOLOR; if (!m_bRecordMarker) nAnyMask |= RECORDMARKER; diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 1f9ab4fcf6d3..3891bbe9d31a 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -81,7 +81,7 @@ void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const An switch (_nHandle) { case PROPERTY_ID_HIDDEN_VALUE : - DBG_ASSERT(_rValue.getValueType().getTypeClass() == TypeClass_STRING, "OHiddenModel::setFastPropertyValue_NoBroadcast : invalid type !" ); + DBG_ASSERT(_rValue.getValueTypeClass() == TypeClass_STRING, "OHiddenModel::setFastPropertyValue_NoBroadcast : invalid type !" ); _rValue >>= m_sHiddenValue; break; default: diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index ba999944a2d1..fc879ed06450 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -248,7 +248,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con switch (nHandle) { case PROPERTY_ID_READONLY : - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_BOOLEAN, "OImageControlModel::setFastPropertyValue_NoBroadcast : invalid type !" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_BOOLEAN, "OImageControlModel::setFastPropertyValue_NoBroadcast : invalid type !" ); m_bReadOnly = getBOOL(rValue); break; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index d2371e4e5a18..1b54c674ef99 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -299,7 +299,7 @@ namespace frm switch (_nHandle) { case PROPERTY_ID_BOUNDCOLUMN : - DBG_ASSERT((_rValue.getValueType().getTypeClass() == TypeClass_SHORT) || (_rValue.getValueType().getTypeClass() == TypeClass_VOID), + DBG_ASSERT((_rValue.getValueTypeClass() == TypeClass_SHORT) || (_rValue.getValueTypeClass() == TypeClass_VOID), "OListBoxModel::setFastPropertyValue_NoBroadcast : invalid type !" ); m_aBoundColumn = _rValue; break; @@ -570,7 +570,7 @@ namespace frm // Masking for any sal_uInt16 nAnyMask = 0; - if (m_aBoundColumn.getValueType().getTypeClass() != TypeClass_VOID) + if (m_aBoundColumn.getValueTypeClass() != TypeClass_VOID) nAnyMask |= BOUNDCOLUMN; _rxOutStream << nAnyMask; @@ -745,7 +745,7 @@ namespace frm } ::std::optional< sal_Int16 > aBoundColumn(std::nullopt); - if ( m_aBoundColumn.getValueType().getTypeClass() == TypeClass_SHORT ) + if ( m_aBoundColumn.getValueTypeClass() == TypeClass_SHORT ) { sal_Int16 nBoundColumn( 0 ); m_aBoundColumn >>= nBoundColumn; diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index b3465d7c940c..fd1697c296b0 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -165,7 +165,7 @@ Any ONumericModel::translateDbColumnToControlValue() Any ONumericModel::getDefaultForReset() const { Any aValue; - if (m_aDefault.getValueType().getTypeClass() == TypeClass_DOUBLE) + if (m_aDefault.getValueTypeClass() == TypeClass_DOUBLE) aValue = m_aDefault; return aValue; diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 8c16660c731d..5c95ef6be5fe 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -606,17 +606,17 @@ namespace frm break; case PROPERTY_ID_TARGET_URL : - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_STRING, "OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_STRING, "OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" ); rValue >>= m_sTargetURL; break; case PROPERTY_ID_TARGET_FRAME : - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_STRING, "OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_STRING, "OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" ); rValue >>= m_sTargetFrame; break; case PROPERTY_ID_DISPATCHURLINTERNAL: - DBG_ASSERT(rValue.getValueType().getTypeClass() == TypeClass_BOOLEAN, "OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" ); + DBG_ASSERT(rValue.getValueTypeClass() == TypeClass_BOOLEAN, "OClickableImageBaseModel::setFastPropertyValue_NoBroadcast : invalid type !" ); rValue >>= m_bDispatchUrlInternal; break; diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 758cae8a1de4..67ef5bfec6e2 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -1097,7 +1097,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any if (aPair.first == aPair.second) throw NoSuchElementException(); - if (Element.getValueType().getTypeClass() != TypeClass_INTERFACE) + if (Element.getValueTypeClass() != TypeClass_INTERFACE) throw IllegalArgumentException(); Reference<XPropertySet> xSet; diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index b1e0a8aa7322..bce816334ebd 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -279,7 +279,7 @@ void DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUStringBuff if (aValue.getValueTypeClass() == css::uno::TypeClass_ENUM ) { - OUString aName = aValue.getValueType().getTypeName(); + OUString aName = aValue.getValueTypeName(); aArgumentBuffer.append( aName ); aArgumentBuffer.append("."); } diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx index 9bae72e77f0c..e6a1a856aaa6 100644 --- a/include/comphelper/unwrapargs.hxx +++ b/include/comphelper/unwrapargs.hxx @@ -82,7 +82,7 @@ namespace detail { { OUString msg = "Cannot extract ANY { " + - seq[nArg].getValueType().getTypeName() + + seq[nArg].getValueTypeName() + " } to " + ::cppu::UnoType<T>::get().getTypeName() + "!"; diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx index 339c3910e2a7..3c55ae925e52 100644 --- a/include/cppuhelper/proptypehlp.hxx +++ b/include/cppuhelper/proptypehlp.hxx @@ -45,7 +45,7 @@ void convertPropertyValue(bool & b, const css::uno::Any & a) if( a >>= b ) return; - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BYTE: b = a.get<sal_Int8>() != 0; break; @@ -85,7 +85,7 @@ void convertPropertyValue(sal_Bool & target, css::uno::Any const & source) { inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const css::uno::Any & a ) { if( !(a >>= i) ) { - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: i = static_cast<sal_Int64>(a.get<bool>()); break; @@ -106,7 +106,7 @@ inline void SAL_CALL convertPropertyValue( sal_Int64 & i , const css::uno::Any inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const css::uno::Any & a ) { if( !(a >>= i) ) { - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: i = static_cast<sal_uInt64>(a.get<bool>()); break; @@ -126,7 +126,7 @@ inline void SAL_CALL convertPropertyValue( sal_uInt64 & i , const css::uno::Any inline void SAL_CALL convertPropertyValue( sal_Int32 & i , const css::uno::Any & a ) { if( !(a >>= i) ) { - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: i = static_cast<sal_Int32>(a.get<bool>()); break; @@ -146,7 +146,7 @@ inline void SAL_CALL convertPropertyValue( sal_Int32 & i , const css::uno::Any inline void SAL_CALL convertPropertyValue( sal_uInt32 & i , const css::uno::Any & a ) { if( !(a >>= i) ) { - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: i = static_cast<sal_uInt32>(a.get<bool>()); break; @@ -166,7 +166,7 @@ inline void SAL_CALL convertPropertyValue( sal_uInt32 & i , const css::uno::Any inline void SAL_CALL convertPropertyValue( sal_Int16 & i , const css::uno::Any & a ) { if( !(a >>= i) ) { - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: i = static_cast<sal_Int16>(a.get<bool>()); break; @@ -186,7 +186,7 @@ inline void SAL_CALL convertPropertyValue( sal_Int16 & i , const css::uno::Any inline void SAL_CALL convertPropertyValue( sal_uInt16 & i , const css::uno::Any & a ) { if( !(a >>= i) ) { - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: i = static_cast<sal_uInt16>(a.get<bool>()); break; @@ -206,7 +206,7 @@ inline void SAL_CALL convertPropertyValue( sal_uInt16 & i , const css::uno::Any inline void SAL_CALL convertPropertyValue( sal_Int8 & i , const css::uno::Any & a ) { if( !(a >>= i) ) { - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: i = static_cast<sal_Int8>(a.get<bool>()); break; @@ -221,7 +221,7 @@ inline void SAL_CALL convertPropertyValue( float &f , const css::uno::Any &a ) if( a >>= f ) return; - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: f = static_cast<float>(a.get<bool>()); break; @@ -257,7 +257,7 @@ inline void SAL_CALL convertPropertyValue( double &d , const css::uno::Any &a ) if( a >>= d ) return; - switch( a.getValueType().getTypeClass() ) { + switch( a.getValueTypeClass() ) { case css::uno::TypeClass_BOOLEAN: d = static_cast<double>(a.get<bool>()); break; diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx index b833970e8751..fe55c4bf36cb 100644 --- a/pyuno/source/module/pyuno_except.cxx +++ b/pyuno/source/module/pyuno_except.cxx @@ -37,7 +37,7 @@ void raisePyExceptionWithAny( const css::uno::Any &anyExc ) PyRef exc = runtime.any2PyObject( anyExc ); if( exc.is() ) { - PyRef type( getClass( anyExc.getValueType().getTypeName(),runtime ) ); + PyRef type( getClass( anyExc.getValueTypeName(),runtime ) ); PyErr_SetObject( type.get(), exc.get()); } else @@ -46,7 +46,7 @@ void raisePyExceptionWithAny( const css::uno::Any &anyExc ) anyExc >>= e; OUString buf = "Couldn't convert uno exception to a python exception (" + - anyExc.getValueType().getTypeName() + ": " + e.Message + ")"; + anyExc.getValueTypeName() + ": " + e.Message + ")"; PyErr_SetString( PyExc_SystemError, OUStringToOString(buf,RTL_TEXTENCODING_ASCII_US).getStr() ); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 471121a8bf6d..5e98cc434d8f 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -488,13 +488,13 @@ PyRef Runtime::any2PyObject (const Any &a ) const } } } - throw RuntimeException( "Any carries enum " + a.getValueType().getTypeName() + + throw RuntimeException( "Any carries enum " + a.getValueTypeName() + " with invalid value " + OUString::number(l) ); } case css::uno::TypeClass_EXCEPTION: case css::uno::TypeClass_STRUCT: { - PyRef excClass = getClass( a.getValueType().getTypeName(), *this ); + PyRef excClass = getClass( a.getValueTypeName(), *this ); PyRef value = PyUNOStruct_new( a, getImpl()->cargo->xInvocation ); PyRef argsTuple( PyTuple_New( 1 ) , SAL_NO_ACQUIRE, NOT_NULL ); PyTuple_SetItem( argsTuple.get() , 0 , value.getAcquired() ); @@ -502,7 +502,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const if( ! ret.is() ) { throw RuntimeException( "Couldn't instantiate python representation of structured UNO type " + - a.getValueType().getTypeName() ); + a.getValueTypeName() ); } if( auto e = o3tl::tryAccess<css::uno::Exception>(a) ) diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx index 977ac8d70e69..1a691f16d5f0 100644 --- a/pyuno/source/module/pyuno_struct.cxx +++ b/pyuno/source/module/pyuno_struct.cxx @@ -73,7 +73,7 @@ static PyObject *PyUNOStruct_repr( PyObject *self ) PyUNO *me = reinterpret_cast<PyUNO*>( self ); PyObject *ret = nullptr; - if( me->members->wrappedObject.getValueType().getTypeClass() + if( me->members->wrappedObject.getValueTypeClass() == css::uno::TypeClass_EXCEPTION ) { Reference< XMaterialHolder > rHolder(me->members->xInvocation,UNO_QUERY); @@ -134,7 +134,7 @@ static PyObject* PyUNOStruct_getattr( PyObject* self, char* name ) if( strcmp( name, "__class__" ) == 0 ) { return getClass( - me->members->wrappedObject.getValueType().getTypeName(), runtime ).getAcquired(); + me->members->wrappedObject.getValueTypeName(), runtime ).getAcquired(); } PyObject *pRet = PyObject_GenericGetAttr( self, PyUnicode_FromString( name ) ); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index a2a731777cd9..939a3ef8fbde 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -967,7 +967,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope // nothing to do, type is already as desired return aPropertyValue; - if ( _rControlValue.getValueType().getTypeClass() == uno::TypeClass_STRING ) + if ( _rControlValue.getValueTypeClass() == uno::TypeClass_STRING ) { OUString sControlValue; _rControlValue >>= sControlValue; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index d817c9a970b4..c0caf001c20d 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -277,7 +277,7 @@ namespace calc if ( aValue.hasValue() ) checkValueType( aGuard, aValue.getValueType() ); - switch ( aValue.getValueType().getTypeClass() ) + switch ( aValue.getValueTypeClass() ) { case TypeClass_STRING: { diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 178e8aef00c1..96d71e06b108 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -78,7 +78,7 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const uno::Sequence< uno:: { for( uno::Any & rArray : asNonConstRange(aParamTemp) ) { - switch( rArray.getValueType().getTypeClass() ) + switch( rArray.getValueTypeClass() ) { case uno::TypeClass_BOOLEAN: lclConvertBooleanToDouble( rArray ); diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index 7f1e2be5133b..79588352cfb2 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -1096,7 +1096,7 @@ bool AnimationExporter::exportAnimProperty( SvStream& rStrm, const sal_uInt16 nP bool bRet = false; if ( rAny.hasValue() ) { - switch( rAny.getValueType().getTypeClass() ) + switch( rAny.getValueTypeClass() ) { case css::uno::TypeClass_UNSIGNED_SHORT : case css::uno::TypeClass_SHORT : diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx index 4120b3d7a73a..0029cc96c659 100644 --- a/sd/source/filter/eppt/pptx-animations.cxx +++ b/sd/source/filter/eppt/pptx-animations.cxx @@ -108,7 +108,7 @@ void WriteAnimationProperty(const FSHelperPtr& pFS, const Any& rAny, sal_Int32 n sal_Int32 nRgb = {}; // spurious -Werror=maybe-uninitialized double fDouble = {}; // spurious -Werror=maybe-uninitialized - TypeClass aClass = rAny.getValueType().getTypeClass(); + TypeClass aClass = rAny.getValueTypeClass(); bool bWriteToken = nToken && (aClass == TypeClass_LONG || aClass == TypeClass_DOUBLE || aClass == TypeClass_STRING); @@ -116,7 +116,7 @@ void WriteAnimationProperty(const FSHelperPtr& pFS, const Any& rAny, sal_Int32 n if (bWriteToken) pFS->startElementNS(XML_p, nToken); - switch (rAny.getValueType().getTypeClass()) + switch (rAny.getValueTypeClass()) { case TypeClass_LONG: if (!(rAny >>= nRgb)) diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx index 83c6a4eb69c9..f3fd127bd5b0 100644 --- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx +++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx @@ -67,7 +67,7 @@ OUString enumValueToEnumName(uno::Any const& aValue, uno::UNO_QUERY); uno::Reference<reflection::XEnumTypeDescription> xTypeDescription; - xTypeDescription.set(xManager->getByHierarchicalName(aValue.getValueType().getTypeName()), + xTypeDescription.set(xManager->getByHierarchicalName(aValue.getValueTypeName()), uno::UNO_QUERY); const uno::Sequence<sal_Int32> aValues = xTypeDescription->getEnumValues(); @@ -300,7 +300,7 @@ OUString convertAnyToShortenedString(const uno::Any& aValue, /** converts an any's type to a string (in a short form) */ OUString getAnyType(const uno::Any& aValue) { - OUString aTypeName = aValue.getValueType().getTypeName(); + OUString aTypeName = aValue.getValueTypeName(); return aTypeName.replaceAll("com.sun.star", "css"); } @@ -558,7 +558,7 @@ public: { if (maAny.hasValue()) { - switch (maAny.getValueType().getTypeClass()) + switch (maAny.getValueTypeClass()) { case uno::TypeClass_INTERFACE: { @@ -853,8 +853,7 @@ void GenericPropertiesNode::fillChildren(std::unique_ptr<weld::TreeView>& pTree, void StructNode::fillChildren(std::unique_ptr<weld::TreeView>& pTree, const weld::TreeIter* pParent) { auto xReflection = reflection::theCoreReflection::get(mxContext); - uno::Reference<reflection::XIdlClass> xClass - = xReflection->forName(maAny.getValueType().getTypeName()); + uno::Reference<reflection::XIdlClass> xClass = xReflection->forName(maAny.getValueTypeName()); const auto xFields = xClass->getFields(); @@ -875,7 +874,7 @@ ObjectInspectorNodeInterface* BasicValueNode::createNodeObjectForAny(OUString co const uno::Any& rAny, OUString const& rInfo) { - switch (rAny.getValueType().getTypeClass()) + switch (rAny.getValueTypeClass()) { case uno::TypeClass_INTERFACE: return new GenericPropertiesNode(rName, rAny, rInfo, mxContext); diff --git a/static/source/unoembindhelpers/PrimaryBindings.cxx b/static/source/unoembindhelpers/PrimaryBindings.cxx index ab2adecad091..7cf197694cae 100644 --- a/static/source/unoembindhelpers/PrimaryBindings.cxx +++ b/static/source/unoembindhelpers/PrimaryBindings.cxx @@ -329,7 +329,7 @@ EMSCRIPTEN_BINDINGS(PrimaryBindings) .constructor(&constructAny) .function("getType", &css::uno::Any::getValueType) .function("get", +[](css::uno::Any const& self) { - switch (self.getValueType().getTypeClass()) + switch (self.getValueTypeClass()) { case css::uno::TypeClass_VOID: return emscripten::val::undefined(); diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx index f3de3041c260..1eecd9c99646 100644 --- a/stoc/source/corereflection/crarray.cxx +++ b/stoc/source/corereflection/crarray.cxx @@ -39,7 +39,7 @@ void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen ) if (eTC != TypeClass_SEQUENCE) { throw IllegalArgumentException( - "expected sequence, but found " + rArray.getValueType().getTypeName(), + "expected sequence, but found " + rArray.getValueTypeName(), getXWeak(), 0 ); } if (nLen < 0) @@ -63,7 +63,7 @@ sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray ) if (eTC != TypeClass_SEQUENCE) { throw IllegalArgumentException( - "expected sequence, but found " + rArray.getValueType().getTypeName(), + "expected sequence, but found " + rArray.getValueTypeName(), getXWeak(), 0 ); } @@ -76,7 +76,7 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex ) if (eTC != TypeClass_SEQUENCE) { throw IllegalArgumentException( - "expected sequence, but found " + rArray.getValueType().getTypeName(), + "expected sequence, but found " + rArray.getValueTypeName(), getXWeak(), 0 ); } @@ -106,7 +106,7 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal if (eTC != TypeClass_SEQUENCE) { throw IllegalArgumentException( - "expected sequence, but found " + rArray.getValueType().getTypeName(), + "expected sequence, but found " + rArray.getValueTypeName(), getXWeak(), 0 ); } diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx index d47151c7ea92..b370b00adc4a 100644 --- a/stoc/source/corereflection/crcomp.cxx +++ b/stoc/source/corereflection/crcomp.cxx @@ -136,7 +136,7 @@ Any IdlCompFieldImpl::get( const Any & rObj ) TYPELIB_DANGER_RELEASE( pObjTD ); } throw IllegalArgumentException( - "expected struct or exception, got " + rObj.getValueType().getTypeName(), + "expected struct or exception, got " + rObj.getValueTypeName(), getXWeak(), 0 ); } @@ -168,7 +168,7 @@ void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue ) TYPELIB_DANGER_RELEASE( pObjTD ); } throw IllegalArgumentException( - "expected struct or exception, got " + rObj.getValueType().getTypeName(), + "expected struct or exception, got " + rObj.getValueTypeName(), getXWeak(), 0 ); } @@ -201,7 +201,7 @@ void IdlCompFieldImpl::set( Any & rObj, const Any & rValue ) TYPELIB_DANGER_RELEASE( pObjTD ); } throw IllegalArgumentException( - "expected struct or exception, got " + rObj.getValueType().getTypeName(), + "expected struct or exception, got " + rObj.getValueTypeName(), getXWeak(), 0 ); } diff --git a/stoc/source/corereflection/dump.cxx b/stoc/source/corereflection/dump.cxx index 445e05b83e79..4009eb58512d 100644 --- a/stoc/source/corereflection/dump.cxx +++ b/stoc/source/corereflection/dump.cxx @@ -230,7 +230,7 @@ public: OUString SAL_CALL dumpAny(css::uno::Any const& value) override { - return "[" + value.getValueType().getTypeName() + ": " + dumpValue(value) + "]"; + return "[" + value.getValueTypeName() + ": " + dumpValue(value) + "]"; } OUString SAL_CALL dumpConstant(OUString const& constantsGroup, diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 3082bed5d44e..c8224d084130 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1054,8 +1054,8 @@ void SAL_CALL NestedRegistryImpl::initialize( const Sequence< Any >& aArguments { Guard< Mutex > aGuard( m_mutex ); if ( (aArguments.getLength() == 2) && - (aArguments[0].getValueType().getTypeClass() == TypeClass_INTERFACE) && - (aArguments[1].getValueType().getTypeClass() == TypeClass_INTERFACE) ) + (aArguments[0].getValueTypeClass() == TypeClass_INTERFACE) && + (aArguments[1].getValueTypeClass() == TypeClass_INTERFACE) ) { aArguments[0] >>= m_localReg; aArguments[1] >>= m_defaultReg; diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 6f2a8cb4ee93..993574928a8f 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1142,7 +1142,7 @@ Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceM Any aAny = xPropSet->getPropertyValue( Registry ); - if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE ) { + if( aAny.getValueTypeClass() == TypeClass_INTERFACE ) { aAny >>= xRegistry; } } @@ -1173,7 +1173,7 @@ void ImplementationRegistration::initialize( Reference< XSimpleRegistry > rReg; // 1st argument : An instance of an implementation loader - if( aArgs[0].getValueType().getTypeClass() == TypeClass_INTERFACE ) { + if( aArgs[0].getValueTypeClass() == TypeClass_INTERFACE ) { aArgs[0] >>= rLoader; } if( !rLoader.is()) { @@ -1185,7 +1185,7 @@ void ImplementationRegistration::initialize( } // 2nd argument : The service name of the loader. This name is written into the registry - if( aArgs[1].getValueType().getTypeClass() == TypeClass_STRING ) { + if( aArgs[1].getValueTypeClass() == TypeClass_STRING ) { aArgs[1] >>= loaderServiceName; } if( loaderServiceName.isEmpty() ) { @@ -1196,7 +1196,7 @@ void ImplementationRegistration::initialize( } // 3rd argument : The file name of the dll, that contains the loader - if( aArgs[2].getValueType().getTypeClass() == TypeClass_STRING ) { + if( aArgs[2].getValueTypeClass() == TypeClass_STRING ) { aArgs[2] >>= locationUrl; } if( locationUrl.isEmpty() ) { @@ -1207,7 +1207,7 @@ void ImplementationRegistration::initialize( } // 4th argument : The registry, the service should be written to - if( aArgs[3].getValueType().getTypeClass() == TypeClass_INTERFACE ) { + if( aArgs[3].getValueTypeClass() == TypeClass_INTERFACE ) { aArgs[3] >>= rReg; } @@ -1342,7 +1342,7 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati try { Any aAny = xPropSet->getPropertyValue( Registry ); - if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE ) + if( aAny.getValueTypeClass() == TypeClass_INTERFACE ) { aAny >>= xRegistry; } diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index 6d9a54313923..4e4350f16e8b 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -364,7 +364,7 @@ void IntrospectionAccessStatic_Impl::setPropertyValueByIndex(const Any& obj, sal Reference<XInterface> xInterface; if( !(obj >>= xInterface) ) { - TypeClass eObjType = obj.getValueType().getTypeClass(); + TypeClass eObjType = obj.getValueTypeClass(); if( nSequenceIndex >= mnPropCount) throw IllegalArgumentException( "IntrospectionAccessStatic_Impl::setPropertyValueByIndex(), index > propertyCount, " + @@ -373,7 +373,7 @@ void IntrospectionAccessStatic_Impl::setPropertyValueByIndex(const Any& obj, sal if( eObjType != TypeClass_STRUCT && eObjType != TypeClass_EXCEPTION ) throw IllegalArgumentException( "IntrospectionAccessStatic_Impl::setPropertyValueByIndex(), expected struct or exception, got" + - obj.getValueType().getTypeName(), Reference<XInterface>(), 0); + obj.getValueTypeName(), Reference<XInterface>(), 0); } // Test flags @@ -509,7 +509,7 @@ Any IntrospectionAccessStatic_Impl::getPropertyValueByIndex(const Any& obj, sal_ Reference<XInterface> xInterface; if( !(obj >>= xInterface) ) { - TypeClass eObjType = obj.getValueType().getTypeClass(); + TypeClass eObjType = obj.getValueTypeClass(); if( nSequenceIndex >= mnPropCount || ( eObjType != TypeClass_STRUCT && eObjType != TypeClass_EXCEPTION ) ) { // throw IllegalArgumentException(); @@ -1547,7 +1547,7 @@ css::uno::Reference<css::beans::XIntrospectionAccess> Implementation::inspect( } // Examine object - TypeClass eType = aToInspectObj.getValueType().getTypeClass(); + TypeClass eType = aToInspectObj.getValueTypeClass(); if( eType != TypeClass_INTERFACE && eType != TypeClass_STRUCT && eType != TypeClass_EXCEPTION ) return css::uno::Reference<css::beans::XIntrospectionAccess>(); diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index 83082d2f2c8c..af7e0b752290 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -99,7 +99,7 @@ void DllComponentLoader::initialize( const css::uno::Sequence< css::uno::Any >& // Reference< XMultiServiceFactory > rServiceManager; -// if( aArgs.getConstArray()[0].getValueType().getTypeClass() == TypeClass_INTERFACE ) +// if( aArgs.getConstArray()[0].getValueTypeClass() == TypeClass_INTERFACE ) // { // aArgs.getConstArray()[0] >>= rServiceManager; // } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 80aaae31bfbd..82ec03c3635d 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -1005,7 +1005,7 @@ void OServiceManager::insert( const Any & Element ) if( Element.getValueTypeClass() != TypeClass_INTERFACE ) { throw IllegalArgumentException( - "exception interface, got " + Element.getValueType().getTypeName(), + "exception interface, got " + Element.getValueTypeName(), Reference< XInterface >(), 0 ); } Reference<XInterface > xEle( Element, UNO_QUERY_THROW ); @@ -1077,7 +1077,7 @@ void OServiceManager::remove( const Any & Element ) else { throw IllegalArgumentException( - "expected interface or string, got " + Element.getValueType().getTypeName(), + "expected interface or string, got " + Element.getValueTypeName(), Reference< XInterface >(), 0 ); } diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx index 5549779db117..5ad0ab95a8b7 100644 --- a/stoc/test/testconv.cxx +++ b/stoc/test/testconv.cxx @@ -52,7 +52,7 @@ const double MAX_FLOAT = FLT_MAX; static void printValue( const Any & rVal ) { // print value - OString aStr( OUStringToOString( rVal.getValueType().getTypeName(), RTL_TEXTENCODING_ISO_8859_1 ) ); + OString aStr( OUStringToOString( rVal.getValueTypeName(), RTL_TEXTENCODING_ISO_8859_1 ) ); printf( "(%s)", aStr.getStr() ); switch (rVal.getValueTypeClass()) @@ -250,7 +250,7 @@ static sal_Bool convertTo( const Type & rDestType, const Any & rVal, sal_Bool bE printf( "# re-conversion of " ); printValue( aRet ); printf( " to " ); - printf( rVal.getValueType().getTypeName().getStr() ); + printf( rVal.getValueTypeName().getStr() ); printf( " failed! [" ); printf( aExcMsg.getStr() ); printf( "] " ); diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx index 0b56c8564ef9..ce67a07eb95f 100644 --- a/stoc/test/testintrosp.cxx +++ b/stoc/test/testintrosp.cxx @@ -944,7 +944,7 @@ static sal_Bool test_introsp( Reference< XMultiServiceFactory > xMgr, OSL_ENSURE( aValStr == aDemandedValStr, aErrorStr.getStr() ); // check value and modify it according to its type - TypeClass eType = aPropVal.getValueType().getTypeClass(); + TypeClass eType = aPropVal.getValueTypeClass(); Any aNewVal; sal_Bool bModify = sal_True; switch( eType ) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 8861c69fcdc9..af72f2045a55 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -761,7 +761,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& rM xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY); DBG_ASSERT(xCurCol.is(), "FmGridHeader::PreExecuteColumnContextMenu : the Peer has invalid columns !"); aHidden = xCurCol->getPropertyValue(FM_PROP_HIDDEN); - DBG_ASSERT(aHidden.getValueType().getTypeClass() == TypeClass_BOOLEAN, + DBG_ASSERT(aHidden.getValueTypeClass() == TypeClass_BOOLEAN, "FmGridHeader::PreExecuteColumnContextMenu : the property 'hidden' should be boolean !"); if (::comphelper::getBOOL(aHidden)) { @@ -1140,7 +1140,7 @@ void FmGridControl::SetDesignMode(bool bMode) { Any aSelection = xSelSupplier->getSelection(); Reference< css::beans::XPropertySet > xColumn; - if (aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE) + if (aSelection.getValueTypeClass() == TypeClass_INTERFACE) xColumn.set(aSelection, css::uno::UNO_QUERY); Reference< XInterface > xCurrent; for (sal_Int32 i=0; i<xColumns->getCount(); ++i) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index b3fe21c0cc0f..9326f6b3c6ee 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1361,7 +1361,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) else if (evt.PropertyName == FM_PROP_WIDTH) { sal_Int32 nWidth = 0; - if (evt.NewValue.getValueType().getTypeClass() == TypeClass_VOID) + if (evt.NewValue.getValueTypeClass() == TypeClass_VOID) nWidth = pGrid->GetDefaultColumnWidth(pGrid->GetColumnTitle(nId)); // GetDefaultColumnWidth already considered the zoom factor else @@ -1386,7 +1386,7 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) } else if (evt.PropertyName == FM_PROP_HIDDEN) { - DBG_ASSERT(evt.NewValue.getValueType().getTypeClass() == TypeClass_BOOLEAN, + DBG_ASSERT(evt.NewValue.getValueTypeClass() == TypeClass_BOOLEAN, "FmXGridPeer::propertyChange : the property 'hidden' should be of type boolean !"); if (::comphelper::getBOOL(evt.NewValue)) pGrid->HideColumn(nId); @@ -2245,7 +2245,7 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) Reference< css::view::XSelectionSupplier > xSelSupplier(evt.Source, UNO_QUERY); Any aSelection = xSelSupplier->getSelection(); - DBG_ASSERT(aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE, "FmXGridPeer::selectionChanged : invalid selection !"); + DBG_ASSERT(aSelection.getValueTypeClass() == TypeClass_INTERFACE, "FmXGridPeer::selectionChanged : invalid selection !"); Reference< XPropertySet > xSelection; aSelection >>= xSelection; if (xSelection.is()) diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 64947e7c8814..dae6b27a0e44 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1281,7 +1281,7 @@ void DbFormattedField::Init( BrowserDataWin& rParent, const Reference< XRowSet > Any aFmtKey( xUnoModel->getPropertyValue(FM_PROP_FORMATKEY)); if (aFmtKey.hasValue()) { - DBG_ASSERT(aFmtKey.getValueType().getTypeClass() == TypeClass_LONG, "DbFormattedField::Init : invalid format key property (no sal_Int32) !"); + DBG_ASSERT(aFmtKey.getValueTypeClass() == TypeClass_LONG, "DbFormattedField::Init : invalid format key property (no sal_Int32) !"); nFormatKey = ::comphelper::getINT32(aFmtKey); } else @@ -1348,9 +1348,9 @@ void DbFormattedField::Init( BrowserDataWin& rParent, const Reference< XRowSet > if (::comphelper::hasProperty(FM_PROP_EFFECTIVE_MIN, xUnoModel)) { Any aMin( xUnoModel->getPropertyValue(FM_PROP_EFFECTIVE_MIN)); - if (aMin.getValueType().getTypeClass() != TypeClass_VOID) + if (aMin.getValueTypeClass() != TypeClass_VOID) { - DBG_ASSERT(aMin.getValueType().getTypeClass() == TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid min value !"); + DBG_ASSERT(aMin.getValueTypeClass() == TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid min value !"); double dMin = ::comphelper::getDouble(aMin); rControlFormatter.SetMinValue(dMin); rPainterFormatter.SetMinValue(dMin); @@ -1366,9 +1366,9 @@ void DbFormattedField::Init( BrowserDataWin& rParent, const Reference< XRowSet > if (::comphelper::hasProperty(FM_PROP_EFFECTIVE_MAX, xUnoModel)) { Any aMax(xUnoModel->getPropertyValue(FM_PROP_EFFECTIVE_MAX)); - if (aMax.getValueType().getTypeClass() != TypeClass_VOID) + if (aMax.getValueTypeClass() != TypeClass_VOID) { - DBG_ASSERT(aMax.getValueType().getTypeClass() == TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid max value !"); + DBG_ASSERT(aMax.getValueTypeClass() == TypeClass_DOUBLE, "DbFormattedField::Init : the model has an invalid max value !"); double dMax = ::comphelper::getDouble(aMax); rControlFormatter.SetMaxValue(dMax); rPainterFormatter.SetMaxValue(dMax); @@ -1386,7 +1386,7 @@ void DbFormattedField::Init( BrowserDataWin& rParent, const Reference< XRowSet > Any aDefault( xUnoModel->getPropertyValue(FM_PROP_EFFECTIVE_DEFAULT)); if (aDefault.hasValue()) { // the thing can be a double or a string - switch (aDefault.getValueType().getTypeClass()) + switch (aDefault.getValueTypeClass()) { case TypeClass_DOUBLE: if (m_rColumn.IsNumeric()) @@ -2258,7 +2258,7 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet > weld::DateFormatter& rPainterFormatter = static_cast<weld::DateFormatter&>(pPainter->get_formatter()); Any aCentury = _rxModel->getPropertyValue( FM_PROP_DATE_SHOW_CENTURY ); - if ( aCentury.getValueType().getTypeClass() != TypeClass_VOID ) + if ( aCentury.getValueTypeClass() != TypeClass_VOID ) { bool bShowDateCentury = getBOOL( aCentury ); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 4cae4ae8a502..4dd1f84ce274 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -362,7 +362,7 @@ namespace svx } else { - switch ( _rUnoState.getValueType().getTypeClass() ) + switch ( _rUnoState.getValueTypeClass() ) { case TypeClass_BOOLEAN: { diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 014884802c11..4b88dbfdf2e0 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -1040,7 +1040,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName, m_rEntry.family()); if (pBase) throw container::ElementExistException(); - if(rElement.getValueType().getTypeClass() != uno::TypeClass_INTERFACE) + if(rElement.getValueTypeClass() != uno::TypeClass_INTERFACE) throw lang::IllegalArgumentException(); if (SwGetPoolIdFromName::CellStyle == m_rEntry.poolId()) { diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index c818997ca28f..aeb358201205 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -972,7 +972,7 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings() static sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, bool& bException) { bException = false; - TypeClass eType = rValue.getValueType().getTypeClass(); + TypeClass eType = rValue.getValueTypeClass(); sal_uInt32 nRet = 0; if( eType == TypeClass_UNSIGNED_LONG ) diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx index 09b2f1e9d81d..eedf85f13ded 100644 --- a/testtools/source/bridgetest/bridgetest.cxx +++ b/testtools/source/bridgetest/bridgetest.cxx @@ -232,20 +232,20 @@ bool testAny( fprintf( stderr, "any is different after roundtrip: in %s, out %s ", OUStringToOString( - any.getValueType().getTypeName(), + any.getValueTypeName(), RTL_TEXTENCODING_ASCII_US).getStr(), OUStringToOString( - any2.getValueType().getTypeName(), + any2.getValueTypeName(), RTL_TEXTENCODING_ASCII_US).getStr()); success = false; } if (typeName != nullptr - && !any2.getValueType().getTypeName().equalsAscii(typeName)) + && !any2.getValueTypeName().equalsAscii(typeName)) { fprintf( stderr, "any has wrong type after roundtrip: %s instead of %s ", OUStringToOString( - any2.getValueType().getTypeName(), + any2.getValueTypeName(), RTL_TEXTENCODING_ASCII_US).getStr(), typeName); success = false; diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index ba0a62c716eb..e7be48ed2894 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -126,7 +126,7 @@ void VCLXContainer::setTabOrder( const css::uno::Sequence< css::uno::Reference< WinBits nStyle = pWin->GetStyle(); nStyle &= ~(WB_TABSTOP|WB_NOTABSTOP|WB_GROUP); - if ( pTabs[n].getValueType().getTypeClass() == css::uno::TypeClass_BOOLEAN ) + if ( pTabs[n].getValueTypeClass() == css::uno::TypeClass_BOOLEAN ) { bool bTab = false; pTabs[n] >>= bTab; diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 20ddba055804..79b21ebfa4d3 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1403,7 +1403,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const css::uno::Any& if ( !pWindow ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; WindowType eWinType = pWindow->GetType(); sal_uInt16 nPropType = GetPropertyId( PropertyName ); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index f1162b68cf56..c5f4ededd2e6 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1865,7 +1865,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const css::uno::Any case BASEPROPERTY_HIGHLIGHT_COLOR: { Color nColor = 0; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; if (bVoid) { nColor = Application::GetSettings().GetStyleSettings().GetHighlightColor(); @@ -1881,7 +1881,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const css::uno::Any case BASEPROPERTY_HIGHLIGHT_TEXT_COLOR: { Color nColor = 0; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; if (bVoid) { nColor = Application::GetSettings().GetStyleSettings().GetHighlightTextColor(); @@ -2335,7 +2335,7 @@ void SAL_CALL VCLXDialog::setProperty( if ( !pDialog ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -2459,7 +2459,7 @@ void SAL_CALL VCLXMultiPage::setProperty( if ( !pTabControl ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -2680,7 +2680,7 @@ void SAL_CALL VCLXTabPage::setProperty( if ( !pTabPage ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -3344,7 +3344,7 @@ void VCLXScrollBar::setProperty( const OUString& PropertyName, const css::uno::A if ( !pScrollBar ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -4141,7 +4141,7 @@ void VCLXComboBox::setProperty( const OUString& PropertyName, const css::uno::An if ( !pComboBox ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) { @@ -4639,7 +4639,7 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const css::uno::A if ( !(GetWindow()) ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -5109,7 +5109,7 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const css::uno::A if ( !(GetWindow()) ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -5425,7 +5425,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const css::uno if ( !(GetWindow()) ) return; - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; sal_uInt16 nPropType = GetPropertyId( PropertyName ); switch ( nPropType ) @@ -6183,7 +6183,7 @@ void VCLXProgressBar::setProperty( const OUString& PropertyName, const css::uno: VclPtr<vcl::Window> pWindow = GetWindow(); if ( pWindow ) { - bool bVoid = Value.getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = Value.getValueTypeClass() == css::uno::TypeClass_VOID; if ( bVoid ) { @@ -6596,7 +6596,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const css::u case BASEPROPERTY_EFFECTIVE_VALUE: case BASEPROPERTY_VALUE_DOUBLE: { - const css::uno::TypeClass rTC = Value.getValueType().getTypeClass(); + const css::uno::TypeClass rTC = Value.getValueTypeClass(); if (rTC != css::uno::TypeClass_STRING) // no string if (rTC != css::uno::TypeClass_DOUBLE) @@ -6733,7 +6733,7 @@ css::uno::Any SVTXFormattedField::convertEffectiveValue(const css::uno::Any& rVa return aReturn; Formatter& rFieldFormatter = pField->GetFormatter(); - switch (rValue.getValueType().getTypeClass()) + switch (rValue.getValueTypeClass()) { case css::uno::TypeClass_DOUBLE: if (rFieldFormatter.TreatingAsNumber()) @@ -6791,7 +6791,7 @@ void SVTXFormattedField::SetMinValue(const css::uno::Any& rValue) return; Formatter& rFormatter = pField->GetFormatter(); - switch (rValue.getValueType().getTypeClass()) + switch (rValue.getValueTypeClass()) { case css::uno::TypeClass_DOUBLE: @@ -6802,8 +6802,8 @@ void SVTXFormattedField::SetMinValue(const css::uno::Any& rValue) break; } default: - DBG_ASSERT(rValue.getValueType().getTypeClass() == css::uno::TypeClass_VOID, "SVTXFormattedField::SetMinValue : invalid argument (an exception will be thrown) !"); - if ( rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID ) + DBG_ASSERT(rValue.getValueTypeClass() == css::uno::TypeClass_VOID, "SVTXFormattedField::SetMinValue : invalid argument (an exception will be thrown) !"); + if ( rValue.getValueTypeClass() != css::uno::TypeClass_VOID ) { throw css::lang::IllegalArgumentException(); @@ -6834,7 +6834,7 @@ void SVTXFormattedField::SetMaxValue(const css::uno::Any& rValue) return; Formatter& rFormatter = pField->GetFormatter(); - switch (rValue.getValueType().getTypeClass()) + switch (rValue.getValueTypeClass()) { case css::uno::TypeClass_DOUBLE: { @@ -6844,7 +6844,7 @@ void SVTXFormattedField::SetMaxValue(const css::uno::Any& rValue) break; } default: - if (rValue.getValueType().getTypeClass() != css::uno::TypeClass_VOID) + if (rValue.getValueTypeClass() != css::uno::TypeClass_VOID) { throw css::lang::IllegalArgumentException(); @@ -6877,7 +6877,7 @@ void SVTXFormattedField::SetDefaultValue(const css::uno::Any& rValue) css::uno::Any aConverted = convertEffectiveValue(rValue); Formatter& rFormatter = pField->GetFormatter(); - switch (aConverted.getValueType().getTypeClass()) + switch (aConverted.getValueTypeClass()) { case css::uno::TypeClass_DOUBLE: { @@ -6968,7 +6968,7 @@ void SVTXFormattedField::SetValue(const css::uno::Any& rValue) else { Formatter& rFormatter = pField->GetFormatter(); - if (rValue.getValueType().getTypeClass() == css::uno::TypeClass_DOUBLE ) + if (rValue.getValueTypeClass() == css::uno::TypeClass_DOUBLE ) { double d = 0.0; rValue >>= d; @@ -6976,7 +6976,7 @@ void SVTXFormattedField::SetValue(const css::uno::Any& rValue) } else { - DBG_ASSERT(rValue.getValueType().getTypeClass() == css::uno::TypeClass_STRING, "SVTXFormattedField::SetValue : invalid argument !"); + DBG_ASSERT(rValue.getValueTypeClass() == css::uno::TypeClass_STRING, "SVTXFormattedField::SetValue : invalid argument !"); OUString sText; rValue >>= sText; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 5a5fdfa05b11..08207a61ae64 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -549,7 +549,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt const css::uno::Any* pProp = &(maData[rProp]); OutStream->writeShort( rProp ); - bool bVoid = pProp->getValueType().getTypeClass() == css::uno::TypeClass_VOID; + bool bVoid = pProp->getValueTypeClass() == css::uno::TypeClass_VOID; OutStream->writeBoolean( bVoid ); @@ -1030,7 +1030,7 @@ css::uno::Sequence< OUString > UnoControlModel::getSupportedServiceNames( ) -e ... etc. - the rest is truncated
