[Libreoffice-commits] core.git: extensions/source
Stephan Bergmann
sbergman at redhat.com
Tue Feb 28 16:57:52 UTC 2017
extensions/source/update/check/download.cxx | 4 ++--
extensions/source/update/check/updatecheckconfig.cxx | 14 +++++++-------
extensions/source/update/check/updatehdl.cxx | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 9697b14b65e923f5b9fdfcc27cad00387372d202
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Feb 28 17:57:12 2017 +0100
loplugin:unoany
Change-Id: I57f1d614b1dbb945e39b546fec2fdaac40de82b2
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 43320b5..4b4afea 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -181,10 +181,10 @@ Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort)
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
- aProperty.Value = uno::makeAny( OUString("org.openoffice.Inet/Settings") );
+ aProperty.Value <<= OUString("org.openoffice.Inet/Settings");
uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] = uno::makeAny( aProperty );
+ aArgumentList[0] <<= 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 d98a905..e61f7ed 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -229,22 +229,22 @@ UpdateCheckConfig::get(
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
- aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments") );
+ aProperty.Value <<= OUString("org.openoffice.Office.Jobs/Jobs/UpdateCheck/Arguments");
uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] = uno::makeAny( aProperty );
+ aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameContainer > xContainer(
xConfigProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationUpdateAccess", aArgumentList ),
uno::UNO_QUERY_THROW );
- aProperty.Value = uno::makeAny( OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates") );
- aArgumentList[0] = uno::makeAny( aProperty );
+ aProperty.Value <<= OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/IgnoredUpdates");
+ aArgumentList[0] <<= aProperty;
uno::Reference< container::XNameContainer > xIgnoredExt( xConfigProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationUpdateAccess", aArgumentList ), uno::UNO_QUERY_THROW );
- aProperty.Value = uno::makeAny( OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates") );
- aArgumentList[0] = uno::makeAny( aProperty );
+ aProperty.Value <<= OUString("/org.openoffice.Office.ExtensionManager/ExtensionUpdateData/AvailableUpdates");
+ aArgumentList[0] <<= 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 );
@@ -472,7 +472,7 @@ UpdateCheckConfig::getByName( const OUString& aName )
aValue >>= aStr;
if( aStr.isEmpty() )
- aValue = uno::makeAny(getDesktopDirectory());
+ aValue <<= getDesktopDirectory();
}
return aValue;
}
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 6a18544..1fb0bae 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -816,10 +816,10 @@ void UpdateHandler::setFullVersion( OUString& rString )
beans::PropertyValue aProperty;
aProperty.Name = "nodepath";
- aProperty.Value = uno::makeAny( OUString("org.openoffice.Setup/Product") );
+ aProperty.Value <<= OUString("org.openoffice.Setup/Product");
uno::Sequence< uno::Any > aArgumentList( 1 );
- aArgumentList[0] = uno::makeAny( aProperty );
+ aArgumentList[0] <<= aProperty;
uno::Reference< uno::XInterface > xConfigAccess;
xConfigAccess = xConfigurationProvider->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess",
More information about the Libreoffice-commits
mailing list