Just use Any ctor instead of makeAny in extensions

Change-Id: I0441d30044168563b0d5b8406fcc99b51a9cbc1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133817
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

40 files changed, 174 insertions, 178 deletions

diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 806acca41f16..a411c2536b50 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -141,7 +141,7 @@ namespace abp
             {
                 xNewDataSource->setPropertyValue(
                     "URL",
-                    makeAny( OUString::createFromAscii( _pInitialAsciiURL ) )
+                    Any( OUString::createFromAscii( _pInitialAsciiURL ) )
                 );
             }
 
@@ -360,9 +360,9 @@ namespace abp
                     uno::Reference<embed::XStorage> xStorage = pObjectShell->GetStorage();
                     uno::Sequence<beans::PropertyValue> aSequence = comphelper::InitPropertySequence(
                     {
-                        {"TargetStorage", uno::makeAny(xStorage)},
-                        {"StreamRelPath", uno::makeAny(aStreamRelPath)},
-                        {"BaseURI", uno::makeAny(aOwnURL)}
+                        {"TargetStorage", uno::Any(xStorage)},
+                        {"StreamRelPath", uno::Any(aStreamRelPath)},
+                        {"BaseURI", uno::Any(aOwnURL)}
                     });
                     xStorable->storeAsURL(sTmpName, aSequence);
                     m_pImpl->sName = sTmpName;
@@ -371,7 +371,7 @@ namespace abp
                     // we can load it again next time the file is imported.
                     uno::Reference<lang::XMultiServiceFactory> xFactory(pObjectShell->GetModel(), uno::UNO_QUERY);
                     uno::Reference<beans::XPropertySet> xPropertySet(xFactory->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY);
-                    xPropertySet->setPropertyValue("EmbeddedDatabaseName", uno::makeAny(aStreamRelPath));
+                    xPropertySet->setPropertyValue("EmbeddedDatabaseName", uno::Any(aStreamRelPath));
                 }
             }
         }
@@ -563,12 +563,12 @@ namespace abp
                     aDetailedError.Details = compmodule::ModuleRes(RID_STR_PLEASECHECKSETTINGS);
                     aDetailedError.NextException = aError;
                     // handle (aka display) the new context info
-                    xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) );
+                    xInteractions->handle( new OInteractionRequest( Any( aDetailedError ) ) );
                 }
                 else
                 {
                       // handle (aka display) the original error
-                    xInteractions->handle( new OInteractionRequest( makeAny( aException ) ) );
+                    xInteractions->handle( new OInteractionRequest( Any( aException ) ) );
                 }
             }
             catch( const Exception& )
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 43a75cf19ee4..145732bdf41e 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -238,7 +238,7 @@ namespace abp
                 {   // yes
                     // -> set a new value
                     OConfigurationNode aExistentField = aFields.openNode( *pExistentFields );
-                    aExistentField.setNodeValue( sAssignedNodeName, makeAny( aPos->second ) );
+                    aExistentField.setNodeValue( sAssignedNodeName, Any( aPos->second ) );
                     // and remove the mapping entry
                     aFieldAssignment.erase( *pExistentFields );
                 }
@@ -258,8 +258,8 @@ namespace abp
                     // in case the config node for the fields already has the node named <aNewMapping->first>,
                     // the entry should have been removed from aNewMapping (in the above loop)
                 OConfigurationNode aNewField =  aFields.createNode( elem.first );
-                aNewField.setNodeValue( sProgrammaticNodeName, makeAny( elem.first ) );
-                aNewField.setNodeValue( sAssignedNodeName, makeAny( elem.second ) );
+                aNewField.setNodeValue( sProgrammaticNodeName, Any( elem.first ) );
+                aNewField.setNodeValue( sAssignedNodeName, Any( elem.second ) );
             }
 
             // commit the changes done
@@ -283,9 +283,9 @@ namespace abp
             OConfigurationTreeRoot aAddressBookSettings = OConfigurationTreeRoot::createWithComponentContext(
                 _rxContext, sAddressBookNodeName);
 
-            aAddressBookSettings.setNodeValue( OUString( "DataSourceName" ), makeAny( _rDataSourceName ) );
-            aAddressBookSettings.setNodeValue( OUString( "Command" ), makeAny( _rTableName ) );
-            aAddressBookSettings.setNodeValue( OUString( "CommandType" ), makeAny( sal_Int16(CommandType::TABLE) ) );
+            aAddressBookSettings.setNodeValue( OUString( "DataSourceName" ), Any( _rDataSourceName ) );
+            aAddressBookSettings.setNodeValue( OUString( "Command" ), Any( _rTableName ) );
+            aAddressBookSettings.setNodeValue( OUString( "CommandType" ), Any( sal_Int16(CommandType::TABLE) ) );
 
             // commit the changes done
             aAddressBookSettings.commit();
@@ -301,7 +301,7 @@ namespace abp
                 _rxContext, sAddressBookNodeName);
 
             // set the flag
-            aAddressBookSettings.setNodeValue( OUString( "AutoPilotCompleted" ), makeAny( true ) );
+            aAddressBookSettings.setNodeValue( OUString( "AutoPilotCompleted" ), Any( true ) );
 
             // commit the changes done
             aAddressBookSettings.commit();
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index dd878f03e5c3..4409a1911f4e 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -106,7 +106,7 @@ namespace abp
         Reference<awt::XWindow> xParentWindow;
         if (aArguments.getLength() == 1 && (aArguments[0] >>= xParentWindow) ) {
             Sequence< Any > aNewArgs{ Any(PropertyValue(
-                "ParentWindow", 0, makeAny(xParentWindow), PropertyState_DIRECT_VALUE )) };
+                "ParentWindow", 0, Any(xParentWindow), PropertyState_DIRECT_VALUE )) };
             OGenericUnoDialog::initialize(aNewArgs);
         } else {
             OGenericUnoDialog::initialize(aArguments);
@@ -129,8 +129,8 @@ namespace abp
         // User has one chance to accept it or not.
         // (or he can start it again by using wizard-menu!)
         // So we should deregister it on our general job execution service by using right protocol parameters.
-        css::uno::Sequence< css::beans::NamedValue > lProtocol { { "Deactivate", css::uno::makeAny( true ) } };
-        return makeAny( lProtocol );
+        css::uno::Sequence< css::beans::NamedValue > lProtocol { { "Deactivate", css::uno::Any( true ) } };
+        return Any( lProtocol );
     }
 
     void OABSPilotUno::executedDialog(sal_Int16 _nExecutionResult)
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 24dd48de477e..e010f81858c4 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -630,11 +630,11 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
                 Any aFormatted(bFormattedIsNumeric);
                 xCurrentCol->setPropertyValue("TreatAsNumber", aFormatted);
             }
-            Any aColName = makeAny( rField );
+            Any aColName( rField );
             xCurrentCol->setPropertyValue(FM_PROP_CONTROLSOURCE,    aColName);
             xCurrentCol->setPropertyValue(FM_PROP_LABEL, aColName);
 
-            xColContainer->insertByName( rField, makeAny( xCurrentCol ) );
+            xColContainer->insertByName( rField, Any( xCurrentCol ) );
         }
     }
     catch (const Exception&)
@@ -661,7 +661,7 @@ Reference< awt::XControlModel > const & BibDataManager::updateGridModel(const Re
             m_xGridModel = createGridModel( gGridName );
 
             Reference< XNameContainer >  xNameCont(xDbForm, UNO_QUERY);
-            xNameCont->insertByName( sName, makeAny( m_xGridModel ) );
+            xNameCont->insertByName( sName, Any( m_xGridModel ) );
         }
 
         // insert the fields
@@ -788,8 +788,8 @@ void BibDataManager::setFilter(const OUString& rQuery)
         m_xParser->setFilter( rQuery );
         OUString aQuery = m_xParser->getFilter();
         Reference< XPropertySet >  xFormProps( m_xForm, UNO_QUERY_THROW );
-        xFormProps->setPropertyValue( "Filter", makeAny( aQuery ) );
-        xFormProps->setPropertyValue( "ApplyFilter", makeAny( true ) );
+        xFormProps->setPropertyValue( "Filter", Any( aQuery ) );
+        xFormProps->setPropertyValue( "ApplyFilter", Any( true ) );
         reload();
     }
     catch (const Exception&)
