summaryrefslogtreecommitdiff
path: root/framework/source/dispatch
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-02-08 13:16:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-02-09 17:07:24 +0100
commitcfadf87cf51e0681d5fc4059a973ed1630a8203f (patch)
treef6eebc381a4fba4c282e6a19d4fe53332e66bd0c /framework/source/dispatch
parent0019eac5e5c1e0a9f0a216da7ce56eb5bfff886b (diff)
loplugin:indentation in framework
Change-Id: I9d0ef502eb812499b0372436083f673bb19ff578 Reviewed-on: https://gerrit.libreoffice.org/67557 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/source/dispatch')
-rw-r--r--framework/source/dispatch/dispatchinformationprovider.cxx16
-rw-r--r--framework/source/dispatch/dispatchprovider.cxx6
-rw-r--r--framework/source/dispatch/interceptionhelper.cxx8
3 files changed, 14 insertions, 16 deletions
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index ea0b05cf99ec..1f4e98f41616 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -56,12 +56,12 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
continue;
const css::uno::Sequence< sal_Int16 > lProviderGroups = xProvider->getSupportedCommandGroups();
- sal_Int32 c2 = lProviderGroups.getLength();
- sal_Int32 i2 = 0;
+ sal_Int32 c2 = lProviderGroups.getLength();
+ sal_Int32 i2 = 0;
for (i2=0; i2<c2; ++i2)
{
- const sal_Int16& rGroup = lProviderGroups[i2];
- ::std::vector< sal_Int16 >::const_iterator pGroup =
+ const sal_Int16& rGroup = lProviderGroups[i2];
+ ::std::vector< sal_Int16 >::const_iterator pGroup =
::std::find(lGroups.begin(), lGroups.end(), rGroup);
if (pGroup == lGroups.end())
lGroups.push_back(rGroup);
@@ -89,12 +89,12 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
continue;
const css::uno::Sequence< css::frame::DispatchInformation > lProviderInfos = xProvider->getConfigurableDispatchInformation(nCommandGroup);
- sal_Int32 c2 = lProviderInfos.getLength();
- sal_Int32 i2 = 0;
+ sal_Int32 c2 = lProviderInfos.getLength();
+ sal_Int32 i2 = 0;
for (i2=0; i2<c2; ++i2)
{
- const css::frame::DispatchInformation& rInfo = lProviderInfos[i2];
- auto pInfo = lInfos.find(rInfo.Command);
+ const css::frame::DispatchInformation& rInfo = lProviderInfos[i2];
+ auto pInfo = lInfos.find(rInfo.Command);
if (pInfo == lInfos.end())
lInfos[rInfo.Command] = rInfo;
}
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 7e7bb405ea43..480953f0cb3c 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -217,8 +217,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
else
{
- sal_Int32 nRightFlags = nSearchFlags;
- nRightFlags &= ~css::frame::FrameSearchFlag::CREATE;
+ sal_Int32 nRightFlags = nSearchFlags & ~css::frame::FrameSearchFlag::CREATE;
// try to find any existing target and ask him for his dispatcher
css::uno::Reference< css::frame::XFrame > xFoundFrame = xDesktop->findFrame(sTargetFrameName, nRightFlags);
@@ -385,8 +384,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
else
{
- sal_Int32 nRightFlags = nSearchFlags;
- nRightFlags &= ~css::frame::FrameSearchFlag::CREATE;
+ sal_Int32 nRightFlags = nSearchFlags & ~css::frame::FrameSearchFlag::CREATE;
// try to find any existing target and ask him for his dispatcher
css::uno::Reference< css::frame::XFrame > xFoundFrame = xFrame->findFrame(sTargetFrameName, nRightFlags);
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index 32378f2283a5..9a98285ec720 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -84,10 +84,10 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL InterceptionHelper::queryD
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL InterceptionHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor )
{
- sal_Int32 c = lDescriptor.getLength();
- css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c);
- css::uno::Reference< css::frame::XDispatch >* pDispatches = lDispatches.getArray();
- const css::frame::DispatchDescriptor* pDescriptor = lDescriptor.getConstArray();
+ sal_Int32 c = lDescriptor.getLength();
+ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > lDispatches (c);
+ css::uno::Reference< css::frame::XDispatch >* pDispatches = lDispatches.getArray();
+ const css::frame::DispatchDescriptor* pDescriptor = lDescriptor.getConstArray();
for (sal_Int32 i=0; i<c; ++i)
pDispatches[i] = queryDispatch(pDescriptor[i].FeatureURL, pDescriptor[i].FrameName, pDescriptor[i].SearchFlags);