summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-04-13 08:20:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-04-13 14:46:37 +0200
commitfd6d01c95594746602090972d5edabe1b9f281c3 (patch)
tree9032926a32661fb69424efc5ea798c984e07051c /desktop
parentaac4f0660f9599bbf5f74c7ce683d7147b5bd1e7 (diff)
loplugin:sequentialassign in dbaccess..desktop
Change-Id: I3f3108daf208fa8c6be90b28da5503846c27732e Reviewed-on: https://gerrit.libreoffice.org/70698 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx3
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx3
-rw-r--r--desktop/source/lib/init.cxx37
3 files changed, 14 insertions, 29 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 2f74f256e68a..96a9a0881d39 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -301,8 +301,7 @@ void TheExtensionManager::createPackageList()
}
}
- uno::Sequence< uno::Reference< deployment::XPackage > > xNoLicPackages;
- xNoLicPackages = m_xExtensionManager->getExtensionsWithUnacceptedLicenses( SHARED_PACKAGE_MANAGER,
+ uno::Sequence< uno::Reference< deployment::XPackage > > xNoLicPackages = m_xExtensionManager->getExtensionsWithUnacceptedLicenses( SHARED_PACKAGE_MANAGER,
uno::Reference< ucb::XCommandEnvironment >() );
for ( sal_Int32 i = 0; i < xNoLicPackages.getLength(); ++i )
{
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index b6f8887da08e..fae8afe53e62 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -472,8 +472,7 @@ Reference<css::deployment::XPackage> ExtensionManager::backupExtension(
Reference<css::deployment::XPackage> xBackup;
Reference<ucb::XCommandEnvironment> tmpCmdEnv(
new TmpRepositoryCommandEnv(xCmdEnv->getInteractionHandler()));
- Reference<css::deployment::XPackage> xOldExtension;
- xOldExtension = xPackageManager->getDeployedPackage(
+ Reference<css::deployment::XPackage> xOldExtension = xPackageManager->getDeployedPackage(
identifier, fileName, tmpCmdEnv);
if (xOldExtension.is())
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d82a44dd09f5..279232e07c99 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1639,8 +1639,7 @@ static LibreOfficeKitDocument* lo_documentLoadWithOptions(LibreOfficeKit* pThis,
aFilterOptions[3].Value <<= nUpdateDoc;
*/
- uno::Reference<lang::XComponent> xComponent;
- xComponent = xComponentLoader->loadComponentFromURL(
+ uno::Reference<lang::XComponent> xComponent = xComponentLoader->loadComponentFromURL(
aURL, "_blank", 0,
aFilterOptions);
@@ -1737,9 +1736,7 @@ static int lo_runMacro(LibreOfficeKit* pThis, const char *pURL)
uno::Reference < frame::XSynchronousDispatch > xSyncDisp( xD, uno::UNO_QUERY_THROW );
uno::Sequence<css::beans::PropertyValue> aEmpty;
css::beans::PropertyValue aErr;
- uno::Any aRet;
-
- aRet = xSyncDisp->dispatchWithReturnValue( aURL, aEmpty );
+ uno::Any aRet = xSyncDisp->dispatchWithReturnValue( aURL, aEmpty );
aRet >>= aErr;
if (aErr.Name == "ErrorCode")
@@ -1803,20 +1800,17 @@ static bool lo_signDocument(LibreOfficeKit* /*pThis*/,
}
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(xContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext;
- xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
if (!xSecurityContext.is())
return false;
- uno::Reference<xml::crypto::XSecurityEnvironment> xSecurityEnvironment;
- xSecurityEnvironment = xSecurityContext->getSecurityEnvironment();
+ uno::Reference<xml::crypto::XSecurityEnvironment> xSecurityEnvironment = xSecurityContext->getSecurityEnvironment();
uno::Reference<xml::crypto::XCertificateCreator> xCertificateCreator(xSecurityEnvironment, uno::UNO_QUERY);
if (!xCertificateCreator.is())
return false;
- uno::Reference<security::XCertificate> xCertificate;
- xCertificate = xCertificateCreator->createDERCertificateWithPrivateKey(aCertificateSequence, aPrivateKeySequence);
+ uno::Reference<security::XCertificate> xCertificate = xCertificateCreator->createDERCertificateWithPrivateKey(aCertificateSequence, aPrivateKeySequence);
if (!xCertificate.is())
return false;
@@ -4079,13 +4073,11 @@ static bool doc_insertCertificate(LibreOfficeKitDocument* pThis,
return false;
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(xContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext;
- xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
if (!xSecurityContext.is())
return false;
- uno::Reference<xml::crypto::XSecurityEnvironment> xSecurityEnvironment;
- xSecurityEnvironment = xSecurityContext->getSecurityEnvironment();
+ uno::Reference<xml::crypto::XSecurityEnvironment> xSecurityEnvironment = xSecurityContext->getSecurityEnvironment();
uno::Reference<xml::crypto::XCertificateCreator> xCertificateCreator(xSecurityEnvironment, uno::UNO_QUERY);
if (!xCertificateCreator.is())
@@ -4120,8 +4112,7 @@ static bool doc_insertCertificate(LibreOfficeKitDocument* pThis,
std::copy(pPrivateKeyBinary, pPrivateKeyBinary + nPrivateKeySize, aPrivateKeySequence.begin());
}
- uno::Reference<security::XCertificate> xCertificate;
- xCertificate = xCertificateCreator->createDERCertificateWithPrivateKey(aCertificateSequence, aPrivateKeySequence);
+ uno::Reference<security::XCertificate> xCertificate = xCertificateCreator->createDERCertificateWithPrivateKey(aCertificateSequence, aPrivateKeySequence);
if (!xCertificate.is())
return false;
@@ -4152,13 +4143,11 @@ static bool doc_addCertificate(LibreOfficeKitDocument* pThis,
return false;
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer = xml::crypto::SEInitializer::create(xContext);
- uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext;
- xSecurityContext = xSEInitializer->createSecurityContext(OUString());
+ uno::Reference<xml::crypto::XXMLSecurityContext> xSecurityContext = xSEInitializer->createSecurityContext(OUString());
if (!xSecurityContext.is())
return false;
- uno::Reference<xml::crypto::XSecurityEnvironment> xSecurityEnvironment;
- xSecurityEnvironment = xSecurityContext->getSecurityEnvironment();
+ uno::Reference<xml::crypto::XSecurityEnvironment> xSecurityEnvironment = xSecurityContext->getSecurityEnvironment();
uno::Reference<xml::crypto::XCertificateCreator> xCertificateCreator(xSecurityEnvironment, uno::UNO_QUERY);
if (!xCertificateCreator.is())
@@ -4179,8 +4168,7 @@ static bool doc_addCertificate(LibreOfficeKitDocument* pThis,
std::copy(pCertificateBinary, pCertificateBinary + nCertificateBinarySize, aCertificateSequence.begin());
}
- uno::Reference<security::XCertificate> xCertificate;
- xCertificate = xCertificateCreator->addDERCertificateToTheDatabase(aCertificateSequence, "TCu,Cu,Tu");
+ uno::Reference<security::XCertificate> xCertificate = xCertificateCreator->addDERCertificateToTheDatabase(aCertificateSequence, "TCu,Cu,Tu");
if (!xCertificate.is())
return false;
@@ -4464,8 +4452,7 @@ static void preloadData()
}
std::cerr << "\n";
- css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg;
- xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create(
+ css::uno::Reference< css::ui::XAcceleratorConfiguration > xGlobalCfg = css::ui::GlobalAcceleratorConfiguration::create(
comphelper::getProcessComponentContext());
xGlobalCfg->getAllKeyEvents();