diff options
Diffstat (limited to 'sw/source')
29 files changed, 98 insertions, 98 deletions
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx index 4b04920f8f78..1c96f144efa7 100644 --- a/sw/source/core/doc/docbasic.cxx +++ b/sw/source/core/doc/docbasic.cxx @@ -63,7 +63,7 @@ static Sequence<Any> *lcl_docbasic_convertArgs( SbxArray& rArgs ) pUnoArgs[i] <<= (sal_Int32)pVar->GetLong(); break; default: - pUnoArgs[i].setValue(0, ::getVoidCppuType()); + pUnoArgs[i].setValue(0, cppu::UnoType<cppu::UnoVoidType>::get()); break; } } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index f99ad3eb3899..ad6abd3e88ff 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1061,7 +1061,7 @@ OUString SwDocInfoField::Expand() const uno::Any aAny; if( xSetInfo->hasPropertyByName( aName ) ) aAny = xSet->getPropertyValue( aName ); - if ( aAny.getValueType() != ::getVoidCppuType() ) + if ( aAny.getValueType() != cppu::UnoType<cppu::UnoVoidType>::get() ) { // "void" type means that the property has not been inserted until now if ( !IsFixed() ) @@ -1192,7 +1192,7 @@ bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const case FIELD_PROP_DOUBLE: { double fVal = GetValue(); - rAny.setValue(&fVal, ::getCppuType(&fVal)); + rAny.setValue(&fVal, cppu::UnoType<decltype(fVal)>::get()); } break; case FIELD_PROP_PAR3: diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 8922211b3c09..8b0319a4fbd0 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -496,7 +496,7 @@ bool SwFmtRuby::PutValue( const uno::Any& rVal, break; case MID_RUBY_ABOVE: { - const uno::Type& rType = ::getBooleanCppuType(); + const uno::Type& rType = cppu::UnoType<bool>::get(); if(rVal.hasValue() && rVal.getValueType() == rType) { bool bAbove = *static_cast<sal_Bool const *>(rVal.getValue()); diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 5fcfcc8ba8c3..b783fc9d8b5e 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -872,7 +872,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam) } } } - else if ( rValue.getValueType() == ::getVoidCppuType() ) + else if ( rValue.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get() ) { rPam.GetDoc()->DelNumRules(rPam); } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 380b4742c167..b5faf4192354 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -709,7 +709,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } else if(rPropertyName == UNO_NAME_IS_EXPRESSION) { - if(rValue.getValueType() != ::getBooleanCppuType()) + if(rValue.getValueType() != cppu::UnoType<bool>::get()) throw lang::IllegalArgumentException(); rValue >>= m_pImpl->m_bParam1; } @@ -2300,7 +2300,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, } if (pBool) { - if( rValue.getValueType() == getCppuBooleanType() ) + if( rValue.getValueType() == cppu::UnoType<bool>::get() ) *pBool = *static_cast<sal_Bool const *>(rValue.getValue()); else throw lang::IllegalArgumentException(); @@ -2341,7 +2341,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::Sequence<text::TextContentAnchorType> aTypes(1); text::TextContentAnchorType* pArray = aTypes.getArray(); pArray[0] = text::TextContentAnchorType_AS_CHARACTER; - aRet.setValue(&aTypes, ::getCppuType(static_cast<uno::Sequence<text::TextContentAnchorType>*>(0))); + aRet.setValue(&aTypes, cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get()); } break; diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index dd8dc932a879..3c0386c58a07 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -1983,7 +1983,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) pArray[2] = text::TextContentAnchorType_AT_PAGE; pArray[3] = text::TextContentAnchorType_AT_FRAME; pArray[4] = text::TextContentAnchorType_AT_CHARACTER; - aAny.setValue(&aTypes, ::getCppuType(static_cast<uno::Sequence<text::TextContentAnchorType>*>(0))); + aAny.setValue(&aTypes, cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get()); } else if(pFmt) { @@ -3117,9 +3117,9 @@ void SAL_CALL SwXTextFrame::release( )throw() throw (uno::RuntimeException, std::exception) { ::uno::Any aRet = SwXFrame::queryInterface(aType); - if(aRet.getValueType() == ::getCppuVoidType()) + if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) aRet = SwXText::queryInterface(aType); - if(aRet.getValueType() == ::getCppuVoidType()) + if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) aRet = SwXTextFrameBaseClass::queryInterface(aType); return aRet; } @@ -3401,7 +3401,7 @@ void SAL_CALL SwXTextGraphicObject::release( )throw() throw(uno::RuntimeException, std::exception) { ::uno::Any aRet = SwXFrame::queryInterface(aType); - if(aRet.getValueType() == ::getCppuVoidType()) + if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) aRet = SwXTextGraphicObjectBaseClass::queryInterface(aType); return aRet; } @@ -3533,7 +3533,7 @@ void SAL_CALL SwXTextEmbeddedObject::release()throw() throw( uno::RuntimeException, std::exception) { ::uno::Any aRet = SwXFrame::queryInterface(aType);; - if(aRet.getValueType() == ::getCppuVoidType()) + if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) aRet = SwXTextEmbeddedObjectBaseClass::queryInterface(aType); return aRet; } diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index ec318c528b7e..990b6c79390d 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -232,7 +232,7 @@ SwXFootnote::queryInterface(const uno::Type& rType) throw (uno::RuntimeException, std::exception) { const uno::Any ret = SwXFootnote_Base::queryInterface(rType); - return (ret.getValueType() == ::getCppuVoidType()) + return (ret.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) ? SwXText::queryInterface(rType) : ret; } diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 402a3e652c51..f2d4e2315e27 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -2734,7 +2734,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, true); pStyles[i] = aString; } - uno::Any aRet(&aStyles, ::getCppuType((uno::Sequence<OUString>*)0)); + uno::Any aRet(&aStyles, cppu::UnoType<uno::Sequence<OUString>>::get()); return aRet; } @@ -2742,7 +2742,7 @@ uno::Type SAL_CALL SwXDocumentIndex::StyleAccess_Impl::getElementType() throw (uno::RuntimeException, std::exception) { - return ::getCppuType((uno::Sequence<OUString>*)0); + return cppu::UnoType<uno::Sequence<OUString>>::get(); } sal_Bool SAL_CALL @@ -3254,7 +3254,7 @@ uno::Type SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getElementType() throw (uno::RuntimeException, std::exception) { - return ::getCppuType((uno::Sequence< beans::PropertyValues >*)0); + return cppu::UnoType<uno::Sequence< beans::PropertyValues >>::get(); } sal_Bool SAL_CALL diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 52f120d0e8fd..887149b3097e 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -477,7 +477,7 @@ SwUnoCursorHelper::SetCursorPropertyValue( throw (lang::IllegalArgumentException, uno::RuntimeException, uno::DeploymentException) { if (!(rEntry.nFlags & beans::PropertyAttribute::MAYBEVOID) && - (rValue.getValueType() == ::getCppuVoidType())) + (rValue.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get())) { return false; } @@ -2142,8 +2142,8 @@ SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException, std::exception { static SfxItemPropertyMapEntry const aCrsrExtMap_Impl[] = { - { OUString(UNO_NAME_IS_SKIP_HIDDEN_TEXT), FN_SKIP_HIDDEN_TEXT, ::getBooleanCppuType(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_IS_SKIP_PROTECTED_TEXT), FN_SKIP_PROTECTED_TEXT, ::getBooleanCppuType(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_IS_SKIP_HIDDEN_TEXT), FN_SKIP_HIDDEN_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_IS_SKIP_PROTECTED_TEXT), FN_SKIP_PROTECTED_TEXT, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; const uno::Reference< beans::XPropertySetInfo > xInfo = @@ -2728,7 +2728,7 @@ bool SwUnoCursorHelper::ConvertSortProperties( // old and new sortdescriptor if ( rPropName == "IsSortInTable" ) { - if (aValue.getValueType() == ::getBooleanCppuType()) + if (aValue.getValueType() == cppu::UnoType<bool>::get()) { rSortOpt.bTable = *static_cast<sal_Bool const *>(aValue.getValue()); } @@ -2835,7 +2835,7 @@ bool SwUnoCursorHelper::ConvertSortProperties( bOldSortdescriptor = true; sal_uInt16 nIndex = rPropName[13]; nIndex = nIndex - '0'; - if (aValue.getValueType() == ::getBooleanCppuType() && nIndex < 3) + if (aValue.getValueType() == cppu::UnoType<bool>::get() && nIndex < 3) { bool bTemp = *static_cast<sal_Bool const *>(aValue.getValue()); aKeys[nIndex]->bIsNumeric = bTemp; @@ -2852,7 +2852,7 @@ bool SwUnoCursorHelper::ConvertSortProperties( bOldSortdescriptor = true; sal_uInt16 nIndex = rPropName[15]; nIndex -= '0'; - if (aValue.getValueType() == ::getBooleanCppuType() && nIndex < 3) + if (aValue.getValueType() == cppu::UnoType<bool>::get() && nIndex < 3) { bool bTemp = *static_cast<sal_Bool const *>(aValue.getValue()); aKeys[nIndex]->eSortOrder = (bTemp) @@ -2867,7 +2867,7 @@ bool SwUnoCursorHelper::ConvertSortProperties( else if ( rPropName == "IsSortColumns" ) { bNewSortdescriptor = true; - if (aValue.getValueType() == ::getBooleanCppuType()) + if (aValue.getValueType() == cppu::UnoType<bool>::get()) { bool bTemp = *static_cast<sal_Bool const *>(aValue.getValue()); rSortOpt.eDirection = bTemp ? SRT_COLUMNS : SRT_ROWS; diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index aa7bc1a70960..2ef2c8452c1d 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -504,7 +504,7 @@ throw(uno::RuntimeException) // fallback to standard get value implementation used before this helper was created m_rPropSet.getPropertyValue(rEntry, rSet, rAny); - if(rEntry.aType == ::getCppuType((const sal_Int16*)0) && rEntry.aType != rAny.getValueType()) + if(rEntry.aType == cppu::UnoType<sal_Int16>::get() && rEntry.aType != rAny.getValueType()) { // since the sfx uInt16 item now exports a sal_Int32, we may have to fix this here sal_Int32 nValue(0); @@ -898,7 +898,7 @@ bool ::sw::GetDefaultTextContentValue( { uno::Sequence<text::TextContentAnchorType> aTypes(1); text::TextContentAnchorType* pArray = aTypes.getArray(); pArray[0] = text::TextContentAnchorType_AT_PARAGRAPH; - rAny.setValue(&aTypes, ::getCppuType((uno::Sequence<text::TextContentAnchorType>*)0)); + rAny.setValue(&aTypes, cppu::UnoType<uno::Sequence<text::TextContentAnchorType>>::get()); } break; default: diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 76aa4b404a16..e4427d2bf6cb 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -113,7 +113,7 @@ const SfxItemPropertySet* GetFootnoteSet() { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE, ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_PAGE_STYLE_NAME), WID_PAGE_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_PARA_STYLE_NAME), WID_PARAGRAPH_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_POSITION_END_OF_DOC), WID_POSITION_END_OF_DOC,::getBooleanCppuType(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_POSITION_END_OF_DOC), WID_POSITION_END_OF_DOC,cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_PREFIX), WID_PREFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_START_AT), WID_START_AT , ::cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_SUFFIX), WID_SUFFIX, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, @@ -145,11 +145,11 @@ const SfxItemPropertySet* GetNumberingRulesSet() { static const SfxItemPropertyMapEntry aNumberingRulesMap_Impl[] = { - { OUString(UNO_NAME_IS_ABSOLUTE_MARGINS), WID_IS_ABS_MARGINS, ::getBooleanCppuType(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_IS_AUTOMATIC), WID_IS_AUTOMATIC, ::getBooleanCppuType(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_IS_CONTINUOUS_NUMBERING), WID_CONTINUOUS, ::getBooleanCppuType(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_IS_ABSOLUTE_MARGINS), WID_IS_ABS_MARGINS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_IS_AUTOMATIC), WID_IS_AUTOMATIC, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_IS_CONTINUOUS_NUMBERING), WID_CONTINUOUS, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_NAME), WID_RULE_NAME , ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_NUMBERING_IS_OUTLINE), WID_IS_OUTLINE, ::getBooleanCppuType(), PROPERTY_NONE, 0}, + { OUString(UNO_NAME_NUMBERING_IS_OUTLINE), WID_IS_OUTLINE, cppu::UnoType<bool>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_DEFAULT_LIST_ID), WID_DEFAULT_LIST_ID, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -173,15 +173,15 @@ const SfxItemPropertySet* GetLineNumberingSet() static const SfxItemPropertyMapEntry aLineNumberingMap_Impl[] = { { OUString(UNO_NAME_CHAR_STYLE_NAME), WID_CHARACTER_STYLE, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, - { OUString(UNO_NAME_COUNT_EMPTY_LINES), WID_COUNT_EMPTY_LINES , ::getBooleanCppuType(),PROPERTY_NONE, 0}, - { OUString(UNO_NAME_COUNT_LINES_IN_FRAMES), WID_COUNT_LINES_IN_FRAMES, ::getBooleanCppuType(),PROPERTY_NONE, 0}, + { OUString(UNO_NAME_COUNT_EMPTY_LINES), WID_COUNT_EMPTY_LINES , cppu::UnoType<bool>::get(),PROPERTY_NONE, 0}, + { OUString(UNO_NAME_COUNT_LINES_IN_FRAMES), WID_COUNT_LINES_IN_FRAMES, cppu::UnoType<bool>::get(),PROPERTY_NONE, 0}, { OUString(UNO_NAME_DISTANCE), WID_DISTANCE , ::cppu::UnoType<sal_Int32>::get(),PROPERTY_NONE, 0}, - { OUString(UNO_NAME_IS_ON), WID_NUM_ON, ::getBooleanCppuType() , PROPERTY_NONE, 0}, + { OUString(UNO_NAME_IS_ON), WID_NUM_ON, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, { OUString(UNO_NAME_INTERVAL), WID_INTERVAL , ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, { OUString(UNO_NAME_SEPARATOR_TEXT), WID_SEPARATOR_TEXT, ::cppu::UnoType<OUString>::get(), PROPERTY_NONE, 0}, { OUString(UNO_NAME_NUMBER_POSITION), WID_NUMBER_POSITION, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, { OUString(UNO_NAME_NUMBERING_TYPE), WID_NUMBERING_TYPE , ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, - { OUString(UNO_NAME_RESTART_AT_EACH_PAGE), WID_RESTART_AT_EACH_PAGE, ::getBooleanCppuType() , PROPERTY_NONE, 0}, + { OUString(UNO_NAME_RESTART_AT_EACH_PAGE), WID_RESTART_AT_EACH_PAGE, cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, { OUString(UNO_NAME_SEPARATOR_INTERVAL), WID_SEPARATOR_INTERVAL, ::cppu::UnoType<sal_Int16>::get(),PROPERTY_NONE, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -1264,14 +1264,14 @@ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) { uno::Sequence<beans::PropertyValue> aRet = GetNumberingRuleByIndex( *pRule, nIndex); - aVal.setValue(&aRet, ::getCppuType((uno::Sequence<beans::PropertyValue>*)0)); + aVal.setValue(&aRet, cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get()); } else if(pDocShell) { uno::Sequence<beans::PropertyValue> aRet = GetNumberingRuleByIndex( *pDocShell->GetDoc()->GetOutlineNumRule(), nIndex); - aVal.setValue(&aRet, ::getCppuType((uno::Sequence<beans::PropertyValue>*)0)); + aVal.setValue(&aRet, cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get()); } else throw uno::RuntimeException(); @@ -1281,7 +1281,7 @@ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) uno::Type SwXNumberingRules::getElementType(void) throw( uno::RuntimeException, std::exception ) { - return ::getCppuType((uno::Sequence<beans::PropertyValue>*)0); + return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } sal_Bool SwXNumberingRules::hasElements(void) throw( uno::RuntimeException, std::exception ) diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 923bbeb1af02..3a5597e8e27e 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -562,7 +562,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A if ( pEntry->nFlags & beans::PropertyAttribute::READONLY) throw beans::PropertyVetoException ("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) ); bool bVal = false; - if(aValue.getValueType() == ::getBooleanCppuType()) + if(aValue.getValueType() == cppu::UnoType<bool>::get()) bVal = *static_cast<sal_Bool const *>(aValue.getValue()); switch(pEntry->nWID) { diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 53b96224db35..d6a84c7f610c 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -342,7 +342,7 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, for(int i = 0; i < nCount; i++) { const uno::Any* pVal = &pArray[i].Value; - if( pVal->getValueType() == ::getBooleanCppuType() ) + if( pVal->getValueType() == cppu::UnoType<bool>::get() ) { const OUString sName = pArray[i].Name; bool bVal = *static_cast<sal_Bool const *>(pVal->getValue()); @@ -4693,7 +4693,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl( if(bTakeCareOfDrawingLayerFillStyle) { - if(pEntry->aType == ::getCppuType((const sal_Int16*)0) && pEntry->aType != aTarget.getValueType()) + if(pEntry->aType == cppu::UnoType<sal_Int16>::get() && pEntry->aType != aTarget.getValueType()) { // since the sfx uint16 item now exports a sal_Int32, we may have to fix this here sal_Int32 nValue = 0; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index a1ef18e17a87..aa259f2c8590 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -676,7 +676,7 @@ static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pB } } if(!bError) - rRet.setValue(&aColSeq, ::getCppuType((uno::Sequence< text::TableColumnSeparator>*)0)); + rRet.setValue(&aColSeq, cppu::UnoType<uno::Sequence< text::TableColumnSeparator>>::get()); } @@ -882,7 +882,7 @@ uno::Any SAL_CALL SwXCell::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException, std::exception) { uno::Any aRet = SwXCellBaseClass::queryInterface(aType); - if(aRet.getValueType() == ::getCppuVoidType()) + if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) aRet = SwXText::queryInterface(aType); return aRet; } diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 143e7a050bb9..0382c4c2b8f1 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2416,7 +2416,7 @@ throw (uno::RuntimeException, std::exception) { aRet = SwXText::queryInterface( rType ); } - if(aRet.getValueType() == ::getCppuVoidType()) + if(aRet.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) { aRet = OWeakAggObject::queryAggregation( rType ); } @@ -2442,7 +2442,7 @@ SwXBodyText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException, std::exception) { const uno::Any ret = SwXText::queryInterface(rType); - return (ret.getValueType() == ::getCppuVoidType()) + return (ret.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) ? SwXBodyText_Base::queryInterface(rType) : ret; } @@ -2718,7 +2718,7 @@ SwXHeadFootText::queryInterface(const uno::Type& rType) throw (uno::RuntimeException, std::exception) { const uno::Any ret = SwXHeadFootText_Base::queryInterface(rType); - return (ret.getValueType() == ::getCppuVoidType()) + return (ret.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get()) ? SwXText::queryInterface(rType) : ret; } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 4e201f963142..0aa17642c18c 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -630,7 +630,7 @@ static void lcl_html_setFixedFontProperty( rPropSet->setPropertyValue("FontPitch", aTmp ); float fVal(10.); - aTmp.setValue( &fVal, ::getCppuType(&fVal )); + aTmp.setValue( &fVal, cppu::UnoType<decltype(fVal)>::get()); rPropSet->setPropertyValue("FontHeight", aTmp ); } @@ -1002,7 +1002,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( { float fVal = static_cast< float >( (static_cast<const SvxFontHeightItem *>(pItem)->GetHeight()) / 20.0 ); - aTmp.setValue( &fVal, ::getCppuType(&fVal)); + aTmp.setValue( &fVal, cppu::UnoType<decltype(fVal)>::get()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -1049,7 +1049,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( { float fVal = VCLUnoHelper::ConvertFontWeight( static_cast<const SvxWeightItem *>(pItem)->GetWeight() ); - aTmp.setValue( &fVal, ::getCppuType(&fVal)); + aTmp.setValue( &fVal, cppu::UnoType<decltype(fVal)>::get()); rFCompPropSet->setPropertyValue( sPropName, aTmp ); } @@ -2405,14 +2405,14 @@ void SwHTMLParser::EndSelect() pValues[i] = sText; } - Any aAny( &aList, ::getCppuType((uno::Sequence<OUString>*)0) ); + Any aAny( &aList, cppu::UnoType<uno::Sequence<OUString>>::get() ); rPropSet->setPropertyValue("StringItemList", aAny ); aAny <<= ListSourceType_VALUELIST; rPropSet->setPropertyValue("ListSourceType", aAny ); - aAny.setValue( &aValueList, ::getCppuType((uno::Sequence<OUString>*)0) ); + aAny.setValue( &aValueList, cppu::UnoType<uno::Sequence<OUString>>::get() ); rPropSet->setPropertyValue("ListSource", aAny ); @@ -2431,7 +2431,7 @@ void SwHTMLParser::EndSelect() pSels[i] = (sal_Int16)pFormImpl->GetSelectedList()[i]; } aAny.setValue( &aSelList, - ::getCppuType((uno::Sequence<sal_Int16>*)0) ); + cppu::UnoType<uno::Sequence<sal_Int16>>::get() ); rPropSet->setPropertyValue("DefaultSelection", aAny ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index f2df878e90cf..f3ec09a87a79 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -790,7 +790,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, rHTMLWrt.OutNewLine( true ); eTag = TAG_SELECT; aTmp = xPropSet->getPropertyValue( "Dropdown" ); - if( aTmp.getValueType() == ::getBooleanCppuType() && + if( aTmp.getValueType() == cppu::UnoType<bool>::get() && !*static_cast<sal_Bool const *>(aTmp.getValue()) ) { Size aSz( 0, 0 ); @@ -804,7 +804,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( "MultiSelection" ); - if( aTmp.getValueType() == ::getBooleanCppuType() && + if( aTmp.getValueType() == cppu::UnoType<bool>::get() && *static_cast<sal_Bool const *>(aTmp.getValue()) ) { sOptions += " " + OString(OOO_STRING_SVTOOLS_HTML_O_multiple); @@ -822,7 +822,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( xPropSetInfo->hasPropertyByName( sMultiLine ) ) { aTmp = xPropSet->getPropertyValue( sMultiLine ); - bMultiLine = aTmp.getValueType() == ::getBooleanCppuType() && + bMultiLine = aTmp.getValueType() == cppu::UnoType<bool>::get() && *static_cast<sal_Bool const *>(aTmp.getValue()); } @@ -844,14 +844,14 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue( "HScroll" ); - if( aTmp.getValueType() == ::getVoidCppuType() || - (aTmp.getValueType() == ::getBooleanCppuType() && + if( aTmp.getValueType() == cppu::UnoType<cppu::UnoVoidType>::get() || + (aTmp.getValueType() == cppu::UnoType<bool>::get() && !*static_cast<sal_Bool const *>(aTmp.getValue())) ) { const sal_Char *pWrapStr = 0; aTmp = xPropSet->getPropertyValue( "HardLineBreaks" ); pWrapStr = - (aTmp.getValueType() == ::getBooleanCppuType() && + (aTmp.getValueType() == cppu::UnoType<bool>::get() && *static_cast<sal_Bool const *>(aTmp.getValue())) ? OOO_STRING_SVTOOLS_HTML_WW_hard : OOO_STRING_SVTOOLS_HTML_WW_soft; sOptions += " " + OString(OOO_STRING_SVTOOLS_HTML_O_wrap) + "=\"" + @@ -945,7 +945,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, } aTmp = xPropSet->getPropertyValue("Enabled"); - if( aTmp.getValueType() == ::getBooleanCppuType() && + if( aTmp.getValueType() == cppu::UnoType<bool>::get() && !*static_cast<sal_Bool const *>(aTmp.getValue()) ) { sOut += " " + OString(OOO_STRING_SVTOOLS_HTML_O_disabled); @@ -1152,7 +1152,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, if( TAG_SELECT == eTag ) { aTmp = xPropSet->getPropertyValue( "StringItemList" ); - if( aTmp.getValueType() == ::getCppuType((uno::Sequence<OUString>*)0) ) + if( aTmp.getValueType() == cppu::UnoType<uno::Sequence<OUString>>::get() ) { rHTMLWrt.IncIndentLevel(); // der Inhalt von Select darf // eingerueckt werden @@ -1164,7 +1164,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sal_Int32 nValCnt = 0; aTmp = xPropSet->getPropertyValue( "ListSource" ); uno::Sequence<OUString> aValList; - if( aTmp.getValueType() == ::getCppuType((uno::Sequence<OUString>*)0) ) + if( aTmp.getValueType() == cppu::UnoType<uno::Sequence<OUString>>::get() ) { aValList = *static_cast<uno::Sequence<OUString> const *>(aTmp.getValue()); nValCnt = aValList.getLength(); @@ -1176,7 +1176,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, sal_Int32 nSel = 0; sal_Int32 nSelCnt = 0; uno::Sequence<sal_Int16> aSelList; - if( aSelTmp.getValueType() ==::getCppuType((uno::Sequence<sal_Int16>*)0)) + if( aSelTmp.getValueType() ==cppu::UnoType<uno::Sequence<sal_Int16>>::get()) { aSelList = *static_cast<uno::Sequence<sal_Int16> const *>(aSelTmp.getValue()); nSelCnt = aSelList.getLength(); diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 9b028d38690f..1e749490e3cc 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -342,7 +342,7 @@ sal_Int32 ReadThroughComponent( Any aAny = xProps->getPropertyValue("Encrypted"); - bool bEncrypted = aAny.getValueType() == ::getBooleanCppuType() && + bool bEncrypted = aAny.getValueType() == cppu::UnoType<bool>::get() && *static_cast<sal_Bool const *>(aAny.getValue()); uno::Reference <io::XInputStream> xInputStream = xStream->getInputStream(); @@ -558,13 +558,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c cppu::UnoType<container::XNameContainer>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("RecordChanges"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("ShowChanges"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("RedlineProtectionKey"), 0, - ::getCppuType((Sequence<sal_Int8>*)0), + cppu::UnoType<Sequence<sal_Int8>>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("PrivateData"), 0, cppu::UnoType<XInterface>::get(), @@ -580,26 +580,26 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c beans::PropertyAttribute::MAYBEVOID, 0 }, // properties for insert modes { OUString("StyleInsertModeFamilies"), 0, - ::getCppuType((Sequence<OUString>*)0), + cppu::UnoType<Sequence<OUString>>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StyleInsertModeOverwrite"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("TextInsertModeRange"), 0, cppu::UnoType<text::XTextRange>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("AutoTextMode"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("OrganizerMode"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, // #i28749# - Add property, which indicates, if the // shape position attributes are given in horizontal left-to-right layout. // This is the case for the OpenOffice.org file format. { OUString("ShapePositionInHoriL2R"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BuildId"), 0, @@ -613,7 +613,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c // documents in StarOffice 5.2 binary file format this property // will be true. { OUString("TextDocInOOoFileFormat"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("SourceStorage"), 0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 61eaa7f775ee..fb0a57f9447c 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -118,16 +118,16 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& ::cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("WrittenNumberStyles"), 0, - ::getCppuType((uno::Sequence<sal_Int32> *)0), + cppu::UnoType<uno::Sequence<sal_Int32>>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("UsePrettyPrinting"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("ShowChanges"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("RedlineProtectionKey"), 0, - ::getCppuType((Sequence<sal_Int8>*)0), + cppu::UnoType<Sequence<sal_Int8>>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), @@ -139,17 +139,17 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("AutoTextMode"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StyleNames"), 0, - ::getCppuType( (Sequence<OUString>*)0 ), + cppu::UnoType<Sequence<OUString>>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("StyleFamilies"), 0, - ::getCppuType( (Sequence<sal_Int32>*)0 ), + cppu::UnoType<Sequence<sal_Int32>>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, // #i69627# { OUString("OutlineStyleAsNormalListStyle"), 0, - ::getBooleanCppuType(), + cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, { OUString("TargetStorage"),0, cppu::UnoType<embed::XStorage>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 }, diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 07a35f94524a..569813d35522 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -125,7 +125,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) sAutoTextMode ) ) { Any aAny = rInfoSet->getPropertyValue(sAutoTextMode); - if( aAny.getValueType() == ::getBooleanCppuType() && + if( aAny.getValueType() == cppu::UnoType<bool>::get() && *static_cast<const sal_Bool*>(aAny.getValue()) ) setBlockMode(); } diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index c1f846334ac3..496b37f94add 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -551,7 +551,7 @@ void SwXMLImport::startDocument() if( xPropertySetInfo->hasPropertyByName(sStyleInsertModeOverwrite) ) { aAny = xImportInfo->getPropertyValue(sStyleInsertModeOverwrite); - if( aAny.getValueType() == ::getBooleanCppuType() && + if( aAny.getValueType() == cppu::UnoType<bool>::get() && *static_cast<const sal_Bool*>(aAny.getValue()) ) bOverwrite = true; } @@ -575,7 +575,7 @@ void SwXMLImport::startDocument() if( xPropertySetInfo->hasPropertyByName(sAutoTextMode) ) { aAny = xImportInfo->getPropertyValue(sAutoTextMode); - if( aAny.getValueType() == ::getBooleanCppuType() && + if( aAny.getValueType() == cppu::UnoType<bool>::get() && *static_cast<const sal_Bool*>(aAny.getValue()) ) setBlockMode(); } @@ -585,7 +585,7 @@ void SwXMLImport::startDocument() if( xPropertySetInfo->hasPropertyByName(sOrganizerMode) ) { aAny = xImportInfo->getPropertyValue(sOrganizerMode); - if( aAny.getValueType() == ::getBooleanCppuType() && + if( aAny.getValueType() == cppu::UnoType<bool>::get() && *static_cast<const sal_Bool*>(aAny.getValue()) ) setOrganizerMode(); } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 188c99b73a00..8942afc698db 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -373,7 +373,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) aTempURL.removeSegment(); aTempURL.removeFinalSlash(); const OUString sDBURL("sdbc:flat:" + aTempURL.GetMainURL(INetURLObject::NO_DECODE)); - Any aAny(&sDBURL, ::getCppuType(&sDBURL)); + Any aAny(&sDBURL, cppu::UnoType<decltype(sDBURL)>::get()); xDataProperties->setPropertyValue("URL", aAny); //set the filter to the file name without extension uno::Sequence<OUString> aFilters(1); diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index ef793c828d55..e01520743416 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -224,7 +224,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( OUString* pArr = aStyles.getArray(); for(sal_Int32 nStyle = 0; nStyle < nStyles; nStyle++) pArr[nStyle] = sLevel.getToken(nStyle, TOX_STYLE_DELIMITER); - uno::Any aAny(&aStyles, ::getCppuType((uno::Sequence<OUString>*)0)); + uno::Any aAny(&aStyles, cppu::UnoType<uno::Sequence<OUString>>::get()); xAcc->replaceByIndex(i, aAny); } } @@ -373,7 +373,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( uno::Reference< container::XIndexReplace > xFormatAccess; aFormatAccess >>= xFormatAccess; - uno::Any aLevelProp(&aSequPropVals, ::getCppuType((uno::Sequence<beans::PropertyValues>*)0)); + uno::Any aLevelProp(&aSequPropVals, cppu::UnoType<uno::Sequence<beans::PropertyValues>>::get()); xFormatAccess->replaceByIndex(nCurrLevel, aLevelProp); } } diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 3ecac9ec301e..1ed665765e68 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1001,11 +1001,11 @@ void SwDocShell::Execute(SfxRequest& rReq) try { - Any aTemplates(&aListBoxEntries, ::getCppuType(&aListBoxEntries)); + Any aTemplates(&aListBoxEntries, cppu::UnoType<decltype(aListBoxEntries)>::get()); xCtrlAcc->setValue( ExtendedFilePickerElementIds::LISTBOX_TEMPLATE, ListboxControlActions::ADD_ITEMS , aTemplates ); - Any aSelectPos(&nSelect, ::getCppuType(&nSelect)); + Any aSelectPos(&nSelect, cppu::UnoType<decltype(nSelect)>::get()); xCtrlAcc->setValue( ExtendedFilePickerElementIds::LISTBOX_TEMPLATE, ListboxControlActions::SET_SELECT_ITEM, aSelectPos ); xCtrlAcc->setLabel( ExtendedFilePickerElementIds::LISTBOX_TEMPLATE, diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 8590b1f75c6e..91992fbf08db 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -722,7 +722,7 @@ uno::Sequence< datatransfer::DataFlavor > SwMailTransferable::getTransferDataFla else { aRet[0].HumanPresentableName = m_aName; - aRet[0].DataType = getCppuType((uno::Sequence<sal_Int8>*)0); + aRet[0].DataType = cppu::UnoType<uno::Sequence<sal_Int8>>::get(); } return aRet; } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index e1f7b37f8017..0e59206f5774 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -346,12 +346,12 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) } try { - Any aTemplates(&aListBoxEntries, ::getCppuType(&aListBoxEntries)); + Any aTemplates(&aListBoxEntries, cppu::UnoType<decltype(aListBoxEntries)>::get()); xCtrlAcc->setValue( ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE, ListboxControlActions::ADD_ITEMS , aTemplates ); - Any aSelectPos(&nSelect, ::getCppuType(&nSelect)); + Any aSelectPos(&nSelect, cppu::UnoType<decltype(nSelect)>::get()); xCtrlAcc->setValue( ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE, ListboxControlActions::SET_SELECT_ITEM, aSelectPos ); } diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index f580db2a10cb..55e4c0a86c43 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -1121,7 +1121,7 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue } else if(sName == "IsLandscape") { - bException = (::getBooleanCppuType() != rVal.getValueType()); + bException = (cppu::UnoType<bool>::get() != rVal.getValueType()); aData.SetLandscape(*static_cast<sal_Bool const *>(rVal.getValue())); } else @@ -1163,7 +1163,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption FileBase::getSystemPathFromFileURL ( sFileURL, sSystemPath ); aReq.AppendItem(SfxStringItem( SID_FILE_NAME, sSystemPath ) ); } - else if ( rProp.Value.getValueType() != ::getVoidCppuType() ) + else if ( rProp.Value.getValueType() != cppu::UnoType<cppu::UnoVoidType>::get() ) throw IllegalArgumentException(); } @@ -1178,7 +1178,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption // Collate-Property else if ( rProp.Name == UNO_NAME_COLLATE ) { - if ( rProp.Value.getValueType() == ::getBooleanCppuType()) + if ( rProp.Value.getValueType() == cppu::UnoType<bool>::get()) aReq.AppendItem(SfxBoolItem( SID_PRINT_COLLATE, *static_cast<sal_Bool const *>(rProp.Value.getValue()) ) ); else @@ -1188,7 +1188,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption // Sort-Property else if ( rProp.Name == UNO_NAME_SORT ) { - if ( rProp.Value.getValueType() == ::getBooleanCppuType() ) + if ( rProp.Value.getValueType() == cppu::UnoType<bool>::get() ) aReq.AppendItem(SfxBoolItem( SID_PRINT_SORT, *static_cast<sal_Bool const *>(rProp.Value.getValue()) ) ); else throw IllegalArgumentException(); diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 08a0564cc002..f4eaa51a37bc 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -569,7 +569,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto pValues[3].Value <<= (sal_Int16)rAttr.GetAdjustment(); pValues[4].Name = UNO_NAME_RUBY_IS_ABOVE; sal_Bool bVal = !rAttr.GetPosition(); - pValues[4].Value.setValue(&bVal, ::getBooleanCppuType()); + pValues[4].Value.setValue(&bVal, cppu::UnoType<bool>::get()); } return aRet; } diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index f755feea3344..707f361d5020 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -145,7 +145,7 @@ void SwOneExampleFrame::CreateControl() pValues[2].Name = "Referer"; pValues[2].Value <<= OUString("private:user"); uno::Any aArgs; - aArgs.setValue(&aSeq, ::getCppuType((uno::Sequence<beans::PropertyValue>*)0)); + aArgs.setValue(&aSeq, cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get()); xPrSet->setPropertyValue( "LoaderArguments", aArgs ); //save and set readonly??? |