@@ -899,7 +899,7 @@ void BibDataManager::setActiveDataSource(const OUString& rURL)
         aActiveDataTable = aTableNameSeq[0];
         aVal <<= aActiveDataTable;
         aPropertySet->setPropertyValue("Command", aVal);
-        aPropertySet->setPropertyValue("CommandType", makeAny(CommandType::TABLE));
+        aPropertySet->setPropertyValue("CommandType", Any(CommandType::TABLE));
         //Caching for Performance
         aVal <<= sal_Int32(50);
         aPropertySet->setPropertyValue("FetchSize", aVal);
@@ -1107,7 +1107,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString&
 
         // set the
         Reference< XPropertySet > xPropSet( xModel, UNO_QUERY );
-        xPropSet->setPropertyValue( "Name", makeAny( rName ) );
+        xPropSet->setPropertyValue( "Name", Any( rName ) );
 
         // set the name of the to-be-created control
         Any aAny(OUString("com.sun.star.form.control.InteractionGridControl"));
@@ -1119,7 +1119,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString&
         if (xPropInfo->hasPropertyByName(uProp))
         {
             xPropSet->setPropertyValue(
-                uProp, makeAny<OUString>(INET_HID_SCHEME + HID_BIB_DB_GRIDCTRL));
+                uProp, Any(OUString(INET_HID_SCHEME + HID_BIB_DB_GRIDCTRL)));
         }
     }
     catch (const Exception&)
@@ -1206,8 +1206,8 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
             Any aFieldName; aFieldName <<= aName;
 
             xPropSet->setPropertyValue( FM_PROP_NAME,aFieldName);
-            xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, makeAny( rName ) );
-            xPropSet->setPropertyValue("NativeWidgetLook", makeAny( true ) );
+            xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, Any( rName ) );
+            xPropSet->setPropertyValue("NativeWidgetLook", Any( true ) );
 
             if (bForceListBox)
             {
@@ -1265,7 +1265,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
             Reference< XFormComponent >  aFormComp(xModel,UNO_QUERY );
 
             Reference< XNameContainer >  xNameCont( m_xForm, UNO_QUERY );
-            xNameCont->insertByName(aName, makeAny( aFormComp ) );
+            xNameCont->insertByName(aName, Any( aFormComp ) );
 
             // now if the form where we inserted the new model is already loaded, notify the model of this
             // Note that this implementation below is a HACK as it relies on the fact that the model adds itself
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 3f972af18ddc..acf29ea4e1c6 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -593,7 +593,7 @@ namespace
             {
                 aText = m_rEntry.get_text();
             }
-            m_xPropSet->setPropertyValue("Text", makeAny(aText));
+            m_xPropSet->setPropertyValue("Text", Any(aText));
 
             css::uno::Reference<css::form::XBoundComponent> xBound(m_xPropSet, css::uno::UNO_QUERY);
             if (xBound.is())
@@ -667,7 +667,7 @@ namespace
             m_bSelfChanging = true;
 
             Sequence<sal_Int16> aSelection{ o3tl::narrowing<sal_Int16>(m_rComboBox.get_active()) };
-            m_xPropSet->setPropertyValue("SelectedItems", makeAny(aSelection));
+            m_xPropSet->setPropertyValue("SelectedItems", Any(aSelection));
 
             css::uno::Reference<css::form::XBoundComponent> xBound(m_xPropSet, css::uno::UNO_QUERY);
             if (xBound.is())
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index 787769b50367..2914cf78df79 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -401,8 +401,8 @@ css::uno::Any WinUserInfoBe::getPropertyValue(OUString const& PropertyName)
     else
         throw css::beans::UnknownPropertyException(sToken, static_cast<cppu::OWeakObject*>(this));
 
-    return css::uno::makeAny(css::beans::Optional<css::uno::Any>(
-        !sValue.isEmpty(), sValue.isEmpty() ? css::uno::Any() : css::uno::makeAny(sValue)));
+    return css::uno::Any(css::beans::Optional<css::uno::Any>(
+        !sValue.isEmpty(), sValue.isEmpty() ? css::uno::Any() : css::uno::Any(sValue)));
 }
 
 OUString SAL_CALL WinUserInfoBe::getImplementationName()
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 3566e91c5c61..2e133e9c5e2c 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -162,13 +162,13 @@ namespace dbp
                 xOldConn = getFormConnection();
 
                 OUString sDataSource = m_xDatasource->get_selected_text();
-                rContext.xForm->setPropertyValue("DataSourceName", makeAny( sDataSource ) );
+                rContext.xForm->setPropertyValue("DataSourceName", Any( sDataSource ) );
             }
             OUString sCommand = m_xTable->get_selected_text();
             sal_Int32 nCommandType = m_xTable->get_selected_id().toInt32();
 
-            rContext.xForm->setPropertyValue("Command", makeAny( sCommand ) );
-            rContext.xForm->setPropertyValue("CommandType", makeAny( nCommandType ) );
+            rContext.xForm->setPropertyValue("Command", Any( sCommand ) );
+            rContext.xForm->setPropertyValue("CommandType", Any( nCommandType ) );
 
             if ( !rContext.bEmbedded )
                 setFormConnection( xOldConn, false );
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index e8a2dfef1189..20052c4cb629 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -411,7 +411,7 @@ namespace dbp
             }
             else
             {
-                m_aContext.xForm->setPropertyValue("ActiveConnection", makeAny( _rxConn ) );
+                m_aContext.xForm->setPropertyValue("ActiveConnection", Any( _rxConn ) );
             }
         }
         catch(const Exception&)
@@ -527,7 +527,7 @@ namespace dbp
 
                             // not interested in any results, only in the fields
                             Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY);
-                            xStatementProps->setPropertyValue("MaxRows", makeAny(sal_Int32(0)));
+                            xStatementProps->setPropertyValue("MaxRows", Any(sal_Int32(0)));
 
                             // TODO: think about handling local SQLExceptions here ...
                             Reference< XColumnsSupplier >  xSupplyCols(xStatement->executeQuery(), UNO_QUERY);
@@ -585,7 +585,7 @@ namespace dbp
             if ( !xHandler.is() )
                 return false;
 
-            Reference< XInteractionRequest > xRequest = new OInteractionRequest(makeAny(aContext));
+            Reference< XInteractionRequest > xRequest = new OInteractionRequest(Any(aContext));
             try
             {
                 xHandler->handle(xRequest);
@@ -613,7 +613,7 @@ namespace dbp
                 OUString sControlLabel(_pSettings->sControlLabel);
                 m_aContext.xObjectModel->setPropertyValue(
                     "Label",
-                    makeAny(sControlLabel)
+                    Any(sControlLabel)
                 );
             }
         }
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 0559858ca1ca..3cf1d03240b7 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -189,17 +189,17 @@ namespace dbp
                     disambiguateName(xExistenceChecker, sColumnName);
 
                     // the data field the column should be bound to
-                    xColumn->setPropertyValue("DataField", makeAny(*pFormFieldName));
+                    xColumn->setPropertyValue("DataField", Any(*pFormFieldName));
                     // the label
-                    xColumn->setPropertyValue("Label", makeAny(*pFormFieldName + *pColumnLabelPostfix));
+                    xColumn->setPropertyValue("Label", Any(*pFormFieldName + *pColumnLabelPostfix));
                     // the width (<void/> => column will be auto-sized)
                     xColumn->setPropertyValue("Width", Any());
 
                     if ( xColumnPSI->hasPropertyByName( s_sMouseWheelBehavior ) )
-                        xColumn->setPropertyValue( s_sMouseWheelBehavior, makeAny( MouseWheelBehavior::SCROLL_DISABLED ) );
+                        xColumn->setPropertyValue( s_sMouseWheelBehavior, Any( MouseWheelBehavior::SCROLL_DISABLED ) );
 
                     // insert the column
-                    xColumnContainer->insertByName(sColumnName, makeAny(xColumn));
+                    xColumnContainer->insertByName(sColumnName, Any(xColumn));
                 }
                 catch(const Exception&)
                 {
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index cde03e22356e..ae27f9553dd2 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -170,19 +170,19 @@ namespace dbp
             }
 
             // ListSourceType: SQL
