dbaccess/source/core/api/KeySet.cxx | 6
dbaccess/source/core/api/RowSet.cxx | 28 +--
dbaccess/source/core/api/RowSetBase.cxx | 6
dbaccess/source/core/api/RowSetCache.cxx | 4
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 12 -
dbaccess/source/core/api/StaticSet.cxx | 2
dbaccess/source/core/api/WrappedResultSet.cxx | 2
dbaccess/source/core/api/querycontainer.cxx | 6
dbaccess/source/core/api/resultcolumn.cxx | 2
dbaccess/source/core/api/tablecontainer.cxx | 4
dbaccess/source/core/dataaccess/ContentHelper.cxx | 8
dbaccess/source/core/dataaccess/ModelImpl.cxx | 106 ++++++-------
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 10 -
dbaccess/source/core/dataaccess/commanddefinition.cxx | 4
dbaccess/source/core/dataaccess/connection.cxx | 2
dbaccess/source/core/dataaccess/databasecontext.cxx | 12 -
dbaccess/source/core/dataaccess/databasedocument.cxx | 48 ++---
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 8
dbaccess/source/core/dataaccess/datasource.cxx | 6
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 6
dbaccess/source/core/dataaccess/documentcontainer.cxx | 12 -
dbaccess/source/core/dataaccess/documentdefinition.cxx | 46 ++---
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 2
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 30 +--
dbaccess/source/filter/hsqldb/rowinputbinary.cxx | 22 +-
dbaccess/source/filter/xml/dbloader2.cxx | 2
dbaccess/source/filter/xml/xmlColumn.cxx | 6
dbaccess/source/filter/xml/xmlComponent.cxx | 2
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 6
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 2
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 2
dbaccess/source/filter/xml/xmlLogin.cxx | 4
dbaccess/source/filter/xml/xmlQuery.cxx | 12 -
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 2
dbaccess/source/filter/xml/xmlTable.cxx | 10 -
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4
dbaccess/source/filter/xml/xmlfilter.cxx | 4
dbaccess/source/ui/app/AppController.cxx | 8
dbaccess/source/ui/app/AppControllerDnD.cxx | 6
dbaccess/source/ui/app/AppControllerGen.cxx | 8
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 8
dbaccess/source/ui/app/subcomponentmanager.cxx | 4
dbaccess/source/ui/browser/brwctrlr.cxx | 26 +--
dbaccess/source/ui/browser/dbloader.cxx | 2
dbaccess/source/ui/browser/exsrcbrw.cxx | 2
dbaccess/source/ui/browser/formadapter.cxx | 10 -
dbaccess/source/ui/browser/genericcontroller.cxx | 6
dbaccess/source/ui/browser/unodatbr.cxx | 58 +++----
dbaccess/source/ui/control/FieldDescControl.cxx | 4
dbaccess/source/ui/dlg/CollectionView.cxx | 2
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 16 -
dbaccess/source/ui/dlg/UserAdmin.cxx | 4
dbaccess/source/ui/dlg/dbfindex.cxx | 2
dbaccess/source/ui/dlg/dbwizsetup.cxx | 6
dbaccess/source/ui/dlg/directsql.cxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/misc/DExport.cxx | 2
dbaccess/source/ui/misc/HtmlReader.cxx | 2
dbaccess/source/ui/misc/TableCopyHelper.cxx | 14 -
dbaccess/source/ui/misc/TokenWriter.cxx | 6
dbaccess/source/ui/misc/UITools.cxx | 36 ++--
dbaccess/source/ui/misc/WCopyTable.cxx | 18 +-
dbaccess/source/ui/misc/databaseobjectview.cxx | 2
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
dbaccess/source/ui/misc/indexcollection.cxx | 8
dbaccess/source/ui/querydesign/JoinTableView.cxx | 8
dbaccess/source/ui/querydesign/QueryTableView.cxx | 4
dbaccess/source/ui/querydesign/querycontroller.cxx | 44 ++---
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 14 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 2
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 2
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 34 ++--
dbaccess/source/ui/tabledesign/TEditControl.cxx | 4
dbaccess/source/ui/tabledesign/TableController.cxx | 16 -
dbaccess/source/ui/uno/composerdialogs.cxx | 12 -
dbaccess/source/ui/uno/copytablewizard.cxx | 3
77 files changed, 431 insertions(+), 432 deletions(-)
New commits:
commit 031173da38de93e5153c5d2c105706df07127b99
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed May 4 14:42:03 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed May 4 18:36:39 2022 +0200
Just use Any ctor instead of makeAny in dbaccess
Change-Id: I8b20d60d536a8fb3d3396e1ce26bacf309637f40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133829
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 9cf07310502d..577088aaad33 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -282,7 +282,7 @@ void OKeySet::construct(const Reference< XResultSet>&
_xDriverSet, const OUStrin
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
Reference<XColumnsSupplier> xQueryColSup(m_xComposer, UNO_QUERY);
const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns();
- findTableColumnsMatching_throw( makeAny(m_xTable), m_sUpdateTableName,
xMeta, xQueryColumns, m_pKeyColumnNames );
+ findTableColumnsMatching_throw( Any(m_xTable), m_sUpdateTableName, xMeta,
xQueryColumns, m_pKeyColumnNames );
Reference< XSingleSelectQueryComposer>
xSourceComposer(m_xComposer,UNO_QUERY);
Reference< XMultiServiceFactory > xFactory(m_xConnection,
UNO_QUERY_THROW);
@@ -406,7 +406,7 @@ Any OKeySet::getBookmark()
{
OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter !=
m_aKeyMap.begin(),
"getBookmark is only possible when we stand on a valid row!");
- return makeAny(m_aKeyIter->first);
+ return Any(m_aKeyIter->first);
}
bool OKeySet::moveToBookmark( const Any& bookmark )
@@ -761,7 +761,7 @@ void OKeySet::executeInsert( const ORowSetRow&
_rInsertRow,const OUString& i_sSQ
m_aKeyIter = m_aKeyMap.emplace( aKeyIter->first + 1,
OKeySetValue(aKeyRow,std::pair<sal_Int32,Reference<XRow>
>(1,Reference<XRow>())) ).first;
// now we set the bookmark for this row
- (*_rInsertRow)[0] = makeAny(static_cast<sal_Int32>(m_aKeyIter->first));
+ (*_rInsertRow)[0] = Any(static_cast<sal_Int32>(m_aKeyIter->first));
tryRefetch(_rInsertRow,bRefetch);
}
}
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index 1cf4a8f37751..0f0a21bfb98f 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1226,7 +1226,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
dataColumn->getPropertyValue(PROPERTY_ISREADONLY) >>= bReadOnly;
*aReadIter = bReadOnly;
- dataColumn->setPropertyValue(PROPERTY_ISREADONLY,makeAny(false));
+ dataColumn->setPropertyValue(PROPERTY_ISREADONLY,Any(false));
++aReadIter;
}
}
@@ -1237,7 +1237,7 @@ void ORowSet::impl_restoreDataColumnsWriteable_throw()
TDataColumns::const_iterator aIter = m_aDataColumns.begin();
for (bool readOnlyDataColumn : m_aReadOnlyDataColumns)
{
- (*aIter)->setPropertyValue(PROPERTY_ISREADONLY,
makeAny(readOnlyDataColumn) );
+ (*aIter)->setPropertyValue(PROPERTY_ISREADONLY,
Any(readOnlyDataColumn) );
++aIter;
}
m_aReadOnlyDataColumns.clear();
@@ -1616,8 +1616,8 @@ void ORowSet::setStatementResultSetType( const Reference<
XPropertySet >& _rxSta
}
}
- _rxStatement->setPropertyValue( PROPERTY_RESULTSETTYPE, makeAny(
nResultSetType ) );
- _rxStatement->setPropertyValue( PROPERTY_RESULTSETCONCURRENCY, makeAny(
nResultSetConcurrency ) );
+ _rxStatement->setPropertyValue( PROPERTY_RESULTSETTYPE, Any(
nResultSetType ) );
+ _rxStatement->setPropertyValue( PROPERTY_RESULTSETCONCURRENCY, Any(
nResultSetConcurrency ) );
}
void ORowSet::impl_ensureStatement_throw()
@@ -1644,8 +1644,8 @@ void ORowSet::impl_ensureStatement_throw()
// set the result set type and concurrency
try
{
- xStatementProps->setPropertyValue( PROPERTY_USEBOOKMARKS, makeAny(
true ) );
- xStatementProps->setPropertyValue( PROPERTY_MAXROWS, makeAny(
m_nMaxRows ) );
+ xStatementProps->setPropertyValue( PROPERTY_USEBOOKMARKS, Any(
true ) );
+ xStatementProps->setPropertyValue( PROPERTY_MAXROWS, Any(
m_nMaxRows ) );
setStatementResultSetType( xStatementProps, m_nResultSetType,
m_nResultSetConcurrency );
}
@@ -1741,7 +1741,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow(
const Reference< XPropertyS
}
if ( !nFormatKey && m_xNumberFormatTypes.is() )
nFormatKey = ::dbtools::getDefaultNumberFormat( _rxTemplateColumn,
m_xNumberFormatTypes, SvtSysLocale().GetLanguageTag().getLocale() );
- _rxRowSetColumn->setPropertyValue( PROPERTY_NUMBERFORMAT, makeAny(
nFormatKey ) );
+ _rxRowSetColumn->setPropertyValue( PROPERTY_NUMBERFORMAT, Any(
nFormatKey ) );
}
catch(Exception&)
{
@@ -1873,7 +1873,7 @@ void
ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
aNames.push_back(sName);
m_aDataColumns.push_back(pColumn.get());
-
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ISREADONLY,makeAny(rKeyColumns.find(i+1)
!= rKeyColumns.end()));
+
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ISREADONLY,Any(rKeyColumns.find(i+1)
!= rKeyColumns.end()));
try
{
@@ -1882,10 +1882,10 @@ void
ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
nFormatKey =
::dbtools::getDefaultNumberFormat(pColumn,m_xNumberFormatTypes,aLocale);
-
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_NUMBERFORMAT,makeAny(nFormatKey));
-
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_NUMBERFORMAT,Any(nFormatKey));
+
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_RELATIVEPOSITION,Any(sal_Int32(i+1)));
+
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_WIDTH,Any(sal_Int32(227)));
+
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ALIGN,Any(sal_Int32(0)));
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN,
css::uno::Any(false));
}
catch(Exception&)
@@ -1973,7 +1973,7 @@ void
ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
});
aColumns->emplace_back(pColumn);
-
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ISREADONLY,makeAny(rKeyColumns.find(i)
!= rKeyColumns.end()));
+
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ISREADONLY,Any(rKeyColumns.find(i)
!= rKeyColumns.end()));
if(sColumnLabel.isEmpty())
{
@@ -2797,7 +2797,7 @@ ORowSetClone::ORowSetClone( const
Reference<XComponentContext>& _rContext, ORowS
xColumn->getPropertyValue(PROPERTY_NUMBERFORMAT) >>= nFormatKey;
if(!nFormatKey && xColumn.is() && m_xNumberFormatTypes.is())
nFormatKey =
::dbtools::getDefaultNumberFormat(xColumn,m_xNumberFormatTypes,aLocale);
-
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_NUMBERFORMAT,makeAny(nFormatKey));
+
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_NUMBERFORMAT,Any(nFormatKey));
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_RELATIVEPOSITION,xColumn->getPropertyValue(PROPERTY_RELATIVEPOSITION));
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_WIDTH,xColumn->getPropertyValue(PROPERTY_WIDTH));
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_HIDDEN,xColumn->getPropertyValue(PROPERTY_HIDDEN));
diff --git a/dbaccess/source/core/api/RowSetBase.cxx
b/dbaccess/source/core/api/RowSetBase.cxx
index cae0d29eb3b7..46e6122714e9 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -94,7 +94,7 @@ ORowSetBase::ORowSetBase( const Reference<XComponentContext>&
_rContext, ::cppu:
{
sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND
| PropertyAttribute::TRANSIENT;
- registerPropertyNoMember( PROPERTY_ROWCOUNT, PROPERTY_ID_ROWCOUNT,
nRBT, cppu::UnoType<sal_Int32>::get(), css::uno::makeAny<sal_Int32>(0) );
+ registerPropertyNoMember( PROPERTY_ROWCOUNT, PROPERTY_ID_ROWCOUNT,
nRBT, cppu::UnoType<sal_Int32>::get(), css::uno::Any(sal_Int32(0)) );
registerPropertyNoMember( PROPERTY_ISROWCOUNTFINAL,
PROPERTY_ID_ISROWCOUNTFINAL, nRBT, cppu::UnoType<bool>::get(),
css::uno::Any(false) );
}
@@ -1213,8 +1213,8 @@ bool ORowSetBase::isPropertyChangeNotificationEnabled()
const
void ORowSetBase::fireProperty( sal_Int32 _nProperty, bool _bNew, bool _bOld )
{
- Any aNew = css::uno::makeAny( _bNew );
- Any aOld = css::uno::makeAny( _bOld );
+ Any aNew( _bNew );
+ Any aOld( _bOld );
fire( &_nProperty, &aNew, &aOld, 1, false );
}
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 1df68462a444..e3059f889b6b 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -455,7 +455,7 @@ static Any lcl_getBookmark(ORowSetValue&
i_aValue,OCacheSet* i_pCacheSet)
case DataType::TINYINT:
case DataType::SMALLINT:
case DataType::INTEGER:
- return makeAny(i_aValue.getInt32());
+ return Any(i_aValue.getInt32());
default:
if ( i_pCacheSet && i_aValue.isNull())
i_aValue = i_pCacheSet->getBookmark();
@@ -591,7 +591,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32
columnIndex, const Reference
rInsert[columnIndex].setBound(true);
rInsert[columnIndex] = aSeq;
rInsert[columnIndex].setModified(true);
- io_aRow[columnIndex] = makeAny(x);
+ io_aRow[columnIndex] = Any(x);
m_xCacheSet->mergeColumnValues(columnIndex,rInsert,io_aRow,o_ChangedColumns);
impl_updateRowFromCache_throw(io_aRow,o_ChangedColumns);
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index ab018431c9ce..3c6906893d11 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -106,8 +106,8 @@ namespace
{
OUString sSQLStateGeneralError( getStandardSQLState(
StandardSQLState::GENERAL_ERROR ) );
SQLException aError2( aErrorMsg, _rxContext,
sSQLStateGeneralError, 1000, Any() );
- SQLException aError1( _rStatement, _rxContext,
sSQLStateGeneralError, 1000, makeAny( aError2 ) );
- throw
SQLException(_rParser.getContext().getErrorMessage(OParseContext::ErrorCode::General),_rxContext,sSQLStateGeneralError,1000,makeAny(aError1));
+ SQLException aError1( _rStatement, _rxContext,
sSQLStateGeneralError, 1000, Any( aError2 ) );
+ throw
SQLException(_rParser.getContext().getErrorMessage(OParseContext::ErrorCode::General),_rxContext,sSQLStateGeneralError,1000,Any(aError1));
}
return pNewSqlParseNode;
}
@@ -133,7 +133,7 @@ namespace
// and now really ...
SQLException aError1( _rOriginatingCommand, _rxContext,
getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 1000, Any() );
throw SQLException( DBA_RES( RID_STR_ONLY_QUERY ), _rxContext,
- getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 1000,
makeAny( aError1 ) );
+ getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 1000,
Any( aError1 ) );
}
delete pOldNode;
@@ -474,7 +474,7 @@ OUString
OSingleSelectQueryComposer::impl_getColumnRealName_throw(const Referenc
{
OUString sError(DBA_RES(RID_STR_COLUMN_UNKNOWN_PROP));
SQLException aErr(sError.replaceAll("%value",
PROPERTY_NAME),*this,SQLSTATE_GENERAL,1000,Any() );
- throw
SQLException(DBA_RES(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,makeAny(aErr)
);
+ throw
SQLException(DBA_RES(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,Any(aErr)
);
}
OUString aName, aNewName;
@@ -544,7 +544,7 @@ OUString
OSingleSelectQueryComposer::impl_getColumnNameOrderBy_throw(const Refer
{
OUString sError(DBA_RES(RID_STR_COLUMN_UNKNOWN_PROP));
SQLException aErr(sError.replaceAll("%value",
PROPERTY_NAME),*this,SQLSTATE_GENERAL,1000,Any() );
- throw
SQLException(DBA_RES(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,makeAny(aErr)
);
+ throw
SQLException(DBA_RES(RID_STR_COLUMN_NOT_VALID),*this,SQLSTATE_GENERAL,1000,Any(aErr)
);
}
OUString aName;
@@ -847,7 +847,7 @@ Reference< XNameAccess > SAL_CALL
OSingleSelectQueryComposer::getColumns( )
{
xStatement.reset( Reference< XStatement >(
m_xConnection->createStatement(), UNO_SET_THROW ) );
Reference< XPropertySet > xStatementProps( xStatement,
UNO_QUERY_THROW );
- try { xStatementProps->setPropertyValue(
PROPERTY_ESCAPE_PROCESSING, makeAny( false ) ); }
+ try { xStatementProps->setPropertyValue(
PROPERTY_ESCAPE_PROCESSING, Any( false ) ); }
catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION("dbaccess"); }
xResMetaDataSup.set( xStatement->executeQuery( sSQL ),
UNO_QUERY_THROW );
xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_SET_THROW
);
diff --git a/dbaccess/source/core/api/StaticSet.cxx
b/dbaccess/source/core/api/StaticSet.cxx
index 82948e6f1d4e..a7ea00c4376b 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -43,7 +43,7 @@ void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32
/*_nPosition*/)
// css::sdbcx::XRowLocate
Any OStaticSet::getBookmark()
{
- return makeAny(getRow());
+ return Any(getRow());
}
bool OStaticSet::moveToBookmark( const Any& bookmark )
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx
b/dbaccess/source/core/api/WrappedResultSet.cxx
index b97fb4182d68..09d70826bdfb 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -49,7 +49,7 @@ Any WrappedResultSet::getBookmark()
{
return m_xRowLocate->getBookmark( );
}
- return makeAny(m_xDriverSet->getRow());
+ return Any(m_xDriverSet->getRow());
}
bool WrappedResultSet::moveToBookmark( const Any& bookmark )
diff --git a/dbaccess/source/core/api/querycontainer.cxx
b/dbaccess/source/core/api/querycontainer.cxx
index 5a8a93a4f7d4..583cab373b01 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -196,7 +196,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const
Reference< XPropertySet
{
m_eDoingCurrently = AggregateAction::Inserting;
OAutoActionReset aAutoReset(*this);
- m_xCommandDefinitions->insertByName(sNewObjectName,
makeAny(xCommandDefinitionPart));
+ m_xCommandDefinitions->insertByName(sNewObjectName,
Any(xCommandDefinitionPart));
}
implAppend( sNewObjectName, xNewObject );
@@ -261,7 +261,7 @@ void SAL_CALL OQueryContainer::elementInserted( const
css::container::ContainerE
// insert an own new element
xNewElement = implCreateWrapper(sElementName);
}
- insertByName(sElementName,makeAny(xNewElement));
+ insertByName(sElementName,Any(xNewElement));
}
void SAL_CALL OQueryContainer::elementRemoved( const
css::container::ContainerEvent& _rEvent )
@@ -293,7 +293,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const
css::container::ContainerE
xNewElement = implCreateWrapper(sAccessor);
}
- replaceByName(sAccessor,makeAny(xNewElement));
+ replaceByName(sAccessor,Any(xNewElement));
}
Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const
ContainerEvent& Event )
diff --git a/dbaccess/source/core/api/resultcolumn.cxx
b/dbaccess/source/core/api/resultcolumn.cxx
index ed49f52afbca..938e7d1d3f79 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -68,7 +68,7 @@ void OResultColumn::impl_determineIsRowVersion_nothrow()
try
{
Reference< XResultSet > xVersionColumns =
m_xDBMetaData->getVersionColumns(
- makeAny( sCatalog ), sSchema, sTable );
+ Any( sCatalog ), sSchema, sTable );
if ( xVersionColumns.is() ) // allowed to be NULL
{
Reference< XRow > xResultRow( xVersionColumns, UNO_QUERY_THROW
);
diff --git a/dbaccess/source/core/api/tablecontainer.cxx
b/dbaccess/source/core/api/tablecontainer.cxx
index 27f40f97f964..3971dd154bcd 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -156,7 +156,7 @@ void lcl_createDefinitionObject(const OUString& _rName
{
// set as folder
_xTableDefinition = TableDefinition::createWithName(
::comphelper::getProcessComponentContext(), _rName );
- _xTableDefinitions->insertByName(_rName,makeAny(_xTableDefinition));
+ _xTableDefinitions->insertByName(_rName,Any(_xTableDefinition));
}
Reference<XColumnsSupplier> xColumnsSupplier(_xTableDefinition,UNO_QUERY);
if ( xColumnsSupplier.is() )
@@ -408,7 +408,7 @@ void SAL_CALL OTableContainer::elementInserted( const
ContainerEvent& Event )
ObjectType xName = createObject(sName);
insertElement(sName,xName);
// and notify our listeners
- ContainerEvent aEvent(static_cast<XContainer*>(this),
makeAny(sName), makeAny(xName), Any());
+ ContainerEvent aEvent(static_cast<XContainer*>(this), Any(sName),
Any(xName), Any());
m_aContainerListeners.notifyEach(
&XContainerListener::elementInserted, aEvent );
}
}
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index a297abf66ecc..558dd7450513 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -193,7 +193,7 @@ Any SAL_CALL OContentHelper::execute( const Command&
aCommand, sal_Int32 /*Comma
{
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
@@ -211,7 +211,7 @@ Any SAL_CALL OContentHelper::execute( const Command&
aCommand, sal_Int32 /*Comma
{
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
@@ -223,7 +223,7 @@ Any SAL_CALL OContentHelper::execute( const Command&
aCommand, sal_Int32 /*Comma
{
OSL_FAIL( "No properties!" );
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
@@ -249,7 +249,7 @@ Any SAL_CALL OContentHelper::execute( const Command&
aCommand, sal_Int32 /*Comma
OSL_FAIL( "Content::execute - unsupported command!" );
ucbhelper::cancelCommandExecution(
- makeAny( UnsupportedCommandException(
+ Any( UnsupportedCommandException(
OUString(),
static_cast< cppu::OWeakObject * >( this ) ) ),
Environment );
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 0a1ef938d53b..5a4078fccfb9 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -441,7 +441,7 @@ void ODatabaseModelImpl::impl_construct_nothrow()
pSettings->ValueType,
PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT
| PropertyAttribute::MAYBEVOID
);
- xSettingsSet->insert( makeAny( aProperty ) );
+ xSettingsSet->insert( Any( aProperty ) );
}
else
{
@@ -976,7 +976,7 @@ Reference< XModel >
ODatabaseModelImpl::createNewModel_deliverOwnership()
try
{
Reference< XGlobalEventBroadcaster > xModelCollection =
theGlobalEventBroadcaster::get( m_aContext );
- xModelCollection->insert( makeAny( xModel ) );
+ xModelCollection->insert( Any( xModel ) );
}
catch( const Exception& )
{
@@ -1032,68 +1032,68 @@ const AsciiPropertyValue*
ODatabaseModelImpl::getDefaultDataSourceSettings()
static const AsciiPropertyValue aKnownSettings[] =
{
// known JDBC settings
- AsciiPropertyValue( "JavaDriverClass", makeAny( OUString()
) ),
- AsciiPropertyValue( "JavaDriverClassPath", makeAny( OUString()
) ),
- AsciiPropertyValue( "IgnoreCurrency", makeAny( false ) ),
+ AsciiPropertyValue( "JavaDriverClass", Any( OUString() ) ),
+ AsciiPropertyValue( "JavaDriverClassPath", Any( OUString() ) ),
+ AsciiPropertyValue( "IgnoreCurrency", Any( false ) ),
// known settings for file-based drivers
- AsciiPropertyValue( "Extension", makeAny( OUString()
) ),
- AsciiPropertyValue( "CharSet", makeAny( OUString()
) ),
- AsciiPropertyValue( "HeaderLine", makeAny( true ) ),
- AsciiPropertyValue( "FieldDelimiter", makeAny( OUString(
"," ) ) ),
- AsciiPropertyValue( "StringDelimiter", makeAny( OUString(
"\"" ) ) ),
- AsciiPropertyValue( "DecimalDelimiter", makeAny( OUString(
"." ) ) ),
- AsciiPropertyValue( "ThousandDelimiter", makeAny( OUString()
) ),
- AsciiPropertyValue( "ShowDeleted", makeAny( false ) ),
+ AsciiPropertyValue( "Extension", Any( OUString() ) ),
+ AsciiPropertyValue( "CharSet", Any( OUString() ) ),
+ AsciiPropertyValue( "HeaderLine", Any( true ) ),
+ AsciiPropertyValue( "FieldDelimiter", Any( OUString( "," )
) ),
+ AsciiPropertyValue( "StringDelimiter", Any( OUString( "\""
) ) ),
+ AsciiPropertyValue( "DecimalDelimiter", Any( OUString( "." )
) ),
+ AsciiPropertyValue( "ThousandDelimiter", Any( OUString() ) ),
+ AsciiPropertyValue( "ShowDeleted", Any( false ) ),
// known ODBC settings
- AsciiPropertyValue( "SystemDriverSettings", makeAny( OUString()
) ),
- AsciiPropertyValue( "UseCatalog", makeAny( false ) ),
- AsciiPropertyValue( "TypeInfoSettings", makeAny( Sequence<
Any >()) ),
+ AsciiPropertyValue( "SystemDriverSettings", Any( OUString() ) ),
+ AsciiPropertyValue( "UseCatalog", Any( false ) ),
+ AsciiPropertyValue( "TypeInfoSettings", Any( Sequence< Any
>()) ),
// settings related to auto increment handling
- AsciiPropertyValue( "AutoIncrementCreation", makeAny( OUString()
) ),
- AsciiPropertyValue( "AutoRetrievingStatement", makeAny( OUString()
) ),
- AsciiPropertyValue( "IsAutoRetrievingEnabled", makeAny( false ) ),
+ AsciiPropertyValue( "AutoIncrementCreation", Any( OUString() ) ),
+ AsciiPropertyValue( "AutoRetrievingStatement", Any( OUString() ) ),
+ AsciiPropertyValue( "IsAutoRetrievingEnabled", Any( false ) ),
// known LDAP driver settings
- AsciiPropertyValue( "HostName", makeAny( OUString()
) ),
- AsciiPropertyValue( "PortNumber", makeAny(
sal_Int32(389) ) ),
- AsciiPropertyValue( "BaseDN", makeAny( OUString()
) ),
- AsciiPropertyValue( "MaxRowCount", makeAny(
sal_Int32(100) ) ),
+ AsciiPropertyValue( "HostName", Any( OUString() ) ),
+ AsciiPropertyValue( "PortNumber", Any( sal_Int32(389)
) ),
+ AsciiPropertyValue( "BaseDN", Any( OUString() ) ),
+ AsciiPropertyValue( "MaxRowCount", Any( sal_Int32(100)
) ),
// known MySQLNative driver settings
- AsciiPropertyValue( "LocalSocket", makeAny( OUString()
) ),
- AsciiPropertyValue( "NamedPipe", makeAny( OUString()
) ),
+ AsciiPropertyValue( "LocalSocket", Any( OUString() ) ),
+ AsciiPropertyValue( "NamedPipe", Any( OUString() ) ),
// misc known driver settings
- AsciiPropertyValue( "ParameterNameSubstitution", makeAny( false ) ),
- AsciiPropertyValue( "AddIndexAppendix", makeAny( true ) ),
- AsciiPropertyValue( "IgnoreDriverPrivileges", makeAny( true ) ),
+ AsciiPropertyValue( "ParameterNameSubstitution", Any( false ) ),
+ AsciiPropertyValue( "AddIndexAppendix", Any( true ) ),
+ AsciiPropertyValue( "IgnoreDriverPrivileges", Any( true ) ),
AsciiPropertyValue( "ImplicitCatalogRestriction", ::cppu::UnoType<
OUString >::get() ),
AsciiPropertyValue( "ImplicitSchemaRestriction", ::cppu::UnoType<
OUString >::get() ),
AsciiPropertyValue( "PrimaryKeySupport", ::cppu::UnoType<
sal_Bool >::get() ),
- AsciiPropertyValue( "ShowColumnDescription", makeAny( false ) ),
+ AsciiPropertyValue( "ShowColumnDescription", Any( false ) ),
// known SDB level settings
- AsciiPropertyValue( "NoNameLengthLimit", makeAny( false ) ),
- AsciiPropertyValue( "AppendTableAliasName", makeAny( false ) ),
- AsciiPropertyValue( "GenerateASBeforeCorrelationName", makeAny( false
) ),
- AsciiPropertyValue( "ColumnAliasInOrderBy", makeAny( true ) ),
- AsciiPropertyValue( "EnableSQL92Check", makeAny( false ) ),
- AsciiPropertyValue( "BooleanComparisonMode", makeAny(
BooleanComparisonMode::EQUAL_INTEGER ) ),
- AsciiPropertyValue( "TableTypeFilterMode", makeAny(
sal_Int32(3) ) ),
- AsciiPropertyValue( "RespectDriverResultSetType", makeAny( false ) ),
- AsciiPropertyValue( "UseSchemaInSelect", makeAny( true ) ),
- AsciiPropertyValue( "UseCatalogInSelect", makeAny( true ) ),
- AsciiPropertyValue( "EnableOuterJoinEscape", makeAny( true ) ),
- AsciiPropertyValue( "PreferDosLikeLineEnds", makeAny( false ) ),
- AsciiPropertyValue( "FormsCheckRequiredFields", makeAny( true ) ),
- AsciiPropertyValue( "EscapeDateTime", makeAny( true ) ),
+ AsciiPropertyValue( "NoNameLengthLimit", Any( false ) ),
+ AsciiPropertyValue( "AppendTableAliasName", Any( false ) ),
+ AsciiPropertyValue( "GenerateASBeforeCorrelationName", Any( false ) ),
+ AsciiPropertyValue( "ColumnAliasInOrderBy", Any( true ) ),
+ AsciiPropertyValue( "EnableSQL92Check", Any( false ) ),
+ AsciiPropertyValue( "BooleanComparisonMode", Any(
BooleanComparisonMode::EQUAL_INTEGER ) ),
+ AsciiPropertyValue( "TableTypeFilterMode", Any( sal_Int32(3) )
),
+ AsciiPropertyValue( "RespectDriverResultSetType", Any( false ) ),
+ AsciiPropertyValue( "UseSchemaInSelect", Any( true ) ),
+ AsciiPropertyValue( "UseCatalogInSelect", Any( true ) ),
+ AsciiPropertyValue( "EnableOuterJoinEscape", Any( true ) ),
+ AsciiPropertyValue( "PreferDosLikeLineEnds", Any( false ) ),
+ AsciiPropertyValue( "FormsCheckRequiredFields", Any( true ) ),
+ AsciiPropertyValue( "EscapeDateTime", Any( true ) ),
// known services to handle database tasks
- AsciiPropertyValue( "TableAlterationServiceName", makeAny( OUString()
) ),
- AsciiPropertyValue( "TableRenameServiceName", makeAny( OUString()
) ),
- AsciiPropertyValue( "ViewAlterationServiceName", makeAny( OUString()
) ),
- AsciiPropertyValue( "ViewAccessServiceName", makeAny( OUString()
) ),
- AsciiPropertyValue( "CommandDefinitions", makeAny( OUString()
) ),
- AsciiPropertyValue( "Forms", makeAny( OUString()
) ),
- AsciiPropertyValue( "Reports", makeAny( OUString()
) ),
- AsciiPropertyValue( "KeyAlterationServiceName", makeAny( OUString()
) ),
- AsciiPropertyValue( "IndexAlterationServiceName", makeAny( OUString()
) ),
+ AsciiPropertyValue( "TableAlterationServiceName", Any( OUString() ) ),
+ AsciiPropertyValue( "TableRenameServiceName", Any( OUString() ) ),
+ AsciiPropertyValue( "ViewAlterationServiceName", Any( OUString() ) ),
+ AsciiPropertyValue( "ViewAccessServiceName", Any( OUString() ) ),
+ AsciiPropertyValue( "CommandDefinitions", Any( OUString() ) ),
+ AsciiPropertyValue( "Forms", Any( OUString() ) ),
+ AsciiPropertyValue( "Reports", Any( OUString() ) ),
+ AsciiPropertyValue( "KeyAlterationServiceName", Any( OUString() ) ),
+ AsciiPropertyValue( "IndexAlterationServiceName", Any( OUString() ) ),
AsciiPropertyValue()
};
@@ -1402,7 +1402,7 @@ bool
ODatabaseModelImpl::hasTrustedScriptingSignature(bool bAllowUIToAddAuthor)
aRequest.DocumentSignatureInformation = aInfo;
aRequest.DocumentVersion = aODFVersion;
aRequest.Classification =
task::InteractionClassification_QUERY;
- bResult = SfxMedium::CallApproveHandler(xInteraction,
uno::makeAny(aRequest), true);
+ bResult = SfxMedium::CallApproveHandler(xInteraction,
uno::Any(aRequest), true);
}
}
}
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 24feb1371ed0..3ffa2c6fe6a6 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -96,7 +96,7 @@ void SAL_CALL OBookmarkContainer::insertByName( const
OUString& _rName, const An
// notify the listeners
if (m_aContainerListeners.getLength())
{
- ContainerEvent aEvent(*this, makeAny(_rName), makeAny(sNewLink),
Any());
+ ContainerEvent aEvent(*this, Any(_rName), Any(sNewLink), Any());
m_aContainerListeners.notifyEach(
&XContainerListener::elementInserted, aEvent );
}
}
@@ -124,7 +124,7 @@ void SAL_CALL OBookmarkContainer::removeByName( const
OUString& _rName )
// notify the listeners
if (m_aContainerListeners.getLength())
{
- ContainerEvent aEvent(*this, makeAny(_rName), makeAny(sOldBookmark),
Any());
+ ContainerEvent aEvent(*this, Any(_rName), Any(sOldBookmark), Any());
m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved,
aEvent );
}
}
@@ -157,7 +157,7 @@ void SAL_CALL OBookmarkContainer::replaceByName( const
OUString& _rName, const A
aGuard.clear();
if (m_aContainerListeners.getLength())
{
- ContainerEvent aEvent(*this, makeAny(_rName), makeAny(sNewLink),
makeAny(sOldLink));
+ ContainerEvent aEvent(*this, Any(_rName), Any(sNewLink),
Any(sOldLink));
m_aContainerListeners.notifyEach(
&XContainerListener::elementReplaced, aEvent );
}
}
@@ -210,7 +210,7 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32
_nIndex )
if ((_nIndex < 0) || (_nIndex >=
static_cast<sal_Int32>(m_aBookmarksIndexed.size())))
throw IndexOutOfBoundsException();
- return makeAny(m_aBookmarksIndexed[_nIndex]->second);
+ return Any(m_aBookmarksIndexed[_nIndex]->second);
}
Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName )
@@ -220,7 +220,7 @@ Any SAL_CALL OBookmarkContainer::getByName( const OUString&
_rName )
if (!checkExistence(_rName))
throw NoSuchElementException();
- return makeAny(m_aBookmarks[_rName]);
+ return Any(m_aBookmarks[_rName]);
}
Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames( )
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx
b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 998865036f20..f04c472285df 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -126,9 +126,9 @@ void SAL_CALL OCommandDefinition::rename( const OUString&
newName )
{
sal_Int32 nHandle = PROPERTY_ID_NAME;
osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex);
- Any aOld = makeAny(m_pImpl->m_aProps.aTitle);
+ Any aOld(m_pImpl->m_aProps.aTitle);
aGuard.clear();
- Any aNew = makeAny(newName);
+ Any aNew(newName);
fire(&nHandle, &aNew, &aOld, 1, true );
m_pImpl->m_aProps.aTitle = newName;
diff --git a/dbaccess/source/core/dataaccess/connection.cxx
b/dbaccess/source/core/dataaccess/connection.cxx
index c45cb24538c8..37cf9e669a67 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -630,7 +630,7 @@ Reference< XInterface > SAL_CALL
OConnection::createInstance( const OUString& _s
if ( aFind == m_aSupportServices.end() )
{
Reference<XConnection> xMy(this);
- Sequence<Any> aArgs{
Any(NamedValue("ActiveConnection",makeAny(xMy))) };
+ Sequence<Any> aArgs{
Any(NamedValue("ActiveConnection",Any(xMy))) };
aFind = m_aSupportServices.emplace(
_sServiceSpecifier,
m_aContext->getServiceManager()->createInstanceWithArgumentsAndContext(_sServiceSpecifier,
aArgs, m_aContext)
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 471bdd8ad399..5afdadb67b05 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -317,7 +317,7 @@ Reference< XInterface >
ODatabaseContext::loadObjectFromURL(const OUString& _rNa
SQLException aError;
aError.Message = sErrorMessage.replaceAll( "$file$",
aTransformer.get( ::svt::OFileNotation::N_SYSTEM ) );
- throw WrappedTargetException( _sURL, *this, makeAny( aError ) );
+ throw WrappedTargetException( _sURL, *this, Any( aError ) );
}
throw WrappedTargetException( _sURL, *this,
::cppu::getCaughtException() );
}
@@ -440,7 +440,7 @@ void ODatabaseContext::registerObject(const OUString&
_rName, const Reference< X
}
// notify our container listeners
- ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_rName),
makeAny(_rxObject), Any());
+ ContainerEvent aEvent(static_cast<XContainer*>(this), Any(_rName),
Any(_rxObject), Any());
m_aContainerListeners.notifyEach( &XContainerListener::elementInserted,
aEvent );
}
@@ -528,7 +528,7 @@ void ODatabaseContext::revokeObject(const OUString& _rName)
m_aDatabaseObjects.erase( aExistent );
// notify our container listeners
- ContainerEvent aEvent( *this, makeAny( _rName ), Any(), Any() );
+ ContainerEvent aEvent( *this, Any( _rName ), Any(), Any() );
aGuard.clear();
m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved,
aEvent );
}
@@ -611,7 +611,7 @@ Any ODatabaseContext::getByName(const OUString& _rName)
{
Reference< XInterface > xExistent = getObject( _rName );
if ( xExistent.is() )
- return makeAny( xExistent );
+ return Any( xExistent );
// see whether this is a registered name
OUString sURL;
@@ -628,7 +628,7 @@ Any ODatabaseContext::getByName(const OUString& _rName)
if ( !xExistent.is() )
// try to load this as URL
xExistent = loadObjectFromURL( _rName, sURL );
- return makeAny( xExistent );
+ return Any( xExistent );
}
catch (const NoSuchElementException&)
{ // let these exceptions through
@@ -736,7 +736,7 @@ void ODatabaseContext::onBasicManagerCreated( const
Reference< XModel >& _rxForD
// ... whose BasicManager has just been created, then add the global
DatabaseDocument variable to its scope.
if ( xDatabaseDocument.is() )
- _rBasicManager.SetGlobalUNOConstant( "ThisDatabaseDocument", makeAny(
xDatabaseDocument ) );
+ _rBasicManager.SetGlobalUNOConstant( "ThisDatabaseDocument", Any(
xDatabaseDocument ) );
#endif
}
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 2bb57d234d42..051421fa578a 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -452,8 +452,8 @@ void ODatabaseDocument::impl_import_nolck_throw( const
Reference< XComponentCont
if (sBaseURI.isEmpty())
sBaseURI = _rResource.getOrDefault("URL",OUString());
assert(!sBaseURI.isEmpty()); // needed for relative URLs
- xInfoSet->setPropertyValue("BaseURI", uno::makeAny(sBaseURI));
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("content.xml")));
+ xInfoSet->setPropertyValue("BaseURI", uno::Any(sBaseURI));
+ xInfoSet->setPropertyValue("StreamName",
uno::Any(OUString("content.xml")));
const sal_Int32 nCount = aFilterCreationArgs.getLength();
aFilterCreationArgs.realloc(nCount + 1);
@@ -1030,7 +1030,7 @@ void ODatabaseDocument::impl_storeAs_throw( const
OUString& _rURL, const ::comph
if ( !bIsInitializationProcess )
{
_rGuard.clear();
- m_aEventNotifier.notifyDocumentEvent( _eType == SAVE ? "OnSave" :
"OnSaveAs", nullptr, makeAny( _rURL ) );
+ m_aEventNotifier.notifyDocumentEvent( _eType == SAVE ? "OnSave" :
"OnSaveAs", nullptr, Any( _rURL ) );
_rGuard.reset();
}
@@ -1090,13 +1090,13 @@ void ODatabaseDocument::impl_storeAs_throw( const
OUString& _rURL, const ::comph
catch( const IOException& )
{
if ( !bIsInitializationProcess )
- m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveFailed" : "OnSaveAsFailed", nullptr, makeAny( _rURL ) );
+ m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveFailed" : "OnSaveAsFailed", nullptr, Any( _rURL ) );
throw;
}
catch( const RuntimeException& )
{
if ( !bIsInitializationProcess )
- m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveFailed" : "OnSaveAsFailed", nullptr, makeAny( _rURL ) );
+ m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveFailed" : "OnSaveAsFailed", nullptr, Any( _rURL ) );
throw;
}
catch( const Exception& )
@@ -1105,14 +1105,14 @@ void ODatabaseDocument::impl_storeAs_throw( const
OUString& _rURL, const ::comph
// notify the failure
if ( !bIsInitializationProcess )
- m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveFailed" : "OnSaveAsFailed", nullptr, makeAny( _rURL ) );
+ m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveFailed" : "OnSaveAsFailed", nullptr, Any( _rURL ) );
impl_throwIOExceptionCausedBySave_throw( aError, _rURL );
}
// notify the document event
if ( !bIsInitializationProcess )
- m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveDone" : "OnSaveAsDone", nullptr, makeAny( _rURL ) );
+ m_aEventNotifier.notifyDocumentEventAsync( _eType == SAVE ?
"OnSaveDone" : "OnSaveAsDone", nullptr, Any( _rURL ) );
// reset our "modified" flag, and clear the guard
impl_setModified_nothrow( false, _rGuard );
@@ -1252,7 +1252,7 @@ void SAL_CALL ODatabaseDocument::storeToURL( const
OUString& _rURL, const Sequen
{
aGuard.clear();
- m_aEventNotifier.notifyDocumentEvent( "OnSaveTo", nullptr, makeAny(
_rURL ) );
+ m_aEventNotifier.notifyDocumentEvent( "OnSaveTo", nullptr, Any( _rURL
) );
aGuard.reset();
}
@@ -1284,7 +1284,7 @@ void SAL_CALL ODatabaseDocument::storeToURL( const
OUString& _rURL, const Sequen
impl_throwIOExceptionCausedBySave_throw( aError, _rURL );
}
- m_aEventNotifier.notifyDocumentEventAsync( "OnSaveToDone", nullptr,
makeAny( _rURL ) );
+ m_aEventNotifier.notifyDocumentEventAsync( "OnSaveToDone", nullptr, Any(
_rURL ) );
}
// XModifyBroadcaster
@@ -1431,7 +1431,7 @@ Reference< XNameAccess >
ODatabaseDocument::impl_getDocumentContainer_throw( ODa
aValue >>= sSupportService;
if ( !sSupportService.isEmpty() )
{
- Sequence<Any> aArgs{
Any(NamedValue("DatabaseDocument",makeAny(xMy))) };
+ Sequence<Any> aArgs{
Any(NamedValue("DatabaseDocument",Any(xMy))) };
xContainer.set(
m_pImpl->m_aContext->getServiceManager()->createInstanceWithArgumentsAndContext(sSupportService,
aArgs, m_pImpl->m_aContext),
UNO_QUERY);
@@ -1582,8 +1582,8 @@ void ODatabaseDocument::WriteThroughComponent( const
Reference< XComponent >& xC
xSeek->seek(0);
Reference< XPropertySet > xStreamProp( xOutputStream, UNO_QUERY_THROW );
- xStreamProp->setPropertyValue( INFO_MEDIATYPE, makeAny( OUString(
"text/xml" ) ) );
- xStreamProp->setPropertyValue( "Compressed", makeAny( true ) );
+ xStreamProp->setPropertyValue( INFO_MEDIATYPE, Any( OUString( "text/xml" )
) );
+ xStreamProp->setPropertyValue( "Compressed", Any( true ) );
// write the stuff
WriteThroughComponent( xOutputStream, xComponent, pServiceName,
_rArguments, rMediaDesc );
@@ -1629,17 +1629,17 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
uno::Reference< beans::XPropertySet > xInfoSet(
comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo(
aExportInfoMap ) ) );
- xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::makeAny(officecfg::Office::Common::Save::Document::PrettyPrinting::get()));
+ xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::Any(officecfg::Office::Common::Save::Document::PrettyPrinting::get()));
if ( officecfg::Office::Common::Save::URL::FileSystem::get() )
{
OUString sBaseURI = _rMediaDescriptor.getOrDefault("BaseURI",
OUString());
if (sBaseURI.isEmpty())
sBaseURI = _rMediaDescriptor.getOrDefault("URL",OUString());
- xInfoSet->setPropertyValue("BaseURI", uno::makeAny(sBaseURI));
+ xInfoSet->setPropertyValue("BaseURI", uno::Any(sBaseURI));
}
// Set TargetStorage, so it doesn't have to be re-constructed based on
possibly empty URL.
- xInfoSet->setPropertyValue("TargetStorage",
uno::makeAny(m_pImpl->getRootStorage()));
+ xInfoSet->setPropertyValue("TargetStorage",
uno::Any(m_pImpl->getRootStorage()));
// Set StreamRelPath, in case this document is an embedded one.
OUString sStreamRelPath;
@@ -1653,14 +1653,14 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
sStreamRelPath = sStreamRelPath.copy(1);
}
if (!sStreamRelPath.isEmpty())
- xInfoSet->setPropertyValue("StreamRelPath",
uno::makeAny(sStreamRelPath));
+ xInfoSet->setPropertyValue("StreamRelPath", uno::Any(sStreamRelPath));
sal_Int32 nArgsLen = aDelegatorArguments.getLength();
aDelegatorArguments.realloc(nArgsLen+1);
aDelegatorArguments.getArray()[nArgsLen++] <<= xInfoSet;
Reference< XPropertySet > xProp( _rxTargetStorage, UNO_QUERY_THROW );
- xProp->setPropertyValue( INFO_MEDIATYPE, makeAny(
OUString(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) ) );
+ xProp->setPropertyValue( INFO_MEDIATYPE, Any(
OUString(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) ) );
OUString aVersion;
SvtSaveOptions::ODFSaneDefaultVersion const nDefVersion =
@@ -1680,7 +1680,7 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
{
try
{
- xProp->setPropertyValue("Version" , uno::makeAny(aVersion));
+ xProp->setPropertyValue("Version" , uno::Any(aVersion));
}
catch (const uno::Exception&)
{
@@ -1693,11 +1693,11 @@ void ODatabaseDocument::impl_writeStorage_throw( const
Reference< XStorage >& _r
Sequence< PropertyValue > aMediaDescriptor;
_rMediaDescriptor >>= aMediaDescriptor;
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("settings.xml")));
+ xInfoSet->setPropertyValue("StreamName",
uno::Any(OUString("settings.xml")));
WriteThroughComponent( xComponent, "settings.xml",
"com.sun.star.comp.sdb.XMLSettingsExporter",
aDelegatorArguments, aMediaDescriptor, _rxTargetStorage );
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("content.xml")));
+ xInfoSet->setPropertyValue("StreamName",
uno::Any(OUString("content.xml")));
WriteThroughComponent( xComponent, "content.xml",
"com.sun.star.comp.sdb.DBExportFilter",
aDelegatorArguments, aMediaDescriptor, _rxTargetStorage );
@@ -1922,9 +1922,9 @@ void SAL_CALL ODatabaseDocument::loadFromStorage(const
Reference<XStorage>& xSto
uno::Reference<beans::XPropertySet>
xInfoSet(comphelper::GenericPropertySet_CreateInstance(new
comphelper::PropertySetInfo(aEmbeddedImportInfoMap)));
comphelper::NamedValueCollection aDescriptor(rMediaDescriptor);
- xInfoSet->setPropertyValue("StreamRelPath",
uno::makeAny(aDescriptor.getOrDefault("HierarchicalDocumentName", OUString())));
- xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("content.xml")));
- xInfoSet->setPropertyValue("SourceStorage", uno::makeAny(xStorage));
+ xInfoSet->setPropertyValue("StreamRelPath",
uno::Any(aDescriptor.getOrDefault("HierarchicalDocumentName", OUString())));
+ xInfoSet->setPropertyValue("StreamName",
uno::Any(OUString("content.xml")));
+ xInfoSet->setPropertyValue("SourceStorage", uno::Any(xStorage));
uno::Sequence<uno::Any> aFilterCreationArgs{ Any(xInfoSet) };
@@ -2039,7 +2039,7 @@ struct CreateAny
{
Any operator() (const Reference<XController>& lhs) const
{
- return makeAny(lhs);
+ return Any(lhs);
}
};
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index f5776a7fdf46..40fa526d1ba7 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -39,7 +39,7 @@ namespace dbaccess
{
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::makeAny;
+ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::container::NoSuchElementException;
@@ -196,7 +196,7 @@ namespace dbaccess
}
::utl::OConfigurationNode aNewNode( m_aConfigurationRoot.createNode(
sNewNodeName ) );
- aNewNode.setNodeValue( getNameNodeName(), makeAny( _rName ) );
+ aNewNode.setNodeValue( getNameNodeName(), Any( _rName ) );
return aNewNode;
}
@@ -280,7 +280,7 @@ namespace dbaccess
::utl::OConfigurationNode aDataSourceRegistration =
impl_checkValidName_throw_must_not_exist(Name);
// register
- aDataSourceRegistration.setNodeValue( getLocationNodeName(), makeAny(
Location ) );
+ aDataSourceRegistration.setNodeValue( getLocationNodeName(), Any(
Location ) );
m_aConfigurationRoot.commit();
// notify
@@ -330,7 +330,7 @@ namespace dbaccess
OSL_VERIFY( aDataSourceRegistration.getNodeValue(
getLocationNodeName() ) >>= sOldLocation );
// change
- aDataSourceRegistration.setNodeValue( getLocationNodeName(), makeAny(
NewLocation ) );
+ aDataSourceRegistration.setNodeValue( getLocationNodeName(), Any(
NewLocation ) );
m_aConfigurationRoot.commit();
// notify
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index 61d24d89ce2e..b5f10f1b6bee 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -771,7 +771,7 @@ Reference< XConnection >
ODatabaseSource::buildLowLevelConnection(const OUString
aContext.Message = DBA_RES(RID_STR_CONNECTION_REQUEST).
replaceFirst("$name$", m_pImpl->m_sConnectURL);
- throwGenericSQLException( sMessage, static_cast< XDataSource* >( this
), makeAny( aContext ) );
+ throwGenericSQLException( sMessage, static_cast< XDataSource* >( this
), Any( aContext ) );
}
#if ENABLE_FIREBIRD_SDBC
@@ -1160,7 +1160,7 @@ Reference< XConnection >
ODatabaseSource::connectWithCompletion( const Reference
aRequest.HasUserName = aRequest.HasPassword = true;
aRequest.UserName = m_pImpl->m_sUser;
aRequest.Password = m_pImpl->m_sFailedPassword.isEmpty() ?
m_pImpl->m_aPassword : m_pImpl->m_sFailedPassword;
- rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest(makeAny(aRequest));
+ rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest(Any(aRequest));
// some knittings
pRequest->addContinuation(pAbort);
pRequest->addContinuation(pAuthenticate);
@@ -1279,7 +1279,7 @@ Reference< XNameAccess > SAL_CALL
ODatabaseSource::getQueryDefinitions( )
aValue >>= sSupportService;
if ( !sSupportService.isEmpty() )
{
- Sequence<Any> aArgs{
Any(NamedValue("DataSource",makeAny(xMy))) };
+ Sequence<Any> aArgs{ Any(NamedValue("DataSource",Any(xMy))) };
xContainer.set(
m_pImpl->m_aContext->getServiceManager()->createInstanceWithArgumentsAndContext(sSupportService,
aArgs, m_pImpl->m_aContext), UNO_QUERY);
}
}
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 8f3378d69748..d3023f2885ab 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -286,7 +286,7 @@ void ODefinitionContainer::notifyByName(
ResettableMutexGuard& _rGuard, const OU
if ( !rContainer.getLength() )
return;
- ContainerEvent aEvent( *this, makeAny( _rName ), makeAny( _xNewElement ),
makeAny( _xOldElement ) );
+ ContainerEvent aEvent( *this, Any( _rName ), Any( _xNewElement ), Any(
_xOldElement ) );
_rGuard.clear();
switch ( _eOperation )
@@ -385,14 +385,14 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32
_nIndex )
// and update the name-access map
}
- return makeAny(xProp);
+ return Any(xProp);
}
Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName )
{
MutexGuard aGuard(m_aMutex);
- return makeAny( implGetByName( _rName, true ) );
+ return Any( implGetByName( _rName, true ) );
}
Reference< XContent > ODefinitionContainer::implGetByName(const OUString&
_rName, bool _bReadIfNecessary)
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 1a4eedac9532..6a9f17adb0fe 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -393,7 +393,7 @@ Reference< XInterface > SAL_CALL
ODocumentContainer::createInstanceWithArguments
Reference<XContent >
xNew(xORB->createInstanceWithArguments(sServiceName,aArguments),UNO_QUERY);
Reference<XNameContainer>
xNameContainer(xContent,UNO_QUERY);
if ( xNameContainer.is() )
- xNameContainer->insertByName(*elements,makeAny(xNew));
+ xNameContainer->insertByName(*elements,Any(xNew));
}
}
}
@@ -423,7 +423,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command&
aCommand, sal_Int32 Com
{
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
@@ -450,7 +450,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command&
aCommand, sal_Int32 Com
{
// Unsupported.
ucbhelper::cancelCommandExecution(
- makeAny( UnsupportedOpenModeException(
+ Any( UnsupportedOpenModeException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
sal_Int16( aOpenCommand.Mode ) ) ),
@@ -467,7 +467,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command&
aCommand, sal_Int32 Com
{
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
@@ -751,8 +751,8 @@ void SAL_CALL ODocumentContainer::rename( const OUString&
newName )
return;
sal_Int32 nHandle = PROPERTY_ID_NAME;
- Any aOld = makeAny(m_pImpl->m_aProps.aTitle);
- Any aNew = makeAny(newName);
+ Any aOld(m_pImpl->m_aProps.aTitle);
+ Any aNew(newName);
aGuard.clear();
fire(&nHandle, &aNew, &aOld, 1, true );
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index d3383cc837b0..98e84d6d4585 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -721,14 +721,14 @@ void ODocumentDefinition::impl_initFormEditView( const
Reference< XController >&
LayoutManagerLock aLockLayout( _rxController );
// setting of the visual properties
- xViewSettings->setPropertyValue("ShowRulers",makeAny(true));
- xViewSettings->setPropertyValue("ShowVertRuler",makeAny(true));
- xViewSettings->setPropertyValue("ShowHoriRuler",makeAny(true));
- xViewSettings->setPropertyValue("IsRasterVisible",makeAny(true));
- xViewSettings->setPropertyValue("IsSnapToRaster",makeAny(true));
- xViewSettings->setPropertyValue("ShowOnlineLayout",makeAny(true));
-
xViewSettings->setPropertyValue("RasterSubdivisionX",makeAny(sal_Int32(5)));
-
xViewSettings->setPropertyValue("RasterSubdivisionY",makeAny(sal_Int32(5)));
+ xViewSettings->setPropertyValue("ShowRulers",Any(true));
+ xViewSettings->setPropertyValue("ShowVertRuler",Any(true));
+ xViewSettings->setPropertyValue("ShowHoriRuler",Any(true));
+ xViewSettings->setPropertyValue("IsRasterVisible",Any(true));
+ xViewSettings->setPropertyValue("IsSnapToRaster",Any(true));
+ xViewSettings->setPropertyValue("ShowOnlineLayout",Any(true));
+
xViewSettings->setPropertyValue("RasterSubdivisionX",Any(sal_Int32(5)));
+
xViewSettings->setPropertyValue("RasterSubdivisionY",Any(sal_Int32(5)));
}
catch( const Exception& )
{
@@ -882,7 +882,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any&
_rOpenArgument, cons
{
// not supported
ucbhelper::cancelCommandExecution(
- makeAny( UnsupportedOpenModeException(
+ Any( UnsupportedOpenModeException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
sal_Int16( nOpenMode ) ) ),
@@ -930,8 +930,8 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any&
_rOpenArgument, cons
xReportEngine->setReportDefinition(xReportDefinition);
xReportEngine->setActiveConnection(m_xLastKnownConnection);
if ( bOpenHidden )
- return makeAny( xReportEngine->createDocumentModel() );
- return makeAny( xReportEngine->createDocumentAlive( nullptr ) );
+ return Any( xReportEngine->createDocumentModel() );
+ return Any( xReportEngine->createDocumentAlive( nullptr ) );
}
if ( _bActivate && !bOpenHidden )
@@ -949,7 +949,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any&
_rOpenArgument, cons
if ( !m_bForm && m_pImpl->m_aProps.bAsTemplate && !m_bOpenInDesign )
ODocumentDefinition::fillReportData( m_aContext, getComponent(),
xConnection );
- return makeAny( xModel );
+ return Any( xModel );
}
Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32
CommandId, const Reference< XCommandEnvironment >& Environment )
@@ -996,7 +996,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command&
aCommand, sal_Int32 Co
if ( !bIsAliveNewStyleReport )
{
impl_onActivateEmbeddedObject_nothrow( true );
- return makeAny( getComponent() );
+ return Any( getComponent() );
}
}
}
@@ -1017,7 +1017,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command&
aCommand, sal_Int32 Co
{
OSL_FAIL( "Wrong argument type!" );
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
@@ -1043,7 +1043,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command&
aCommand, sal_Int32 Co
{
OSL_FAIL( "Wrong argument count!" );
ucbhelper::cancelCommandExecution(
- makeAny( IllegalArgumentException(
+ Any( IllegalArgumentException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
-1 ) ),
@@ -1114,7 +1114,7 @@ namespace
try
{
Reference< XPropertySet > xFormProps( xForm, UNO_QUERY_THROW );
- xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME,
makeAny( OUString() ) );
+ xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME, Any(
OUString() ) );
}
catch( const Exception& )
{
@@ -1160,7 +1160,7 @@ void ODocumentDefinition::onCommandInsert( const
OUString& _sURL, const Referenc
Sequence<OUString> aProps { PROPERTY_URL };
ucbhelper::cancelCommandExecution(
- makeAny( MissingPropertiesException(
+ Any( MissingPropertiesException(
OUString(),
static_cast< cppu::OWeakObject * >( this ),
aProps ) ),
@@ -1230,7 +1230,7 @@ bool ODocumentDefinition::save(bool _bApprove, const
css::uno::Reference<css::aw
}
aRequest.Content.set(m_xParentContainer,UNO_QUERY);
- rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest(makeAny(aRequest));
+ rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest(Any(aRequest));
// some knittings
// two continuations allowed: OK and Cancel
rtl::Reference<ODocumentSaveContinuation> pDocuSave;
@@ -1271,7 +1271,7 @@ bool ODocumentDefinition::save(bool _bApprove, const
css::uno::Reference<css::aw
m_pImpl->m_aProps.aTitle = pDocuSave->getName();
Reference< XContent> xContent = this;
- xNC->insertByName(pDocuSave->getName(),makeAny(xContent));
+ xNC->insertByName(pDocuSave->getName(),Any(xContent));
updateDocumentTitle();
}
@@ -1316,7 +1316,7 @@ void ODocumentDefinition::saveAs()
aRequest.Name = m_pImpl->m_aProps.aTitle;
aRequest.Content.set(m_xParentContainer,UNO_QUERY);
- rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest(makeAny(aRequest));
+ rtl::Reference<OInteractionRequest> pRequest = new
OInteractionRequest(Any(aRequest));
// some knittings
// two continuations allowed: OK and Cancel
rtl::Reference<ODocumentSaveContinuation> pDocuSave = new
ODocumentSaveContinuation;
@@ -1362,7 +1362,7 @@ void ODocumentDefinition::saveAs()
Reference< XMultiServiceFactory > xORB(
m_xParentContainer, UNO_QUERY_THROW );
Reference< XInterface > xComponent(
xORB->createInstanceWithArguments( SERVICE_SDB_DOCUMENTDEFINITION, aArguments )
);
Reference< XNameContainer > xNameContainer(
m_xParentContainer, UNO_QUERY_THROW );
- xNameContainer->insertByName( sOldName, makeAny(
xComponent ) );
+ xNameContainer->insertByName( sOldName, Any(
xComponent ) );
}
catch(const Exception&)
{
@@ -2077,8 +2077,8 @@ void ODocumentDefinition::firePropertyChange( sal_Int32
i_nHandle, const Any& i_
NameChangeNotifier::NameChangeNotifier( ODocumentDefinition&
i_rDocumentDefinition, const OUString& i_rNewName,
::osl::ResettableMutexGuard&
i_rClearForNotify )
:m_rDocumentDefinition( i_rDocumentDefinition )
- ,m_aOldValue( makeAny( i_rDocumentDefinition.getCurrentName() ) )
- ,m_aNewValue( makeAny( i_rNewName ) )
+ ,m_aOldValue( Any( i_rDocumentDefinition.getCurrentName() ) )
+ ,m_aNewValue( Any( i_rNewName ) )
,m_rClearForNotify( i_rClearForNotify )
{
impl_fireEvent_throw( true );
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index b5b2c0ae6143..8c2029634b8a 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -220,7 +220,7 @@ private:
::osl::MutexGuard aGuard(m_aMutex);
if ( _member != Value )
{
- prepareSet(_sProperty, css::uno::makeAny(_member),
css::uno::makeAny(Value), &l);
+ prepareSet(_sProperty, css::uno::Any(_member),
css::uno::Any(Value), &l);
_member = Value;
}
}
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index c177ce70573c..8695d518ce31 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -69,8 +69,8 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference<
uno::XComponentContex
uno::Reference<beans::XPropertySet> xProp(static_cast<
::cppu::OWeakObject* >( this ),uno::UNO_QUERY);
m_aFilterManager.initialize( m_xAggregateSet );
m_aParameterManager.initialize( xProp, m_xAggregate );
-
m_xAggregateSet->setPropertyValue(PROPERTY_COMMAND_TYPE,uno::makeAny(m_CommandType));
-
m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,uno::makeAny(m_EscapeProcessing));
+
m_xAggregateSet->setPropertyValue(PROPERTY_COMMAND_TYPE,uno::Any(m_CommandType));
+
m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,uno::Any(m_EscapeProcessing));
}
osl_atomic_decrement( &m_refCount );
}
@@ -123,7 +123,7 @@ void SAL_CALL DatabaseDataProvider::initialize(const
uno::Sequence< uno::Any > &
else if ( !m_xHandler.is() )
(*pIter) >>= m_xHandler;
}
- m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION,
uno::makeAny( m_xActiveConnection ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, uno::Any(
m_xActiveConnection ) );
}
// chart2::data::XDataProvider:
@@ -201,7 +201,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL
DatabaseDataProvider::creat
uno::Reference< lang::XInitialization>
xIni(m_xInternal,uno::UNO_QUERY);
if ( xIni.is() )
{
- beans::NamedValue
aParam("CreateDefaultData",uno::makeAny(true));
+ beans::NamedValue aParam("CreateDefaultData",uno::Any(true));
uno::Sequence< uno::Any > aInitArgs{ uno::Any(aParam) };
xIni->initialize(aInitArgs);
}
@@ -215,9 +215,9 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
DatabaseDataProvider::detectArgum
{
::comphelper::NamedValueCollection aArguments;
aArguments.put( "CellRangeRepresentation", uno::Any( OUString( "all" ) ) );
- aArguments.put( "DataRowSource", uno::makeAny(
chart::ChartDataRowSource_COLUMNS ) );
+ aArguments.put( "DataRowSource", uno::Any(
chart::ChartDataRowSource_COLUMNS ) );
// internal data always contains labels
- aArguments.put( "FirstCellAsLabel", uno::makeAny( true ) );
+ aArguments.put( "FirstCellAsLabel", uno::Any( true ) );
bool bHasCategories = false;
if( _xDataSource.is())
@@ -241,7 +241,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
DatabaseDataProvider::detectArgum
}
}
}
- aArguments.put( "HasCategories", uno::makeAny( bHasCategories ) );
+ aArguments.put( "HasCategories", uno::Any( bHasCategories ) );
return aArguments.getPropertyValues();
}
@@ -255,7 +255,7 @@ uno::Any
DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString &
std::map< OUString,css::uno::Any>::const_iterator aFind =
m_aNumberFormats.find(_sRangeRepresentation);
if ( aFind != m_aNumberFormats.end() )
return aFind->second;
- return uno::makeAny(sal_Int32(0));
+ return uno::Any(sal_Int32(0));
}
uno::Reference< chart2::data::XDataSequence > SAL_CALL
DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString &
_sRangeRepresentation)
@@ -444,7 +444,7 @@ void SAL_CALL DatabaseDataProvider::setCommand(const
OUString & the_value)
{
osl::MutexGuard g(m_aMutex);
impl_invalidateParameter_nothrow();
- m_xAggregateSet->setPropertyValue( PROPERTY_COMMAND, uno::makeAny(
the_value ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_COMMAND, uno::Any(
the_value ) );
}
set(PROPERTY_COMMAND,the_value,m_Command);
}
@@ -459,7 +459,7 @@ void SAL_CALL
DatabaseDataProvider::setCommandType(::sal_Int32 the_value)
{
{
osl::MutexGuard g(m_aMutex);
- m_xAggregateSet->setPropertyValue( PROPERTY_COMMAND_TYPE,
uno::makeAny( the_value ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_COMMAND_TYPE, uno::Any(
the_value ) );
}
set(PROPERTY_COMMAND_TYPE,the_value,m_CommandType);
}
@@ -489,7 +489,7 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter(
sal_Bool the_value )
{
{
osl::MutexGuard g(m_aMutex);
- m_xAggregateSet->setPropertyValue( PROPERTY_APPLYFILTER,
uno::makeAny( the_value ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_APPLYFILTER, uno::Any(
the_value ) );
}
set(PROPERTY_APPLYFILTER,static_cast<bool>(the_value),m_ApplyFilter);
}
@@ -504,7 +504,7 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const
OUString& the_value )
{
{
osl::MutexGuard g(m_aMutex);
- m_xAggregateSet->setPropertyValue( PROPERTY_HAVING_CLAUSE,
uno::makeAny( the_value ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_HAVING_CLAUSE, uno::Any(
the_value ) );
}
set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause);
}
@@ -519,7 +519,7 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const
OUString& the_value )
{
{
osl::MutexGuard g(m_aMutex);
- m_xAggregateSet->setPropertyValue( PROPERTY_GROUP_BY, uno::makeAny(
the_value ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_GROUP_BY, uno::Any(
the_value ) );
}
set(PROPERTY_GROUP_BY,the_value,m_GroupBy);
}
@@ -534,7 +534,7 @@ void SAL_CALL DatabaseDataProvider::setOrder( const
OUString& the_value )
{
{
osl::MutexGuard g(m_aMutex);
- m_xAggregateSet->setPropertyValue( PROPERTY_ORDER, uno::makeAny(
the_value ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_ORDER, uno::Any(
the_value ) );
}
set(PROPERTY_ORDER,the_value,m_Order);
}
@@ -792,7 +792,7 @@ void
DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor
void DatabaseDataProvider::impl_fillRowSet_throw()
{
- m_xAggregateSet->setPropertyValue( PROPERTY_FILTER, uno::makeAny(
getFilter() ) );
+ m_xAggregateSet->setPropertyValue( PROPERTY_FILTER, uno::Any(
getFilter() ) );
uno::Reference< sdbc::XParameters> xParam(m_xRowSet,uno::UNO_QUERY_THROW);
xParam->clearParameters( );
}
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
index f7a927a487de..95ce05f69b56 100644
--- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
+++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
@@ -257,28 +257,28 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const
std::vector<ColumnDefiniti
case DataType::CHAR:
case DataType::VARCHAR:
case DataType::LONGVARCHAR:
- aData.push_back(makeAny(readString()));
+ aData.push_back(Any(readString()));
break;
case DataType::TINYINT:
case DataType::SMALLINT:
{
sal_Int16 value = 0;
m_pStream->ReadInt16(value);
- aData.push_back(makeAny(value));
+ aData.push_back(Any(value));
}
break;
case DataType::INTEGER:
{
sal_Int32 value = 0;
m_pStream->ReadInt32(value);
- aData.push_back(makeAny(value));
+ aData.push_back(Any(value));
}
break;
case DataType::BIGINT:
{
sal_Int64 value = 0;
m_pStream->ReadInt64(value);
- aData.push_back(makeAny(value));
+ aData.push_back(Any(value));
}
break;
case DataType::REAL:
@@ -288,7 +288,7 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const
std::vector<ColumnDefiniti
double value = 0;
m_pStream->ReadDouble(value);
// FIXME double is not necessarily 4 bytes
- aData.push_back(makeAny(value));
+ aData.push_back(Any(value));
}
break;
case DataType::NUMERIC:
@@ -306,7 +306,7 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const
std::vector<ColumnDefiniti
OUString sNum = lcl_makeStringFromBigint(std::move(aBytes));
Sequence<Any> result{ Any(lcl_putDot(sNum, nScale)),
Any(nScale) };
- aData.push_back(makeAny(result));
+ aData.push_back(Any(result));
}
break;
case DataType::DATE:
@@ -319,7 +319,7 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const
std::vector<ColumnDefiniti
css::util::Date loDate(asDate.day(), asDate.month(),
asDate.year()); // day, month, year
- aData.push_back(makeAny(loDate));
+ aData.push_back(Any(loDate));
}
break;
case DataType::TIME:
@@ -338,7 +338,7 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const
std::vector<ColumnDefiniti
const sal_uInt16 nMins = valueInSecs / 60;
const sal_uInt16 nSecs = valueInSecs % 60;
css::util::Time time((value % 1000) * 1000000, nSecs, nMins,
nHours, true);
- aData.push_back(makeAny(time));
+ aData.push_back(Any(time));
}
break;
case DataType::TIMESTAMP:
@@ -361,14 +361,14 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const
std::vector<ColumnDefiniti
dateTime.Day = asDate.day();
dateTime.Month = asDate.month();
dateTime.Year = asDate.year();
- aData.push_back(makeAny(dateTime));
+ aData.push_back(Any(dateTime));
}
break;
case DataType::BOOLEAN:
{
sal_uInt8 nBool = 0;
m_pStream->ReadUChar(nBool);
- aData.push_back(makeAny(static_cast<bool>(nBool)));
+ aData.push_back(Any(static_cast<bool>(nBool)));
}
break;
case DataType::OTHER:
@@ -383,7 +383,7 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const
std::vector<ColumnDefiniti
Sequence<sal_Int8> aBytes(nSize);
m_pStream->ReadBytes(aBytes.getArray(), nSize);
- aData.push_back(makeAny(aBytes));
+ aData.push_back(Any(aBytes));
}
break;
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx
b/dbaccess/source/filter/xml/dbloader2.cxx
index 30d613a56e4b..0513af5a225e 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -474,7 +474,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame
> & rFrame, const OU
{
NamedDatabaseObject aSelection;
aSelection.Type = nInitialSelection;
- xDocView->select( makeAny( aSelection ) );
+ xDocView->select( Any( aSelection ) );
}
}
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx
b/dbaccess/source/filter/xml/xmlColumn.cxx
index b86707789cd7..1afbf9f0f419 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -94,10 +94,10 @@ void OXMLColumn::endFastElement(sal_Int32 )
Reference<XPropertySet> xProp(xFac->createDataDescriptor());
if ( xProp.is() )
{
- xProp->setPropertyValue(PROPERTY_NAME,makeAny(m_sName));
- xProp->setPropertyValue(PROPERTY_HIDDEN,makeAny(m_bHidden));
+ xProp->setPropertyValue(PROPERTY_NAME,Any(m_sName));
+ xProp->setPropertyValue(PROPERTY_HIDDEN,Any(m_bHidden));
if ( !m_sHelpMessage.isEmpty() )
-
xProp->setPropertyValue(PROPERTY_HELPTEXT,makeAny(m_sHelpMessage));
+ xProp->setPropertyValue(PROPERTY_HELPTEXT,Any(m_sHelpMessage));
if ( m_aDefaultValue.hasValue() )
xProp->setPropertyValue(PROPERTY_CONTROLDEFAULT,m_aDefaultValue);
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx
b/dbaccess/source/filter/xml/xmlComponent.cxx
index a9ba7a708842..97423f14a560 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -81,7 +81,7 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport
Reference< XMultiServiceFactory > xORB( _xParentContainer,
UNO_QUERY_THROW );
Reference< XInterface > xComponent( xORB->createInstanceWithArguments(
_sComponentServiceName, aArguments ) );
Reference< XNameContainer > xNameContainer( _xParentContainer,
UNO_QUERY_THROW );
- xNameContainer->insertByName( sName, makeAny( xComponent ) );
+ xNameContainer->insertByName( sName, Any( xComponent ) );
}
catch(Exception&)
{
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index e5d92a8d0a8e..2df2a1a73c7f 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -50,7 +50,7 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter&
rImport,
case XML_ELEMENT(XLINK, XML_HREF):
try
{
-
xDataSource->setPropertyValue(PROPERTY_URL,makeAny(aIter.toString()));
+
xDataSource->setPropertyValue(PROPERTY_URL,Any(aIter.toString()));
}
catch(const Exception&)
{
diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx
b/dbaccess/source/filter/xml/xmlDataSource.cxx
index e133d09cbc29..bf63d4f79013 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -61,7 +61,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
case XML_CONNECTION_RESOURCE:
try
{
-
xDataSource->setPropertyValue(PROPERTY_URL,makeAny(aIter.toString()));
+
xDataSource->setPropertyValue(PROPERTY_URL,Any(aIter.toString()));
}
catch(const Exception&)
{
@@ -71,7 +71,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
case XML_SUPPRESS_VERSION_COLUMNS:
try
{
-
xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(IsXMLToken(aIter,
XML_TRUE)));
+
xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,Any(IsXMLToken(aIter,
XML_TRUE)));
bFoundSuppressVersionColumns = true;
}
catch(const Exception&)
@@ -180,7 +180,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport,
{
try
{
-
xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(true));
+
xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,Any(true));
}
catch(const Exception&)
{
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index 0ee1445a8699..37e4058ab7ed 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -95,7 +95,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter&
rImport,
OUString sURL =
aTypeCollection.getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)
+ sLocation;
try
{
- xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sURL));
+ xDataSource->setPropertyValue(PROPERTY_URL,Any(sURL));
}
catch(const Exception&)
{
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 66b7ca1217ba..8528f11c8e77 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -73,7 +73,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter&
rImport
m_xContainer.set(xORB->createInstanceWithArguments(_sCollectionServiceName,aArguments),UNO_QUERY);
Reference<XNameContainer>
xNameContainer(_xParentContainer,UNO_QUERY);
if ( xNameContainer.is() && !xNameContainer->hasByName(sName) )
- xNameContainer->insertByName(sName,makeAny(m_xContainer));
+ xNameContainer->insertByName(sName,Any(m_xContainer));
}
}
catch(Exception&)
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx
b/dbaccess/source/filter/xml/xmlLogin.cxx
index cc7502301233..fb4bb9eb8262 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -52,7 +52,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
bUserFound = true;
try
{
-
xDataSource->setPropertyValue(PROPERTY_USER,makeAny(aIter.toString()));
+
xDataSource->setPropertyValue(PROPERTY_USER,Any(aIter.toString()));
}
catch(const Exception&)
{
@@ -63,7 +63,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
case XML_IS_PASSWORD_REQUIRED:
try
{
-
xDataSource->setPropertyValue(PROPERTY_ISPASSWORDREQUIRED,makeAny(IsXMLToken(aIter,
XML_TRUE)));
+
xDataSource->setPropertyValue(PROPERTY_ISPASSWORDREQUIRED,Any(IsXMLToken(aIter,
XML_TRUE)));
}
catch(const Exception&)
{
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx
b/dbaccess/source/filter/xml/xmlQuery.cxx
index df732af6b698..18ba034dadb6 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -90,20 +90,20 @@ void OXMLQuery::setProperties(Reference< XPropertySet > &
_xProp )
{
OXMLTable::setProperties(_xProp);
- _xProp->setPropertyValue(PROPERTY_COMMAND,makeAny(m_sCommand));
-
_xProp->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,makeAny(m_bEscapeProcessing));
+ _xProp->setPropertyValue(PROPERTY_COMMAND,Any(m_sCommand));
+
_xProp->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,Any(m_bEscapeProcessing));
if ( !m_sTable.isEmpty() )
-
_xProp->setPropertyValue(PROPERTY_UPDATE_TABLENAME,makeAny(m_sTable));
+
_xProp->setPropertyValue(PROPERTY_UPDATE_TABLENAME,Any(m_sTable));
if ( !m_sCatalog.isEmpty() )
-
_xProp->setPropertyValue(PROPERTY_UPDATE_CATALOGNAME,makeAny(m_sCatalog));
+
_xProp->setPropertyValue(PROPERTY_UPDATE_CATALOGNAME,Any(m_sCatalog));
if ( !m_sSchema.isEmpty() )
-
_xProp->setPropertyValue(PROPERTY_UPDATE_SCHEMANAME,makeAny(m_sSchema));
+
_xProp->setPropertyValue(PROPERTY_UPDATE_SCHEMANAME,Any(m_sSchema));
const ODBFilter::TPropertyNameMap& rSettings =
GetOwnImport().getQuerySettings();
ODBFilter::TPropertyNameMap::const_iterator aFind =
rSettings.find(m_sName);
if ( aFind != rSettings.end() )
-
_xProp->setPropertyValue(PROPERTY_LAYOUTINFORMATION,makeAny(aFind->second));
+
_xProp->setPropertyValue(PROPERTY_LAYOUTINFORMATION,Any(aFind->second));
}
}
catch(Exception&)
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index 654a9f403402..ff41590f0300 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -118,7 +118,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
}
try
{
-
xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sURL.makeStringAndClear()));
+
xDataSource->setPropertyValue(PROPERTY_URL,Any(sURL.makeStringAndClear()));
}
catch(const Exception&)
{
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx
b/dbaccess/source/filter/xml/xmlTable.cxx
index 31d135ee42ea..403486ee5edf 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -141,12 +141,12 @@ void OXMLTable::setProperties(uno::Reference<
XPropertySet > & _xProp )
{
if ( _xProp.is() )
{
-
_xProp->setPropertyValue(PROPERTY_APPLYFILTER,makeAny(m_bApplyFilter));
-
_xProp->setPropertyValue(PROPERTY_FILTER,makeAny(m_sFilterStatement));
+ _xProp->setPropertyValue(PROPERTY_APPLYFILTER,Any(m_bApplyFilter));
+ _xProp->setPropertyValue(PROPERTY_FILTER,Any(m_sFilterStatement));
if (
_xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_APPLYORDER) )
-
_xProp->setPropertyValue(PROPERTY_APPLYORDER,makeAny(m_bApplyOrder));
-
_xProp->setPropertyValue(PROPERTY_ORDER,makeAny(m_sOrderStatement));
+
_xProp->setPropertyValue(PROPERTY_APPLYORDER,Any(m_bApplyOrder));
+ _xProp->setPropertyValue(PROPERTY_ORDER,Any(m_sOrderStatement));
}
}
catch(Exception&)
@@ -180,7 +180,7 @@ void OXMLTable::endFastElement(sal_Int32 )
}
}
- xNameContainer->insertByName(m_sName,makeAny(m_xTable));
+ xNameContainer->insertByName(m_sName,Any(m_xTable));
}
}
catch(Exception&)
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index 88ec4fa2bcde..a6541684acba 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -84,9 +84,9 @@ void OXMLTableFilterList::endFastElement(sal_Int32 )
if ( xDataSource.is() )
{
if ( !m_aPatterns.empty() )
-
xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,makeAny(comphelper::containerToSequence(m_aPatterns)));
+
xDataSource->setPropertyValue(PROPERTY_TABLEFILTER,Any(comphelper::containerToSequence(m_aPatterns)));
if ( !m_aTypes.empty() )
-
xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,makeAny(comphelper::containerToSequence(m_aTypes)));
+
xDataSource->setPropertyValue(PROPERTY_TABLETYPEFILTER,Any(comphelper::containerToSequence(m_aTypes)));
}
}
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 6848d5a1bb2d..d089359c83c7 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -520,7 +520,7 @@ void ODBFilter::SetConfigurationSettings(const
Sequence<PropertyValue>& aConfigP
pIter->Value >>= aWindows;
uno::Reference<XPropertySet> xProp(getDataSource());
if ( xProp.is() )
-
xProp->setPropertyValue(PROPERTY_LAYOUTINFORMATION,makeAny(aWindows));
+
xProp->setPropertyValue(PROPERTY_LAYOUTINFORMATION,Any(aWindows));
}
}
}
@@ -603,7 +603,7 @@ void ODBFilter::setPropertyInfo()
{
try
{
- xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(aInfo));
+ xDataSource->setPropertyValue(PROPERTY_INFO,Any(aInfo));
}
catch (const Exception&)
{
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index f04d7322aa64..ec83eff76574 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1831,7 +1831,7 @@ Reference< XComponent >
OApplicationController::openElementWithArguments( const
pDesigner.reset( new ResultSetBrowser( getORB(), this,
m_aCurrentFrame.getFrame(), _eType == E_TABLE ) );
if ( !aArguments.has( PROPERTY_SHOWMENU ) )
- aArguments.put( PROPERTY_SHOWMENU, makeAny( true ) );
+ aArguments.put( PROPERTY_SHOWMENU, Any( true ) );
aDataSource <<= getDatabaseName();
}
@@ -2266,7 +2266,7 @@ Any
OApplicationController::getCurrentSelection(weld::TreeView& rControl) const
{
Sequence< NamedDatabaseObject > aSelection;
getContainer()->describeCurrentSelectionForControl(rControl, aSelection);
- return makeAny( aSelection );
+ return Any( aSelection );
}
vcl::Window* OApplicationController::getMenuParent() const
@@ -2529,7 +2529,7 @@ void OApplicationController::OnFirstControllerConnected()
aDetail.Message = DBA_RES(STR_SUB_DOCS_WITH_SCRIPTS_DETAIL);
aWarning.NextException <<= aDetail;
- Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create(
getORB(), "", nullptr, makeAny( aWarning ) );
+ Reference< XExecutableDialog > xDialog = ErrorMessageDialog::create(
getORB(), "", nullptr, Any( aWarning ) );
xDialog->execute();
}
catch( const Exception& )
@@ -2829,7 +2829,7 @@ Any SAL_CALL OApplicationController::getSelection( )
}
}
}
- return makeAny( aCurrentSelection );
+ return Any( aCurrentSelection );
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx
b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 4ba805904387..0af1f29c3702 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -744,11 +744,11 @@ bool OApplicationController::paste( ElementType _eType,
const svx::ODataAccessDe
::comphelper::copyProperties(xQuery,xNewQuery);
else
{
-
xNewQuery->setPropertyValue(PROPERTY_COMMAND,makeAny(sCommand));
-
xNewQuery->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,makeAny(bEscapeProcessing));
+
xNewQuery->setPropertyValue(PROPERTY_COMMAND,Any(sCommand));
+
xNewQuery->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,Any(bEscapeProcessing));
}
// insert
- xDestQueries->insertByName( sTargetName,
makeAny(xNewQuery) );
+ xDestQueries->insertByName( sTargetName, Any(xNewQuery) );
xNewQuery.set(xDestQueries->getByName(
sTargetName),UNO_QUERY);
if ( xQuery.is() && xNewQuery.is() )
{
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx
b/dbaccess/source/ui/app/AppControllerGen.cxx
index 44e1a3b9666e..22dfb3663d86 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -110,7 +110,7 @@ void OApplicationController::convertToView(const OUString&
_sName)
Reference<XPropertySet> xView =
::dbaui::createView(sNewName,xConnection,xSourceObject);
if ( !xView.is() )
throw SQLException(DBA_RES(STR_NO_TABLE_FORMAT_INSIDE),*this,
"S1000",0,Any());
- getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView));
+ getContainer()->elementAdded(E_TABLE,sNewName,Any(xView));
}
}
catch(const SQLException& )
@@ -168,7 +168,7 @@ void OApplicationController::openDialog( const OUString&
_sServiceName )
// the parent window
pArgs[nArgPos++] <<= PropertyValue( "ParentWindow",
0,
- makeAny(xWindow),
+ Any(xWindow),
PropertyState_DIRECT_VALUE);
// the initial selection
@@ -179,7 +179,7 @@ void OApplicationController::openDialog( const OUString&
_sServiceName )
{
pArgs[ nArgPos++ ] <<= PropertyValue(
"InitialSelection", 0,
- makeAny( sInitialSelection ), PropertyState_DIRECT_VALUE );
+ Any( sInitialSelection ), PropertyState_DIRECT_VALUE );
}
SharedConnection xConnection( getConnection() );
@@ -487,7 +487,7 @@ void OApplicationController::previewChanged( sal_Int32
_nMode )
if ( nOldMode != _nMode )
{
aLayoutInfo.put( "Preview", _nMode );
- m_xDataSource->setPropertyValue( PROPERTY_LAYOUTINFORMATION,
makeAny( aLayoutInfo.getPropertyValues() ) );
+ m_xDataSource->setPropertyValue( PROPERTY_LAYOUTINFORMATION,
Any( aLayoutInfo.getPropertyValues() ) );
}
}
catch ( const Exception& )
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 3a25efb0597e..b7506744d017 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1045,7 +1045,7 @@ void OAppDetailPageHelper::showPreview( const OUString&
_sDataSourceName,
aArgs.put( "AsTemplate", false );
aArgs.put( PROPERTY_SHOWMENU, false );
- Reference< XController > xPreview( pDispatcher->openExisting( makeAny(
_sDataSourceName ), _sName, aArgs ), UNO_QUERY );
+ Reference< XController > xPreview( pDispatcher->openExisting( Any(
_sDataSourceName ), _sName, aArgs ), UNO_QUERY );
bool bClearPreview = !xPreview.is();
// clear the preview when the query or table could not be loaded
@@ -1105,9 +1105,9 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl,
weld::Toggleable&, voi
auto xFrame = getBorderWin().getView()->getAppController().getFrame();
css::uno::Sequence<css::uno::Any> aArgs {
- css::uno::makeAny(comphelper::makePropertyValue("InToolbar", true)),
- css::uno::makeAny(comphelper::makePropertyValue("ModuleIdentifier",
OUString("com.sun.star.sdb.OfficeDatabaseDocument"))),
- css::uno::makeAny(comphelper::makePropertyValue("Frame", xFrame)) };
+ css::uno::Any(comphelper::makePropertyValue("InToolbar", true)),
+ css::uno::Any(comphelper::makePropertyValue("ModuleIdentifier",
OUString("com.sun.star.sdb.OfficeDatabaseDocument"))),
+ css::uno::Any(comphelper::makePropertyValue("Frame", xFrame)) };
css::uno::Reference<css::frame::XPopupMenuController> xPopupController
(xPopupMenuFactory->createInstanceWithArgumentsAndContext(".uno:DBPreview",
aArgs, xContext), css::uno::UNO_QUERY);
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx
b/dbaccess/source/ui/app/subcomponentmanager.cxx
index fc4cd1962a8a..bf92f2400a31 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -47,7 +47,7 @@ namespace dbaui
using ::com::sun::star::uno::UNO_SET_THROW;
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::RuntimeException;
- using ::com::sun::star::uno::makeAny;
+ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::frame::XFrame;
using ::com::sun::star::frame::XController;
@@ -315,7 +315,7 @@ namespace dbaui
xBroadcaster->notifyDocumentEvent(
OUString::createFromAscii( _pAsciiEventName ),
&_rData.m_rController,
- makeAny( _rComponent.xFrame )
+ Any( _rComponent.xFrame )
);
}
catch( const Exception& )
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx
b/dbaccess/source/ui/browser/brwctrlr.cxx
index 7b9a2ecf78e2..b8387b203601 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -712,14 +712,14 @@ bool SbaXDataBrowserController::Construct(vcl::Window*
pParent)
// we want to have a grid with a "flat" border
Reference< XPropertySet > xGridSet(m_xGridModel, UNO_QUERY);
if ( xGridSet.is() )
- xGridSet->setPropertyValue(PROPERTY_BORDER, makeAny(sal_Int16(2)));
+ xGridSet->setPropertyValue(PROPERTY_BORDER, Any(sal_Int16(2)));
// marry them
Reference< css::container::XNameContainer > xNameCont(m_xRowSet,
UNO_QUERY);
{
OUString sText(DBA_RES(STR_DATASOURCE_GRIDCONTROL_NAME));
- xNameCont->insertByName(sText, makeAny(m_xGridModel));
+ xNameCont->insertByName(sText, Any(m_xGridModel));
}
// create the view
@@ -1270,7 +1270,7 @@ sal_Bool
SbaXDataBrowserController::approveParameter(const css::form::DatabasePa
ParametersRequest aRequest;
aRequest.Parameters = xParameters;
aRequest.Connection = getConnection(Reference< XRowSet
>(aEvent.Source, UNO_QUERY));
- rtl::Reference<OInteractionRequest> pParamRequest = new
OInteractionRequest(makeAny(aRequest));
+ rtl::Reference<OInteractionRequest> pParamRequest = new
OInteractionRequest(Any(aRequest));
// some knittings
pParamRequest->addContinuation(pParamValues);
pParamRequest->addContinuation(pAbort);
@@ -1581,7 +1581,7 @@ void SbaXDataBrowserController::applyParserOrder(const
OUString& _rOldOrder,cons
bool bSuccess = false;
try
{
- xFormSet->setPropertyValue(PROPERTY_ORDER,
makeAny(_xParser->getOrder()));
+ xFormSet->setPropertyValue(PROPERTY_ORDER, Any(_xParser->getOrder()));
bSuccess = reloadForm(m_xLoadable);
}
catch(Exception&)
@@ -1590,7 +1590,7 @@ void SbaXDataBrowserController::applyParserOrder(const
OUString& _rOldOrder,cons
if (!bSuccess)
{
- xFormSet->setPropertyValue(PROPERTY_ORDER, makeAny(_rOldOrder));
+ xFormSet->setPropertyValue(PROPERTY_ORDER, Any(_rOldOrder));
try
{
@@ -1623,8 +1623,8 @@ void SbaXDataBrowserController::applyParserFilter(const
OUString& _rOldFilter, b
try
{
FormErrorHelper aError(this);
- xFormSet->setPropertyValue(PROPERTY_FILTER,
makeAny(_xParser->getFilter()));
- xFormSet->setPropertyValue(PROPERTY_HAVING_CLAUSE,
makeAny(_xParser->getHavingClause()));
+ xFormSet->setPropertyValue(PROPERTY_FILTER,
Any(_xParser->getFilter()));
+ xFormSet->setPropertyValue(PROPERTY_HAVING_CLAUSE,
Any(_xParser->getHavingClause()));
xFormSet->setPropertyValue(PROPERTY_APPLYFILTER, css::uno::Any(true));
bSuccess = reloadForm(m_xLoadable);
@@ -1635,8 +1635,8 @@ void SbaXDataBrowserController::applyParserFilter(const
OUString& _rOldFilter, b
if (!bSuccess)
{
- xFormSet->setPropertyValue(PROPERTY_FILTER, makeAny(_rOldFilter));
- xFormSet->setPropertyValue(PROPERTY_HAVING_CLAUSE,
makeAny(_sOldHaving));
+ xFormSet->setPropertyValue(PROPERTY_FILTER, Any(_rOldFilter));
+ xFormSet->setPropertyValue(PROPERTY_HAVING_CLAUSE, Any(_sOldHaving));
xFormSet->setPropertyValue(PROPERTY_APPLYFILTER,
css::uno::Any(_bOldFilterApplied));
try
@@ -1789,7 +1789,7 @@ void SbaXDataBrowserController::ExecuteSearch()
... etc. - the rest is truncated
