summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-08 13:14:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-08 13:39:15 +0100
commit347571a6873a4b6bce8733e476fa902830d1a644 (patch)
treeb8bb7b04066d087cb13396b41d879a7343108b7e /desktop
parentloplugin:indentation in cppu..cui (diff)
downloadcore-347571a6873a4b6bce8733e476fa902830d1a644.tar.gz
core-347571a6873a4b6bce8733e476fa902830d1a644.zip
loplugin:indentation in dbaccess..drawinglayer
Change-Id: I05de6c01e827e596c9802c04964f43508dfd4d64 Reviewed-on: https://gerrit.libreoffice.org/67537 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/check_ext_deps.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx6
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx18
-rw-r--r--desktop/source/migration/services/wordbookmigration.cxx4
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx2
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx2
7 files changed, 18 insertions, 18 deletions
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index d241db250a00..15995d99bd64 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -245,7 +245,7 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext
if ( !xExtensionManager.is() )
{
- SAL_WARN( "desktop.app", "Could not get the Extension Manager!" );
+ SAL_WARN( "desktop.app", "Could not get the Extension Manager!" );
return true;
}
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 5b4a03b5d5af..8a92a746ca2f 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -89,7 +89,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
m_sTitle = xPackage->getDisplayName();
m_sVersion = xPackage->getVersion();
m_sDescription = xPackage->getDescription();
- m_sLicenseText = xPackage->getLicenseText();
+ m_sLicenseText = xPackage->getLicenseText();
beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
m_sPublisher = aInfo.First;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index f56c1da379c0..22d4931080b2 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -765,16 +765,16 @@ void BackendImpl::unorc_verify_init(
{
if (token[ 0 ] == '?')
token = token.copy( 1 );
- if (create_ucb_content(
+ if (create_ucb_content(
nullptr, expandUnoRcTerm(token), xCmdEnv,
false /* no throw */ ))
- {
+ {
//The RDB file may not exist anymore if a shared or bundled
//extension was removed, but it can still be in the unorc.
//After running XExtensionManager::synchronize, the unorc is
//cleaned up
m_rdb_typelibs.push_back( token );
- }
+ }
}
}
while (index >= 0);
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index ec2ffa5b3bec..306b219afeb6 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -554,7 +554,7 @@ OUString BackendImpl::PackageImpl::getTextFromURL(
catch (const css::uno::Exception&)
{
Any exc( ::cppu::getCaughtException() );
- throw css::deployment::DeploymentException(
+ throw css::deployment::DeploymentException(
"Could not read file " + licenseUrl, nullptr, exc);
}
@@ -629,7 +629,7 @@ bool BackendImpl::PackageImpl::checkLicense(
{
::boost::optional<SimpleLicenseAttributes> simplLicAttr
= info.getSimpleLicenseAttributes();
- if (! simplLicAttr)
+ if (! simplLicAttr)
return true;
OUString sLic = info.getLocalizedLicenseURL();
//If we do not get a localized licence then there is an error in the description.xml
@@ -639,7 +639,7 @@ bool BackendImpl::PackageImpl::checkLicense(
throw css::deployment::DeploymentException(
"Could not obtain path to license. Possible error in description.xml", nullptr, Any());
OUString sHref = m_url_expanded + "/" + sLic;
- OUString sLicense = getTextFromURL(xCmdEnv, sHref);
+ OUString sLicense = getTextFromURL(xCmdEnv, sHref);
////determine who has to agree to the license
//check correct value for attribute
if ( ! (simplLicAttr->acceptBy == "user" || simplLicAttr->acceptBy == "admin"))
@@ -775,9 +775,9 @@ uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool
uno::Reference< XComponentContext > xContext( getMyBackend()->getComponentContext() );
uno::Reference< graphic::XGraphicProvider > xGraphProvider( graphic::GraphicProvider::create(xContext) );
- uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
- aMediaProps[0].Name = "URL";
- aMediaProps[0].Value <<= aFullIconURL;
+ uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
+ aMediaProps[0].Name = "URL";
+ aMediaProps[0].Value <<= aFullIconURL;
xGraphic = xGraphProvider->queryGraphic( aMediaProps );
}
@@ -959,11 +959,11 @@ OUString BackendImpl::PackageImpl::getLicenseText()
if ( !aLicenseURL.isEmpty() )
{
OUString aFullURL = m_url_expanded + "/" + aLicenseURL;
- sLicense = getTextFromURL( Reference< ucb::XCommandEnvironment >(), aFullURL);
- }
+ sLicense = getTextFromURL( Reference< ucb::XCommandEnvironment >(), aFullURL);
+ }
}
- return sLicense;
+ return sLicense;
}
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 202b883d11ee..b6f3ee0623b7 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -127,8 +127,8 @@ static bool IsUserWordbook( const OUString& rFile )
pStream->ReadUInt16( nLen );
if ( nLen < MAX_HEADER_LENGTH )
{
- pStream->ReadBytes(pMagicHeader, nLen);
- pMagicHeader[nLen] = '\0';
+ pStream->ReadBytes(pMagicHeader, nLen);
+ pMagicHeader[nLen] = '\0';
if ( !strcmp(pMagicHeader, "WBSWG2")
|| !strcmp(pMagicHeader, "WBSWG5")
|| !strcmp(pMagicHeader, "WBSWG6") )
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 725067c20925..05ca301dbd0a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -406,7 +406,7 @@ extern "C" int unopkg_main()
beans::NamedValue nvSuppress(
"SUPPRESS_LICENSE", option_suppressLicense ?
makeAny(OUString("1")):makeAny(OUString("0")));
- xExtensionManager->addExtension(
+ xExtensionManager->addExtension(
cmdPackage, Sequence<beans::NamedValue>(&nvSuppress, 1),
repository, Reference<task::XAbortChannel>(), xCmdEnv);
}
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 7f1cbffb3488..6a11fdeae059 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -233,7 +233,7 @@ void printf_space( sal_Int32 space )
void printf_line(
OUString const & name, OUString const & value, sal_Int32 level )
{
- printf_space( level );
+ printf_space( level );
dp_misc::writeConsole(name + ": " + value + "\n");
}