-            getContext().xObjectModel->setPropertyValue("ListSourceType", makeAny(sal_Int32(ListSourceType_SQL)));
+            getContext().xObjectModel->setPropertyValue("ListSourceType", Any(sal_Int32(ListSourceType_SQL)));
 
             if (isListBox())
             {
                 // BoundColumn: 1
-                getContext().xObjectModel->setPropertyValue("BoundColumn", makeAny(sal_Int16(1)));
+                getContext().xObjectModel->setPropertyValue("BoundColumn", Any(sal_Int16(1)));
 
                 // build the statement to set as list source
                 OUString sStatement = "SELECT " +
                     getSettings().sListContentField +  ", " + getSettings().sLinkedListField +
                     " FROM " + getSettings().sListContentTable;
                 Sequence< OUString > aListSource { sStatement };
-                getContext().xObjectModel->setPropertyValue("ListSource", makeAny(aListSource));
+                getContext().xObjectModel->setPropertyValue("ListSource", Any(aListSource));
             }
             else
             {
@@ -190,11 +190,11 @@ namespace dbp
                 OUString sStatement = "SELECT DISTINCT " +
                     getSettings().sListContentField +
                     " FROM " + getSettings().sListContentTable;
-                getContext().xObjectModel->setPropertyValue( "ListSource", makeAny(sStatement));
+                getContext().xObjectModel->setPropertyValue( "ListSource", Any(sStatement));
             }
 
             // the bound field
-            getContext().xObjectModel->setPropertyValue("DataField", makeAny(getSettings().sLinkedFormField));
+            getContext().xObjectModel->setPropertyValue("DataField", Any(getSettings().sLinkedFormField));
         }
         catch(const Exception&)
         {
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 23afd922cec4..f877a1768767 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -116,20 +116,20 @@ namespace dbp
                 UNO_QUERY);
 
             // the label
-            xRadioModel->setPropertyValue("Label", makeAny(*aLabelIter));
+            xRadioModel->setPropertyValue("Label", Any(*aLabelIter));
             // the value
-            xRadioModel->setPropertyValue("RefValue", makeAny(*aValueIter));
+            xRadioModel->setPropertyValue("RefValue", Any(*aValueIter));
 
             // default selection
             if (_rSettings.sDefaultField == *aLabelIter)
-                xRadioModel->setPropertyValue("DefaultState", makeAny(sal_Int16(1)));
+                xRadioModel->setPropertyValue("DefaultState", Any(sal_Int16(1)));
 
             // the connection to the database field
             if (!_rSettings.sDBField.isEmpty())
-                xRadioModel->setPropertyValue("DataField", makeAny(_rSettings.sDBField));
+                xRadioModel->setPropertyValue("DataField", Any(_rSettings.sDBField));
 
             // the name for the model
-            xRadioModel->setPropertyValue("Name", makeAny(sElementsName));
+            xRadioModel->setPropertyValue("Name", Any(sElementsName));
 
             // create a shape for the radio button
             Reference< XControlShape > xRadioShape(
@@ -164,7 +164,7 @@ namespace dbp
 
             // set the GroupBox as "LabelControl" for the RadioButton
             // (_after_ having inserted the model into the page!)
-            xRadioModel->setPropertyValue("LabelControl", makeAny(_rContext.xObjectModel));
+            xRadioModel->setPropertyValue("LabelControl", Any(_rContext.xObjectModel));
         }
 
         // group the shapes
@@ -176,7 +176,7 @@ namespace dbp
                 Reference< XShapeGroup > xGroupedOptions = xGrouper->group(xButtonCollection);
                 Reference< XSelectionSupplier > xSelector(_rContext.xDocumentModel->getCurrentController(), UNO_QUERY);
                 if (xSelector.is())
-                    xSelector->select(makeAny(xGroupedOptions));
+                    xSelector->select(Any(xGroupedOptions));
             }
         }
         catch(Exception&)
@@ -194,7 +194,7 @@ namespace dbp
         if (_rxShapeProps.is())
             xPropertyInfo = _rxShapeProps->getPropertySetInfo();
         if (xPropertyInfo.is() && xPropertyInfo->hasPropertyByName(s_sAnchorPropertyName))
-            _rxShapeProps->setPropertyValue(s_sAnchorPropertyName, makeAny(TextContentAnchorType_AT_PAGE));
+            _rxShapeProps->setPropertyValue(s_sAnchorPropertyName, Any(TextContentAnchorType_AT_PAGE));
     }
 
 
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 2ad97cc311b5..25ef76e02a7d 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -54,7 +54,6 @@ namespace logging
     using ::com::sun::star::lang::XSingleServiceFactory;
     using ::com::sun::star::uno::XInterface;
     using ::com::sun::star::util::XChangesBatch;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::lang::NullPointerException;
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::lang::ServiceNotRegisteredException;
@@ -222,7 +221,7 @@ namespace logging
 
             // write access to the "Settings" node (which includes settings for all loggers)
             Sequence<Any> aArguments{ Any(NamedValue(
-                "nodepath", makeAny(OUString("/org.openoffice.Office.Logging/Settings")))) };
+                "nodepath", Any(OUString("/org.openoffice.Office.Logging/Settings")))) };
             Reference< XNameContainer > xAllSettings( xConfigProvider->createInstanceWithArguments(
                 "com.sun.star.configuration.ConfigurationUpdateAccess",
                 aArguments
@@ -234,7 +233,7 @@ namespace logging
                 // no node yet for this logger. Create default settings.
                 Reference< XSingleServiceFactory > xNodeFactory( xAllSettings, UNO_QUERY_THROW );
                 Reference< XInterface > xLoggerSettings( xNodeFactory->createInstance(), css::uno::UNO_SET_THROW );
-                xAllSettings->insertByName( sLoggerName, makeAny( xLoggerSettings ) );
+                xAllSettings->insertByName( sLoggerName, Any( xLoggerSettings ) );
                 Reference< XChangesBatch > xChanges( xAllSettings, UNO_QUERY_THROW );
                 xChanges->commitChanges();
             }
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 6cf3dc961731..a73a714abe55 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -405,7 +405,7 @@ void UnoConversionUtilities<T>::variantToAny( const VARIANTARG* pArg, Any& rAny,
                         {
                             try
                             {
-                                Any anySeq = makeAny(unoSeq);
+                                Any anySeq(unoSeq);
                                 Any convAny = conv->convertTo(anySeq, ptype);
                                 rAny = convAny;
                             }
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 32517a6c4be9..633a3574b966 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -129,7 +129,7 @@ namespace pcr
                 // ensure that the "transfer selection as" property is reset. Since we can't remember
                 // it at the object itself, but derive it from the binding only, we have to normalize
                 // it now that there *is* no binding anymore.
-                setPropertyValue( PROPERTY_CELL_EXCHANGE_TYPE, makeAny( sal_Int16(0) ) );
+                setPropertyValue( PROPERTY_CELL_EXCHANGE_TYPE, Any( sal_Int16(0) ) );
             }
         }
         break;
@@ -156,8 +156,8 @@ namespace pcr
                 {
                     if ( !xSource.is() )
                     {
-                        setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( Sequence< OUString >() ) );
-                        setPropertyValue( PROPERTY_TYPEDITEMLIST, makeAny( Sequence< Any >() ) );
+                        setPropertyValue( PROPERTY_STRINGITEMLIST, Any( Sequence< OUString >() ) );
+                        setPropertyValue( PROPERTY_TYPEDITEMLIST, Any( Sequence< Any >() ) );
                     }
                 }
                 catch( const Exception& )
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index e2bc47f16cc2..3c66fc8c97fa 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -146,7 +146,7 @@ namespace pcr
         Any aAddress;
         return doConvertAddressRepresentations(
                     PROPERTY_UI_REPRESENTATION,
-                    makeAny( _rAddressDescription ),
+                    Any( _rAddressDescription ),
                     PROPERTY_ADDRESS,
                     aAddress,
                     false
@@ -174,7 +174,7 @@ namespace pcr
             try
             {
                 Reference< XSpreadsheet > xSheet;
-                xConverter->setPropertyValue( PROPERTY_REFERENCE_SHEET, makeAny( static_cast<sal_Int32>(getControlSheetIndex( xSheet )) ) );
+                xConverter->setPropertyValue( PROPERTY_REFERENCE_SHEET, Any( static_cast<sal_Int32>(getControlSheetIndex( xSheet )) ) );
                 xConverter->setPropertyValue( _rInputProperty, _rInputValue );
                 _rOutputValue = xConverter->getPropertyValue( _rOutputProperty );
                 bSuccess = true;
@@ -195,7 +195,7 @@ namespace pcr
         Any aAddress;
         return doConvertAddressRepresentations(
                     PROPERTY_UI_REPRESENTATION,
-                    makeAny( _rAddressDescription ),
+                    Any( _rAddressDescription ),
                     PROPERTY_ADDRESS,
                     aAddress,
                     true
@@ -209,7 +209,7 @@ namespace pcr
         Reference< XValueBinding > xBinding( createDocumentDependentInstance(
             _bSupportIntegerExchange ? OUString(SERVICE_SHEET_CELL_INT_BINDING) : OUString(SERVICE_SHEET_CELL_BINDING),
             PROPERTY_BOUND_CELL,
-            makeAny( _rAddress )
+            Any( _rAddress )
         ), UNO_QUERY );
 
         return xBinding;
@@ -244,7 +244,7 @@ namespace pcr
         xSource.set(createDocumentDependentInstance(
             SERVICE_SHEET_CELLRANGE_LISTSOURCE,
             PROPERTY_LIST_CELL_RANGE,
-            makeAny( aRangeAddress )
+            Any( aRangeAddress )
         ), css::uno::UNO_QUERY);
 
         return xSource;
@@ -316,7 +316,7 @@ namespace pcr
         if ( getAddressFromCellBinding( _rxBinding, aAddress ) )
         {
             Any aStringAddress;
-            doConvertAddressRepresentations( PROPERTY_ADDRESS, makeAny( aAddress ),
+            doConvertAddressRepresentations( PROPERTY_ADDRESS, Any( aAddress ),
                 PROPERTY_UI_REPRESENTATION, aStringAddress, false );
 
             aStringAddress >>= sAddress;
@@ -345,7 +345,7 @@ namespace pcr
                 xSourceProps->getPropertyValue( PROPERTY_LIST_CELL_RANGE ) >>= aRangeAddress;
 
                 Any aStringAddress;
-                doConvertAddressRepresentations( PROPERTY_ADDRESS, makeAny( aRangeAddress ),
+                doConvertAddressRepresentations( PROPERTY_ADDRESS, Any( aRangeAddress ),
                     PROPERTY_UI_REPRESENTATION, aStringAddress, true );
                 aStringAddress >>= sAddress;
             }
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 72fc1042ab48..22ad04988ce9 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -141,8 +141,8 @@ namespace pcr
                 bool bHasVScroll = 0 != ( nScrollbars & 2 );
                 bool bHasHScroll = 0 != ( nScrollbars & 1 );
 
-                m_xComponent->setPropertyValue( PROPERTY_VSCROLL, makeAny( bHasVScroll ) );
-                m_xComponent->setPropertyValue( PROPERTY_HSCROLL, makeAny( bHasHScroll ) );
+                m_xComponent->setPropertyValue( PROPERTY_VSCROLL, Any( bHasVScroll ) );
+                m_xComponent->setPropertyValue( PROPERTY_HSCROLL, Any( bHasHScroll ) );
             }
             break;
 
@@ -161,8 +161,8 @@ namespace pcr
                     OSL_FAIL( "EditPropertyHandler::setPropertyValue: invalid text type!" );
                 }
 
-                m_xComponent->setPropertyValue( PROPERTY_MULTILINE, makeAny( bMultiLine ) );
-                m_xComponent->setPropertyValue( PROPERTY_RICHTEXT, makeAny( bRichText ) );
+                m_xComponent->setPropertyValue( PROPERTY_MULTILINE, Any( bMultiLine ) );
+                m_xComponent->setPropertyValue( PROPERTY_RICHTEXT, Any( bRichText ) );
             }
             break;
 
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 95d9eeb6aa99..620368e9d7d2 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -525,8 +525,8 @@ namespace pcr
                         xBinding = xModel->createBinding( );
                         if ( xBinding.is() )
                         {
-                            xBinding->setPropertyValue( PROPERTY_BINDING_ID, makeAny( _rBindingName ) );
-                            xModel->getBindings()->insert( makeAny( xBinding ) );
+                            xBinding->setPropertyValue( PROPERTY_BINDING_ID, Any( _rBindingName ) );
+                            xModel->getBindings()->insert( Any( xBinding ) );
                         }
                     }
                 }
