summaryrefslogtreecommitdiff
path: root/extensions/source/update
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/update')
-rw-r--r--extensions/source/update/check/download.cxx3
-rw-r--r--extensions/source/update/check/updatecheckconfig.cxx7
-rw-r--r--extensions/source/update/check/updatehdl.cxx3
-rw-r--r--extensions/source/update/check/updateprotocol.cxx3
-rw-r--r--extensions/source/update/feed/updatefeed.cxx14
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx7
6 files changed, 16 insertions, 21 deletions
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 905d16e99a7f..387c1efd7a4f 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -178,8 +178,7 @@ Download::getProxyForURL(std::u16string_view rURL, OString& rHost, sal_Int32& rP
aProperty.Name = "nodepath";
aProperty.Value <<= OUString("org.openoffice.Inet/Settings");
- uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] <<= aProperty;
+ uno::Sequence< uno::Any > aArgumentList{ uno::Any(aProperty) };
uno::Reference< container::XNameAccess > xNameAccess(
xConfigProvider->createInstanceWithArguments(
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index 3c5f163b7226..30e444051e3f 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -226,8 +226,7 @@ UpdateCheckConfig::get(
aProperty.Name = "nodepath";
aProperty.Value <<= OUString("org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments");
- uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] <<= aProperty;
+ uno::Sequence< uno::Any > aArgumentList{ uno::Any(aProperty) };
uno::Reference< container::XNameContainer > xContainer(
xConfigProvider->createInstanceWithArguments(
@@ -235,11 +234,11 @@ UpdateCheckConfig::get(
uno::UNO_QUERY_THROW );
aProperty.Value <<= OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates");
- aArgumentList[0] <<= aProperty;
+ aArgumentList = { uno::Any(aProperty) };
uno::Reference< container::XNameContainer > xIgnoredExt( xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", aArgumentList ), uno::UNO_QUERY_THROW );
aProperty.Value <<= OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates");
- aArgumentList[0] <<= aProperty;
+ aArgumentList = { uno::Any(aProperty) };
uno::Reference< container::XNameContainer > xUpdateAvail( xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", aArgumentList ), uno::UNO_QUERY_THROW );
return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener );
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 16b94d6c9db0..74f7b857828c 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -782,8 +782,7 @@ void UpdateHandler::setFullVersion( OUString& rString )
aProperty.Name = "nodepath";
aProperty.Value <<= OUString("org.openoffice.Setup/Product");
- uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] <<= aProperty;
+ uno::Sequence< uno::Any > aArgumentList{ uno::Any(aProperty) };
uno::Reference< uno::XInterface > xConfigAccess = xConfigurationProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess",
aArgumentList );
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index a2da6a82c716..db8319c799df 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -61,8 +61,7 @@ getBootstrapData(
if( !aValue.isEmpty() )
{
- rRepositoryList.realloc(1);
- rRepositoryList[0] = aValue;
+ rRepositoryList = { aValue };
}
return true;
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 142bd301cffa..c06328da7f79 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -302,8 +302,9 @@ UpdateInformationProvider::UpdateInformationProvider(
uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider(
css::configuration::theDefaultProvider::get(m_xContext));
- m_aRequestHeaderList[0].First = "Accept-Language";
- m_aRequestHeaderList[0].Second = getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/L10N", "ooLocale" );
+ auto pRequestHeaderList = m_aRequestHeaderList.getArray();
+ pRequestHeaderList[0].First = "Accept-Language";
+ pRequestHeaderList[0].Second = getConfigurationItem( xConfigurationProvider, "org.openoffice.Setup/L10N", "ooLocale" );
}
bool
@@ -385,8 +386,9 @@ uno::Sequence< beans::StringPair > SAL_CALL UpdateInformationProvider::getUserRe
aPair.realloc(1);
else
{
- aPair[1].First = "User-Agent";
- aPair[1].Second = aUserAgent;
+ auto pPair = aPair.getArray();
+ pPair[1].First = "User-Agent";
+ pPair[1].Second = aUserAgent;
}
return aPair;
@@ -403,9 +405,7 @@ UpdateInformationProvider::getConfigurationItemAny(uno::Reference<lang::XMultiSe
aProperty.Name = "nodepath";
aProperty.Value <<= node;
- uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] <<= aProperty;
-
+ uno::Sequence< uno::Any > aArgumentList{ uno::Any(aProperty) };
uno::Reference< container::XNameAccess > xNameAccess(
configurationProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationAccess",
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index fbed068c3b4d..6f7443700ec1 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/task/XJob.hpp>
#include <comphelper/processfactory.hxx>
+#include <comphelper/propertyvalue.hxx>
#include <unotools/resmgr.hxx>
#include <vcl/image.hxx>
#include <vcl/menubarupdateicon.hxx>
@@ -140,10 +141,8 @@ Image UpdateCheckUI::GetBubbleImage( OUString const &rURL )
try
{
uno::Reference< graphic::XGraphicProvider > xGraphProvider(graphic::GraphicProvider::create(xContext));
- uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
- aMediaProps[0].Name = "URL";
- aMediaProps[0].Value <<= rURL;
-
+ uno::Sequence< beans::PropertyValue > aMediaProps{ comphelper::makePropertyValue("URL",
+ rURL) };
uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
if ( xGraphic.is() )
{
generated by cgit (git 2.34.1) at 2024-12-27 00:09:59 +0000