diff options
40 files changed, 95 insertions, 122 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 0747cfc22058..4dfb402d645e 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1076,7 +1076,7 @@ sal_Bool ODbaseTable::CreateImpl() try { Content aContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext()); - aContent.executeCommand( "delete",bool2any( true ) ); + aContent.executeCommand( "delete", css::uno::Any( true ) ); } catch(const Exception&) // an exception is thrown when no file exists { @@ -1104,7 +1104,7 @@ sal_Bool ODbaseTable::CreateImpl() try { Content aMemoContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext()); - aMemoContent.executeCommand( "delete",bool2any( true ) ); + aMemoContent.executeCommand( "delete", css::uno::Any( true ) ); } catch(const Exception&) { @@ -1120,7 +1120,7 @@ sal_Bool ODbaseTable::CreateImpl() { aURL.setExtension(aExt); // kill dbf file Content aMemoContent(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext()); - aMemoContent.executeCommand( "delete",bool2any( true ) ); + aMemoContent.executeCommand( "delete", css::uno::Any( true ) ); return sal_False; } m_aHeader.db_typ = dBaseIIIMemo; diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index cc59ed22e704..13040a0cf95c 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -31,7 +31,6 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/extract.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <comphelper/types.hxx> #include "connectivity/dbtools.hxx" @@ -1517,7 +1516,7 @@ void OResultSet::getFastPropertyValue( switch(nHandle) { case PROPERTY_ID_ISBOOKMARKABLE: - rValue = bool2any(isBookmarkable()); + rValue = css::uno::makeAny(isBookmarkable()); break; case PROPERTY_ID_CURSORNAME: rValue <<= getCursorName(); diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 8c9ac35ce3b4..b0339cb4a7b9 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -24,7 +24,6 @@ #include <dialmgr.hxx> #include <vcl/msgbox.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <comphelper/extract.hxx> #include <comphelper/types.hxx> #define CUIFM_PROP_HIDDEN "Hidden" @@ -60,7 +59,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) { try { - xCol->setPropertyValue(CUIFM_PROP_HIDDEN, ::cppu::bool2any(false)); + xCol->setPropertyValue(CUIFM_PROP_HIDDEN, css::uno::Any(false)); } catch(...) { diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index fa1b228a6578..3b502b29a111 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -1887,7 +1887,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_RELATIVEPOSITION,makeAny(sal_Int32(i+1))); pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_WIDTH,makeAny(sal_Int32(227))); pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ALIGN,makeAny((sal_Int32)0)); - pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN,::cppu::bool2any(false)); + pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN, css::uno::Any(false)); } catch(Exception&) { diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index c3b2e7a88eaf..7b5646c086ac 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <comphelper/sequence.hxx> -#include <comphelper/extract.hxx> #include <comphelper/seqstream.hxx> #include <connectivity/dbexception.hxx> #include <tools/debug.hxx> @@ -1292,8 +1291,8 @@ sal_Bool ORowSetBase::isPropertyChangeNotificationEnabled() const void ORowSetBase::fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld ) { SAL_INFO("dbaccess", "ORowSetBase::fireProperty" ); - Any aNew = bool2any( _bNew ); - Any aOld = bool2any( _bOld ); + Any aNew = css::uno::makeAny( _bNew ); + Any aOld = css::uno::makeAny( _bOld ); fire( &_nProperty, &aNew, &aOld, 1, sal_False ); } diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 299d31bbbe74..d436cfc76fd9 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -49,7 +49,6 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/view/XPrintable.hpp> -#include <comphelper/extract.hxx> #include <comphelper/guarding.hxx> #include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> @@ -982,13 +981,13 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con rValue <<= m_pImpl->m_aPassword; break; case PROPERTY_ID_ISPASSWORDREQUIRED: - rValue = bool2any(m_pImpl->m_bPasswordRequired); + rValue <<= m_pImpl->m_bPasswordRequired; break; case PROPERTY_ID_SUPPRESSVERSIONCL: - rValue = bool2any(m_pImpl->m_bSuppressVersionColumns); + rValue <<= m_pImpl->m_bSuppressVersionColumns; break; case PROPERTY_ID_ISREADONLY: - rValue = bool2any(m_pImpl->m_bReadOnly); + rValue <<= m_pImpl->m_bReadOnly; break; case PROPERTY_ID_INFO: { diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index b679a28d64cd..c3b94448058d 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2391,7 +2391,7 @@ sal_Bool SbaTableQueryBrowser::implLoadAnything(const OUString& _rDataSourceName // set this _before_ setting the connection, else the rowset would rebuild it ... xProp->setPropertyValue(PROPERTY_COMMAND_TYPE, makeAny(_nCommandType)); xProp->setPropertyValue(PROPERTY_COMMAND, makeAny(_rCommand)); - xProp->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, ::cppu::bool2any(_bEscapeProcessing)); + xProp->setPropertyValue(PROPERTY_ESCAPE_PROCESSING, css::uno::makeAny(_bEscapeProcessing)); if ( m_bPreview ) { xProp->setPropertyValue(PROPERTY_FETCHDIRECTION, makeAny(FetchDirection::FORWARD)); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 95afe5f22e07..3bbac2950ccd 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -651,10 +651,10 @@ void setColumnProperties(const Reference<XPropertySet>& _rxColumn,const OFieldDe _rxColumn->setPropertyValue(PROPERTY_PRECISION,makeAny(_pFieldDesc->GetPrecision())); _rxColumn->setPropertyValue(PROPERTY_SCALE,makeAny(_pFieldDesc->GetScale())); _rxColumn->setPropertyValue(PROPERTY_ISNULLABLE, makeAny(_pFieldDesc->GetIsNullable())); - _rxColumn->setPropertyValue(PROPERTY_ISAUTOINCREMENT,::cppu::bool2any(_pFieldDesc->IsAutoIncrement())); + _rxColumn->setPropertyValue(PROPERTY_ISAUTOINCREMENT, css::uno::makeAny(_pFieldDesc->IsAutoIncrement())); _rxColumn->setPropertyValue(PROPERTY_DESCRIPTION,makeAny(_pFieldDesc->GetDescription())); if ( _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_ISCURRENCY) && _pFieldDesc->IsCurrency() ) - _rxColumn->setPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(_pFieldDesc->IsCurrency())); + _rxColumn->setPropertyValue(PROPERTY_ISCURRENCY, css::uno::makeAny(_pFieldDesc->IsCurrency())); // set autoincrement value when available // and only set when the entry is not empty, that lets the value in the column untouched if ( _pFieldDesc->IsAutoIncrement() && !_pFieldDesc->GetAutoIncrementValue().isEmpty() && _rxColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_AUTOINCREMENTCREATION) ) diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index ddc12ca4ce22..8fdb36efee65 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -154,7 +154,7 @@ namespace dbaui static const OUString s_sSortPropertyName = "IsAscending"; static const OUString s_sNamePropertyName = "Name"; // the index' own props - xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, ::cppu::bool2any(_rPos->bUnique)); + xIndexDescriptor->setPropertyValue(s_sUniquePropertyName, css::uno::makeAny(_rPos->bUnique)); xIndexDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(_rPos->sName)); // the fields @@ -169,7 +169,7 @@ namespace dbaui OSL_ENSURE(xColDescriptor.is(), "OIndexCollection::commitNewIndex: invalid column descriptor!"); if (xColDescriptor.is()) { - xColDescriptor->setPropertyValue(s_sSortPropertyName, ::cppu::bool2any(aFieldLoop->bSortAscending)); + xColDescriptor->setPropertyValue(s_sSortPropertyName, css::uno::makeAny(aFieldLoop->bSortAscending)); xColDescriptor->setPropertyValue(s_sNamePropertyName, makeAny(OUString(aFieldLoop->sFieldName))); xAppendCols->appendByDescriptor(xColDescriptor); } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 94de2c99109e..f18a15f3e23d 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -66,7 +66,6 @@ #include <com/sun/star/ui/XUIElement.hpp> #include <comphelper/basicio.hxx> -#include <comphelper/extract.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> @@ -1333,7 +1332,7 @@ void OQueryController::executeQuery() aProps[2].Value <<= sTranslatedStmt; aProps[3].Name = PROPERTY_ENABLE_BROWSER; - aProps[3].Value = ::cppu::bool2any(false); + aProps[3].Value <<= false; aProps[4].Name = PROPERTY_ACTIVE_CONNECTION; aProps[4].Value <<= getConnection(); @@ -1348,7 +1347,7 @@ void OQueryController::executeQuery() aProps[7].Value <<= m_sUpdateTableName; aProps[8].Name = PROPERTY_ESCAPE_PROCESSING; - aProps[8].Value = ::cppu::bool2any(m_bEscapeProcessing); + aProps[8].Value <<= m_bEscapeProcessing; xDisp->dispatch(aWantToDispatch, aProps); // check the state of the beamer @@ -1524,7 +1523,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) if ( editingQuery() ) { xQuery->setPropertyValue( PROPERTY_UPDATE_TABLENAME, makeAny( m_sUpdateTableName ) ); - xQuery->setPropertyValue( PROPERTY_ESCAPE_PROCESSING,::cppu::bool2any( m_bEscapeProcessing ) ); + xQuery->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, css::uno::makeAny( m_bEscapeProcessing ) ); xQuery->setPropertyValue( PROPERTY_LAYOUTINFORMATION, getViewData() ); } diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 59fb8a8ddf93..f6d598b22a1b 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -405,7 +405,7 @@ namespace pcr const SvxWordLineModeItem& rWordLineModeItem = static_cast<const SvxWordLineModeItem&>(_rSet.Get(CFID_WORDLINEMODE)); - lcl_pushBackPropertyValue( _out_properties, PROPERTY_WORDLINEMODE, ::cppu::bool2any(rWordLineModeItem.GetValue())); + lcl_pushBackPropertyValue( _out_properties, PROPERTY_WORDLINEMODE, css::uno::makeAny(rWordLineModeItem.GetValue())); } diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 19a277bcc3b0..88adb0b38539 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2781,9 +2781,9 @@ namespace pcr if (xController.is()) { // do a preview by default - xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(true)); + xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, css::uno::Any(true)); - xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, ::cppu::bool2any(true)); + xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, css::uno::Any(true)); xController->enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK, false); } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index aed7bb88386c..f49ca913c73b 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1510,7 +1510,7 @@ Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { if ((nHandle == PROPERTY_ID_ISMODIFIED) && (m_nResetsPending > 0)) - return ::cppu::bool2any(false); + return css::uno::Any(false); // don't allow the aggregate which is currently being reset to return a (temporary) "yes" else return OPropertySetAggregationHelper::getFastPropertyValue(nHandle); @@ -2080,7 +2080,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners) // (do this _before_ the listeners are notified ! their reaction (maybe asynchronous) may depend // on the modified state of the row) if (bInsertRow) - m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any(false)); + m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, css::uno::Any(false)); aResetGuard.clear(); { @@ -2091,7 +2091,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners) // and again : ensure the row isn't modified // we already did this after we (and maybe our dependents) resetted the values, but the listeners may have changed the row, too if (bInsertRow) - m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, ::cppu::bool2any(false)); + m_xAggregateSet->setPropertyValue(PROPERTY_ISMODIFIED, css::uno::Any(false)); --m_nResetsPending; } diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index d2f1be6f86c2..3df259e1dc76 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -815,7 +815,7 @@ bool OImageControlControl::implInsertGraphics() aDialog.SetTitle( sTitle ); Reference< XFilePickerControlAccess > xController( aDialog.GetFilePicker(), UNO_QUERY_THROW ); - xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(true)); + xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, css::uno::Any(true)); Reference<XPropertySet> xBoundField; if ( hasProperty( PROPERTY_BOUNDFIELD, xSet ) ) diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index aa3423300dcc..45193db61d17 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -994,7 +994,7 @@ namespace frm // - this would be unable to reflect in the db column if ( hasField() ) { - setFastPropertyValue( PROPERTY_ID_MULTISELECTION, ::cppu::bool2any( false ) ); + setFastPropertyValue( PROPERTY_ID_MULTISELECTION, css::uno::Any(false) ); } if ( !hasExternalListSource() ) diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 3e121a714e66..991df45662b8 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -23,7 +23,6 @@ #include "property.hrc" #include "services.hxx" #include <tools/debug.hxx> -#include <comphelper/extract.hxx> #include <comphelper/basicio.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx index 07acf4258417..9a788c795870 100644 --- a/include/comphelper/extract.hxx +++ b/include/comphelper/extract.hxx @@ -121,17 +121,6 @@ inline bool SAL_CALL any2bool( const ::com::sun::star::uno::Any & rAny ) } } -/** - * Puts a boolean in an any. - * - * @DEPRECATED : use makeAny< sal_Bool >() - * - */ -inline ::com::sun::star::uno::Any SAL_CALL bool2any( bool bBool ) -{ - return ::com::sun::star::uno::Any( &bBool, ::getCppuBooleanType() ); -} - } #endif diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 472d1686911d..a683f8c668ab 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3012,13 +3012,13 @@ void OReportController::insertGraphic() aDialog.SetTitle( sTitle ); uno::Reference< ui::dialogs::XFilePickerControlAccess > xController(aDialog.GetFilePicker(), UNO_QUERY_THROW); - xController->setValue(ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(true)); + xController->setValue(ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, css::uno::Any(true)); xController->enableControl(ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, sal_False/*sal_True*/); - sal_Bool bLink = sal_True; - xController->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, ::cppu::bool2any( bLink ) ); + xController->setValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, css::uno::Any(true) ); if ( ERRCODE_NONE == aDialog.Execute() ) { + sal_Bool bLink = sal_True; xController->getValue( ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bLink; uno::Sequence<beans::PropertyValue> aArgs(2); aArgs[0].Name = PROPERTY_IMAGEURL; diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index c111cf4776f4..8df12719df3b 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -27,7 +27,6 @@ #include <xmloff/xmltkmap.hxx> #include <xmloff/nmspmap.hxx> -#include <comphelper/extract.hxx> #include <xmloff/xmltoken.hxx> #define SC_USERLIST "UserList" @@ -142,13 +141,13 @@ void ScXMLSortContext::EndElement() ++i; uno::Sequence <beans::PropertyValue> aSortDescriptor(7 + i); aSortDescriptor[0].Name = OUString(SC_UNONAME_BINDFMT); - aSortDescriptor[0].Value = ::cppu::bool2any(bBindFormatsToContent); + aSortDescriptor[0].Value = css::uno::makeAny(bBindFormatsToContent); aSortDescriptor[1].Name = OUString(SC_UNONAME_COPYOUT); - aSortDescriptor[1].Value = ::cppu::bool2any(bCopyOutputData); + aSortDescriptor[1].Value = css::uno::makeAny(bCopyOutputData); aSortDescriptor[2].Name = OUString(SC_UNONAME_ISCASE); - aSortDescriptor[2].Value = ::cppu::bool2any(bIsCaseSensitive); + aSortDescriptor[2].Value = css::uno::makeAny(bIsCaseSensitive); aSortDescriptor[3].Name = OUString(SC_UNONAME_ISULIST); - aSortDescriptor[3].Value = ::cppu::bool2any(bEnabledUserList); + aSortDescriptor[3].Value = css::uno::makeAny(bEnabledUserList); aSortDescriptor[4].Name = OUString(SC_UNONAME_OUTPOS); aSortDescriptor[4].Value <<= aOutputPosition; aSortDescriptor[5].Name = OUString(SC_UNONAME_UINDEX); diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index c36708d42bf9..baec1f43d44e 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -1814,13 +1814,13 @@ bool XmlScPropHdl_BreakBefore::importXML( if (IsXMLToken(rStrImpValue, XML_AUTO)) { bValue = false; - rValue = ::cppu::bool2any(bValue); + rValue <<= bValue; bRetval = true; } else if (IsXMLToken(rStrImpValue, XML_PAGE)) { bValue = true; - rValue = ::cppu::bool2any(bValue); + rValue <<= bValue; bRetval = true; } @@ -1868,12 +1868,12 @@ bool XmlScPropHdl_IsTextWrapped::importXML( if (IsXMLToken(rStrImpValue, XML_WRAP)) { - rValue = ::cppu::bool2any(true); + rValue <<= true; bRetval = true; } else if (IsXMLToken(rStrImpValue, XML_NO_WRAP)) { - rValue = ::cppu::bool2any(false); + rValue <<= false; bRetval = true; } @@ -1937,12 +1937,12 @@ bool XmlScPropHdl_Vertical::importXML( if (IsXMLToken(rStrImpValue, XML_AUTO)) { - rValue = ::cppu::bool2any(true); + rValue <<= true; bRetval = true; } else if (IsXMLToken(rStrImpValue, XML_0)) { - rValue = ::cppu::bool2any(false); + rValue <<= false; bRetval = true; } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 7daa392e9ca7..58b13ca1c9a0 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -271,7 +271,7 @@ void ScXMLRowImportPropertyMapper::finished(::std::vector< XMLPropertyState >& r } else if (pHeight) { - rProperties.push_back(XMLPropertyState(maPropMapper->FindEntryIndex(CTF_SC_ROWOPTIMALHEIGHT), ::cppu::bool2any( false ))); + rProperties.push_back(XMLPropertyState(maPropMapper->FindEntryIndex(CTF_SC_ROWOPTIMALHEIGHT), css::uno::Any(false))); } // don't access pointers to rProperties elements after push_back! } diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 2e33485d3326..664aa017d219 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -933,27 +933,27 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope OUString aNameString = aPropertyName; if ( aNameString.equalsAscii( SC_UNO_DP_COLGRAND ) ) { - aRet = ::cppu::bool2any( aNewData.GetColumnGrand() ); + aRet <<= aNewData.GetColumnGrand(); } else if ( aNameString.equalsAscii( SC_UNO_DP_IGNORE_EMPTYROWS ) ) { - aRet = ::cppu::bool2any( aNewData.GetIgnoreEmptyRows() ); + aRet <<= aNewData.GetIgnoreEmptyRows(); } else if ( aNameString.equalsAscii( SC_UNO_DP_REPEATEMPTY ) ) { - aRet = ::cppu::bool2any( aNewData.GetRepeatIfEmpty() ); + aRet <<= aNewData.GetRepeatIfEmpty(); } else if ( aNameString.equalsAscii( SC_UNO_DP_ROWGRAND ) ) { - aRet = ::cppu::bool2any( aNewData.GetRowGrand() ); + aRet <<= aNewData.GetRowGrand(); } else if ( aNameString.equalsAscii( SC_UNO_DP_SHOWFILTER ) ) { - aRet = ::cppu::bool2any( aNewData.GetFilterButton() ); + aRet <<= aNewData.GetFilterButton(); } else if ( aNameString.equalsAscii( SC_UNO_DP_DRILLDOWN ) ) { - aRet = ::cppu::bool2any( aNewData.GetDrillDown() ); + aRet <<= aNewData.GetDrillDown(); } else if ( aNameString.equalsAscii( SC_UNO_DP_GRANDTOTAL_NAME ) ) { @@ -2001,7 +2001,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam else if ( aNameString.equalsAscii( SC_UNONAME_USESELPAGE ) ) aRet <<= getUseCurrentPage(); else if ( aNameString.equalsAscii( SC_UNONAME_HASAUTOSHOW ) ) - aRet = ::cppu::bool2any(getAutoShowInfo() != NULL); + aRet <<= (getAutoShowInfo() != NULL); else if ( aNameString.equalsAscii( SC_UNONAME_AUTOSHOW ) ) { const DataPilotFieldAutoShowInfo* pInfo = getAutoShowInfo(); @@ -2009,7 +2009,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam aRet <<= DataPilotFieldAutoShowInfo(*pInfo); } else if ( aNameString.equalsAscii( SC_UNONAME_HASLAYOUTINFO ) ) - aRet = ::cppu::bool2any(getLayoutInfo() != NULL); + aRet <<= (getLayoutInfo() != NULL); else if ( aNameString.equalsAscii( SC_UNONAME_LAYOUTINFO ) ) { const DataPilotFieldLayoutInfo* pInfo = getLayoutInfo(); @@ -2017,7 +2017,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam aRet <<= DataPilotFieldLayoutInfo(*pInfo); } else if ( aNameString.equalsAscii( SC_UNONAME_HASREFERENCE ) ) - aRet = ::cppu::bool2any(getReference() != NULL); + aRet <<= (getReference() != NULL); else if ( aNameString.equalsAscii( SC_UNONAME_REFERENCE ) ) { const DataPilotFieldReference* pRef = getReference(); @@ -2025,7 +2025,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam aRet <<= DataPilotFieldReference(*pRef); } else if ( aNameString.equalsAscii( SC_UNONAME_HASSORTINFO ) ) - aRet = ::cppu::bool2any(getSortInfo() != NULL); + aRet <<= (getSortInfo() != NULL); else if ( aNameString.equalsAscii( SC_UNONAME_SORTINFO ) ) { const DataPilotFieldSortInfo* pInfo = getSortInfo(); @@ -2033,7 +2033,7 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam aRet <<= DataPilotFieldSortInfo(*pInfo); } else if ( aNameString.equalsAscii( SC_UNONAME_ISGROUP ) ) - aRet = ::cppu::bool2any(hasGroupInfo()); + aRet <<= (hasGroupInfo()); else if ( aNameString.equalsAscii( SC_UNONAME_GROUPINFO ) ) { aRet <<= getGroupInfo(); diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 81388051b7cf..f29c941af317 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -316,7 +316,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq // Sequence fuellen pArray[0].Name = OUString( SC_UNONAME_ISSORTCOLUMNS ); - pArray[0].Value = ::cppu::bool2any(!rParam.bByRow); + pArray[0].Value <<= !rParam.bByRow; pArray[1].Name = OUString( SC_UNONAME_CONTHDR ); ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, rParam.bHasHeader ); diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 9ee4eb0da18b..96dcdf59821c 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -1688,7 +1688,7 @@ uno::Any SAL_CALL SdUnoEventsAccess::getByName( const OUString& aName ) pProperties->Name = maStrPlayFull; pProperties->Handle = -1; - pProperties->Value = ::cppu::bool2any(pInfo->mbSecondPlayFull); + pProperties->Value = css::uno::makeAny(pInfo->mbSecondPlayFull); pProperties->State = beans::PropertyState_DIRECT_VALUE; } break; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index fd5bac9ff86e..ed5670dd7a30 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -605,7 +605,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) break; default: aCommandType <<= (sal_Int32)CommandType::COMMAND; - xForm->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, bool2any(2 == nCommandType)); + xForm->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, css::uno::Any(2 == nCommandType)); break; } xForm->setPropertyValue(FM_PROP_COMMANDTYPE, aCommandType); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 7dd6351bc362..0e2d40a30fb3 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -78,7 +78,6 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <comphelper/extract.hxx> #include <comphelper/evtmethodhelper.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> @@ -3613,7 +3612,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) Sequence< OUString > aNames(1); aNames[0] = "FormControlPilotsEnabled"; Sequence< Any > aValues(1); - aValues[0] = ::cppu::bool2any(m_bUseWizards); + aValues[0] <<= m_bUseWizards; PutProperties(aNames, aValues); } diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c31b26749e38..dcc3d8f18e9e 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -80,7 +80,6 @@ #include <fchrfmt.hxx> #include <charfmt.hxx> -#include <comphelper/extract.hxx> #include <fltini.hxx> #include "writerwordglue.hxx" @@ -1946,7 +1945,7 @@ void SwWW8ImplReader::ImportDop() { if (xInfo->hasPropertyByName("ApplyFormDesignMode")) { - xDocProps->setPropertyValue("ApplyFormDesignMode", cppu::bool2any(bValue)); + xDocProps->setPropertyValue("ApplyFormDesignMode", css::uno::makeAny(bValue)); } } } diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index e5d462fd6d02..ec596336fcb9 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -45,7 +45,6 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> -#include <comphelper/extract.hxx> #include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -2446,7 +2445,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference < } sal_Bool bDropDown(sal_True); - xPropSet->setPropertyValue("Dropdown", cppu::bool2any(bDropDown)); + xPropSet->setPropertyValue("Dropdown", css::uno::makeAny(bDropDown)); if (!maListEntries.empty()) { diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index b0057fee227d..07e3cfa3f887 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -44,7 +44,6 @@ #include <toolkit/awt/vclxwindows.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/extract.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <vcl/edit.hxx> @@ -1121,7 +1120,7 @@ void UnoRadioButtonControl::createPeer( const uno::Reference< awt::XToolkit > & // have it enabled by default because of 85071) uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( getPeer(), uno::UNO_QUERY ); if ( xVclWindowPeer.is() ) - xVclWindowPeer->setProperty( GetPropertyName( BASEPROPERTY_AUTOTOGGLE ), ::cppu::bool2any( true ) ); + xVclWindowPeer->setProperty( GetPropertyName( BASEPROPERTY_AUTOTOGGLE ), css::uno::Any(true) ); } void UnoRadioButtonControl::addItemListener(const uno::Reference < awt::XItemListener > & l) throw(uno::RuntimeException) diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index eaf3d8ec6013..2228bd05cbe6 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -561,7 +561,7 @@ SvXMLExport::~SvXMLExport() mxExportInfo->setPropertyValue(sProgressCurrent, aAny); } if (xPropertySetInfo->hasPropertyByName(sRepeat)) - mxExportInfo->setPropertyValue(sRepeat, cppu::bool2any(mpProgressBarHelper->GetRepeat())); + mxExportInfo->setPropertyValue(sRepeat, css::uno::makeAny(mpProgressBarHelper->GetRepeat())); } if (mpNumExport && (mnExportFlags & (EXPORT_AUTOSTYLES | EXPORT_STYLES))) { diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index bb88bfbd4604..4c361e503fc9 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -548,7 +548,7 @@ void SAL_CALL SvXMLImport::endDocument() mxImportInfo->setPropertyValue(sProgressCurrent, aAny); } if (xPropertySetInfo->hasPropertyByName(sRepeat)) - mxImportInfo->setPropertyValue(sRepeat, cppu::bool2any(mpProgressBarHelper->GetRepeat())); + mxImportInfo->setPropertyValue(sRepeat, css::uno::makeAny(mpProgressBarHelper->GetRepeat())); // pProgressBarHelper is deleted in dtor } OUString sNumberStyles(XML_NUMBERSTYLES); diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 154d61b04cc5..925e437fd823 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -27,7 +27,6 @@ #include <sax/tools/converter.hxx> #include <list> -#include <comphelper/extract.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> @@ -605,7 +604,7 @@ void XMLAnimationsEffectContext::EndElement() { if( meKind == XMLE_HIDE && !mbTextEffect && meEffect == EK_none ) { - aAny = bool2any( true ); + aAny <<= true; xSet->setPropertyValue( mpImpl->msDimHide, aAny ); } else @@ -631,10 +630,10 @@ void XMLAnimationsEffectContext::EndElement() aAny <<= maSoundURL; xSet->setPropertyValue( mpImpl->msSound, aAny ); - aAny <<= bool2any( mbPlayFull ); + aAny <<= mbPlayFull; xSet->setPropertyValue( mpImpl->msPlayFull, aAny ); - aAny <<= bool2any( true ); + aAny <<= true; xSet->setPropertyValue( mpImpl->msSoundOn, aAny ); } else diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 3de70c97a674..f7158ff9c5c8 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <tools/urlobj.hxx> -#include <comphelper/extract.hxx> #include <sax/tools/converter.hxx> @@ -462,7 +461,7 @@ void SdXMLEventContext::EndElement() pProperties->Name = "PlayFull"; pProperties->Handle = -1; - pProperties->Value = ::cppu::bool2any(mbPlayFull); + pProperties->Value <<= mbPlayFull; pProperties->State = beans::PropertyState_DIRECT_VALUE; break; diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 49fe17c2b84d..d9c95a03b671 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <comphelper/extract.hxx> #include "ximpshap.hxx" #include <xmloff/XMLBase64ImportContext.hxx> #include <xmloff/XMLShapeStyleContext.hxx> @@ -1680,10 +1679,10 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt if( xPropsInfo.is() ) { if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) - xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) ); if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) - xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) ); } } } @@ -2429,7 +2428,7 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: uno::Reference< beans::XPropertySetInfo > xPropsInfo( xPropset->getPropertySetInfo() ); if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) - xPropset->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( mbIsPlaceholder ) ); + xPropset->setPropertyValue("IsEmptyPresentationObject", css::uno::makeAny( mbIsPlaceholder ) ); if( !mbIsPlaceholder ) { @@ -2458,7 +2457,7 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: if( xPropsInfo.is() ) { if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) - xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) ); } } } @@ -2569,7 +2568,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri { uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) - xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) ); uno::Any aAny; @@ -2596,7 +2595,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri if( xPropsInfo.is() ) { if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) - xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) ); } } } @@ -2700,10 +2699,10 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen if( xPropsInfo.is() ) { if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) - xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) ); if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) - xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) ); } } } @@ -3080,10 +3079,10 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen if( xPropsInfo.is() ) { if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) - xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) ); if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) - xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) ); } } } @@ -3887,10 +3886,10 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc if( xPropsInfo.is() ) { if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) - xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsEmptyPresentationObject", css::uno::Any(false) ); if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) - xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) ); + xProps->setPropertyValue("IsPlaceholderDependent", css::uno::Any(false) ); } } } diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index affe7823a804..055ccf3ef3f6 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <sax/tools/converter.hxx> #include <xmloff/xmltoken.hxx> -#include <comphelper/extract.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> @@ -125,57 +124,57 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c } else if( IsXMLToken( aLocalName, XML_ANIMATIONS ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) ); + aAny <<= IsXMLToken( sValue, XML_ENABLED ); mpImpl->mxPresProps->setPropertyValue("AllowAnimations", aAny ); } else if( IsXMLToken( aLocalName, XML_STAY_ON_TOP ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("IsAlwaysOnTop", aAny ); } else if( IsXMLToken( aLocalName, XML_FORCE_MANUAL ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("IsAutomatic", aAny ); } else if( IsXMLToken( aLocalName, XML_ENDLESS ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("IsEndless", aAny ); } else if( IsXMLToken( aLocalName, XML_FULL_SCREEN ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("IsFullScreen", aAny ); } else if( IsXMLToken( aLocalName, XML_MOUSE_VISIBLE ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("IsMouseVisible", aAny ); } else if( IsXMLToken( aLocalName, XML_START_WITH_NAVIGATOR ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("StartWithNavigator", aAny ); } else if( IsXMLToken( aLocalName, XML_MOUSE_AS_PEN ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("UsePen", aAny ); } else if( IsXMLToken( aLocalName, XML_TRANSITION_ON_CLICK ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) ); + aAny <<= IsXMLToken( sValue, XML_ENABLED ); mpImpl->mxPresProps->setPropertyValue("IsTransitionOnClick", aAny ); } else if( IsXMLToken( aLocalName, XML_SHOW_LOGO ) ) { - aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); + aAny <<= IsXMLToken( sValue, XML_TRUE ); mpImpl->mxPresProps->setPropertyValue("IsShowLogo", aAny ); } } } - aAny = bool2any( bAll ); + aAny <<= bAll; mpImpl->mxPresProps->setPropertyValue("IsShowAll", aAny ); } } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 502f8c3d2caa..128b90d32e6c 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -101,7 +101,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun OStringBuffer("PropertyConversion::convertString: could not convert \""). append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a boolean!").getStr()); - aReturn = ::cppu::bool2any(_bInvertBoolean ? !bValue : bValue); + aReturn <<= (_bInvertBoolean ? !bValue : bValue); } break; case TypeClass_SHORT: // sal_Int16 diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx index 8d3273ef65e9..98eb63fe1d68 100644 --- a/xmloff/source/style/NamedBoolPropertyHdl.cxx +++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx @@ -39,13 +39,13 @@ bool XMLNamedBoolPropertyHdl::importXML( const OUString& rStrImpValue, Any& rVal { if( rStrImpValue == maTrueStr ) { - rValue = ::cppu::bool2any( true ); + rValue <<= true; return true; } if( rStrImpValue == maFalseStr ) { - rValue = ::cppu::bool2any( false ); + rValue <<= false; return true; } diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index a3396617f622..b8b2ada6dcb3 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -63,7 +63,7 @@ static void lcl_RemoveStateIfZero16( XMLPropertyState* pState ) static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps) { if(::cppu::any2bool(xProps->getPropertyValue(rProperty))) - rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(true))); + rPropState.push_back(XMLPropertyState (nIndex, css::uno::Any(true))); } // helper struct to handle equal XMLPropertyState's for page, header and footer diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx index a171f0c274d5..715aab239b0e 100644 --- a/xmloff/source/style/PageMasterPropHdl.cxx +++ b/xmloff/source/style/PageMasterPropHdl.cxx @@ -331,7 +331,7 @@ bool XMLPMPropHdl_CenterHorizontal::importXML( if (IsXMLToken( rStrImpValue, XML_BOTH) || IsXMLToken( rStrImpValue, XML_HORIZONTAL)) { - rValue = ::cppu::bool2any(true); + rValue <<= true; bRet = true; } @@ -372,7 +372,7 @@ bool XMLPMPropHdl_CenterVertical::importXML( if (IsXMLToken(rStrImpValue, XML_BOTH) || IsXMLToken(rStrImpValue, XML_VERTICAL) ) { - rValue = ::cppu::bool2any(true); + rValue <<= true; bRet = true; } diff --git a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx index 51b4084dbf93..9c3416f4aff6 100644 --- a/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx +++ b/xmloff/source/style/XMLBitmapLogicalSizePropertyHandler.cxx @@ -21,7 +21,6 @@ #include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/Any.hxx> #include "XMLBitmapLogicalSizePropertyHandler.hxx" -#include <comphelper/extract.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -40,7 +39,7 @@ bool XMLBitmapLogicalSizePropertyHandler::importXML( Any& rValue, const SvXMLUnitConverter& ) const { - rValue = ::cppu::bool2any( rStrImpValue.indexOf( '%' ) == -1 ); + rValue <<= ( rStrImpValue.indexOf( '%' ) == -1 ); return true; } |