@@ -547,7 +547,7 @@ namespace pcr
                         Reference< XNamed > xName( xBinding, UNO_QUERY_THROW );
                         xName->setName( sNewName );
                         // and insert into the model
-                        xModel->getBindings()->insert( makeAny( xBinding ) );
+                        xModel->getBindings()->insert( Any( xBinding ) );
                     }
                 }
             }
@@ -674,7 +674,7 @@ namespace pcr
                         xElement->getPropertyValue( PROPERTY_MODEL ) >>= xElementsModel;
                         OSL_ENSURE( xElementsModel == xModel, "EFormsHelper::getAllElementUINames: inconsistency in the model-element relationship!" );
                         if ( xElementsModel != xModel )
-                            xElement->setPropertyValue( PROPERTY_MODEL, makeAny( xModel ) );
+                            xElement->setPropertyValue( PROPERTY_MODEL, Any( xModel ) );
                     }
 #endif
                     OUString sElementName = ( _eType == Submission ) ? xHelper->getSubmissionName( xElement, true ) : xHelper->getBindingName( xElement, true );
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 23d468a7d909..42ca7ed1afdd 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -178,7 +178,7 @@ namespace pcr
                     OUString sOldBindingName = m_pHelper->getCurrentBindingName();
                     m_pHelper->setBinding( nullptr );
                     firePropertyChange( PROPERTY_BINDING_NAME, PROPERTY_ID_BINDING_NAME,
-                        makeAny( sOldBindingName ), makeAny( OUString() ) );
+                        Any( sOldBindingName ), Any( OUString() ) );
                 }
             }
             break;
@@ -211,7 +211,7 @@ namespace pcr
                     // However, there's no such mechanism in place currently.
                     m_bSimulatingModelChange = true;
                     firePropertyChange( PROPERTY_XML_DATA_MODEL, PROPERTY_ID_XML_DATA_MODEL,
-                        makeAny( OUString() ), makeAny( getModelNamePropertyValue() ) );
+                        Any( OUString() ), Any( getModelNamePropertyValue() ) );
                     m_bSimulatingModelChange = false;
                 }
             }
@@ -499,9 +499,9 @@ namespace pcr
             if ( !xModel.is() || !xBinding.is() || sFacetName.isEmpty() )
                 return InteractiveSelectionResult_Cancelled;
 
-            xDialogProps->setPropertyValue("FormModel", makeAny( xModel ) );
-            xDialogProps->setPropertyValue("Binding", makeAny( xBinding ) );
-            xDialogProps->setPropertyValue("FacetName", makeAny( sFacetName ) );
+            xDialogProps->setPropertyValue("FormModel", Any( xModel ) );
+            xDialogProps->setPropertyValue("Binding", Any( xBinding ) );
+            xDialogProps->setPropertyValue("FacetName", Any( sFacetName ) );
 
             if ( !xDialog->execute() )
                 // cancelled
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 41afc78cc494..d07f524bfdf9 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -98,7 +98,6 @@ namespace pcr
     using ::com::sun::star::form::runtime::FormController;
     using ::com::sun::star::form::runtime::XFormController;
     using ::com::sun::star::beans::UnknownPropertyException;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::container::NoSuchElementException;
     using ::com::sun::star::beans::XPropertySetInfo;
     using ::com::sun::star::container::XNameReplace;
@@ -275,7 +274,7 @@ namespace pcr
             OSL_PRECOND( _rxIntrospection.is(), "lcl_addListenerTypesFor_throw: this will crash!" );
 
             Reference< XIntrospectionAccess > xIntrospectionAccess(
-                _rxIntrospection->inspect( makeAny( _rxComponent ) ), UNO_SET_THROW );
+                _rxIntrospection->inspect( Any( _rxComponent ) ), UNO_SET_THROW );
 
             const Sequence< Type > aListeners( xIntrospectionAccess->getSupportedListeners() );
 
@@ -381,7 +380,7 @@ namespace pcr
             comphelper::makePropertyValue("Script", aDescriptor.ScriptCode)
         };
 
-        return makeAny( aScriptDescriptor );
+        return Any( aScriptDescriptor );
     }
 
     Sequence< OUString > SAL_CALL EventHolder::getElementNames(  )
@@ -511,7 +510,7 @@ namespace pcr
             }
         }
 
-        return makeAny( aPropertyValue );
+        return Any( aPropertyValue );
     }
 
     void SAL_CALL EventHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue )
@@ -568,7 +567,7 @@ namespace pcr
         // there is no need for this code...
 
         aAssignedScript.ScriptCode = sNewScriptCode;
-        return makeAny( aAssignedScript );
+        return Any( aAssignedScript );
     }
 
     Any SAL_CALL EventHandler::convertToControlValue( const OUString& /*_rPropertyName*/, const Any& _rPropertyValue, const Type& _rControlValueType )
@@ -629,7 +628,7 @@ namespace pcr
             }
         }
 
-        return makeAny( sScript );
+        return Any( sScript );
     }
 
     PropertyState SAL_CALL EventHandler::getPropertyState( const OUString& /*_rPropertyName*/ )
@@ -802,7 +801,7 @@ namespace pcr
                 // set the new "property value"
                 setPropertyValue(
                     lcl_getEventPropertyName( event.second.sListenerClassName, event.second.sListenerMethodName ),
-                    makeAny( aScriptDescriptor )
+                    Any( aScriptDescriptor )
                 );
             }
         }
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 89e6fb80e635..133367953f4c 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -305,10 +305,10 @@ namespace pcr
                 const SvxFontItem& rFontItem =
                     static_cast<const SvxFontItem&>(_rSet.Get(CFID_FONT));
 
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME     , makeAny(rFontItem.GetFamilyName()));
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, makeAny(rFontItem.GetStyleName()));
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_FAMILY   , makeAny(static_cast<sal_Int16>(rFontItem.GetFamily())));
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_CHARSET  , makeAny(static_cast<sal_Int16>(rFontItem.GetCharSet())));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_NAME     , Any(rFontItem.GetFamilyName()));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STYLENAME, Any(rFontItem.GetStyleName()));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_FAMILY   , Any(static_cast<sal_Int16>(rFontItem.GetFamily())));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_CHARSET  , Any(static_cast<sal_Int16>(rFontItem.GetCharSet())));
             }
 
 
@@ -321,7 +321,7 @@ namespace pcr
                     static_cast<const SvxFontHeightItem&>(_rSet.Get(CFID_HEIGHT));
 
                 float nHeight = static_cast<float>(o3tl::convert(rSvxFontHeightItem.GetHeight(), o3tl::Length::twip, o3tl::Length::pt));
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_HEIGHT,makeAny(nHeight));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_HEIGHT,Any(nHeight));
 
             }
 
@@ -335,7 +335,7 @@ namespace pcr
                     static_cast<const SvxWeightItem&>(_rSet.Get(CFID_WEIGHT));
 
                 float nWeight = vcl::unohelper::ConvertFontWeight(rWeightItem.GetWeight());
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_WEIGHT,makeAny(nWeight));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_WEIGHT,Any(nWeight));
             }
 
 
@@ -348,7 +348,7 @@ namespace pcr
                     static_cast<const SvxPostureItem&>(_rSet.Get(CFID_POSTURE));
 
                 css::awt::FontSlant eSlant = vcl::unohelper::ConvertFontSlant(rPostureItem.GetPosture());
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_SLANT, makeAny(static_cast<sal_Int16>(eSlant)));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_SLANT, Any(static_cast<sal_Int16>(eSlant)));
             }
 
 
@@ -361,7 +361,7 @@ namespace pcr
                     static_cast<const SvxUnderlineItem&>(_rSet.Get(CFID_UNDERLINE));
 
                 sal_Int16 nUnderline = static_cast<sal_Int16>(rUnderlineItem.GetLineStyle());
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_UNDERLINE,makeAny(nUnderline));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_UNDERLINE,Any(nUnderline));
 
                 // the text line color is transported in this item, too
                 Color nColor = rUnderlineItem.GetColor();
@@ -383,7 +383,7 @@ namespace pcr
                     static_cast<const SvxCrossedOutItem&>(_rSet.Get(CFID_STRIKEOUT));
 
                 sal_Int16 nStrikeout = static_cast<sal_Int16>(rCrossedOutItem.GetStrikeout());
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STRIKEOUT,makeAny(nStrikeout));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_STRIKEOUT,Any(nStrikeout));
             }
 
 
@@ -395,7 +395,7 @@ namespace pcr
                 const SvxWordLineModeItem& rWordLineModeItem =
                     static_cast<const SvxWordLineModeItem&>(_rSet.Get(CFID_WORDLINEMODE));
 
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_WORDLINEMODE, css::uno::makeAny(rWordLineModeItem.GetValue()));
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_WORDLINEMODE, css::uno::Any(rWordLineModeItem.GetValue()));
             }
 
 
@@ -425,7 +425,7 @@ namespace pcr
                 const SvxCharReliefItem& rReliefItem =
                     static_cast<const SvxCharReliefItem&>(_rSet.Get(CFID_RELIEF));
 
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_RELIEF, makeAny(static_cast<sal_Int16>(rReliefItem.GetValue())) );
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_RELIEF, Any(static_cast<sal_Int16>(rReliefItem.GetValue())) );
             }
 
 
@@ -437,7 +437,7 @@ namespace pcr
                 const SvxEmphasisMarkItem& rEmphMarkItem =
                     static_cast<const SvxEmphasisMarkItem&>(_rSet.Get(CFID_EMPHASIS));
 
-                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_EMPHASIS_MARK, makeAny(static_cast<sal_Int16>(rEmphMarkItem.GetEmphasisMark())) );
+                lcl_pushBackPropertyValue( _out_properties, PROPERTY_FONT_EMPHASIS_MARK, Any(static_cast<sal_Int16>(rEmphMarkItem.GetEmphasisMark())) );
             }
         }
         catch (const Exception& )
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 2bf922d1b603..d5f3976629a7 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -322,7 +322,7 @@ namespace pcr
         if ( PROPERTY_ID_IMAGE_URL == nPropId && ( _rValue >>= xGrfObj ) )
         {
             DBG_ASSERT( xGrfObj.is(), "FormComponentPropertyHandler::setPropertyValue() xGrfObj is invalid");
-            m_xComponent->setPropertyValue(PROPERTY_GRAPHIC, uno::makeAny(xGrfObj->getGraphic()));
+            m_xComponent->setPropertyValue(PROPERTY_GRAPHIC, uno::Any(xGrfObj->getGraphic()));
         }
         else if ( PROPERTY_ID_FONT == nPropId )
         {
@@ -721,7 +721,7 @@ namespace pcr
                 break;
             }
 
-            aControlValue = PropertyHandlerComponent::convertToControlValue( _rPropertyName, makeAny( nNormalized ), _rControlValueType );
+            aControlValue = PropertyHandlerComponent::convertToControlValue( _rPropertyName, Any( nNormalized ), _rControlValueType );
         }
         break;
 
@@ -1488,7 +1488,7 @@ namespace pcr
             OSL_PRECOND( _rxInspectorUI.is(), "lcl_rebuildAndResetCommand: invalid BrowserUI!" );
             OSL_PRECOND( _rxHandler.is(), "lcl_rebuildAndResetCommand: invalid handler!" );
             _rxInspectorUI->rebuildPropertyUI( PROPERTY_COMMAND );
-            _rxHandler->setPropertyValue( PROPERTY_COMMAND, makeAny( OUString() ) );
+            _rxHandler->setPropertyValue( PROPERTY_COMMAND, Any( OUString() ) );
         }
     }
 
@@ -2633,11 +2633,11 @@ namespace pcr
 
             // initialize the dialog
             Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY_THROW );
-            xDialogProps->setPropertyValue("QueryComposer", makeAny( xComposer ) );
-            xDialogProps->setPropertyValue("RowSet",        makeAny( m_xComponent ) );
+            xDialogProps->setPropertyValue("QueryComposer", Any( xComposer ) );
+            xDialogProps->setPropertyValue("RowSet",        Any( m_xComponent ) );
             if (auto pTopLevel = impl_getDefaultDialogFrame_nothrow())
-                xDialogProps->setPropertyValue("ParentWindow",  makeAny(pTopLevel->GetXWindow()));
-            xDialogProps->setPropertyValue("Title",         makeAny( sPropertyUIName ) );
+                xDialogProps->setPropertyValue("ParentWindow",  Any(pTopLevel->GetXWindow()));
+            xDialogProps->setPropertyValue("Title",         Any( sPropertyUIName ) );
 
             _rClearBeforeDialog.clear();
             bSuccess = ( xDialog->execute() != 0 );
@@ -3026,13 +3026,13 @@ namespace pcr
 
         void FormSQLCommandUI::setSQLCommand( const OUString& _rCommand ) const
         {
-            m_xObject->setPropertyValue( PROPERTY_COMMAND, makeAny( _rCommand ) );
+            m_xObject->setPropertyValue( PROPERTY_COMMAND, Any( _rCommand ) );
         }
 
 
         void FormSQLCommandUI::setEscapeProcessing( const bool _bEscapeProcessing ) const
         {
-            m_xObject->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( _bEscapeProcessing ) );
+            m_xObject->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, Any( _bEscapeProcessing ) );
         }
 
 
@@ -3126,7 +3126,7 @@ namespace pcr
 
         void ValueListCommandUI::setEscapeProcessing( const bool _bEscapeProcessing ) const
         {
-            m_xObject->setPropertyValue( PROPERTY_LISTSOURCETYPE, makeAny(
+            m_xObject->setPropertyValue( PROPERTY_LISTSOURCETYPE, Any(
                 _bEscapeProcessing ? ListSourceType_SQL : ListSourceType_SQLPASSTHROUGH ) );
         }
 
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 356a694dc513..26c4324056a9 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -58,7 +58,6 @@ namespace pcr
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Any;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::beans::Property;
@@ -306,7 +305,7 @@ namespace pcr
                     Reference< XMap > xControlMap;
                     Any any = m_xContext->getValueByName( "ControlShapeAccess" );
                     any >>= xControlMap;
-                    m_xAssociatedShape.set( xControlMap->get( makeAny( xControlModel ) ), UNO_QUERY_THROW );
+                    m_xAssociatedShape.set( xControlMap->get( Any( xControlModel ) ), UNO_QUERY_THROW );
                     m_xShapeProperties.set( m_xAssociatedShape, UNO_QUERY_THROW );
                 }
             }
@@ -671,7 +670,7 @@ namespace pcr
                 if ( xSheet.is() )
                 {
                     css::awt::Point aPreservePosition( m_xAssociatedShape->getPosition() );
-                    m_xShapeProperties->setPropertyValue( PROPERTY_ANCHOR, makeAny( xSheet ) );
+                    m_xShapeProperties->setPropertyValue( PROPERTY_ANCHOR, Any( xSheet ) );
                     m_xAssociatedShape->setPosition( aPreservePosition );
                 }
                 break;
@@ -739,14 +738,14 @@ namespace pcr
         if ( _event.PropertyName == "Position" )
         {
             css::awt::Point aPos = m_xShape->getPosition();
-            aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, makeAny( aPos.X ) ) );
-            aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, makeAny( aPos.Y ) ) );
+            aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONX, Any( aPos.X ) ) );
+            aEventTranslations.push_back( EventTranslation( PROPERTY_POSITIONY, Any( aPos.Y ) ) );
         }
         else if ( _event.PropertyName == "Size" )
         {
             css::awt::Size aSize = m_xShape->getSize();
-            aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, makeAny( aSize.Width ) ) );
-            aEventTranslations.push_back( EventTranslation( PROPERTY_HEIGHT, makeAny( aSize.Height ) ) );
+            aEventTranslations.push_back( EventTranslation( PROPERTY_WIDTH, Any( aSize.Width ) ) );
+            aEventTranslations.push_back( EventTranslation( PROPERTY_HEIGHT, Any( aSize.Height ) ) );
         }
         else if ( _event.PropertyName == PROPERTY_ANCHOR_TYPE )
         {
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 7f2d794b4010..319ade95605f 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -209,8 +209,8 @@ namespace pcr
         {
             if ( m_xDetailForm.is() )
             {
-                m_xDetailForm->setPropertyValue( PROPERTY_DETAILFIELDS, makeAny( Sequence< OUString >( aDetailFields.data(), aDetailFields.size() ) ) );
-                m_xDetailForm->setPropertyValue( PROPERTY_MASTERFIELDS, makeAny( Sequence< OUString >( aMasterFields.data(), aMasterFields.size() ) ) );
+                m_xDetailForm->setPropertyValue( PROPERTY_DETAILFIELDS, Any( Sequence< OUString >( aDetailFields.data(), aDetailFields.size() ) ) );
+                m_xDetailForm->setPropertyValue( PROPERTY_MASTERFIELDS, Any( Sequence< OUString >( aMasterFields.data(), aMasterFields.size() ) ) );
             }
         }
         catch( const Exception& )
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 014b4cf55f0f..6d26811cee1d 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -303,7 +303,7 @@ namespace pcr
         // create an introspection adapter for the component
         Reference< XIntrospection > xIntrospection = theIntrospection::get( m_xContext );
 
-        Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( makeAny( _rxIntrospectee ) ) );
+        Reference< XIntrospectionAccess > xIntrospectionAccess( xIntrospection->inspect( Any( _rxIntrospectee ) ) );
         if ( !xIntrospectionAccess.is() )
             throw RuntimeException("The introspection service could not handle the given component.", *this );
 
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 1f274def355f..89f149b92bdc 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -299,7 +299,7 @@ namespace pcr
     {
         Reference<css::container::XNameContainer> xName(rContext, UNO_QUERY_THROW);
         Reference<XWindow> xWindow(new weld::TransportAsXWindow(pParent));
-        xName->insertByName("BuilderParent", makeAny(xWindow));
+        xName->insertByName("BuilderParent", Any(xWindow));
     }
 
     void PropertyHandlerHelper::clearBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext)
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index 1fdc8a0b5dfc..f8780ff996cf 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -39,7 +39,6 @@ namespace pcr
     using ::com::sun::star::beans::XPropertySetInfo;
     using ::com::sun::star::uno::Any;
     using ::com::sun::star::uno::Sequence;
-    using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::beans::Property;
 
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
@@ -226,7 +225,7 @@ namespace pcr
 
     void SAL_CALL ImplInspectorModel::setIsReadOnly( sal_Bool IsReadOnly )
     {
-        setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( IsReadOnly ) );
+        setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, Any( IsReadOnly ) );
     }
 
     sal_Bool SAL_CALL ImplInspectorModel::supportsService( const OUString& ServiceName )
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 3dec4d7a79d3..18ab1d77840d 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -99,7 +99,7 @@ namespace pcr
 
         try
         {
-            m_xListBox->setPropertyValue( m_sPropertyName, makeAny( comphelper::containerToSequence(aSelection) ) );
+            m_xListBox->setPropertyValue( m_sPropertyName, Any( comphelper::containerToSequence(aSelection) ) );
         }
         catch( const Exception& )
         {
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index d3f1e81190d3..9083cb284cef 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -114,15 +114,15 @@ namespace pcr
             Sequence< Any > aNewArguments{
                 Any(NamedValue(
                     "TabbingModel",
-                    makeAny( xTabbingModel )
+                    Any( xTabbingModel )
                 )),
                 Any(NamedValue(
                     "ControlContext",
-                    makeAny( xControlContext )
+                    Any( xControlContext )
                 )),
                 Any(NamedValue(
                     "ParentWindow",
-                    makeAny( xParentWindow )
+                    Any( xParentWindow )
                 ))
             };
             OTabOrderDialog_DBase::initialize(aNewArguments);
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 4fd878441f90..6bbcdcf5dc3b 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -443,7 +443,7 @@ namespace pcr
 
     Any SAL_CALL OPropertyBrowserController::getViewData(  )
     {
-        return makeAny( m_sPageSelection );
+        return Any( m_sPageSelection );
     }
 
 
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 6c1215524fd2..53cf29fc6f4c 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -164,7 +164,7 @@ namespace pcr
             ::rtl::Reference< IPropertyEnumRepresentation > aEnumConversion(
                 new DefaultEnumRepresentation( *m_pInfoService, _rPropertyValue.getValueType(), nPropId ) );
             // TODO/UNOize: cache those converters?
-            return makeAny( aEnumConversion->getDescriptionForValue( _rPropertyValue ) );
+            return Any( aEnumConversion->getDescriptionForValue( _rPropertyValue ) );
         }
 
         return PropertyHandlerHelper::convertToControlValue(
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 14cca3a5d4b1..449ffd583530 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -158,8 +158,8 @@ namespace pcr
                 nButtonType = sal_Int32(FormButtonType_URL);
             }
 
-            m_xControlModel->setPropertyValue( PROPERTY_BUTTONTYPE, makeAny( static_cast< FormButtonType >( nButtonType ) ) );
-            m_xControlModel->setPropertyValue( PROPERTY_TARGET_URL, makeAny( sTargetURL ) );
+            m_xControlModel->setPropertyValue( PROPERTY_BUTTONTYPE, Any( static_cast< FormButtonType >( nButtonType ) ) );
+            m_xControlModel->setPropertyValue( PROPERTY_TARGET_URL, Any( sTargetURL ) );
         }
         catch( const Exception& )
         {
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index f5f00f663790..c8c0a82a3554 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -70,7 +70,7 @@ namespace pcr
             nClassID = ::comphelper::getINT16(m_xControlModel->getPropertyValue(PROPERTY_CLASSID));
 
         sDescription = sDescription.replaceAll("$controlclass$",
-            GetUIHeadlineName(nClassID, makeAny(m_xControlModel)));
+            GetUIHeadlineName(nClassID, Any(m_xControlModel)));
         OUString sName = ::comphelper::getString(m_xControlModel->getPropertyValue(PROPERTY_NAME));
         sDescription = sDescription.replaceAll("$controlname$", sName);
         m_xMainDesc->set_label(sDescription);
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index ba1b943f29a5..95b4143c76b8 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -314,7 +314,7 @@ namespace pcr
     Any SAL_CALL OHyperlinkControl::getValue()
     {
         OUString sText = m_xEntry->get_text();
-        return makeAny( sText );
+        return Any( sText );
     }
 
     void SAL_CALL OHyperlinkControl::setValue( const Any& _value )
@@ -638,7 +638,7 @@ namespace pcr
 
     Any SAL_CALL OComboboxControl::getValue()
     {
-        return makeAny( getTypedControlWindow()->get_active_text() );
+        return Any( getTypedControlWindow()->get_active_text() );
     }
 
     Type SAL_CALL OComboboxControl::getValueType()
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index e436b28e0b64..143ab1363a22 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -479,7 +479,7 @@ uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,co
             }
 
             if ( !aReturn.hasValue() )
-                aReturn = m_xTypeConverter->convertToSimpleType( makeAny( _rValue ), _ePropertyType );
+                aReturn = m_xTypeConverter->convertToSimpleType( Any( _rValue ), _ePropertyType );
         }
         catch( const script::CannotConvertException& ) { }
         catch( const lang::IllegalArgumentException& ) { }
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 390993de6aca..b5b96cc28682 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -257,7 +257,7 @@ namespace pcr
                 } catch( const Exception& ) { }
 
                 // set the new data type name
-                xBinding->setPropertyValue( PROPERTY_XSD_DATA_TYPE, makeAny( _rName ) );
+                xBinding->setPropertyValue( PROPERTY_XSD_DATA_TYPE, Any( _rName ) );
 
                 // retrieve the new data type object
                 Reference< XPropertySet > xNewType = getDataType( _rName );
@@ -269,7 +269,7 @@ namespace pcr
                 // fire the change in the Data Type property
                 OUString sNewDataTypeName;
                 OSL_VERIFY( xBinding->getPropertyValue( PROPERTY_XSD_DATA_TYPE ) >>= sNewDataTypeName );
-                firePropertyChange( PROPERTY_XSD_DATA_TYPE, makeAny( sOldDataTypeName ), makeAny( sNewDataTypeName ) );
+                firePropertyChange( PROPERTY_XSD_DATA_TYPE, Any( sOldDataTypeName ), Any( sNewDataTypeName ) );
             }
         }
         catch( const Exception& )
@@ -361,7 +361,7 @@ namespace pcr
                 sal_Int32 nDesiredFormat = xFormatTypes->getStandardFormat( nNumberFormatType, SvtSysLocale().GetLanguageTag().getLocale() );
 
                 // set this at the introspectee
-                m_xControlModel->setPropertyValue( PROPERTY_FORMATKEY, makeAny( nDesiredFormat ) );
+                m_xControlModel->setPropertyValue( PROPERTY_FORMATKEY, Any( nDesiredFormat ) );
             }
         }
         catch( const Exception& )
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 3f61549b62d0..1f8351cdbcc5 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -102,9 +102,9 @@ namespace pcr
         switch ( nPropId )
         {
         // common facets
-        case PROPERTY_ID_XSD_DATA_TYPE:  aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : makeAny( OUString() ); break;
-        case PROPERTY_ID_XSD_WHITESPACES:aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_WHITESPACES ) : makeAny( WhiteSpaceTreatment::Preserve ); break;
-        case PROPERTY_ID_XSD_PATTERN:    aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : makeAny( OUString() ); break;
+        case PROPERTY_ID_XSD_DATA_TYPE:  aReturn = pType.is() ? pType->getFacet( PROPERTY_NAME ) : Any( OUString() ); break;
+        case PROPERTY_ID_XSD_WHITESPACES:aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_WHITESPACES ) : Any( WhiteSpaceTreatment::Preserve ); break;
+        case PROPERTY_ID_XSD_PATTERN:    aReturn = pType.is() ? pType->getFacet( PROPERTY_XSD_PATTERN ) : Any( OUString() ); break;
 
         // all other properties are simply forwarded, if they exist at the given type
         default:
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index b9b64a4dfb9c..8669f890e798 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -206,7 +206,7 @@ uno::Reference< beans::XPropertySet > createMenuBarUI(
             xServiceManager->createInstanceWithContext( "com.sun.star.setup.UpdateCheckUI", xContext ),
             uno::UNO_QUERY_THROW);
 
-    xMenuBarUI->setPropertyValue( PROPERTY_CLICK_HDL, uno::makeAny( xJob ) );
+    xMenuBarUI->setPropertyValue( PROPERTY_CLICK_HDL, uno::Any( xJob ) );
 
     return xMenuBarUI;
 }
@@ -724,7 +724,7 @@ ShutdownThread::run()
     // Tell QuickStarter not to veto ..
     uno::Reference< css::beans::XFastPropertySet > xQuickStarter = css::office::Quickstart::createDefault(m_xContext);
 
-    xQuickStarter->setFastPropertyValue(0, uno::makeAny(false));
+    xQuickStarter->setFastPropertyValue(0, uno::Any(false));
 
     // Shutdown the office
     uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(m_xContext);
@@ -1390,18 +1390,18 @@ void UpdateCheck::handleMenuBarUI( const rtl::Reference< UpdateHandler >& rUpdat
     {
         if( UPDATESTATE_NO_UPDATE_AVAIL == eState )
         {
-            xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::makeAny(false) );
+            xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::Any(false) );
         }
         else
         {
-            xMenuBarUI->setPropertyValue( PROPERTY_TITLE, uno::makeAny(rUpdateHandler->getBubbleTitle(eState)) );
-            xMenuBarUI->setPropertyValue( PROPERTY_TEXT, uno::makeAny(rUpdateHandler->getBubbleText(eState)) );
+            xMenuBarUI->setPropertyValue( PROPERTY_TITLE, uno::Any(rUpdateHandler->getBubbleTitle(eState)) );
+            xMenuBarUI->setPropertyValue( PROPERTY_TEXT, uno::Any(rUpdateHandler->getBubbleText(eState)) );
 
             if( ! suppressBubble && ( ! rUpdateHandler->isVisible() || rUpdateHandler->isMinimized() ) )
-                xMenuBarUI->setPropertyValue( PROPERTY_SHOW_BUBBLE, uno::makeAny( true ) );
+                xMenuBarUI->setPropertyValue( PROPERTY_SHOW_BUBBLE, uno::Any( true ) );
 
             if( UPDATESTATE_CHECKING != eState )
-                xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::makeAny(true) );
+                xMenuBarUI->setPropertyValue( PROPERTY_SHOW_MENUICON, uno::Any(true) );
         }
     }
 }
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 6a9236ed6987..e728d91e77f1 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -316,7 +316,7 @@ UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64
 {
     const sal_uInt8 nItems = 2;
     const OUString aNameList[nItems] = { OUString(LOCAL_FILE), OUString(DOWNLOAD_SIZE) };
-    const uno::Any aValueList[nItems] = { uno::makeAny(rLocalFileName), uno::makeAny(nFileSize) };
+    const uno::Any aValueList[nItems] = { uno::Any(rLocalFileName), uno::Any(nFileSize) };
 
     for( sal_uInt8 i=0; i < nItems; ++i )
     {
@@ -347,7 +347,7 @@ UpdateCheckConfig::clearLocalFileName()
 void
 UpdateCheckConfig::storeDownloadPaused(bool paused)
 {
-    replaceByName(DOWNLOAD_PAUSED , uno::makeAny(paused));
+    replaceByName(DOWNLOAD_PAUSED , uno::Any(paused));
     commitChanges();
 }
 
@@ -359,7 +359,7 @@ UpdateCheckConfig::updateLastChecked()
 
     sal_Int64 lastCheck = systime.Seconds;
 
-    replaceByName(LAST_CHECK, uno::makeAny(lastCheck));
+    replaceByName(LAST_CHECK, uno::Any(lastCheck));
 }
 
 void
@@ -370,17 +370,17 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aC
 
     uno::Any aValues[nUpdateEntryProperties] =
     {
-        uno::makeAny(rInfo.Version),
-        uno::makeAny(rInfo.BuildId),
-        uno::makeAny(rInfo.Description),
-        uno::makeAny(rInfo.Sources[0].URL),
-        uno::makeAny(rInfo.Sources[0].IsDirect),
-        uno::makeAny(getReleaseNote(rInfo, 1, autoDownloadEnabled) ),
-        uno::makeAny(getReleaseNote(rInfo, 2, autoDownloadEnabled) ),
-        uno::makeAny(getReleaseNote(rInfo, 3, autoDownloadEnabled) ),
-        uno::makeAny(getReleaseNote(rInfo, 4, autoDownloadEnabled) ),
-        uno::makeAny(getReleaseNote(rInfo, 5, autoDownloadEnabled) ),
-        uno::makeAny(aCurrentBuild)
+        uno::Any(rInfo.Version),
+        uno::Any(rInfo.BuildId),
+        uno::Any(rInfo.Description),
+        uno::Any(rInfo.Sources[0].URL),
+        uno::Any(rInfo.Sources[0].IsDirect),
+        uno::Any(getReleaseNote(rInfo, 1, autoDownloadEnabled) ),
+        uno::Any(getReleaseNote(rInfo, 2, autoDownloadEnabled) ),
+        uno::Any(getReleaseNote(rInfo, 3, autoDownloadEnabled) ),
+        uno::Any(getReleaseNote(rInfo, 4, autoDownloadEnabled) ),
+        uno::Any(getReleaseNote(rInfo, 5, autoDownloadEnabled) ),
+        uno::Any(aCurrentBuild)
     };
 
     OUString aName;
@@ -412,7 +412,7 @@ UpdateCheckConfig::clearUpdateFound()
         } catch(const lang::WrappedTargetException& ) {
             // Can not remove value, probably in share layer
             OSL_ASSERT(false);
-            m_xContainer->replaceByName(aName, uno::makeAny(OUString()));
+            m_xContainer->replaceByName(aName, uno::Any(OUString()));
         }
     }
 
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 4ccf0f4fcc20..24fb96bdafbb 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -145,7 +145,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots )
             aLabel += "...";
 
         setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "Label", uno::Any( aLabel ) );
-        setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DOWNLOAD2 ) );
+        setControlProperty( msButtonIDs[DOWNLOAD_BUTTON], "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DOWNLOAD2 )) );
 
         mbDownloadBtnHasDots = bAppendDots;
     }
@@ -1035,7 +1035,7 @@ void UpdateHandler::createDialog()
         xPropSet->setPropertyValue( "PositionY", uno::Any(sal_Int32( 100 )) );
         xPropSet->setPropertyValue( "Width", uno::Any(sal_Int32( DIALOG_WIDTH )) );
         xPropSet->setPropertyValue( "Height", uno::Any(sal_Int32( DIALOG_HEIGHT )) );
-        xPropSet->setPropertyValue( "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DLG ) );
+        xPropSet->setPropertyValue( "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DLG )) );
     }
     {   // Label (fixed text) <status>
         uno::Sequence< beans::NamedValue > aProps { { "Label", uno::Any( msStatusFL ) } };
@@ -1060,7 +1060,7 @@ void UpdateHandler::createDialog()
             { "MultiLine", uno::Any( true ) },
             { "ReadOnly", uno::Any( true ) },
             { "AutoVScroll", uno::Any( true ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_STATUS ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_STATUS )) }
         };
 
         insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS,
@@ -1093,7 +1093,7 @@ void UpdateHandler::createDialog()
             { "Enabled", uno::Any( true ) },
             { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
             { "Label", uno::Any( msPauseBtn ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_PAUSE ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_PAUSE )) }
         };
 
         insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[PAUSE_BUTTON],
@@ -1107,7 +1107,7 @@ void UpdateHandler::createDialog()
             { "Enabled", uno::Any( true ) },
             { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
             { "Label", uno::Any( msResumeBtn ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_RESUME ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_RESUME )) }
         };
 
         insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON],
@@ -1124,7 +1124,7 @@ void UpdateHandler::createDialog()
             { "Enabled", uno::Any( true ) },
             { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
             { "Label", uno::Any( msCancelBtn ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_CANCEL ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_CANCEL )) }
         };
 
         insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON],
@@ -1157,7 +1157,7 @@ void UpdateHandler::createDialog()
             { "MultiLine", uno::Any( true ) },
             { "ReadOnly", uno::Any( true ) },
             { "AutoVScroll", uno::Any( true ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DESCRIPTION ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DESCRIPTION )) }
         };
 
         insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION,
@@ -1186,7 +1186,7 @@ void UpdateHandler::createDialog()
             // setProperty( aProps, 2, "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_CANCEL) ) );
             // [property] string Label // only if PushButtonType_STANDARD
             { "Label", uno::Any( msClose ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_CLOSE ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_CLOSE )) }
         };
 
         insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[ CLOSE_BUTTON ],
@@ -1200,7 +1200,7 @@ void UpdateHandler::createDialog()
             { "Enabled", uno::Any( true ) },
             { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
             { "Label", uno::Any( msInstall ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_INSTALL ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_INSTALL )) }
         };
 
         insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[INSTALL_BUTTON],
@@ -1214,7 +1214,7 @@ void UpdateHandler::createDialog()
             { "Enabled", uno::Any( true ) },
             { "PushButtonType", uno::Any( sal_Int16(awt::PushButtonType_STANDARD) ) },
             { "Label", uno::Any( msDownload ) },
-            { "HelpURL", uno::makeAny<OUString>( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DOWNLOAD ) }
+            { "HelpURL", uno::Any(OUString( INET_HID_SCHEME + HID_CHECK_FOR_UPD_DOWNLOAD )) }
         };
 
         insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[DOWNLOAD_BUTTON],
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index c06328da7f79..ee83c3f9b436 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -236,7 +236,7 @@ public:
             if( xContentNode.is() )
                 aEntry.UpdateDocument = m_xUpdateInformationProvider->getDocumentRoot(xContentNode);
 
-            return uno::makeAny(aEntry);
+            return uno::Any(aEntry);
         }
         catch( ucb::CommandAbortedException const &)
         {
@@ -279,7 +279,7 @@ public:
             throw container::NoSuchElementException(OUString::number(m_nCount), *this);
 
         ++m_nCount;
-        return uno::makeAny(m_aEntry);
+        return uno::Any(m_aEntry);
     };
 
 private:
@@ -448,7 +448,7 @@ UpdateInformationProvider::load(const OUString& rURL)
 
     // Disable KeepAlive in webdav - don't want millions of office
     // instances phone home & clog up servers
-    uno::Sequence< beans::NamedValue > aProps { { "KeepAlive", uno::makeAny(false) } };
+    uno::Sequence< beans::NamedValue > aProps { { "KeepAlive", uno::Any(false) } };
 
     ucb::OpenCommandArgument3 aOpenArgument;
     aOpenArgument.Mode = ucb::OpenMode::DOCUMENT;