summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-06-22 10:21:21 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-06-28 10:47:34 +0200
commitbfc1600c6ade6f006eb774bffe7caa9c948e8603 (patch)
treec660fa18fc6a9e5f05c3cc58fa34411cdc4f4257 /sd
parentf9514beb9bfed51aee69227797e74504afed31c6 (diff)
loplugin:indentation improve checks for brace alignment
Change-Id: I333100fda7e181f68f36b03279b3fbb8cb768310 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117615 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/sdpage.cxx4
-rw-r--r--sd/source/filter/grf/sdgrffilter.cxx2
-rw-r--r--sd/source/filter/ppt/propread.cxx25
-rw-r--r--sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx2
-rw-r--r--sd/source/ui/app/sdmod1.cxx2
-rw-r--r--sd/source/ui/func/fusel.cxx12
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx2
-rw-r--r--sd/source/ui/tools/PreviewRenderer.cxx2
-rw-r--r--sd/source/ui/unoidl/unosrch.cxx6
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx2
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx2
11 files changed, 31 insertions, 30 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index aaf209a63fe8..098947eb96b4 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1089,7 +1089,7 @@ void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind)
const char* sPageKind = PageKindVector[mePageKind];
if (mePageKind == PageKind::Standard)
- {
+ {
getPresObjProp( *this , "PRESOBJ_TITLE" ,sPageKind, propvalue);
aTitlePos.AdjustX(::tools::Long( aTitleSize.Width() * propvalue[2] ) );
aTitlePos.AdjustY(::tools::Long( aTitleSize.Height() * propvalue[3] ) );
@@ -1560,7 +1560,7 @@ static void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDe
}
}
}
- }
+ }
}
break;
case PresObjKind::Chart:
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index 32ef963e1ed6..103cc37ca606 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -294,7 +294,7 @@ bool SdGRFFilter::Export()
static_cast< SdGRFFilter_ImplInteractionHdl* >( xInteractionHandler.get() )->GetErrorCode(),
rGraphicFilter.GetLastError().nStreamError );
}
- }
+ }
}
}
return bRet;
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 2a1b4e440178..c82c0d791dbd 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -579,20 +579,21 @@ void PropRead::Read()
{
mbStatus = false;
}
- else for ( sal_uInt32 i = 0; i < nSections; i++ )
- {
- mpSvStream->ReadBytes(aSectCLSID.data(), aSectCLSID.size());
- sal_uInt32 nSectionOfs(0);
- mpSvStream->ReadUInt32( nSectionOfs );
- sal_uInt32 nCurrent = mpSvStream->Tell();
- if (checkSeek(*mpSvStream, nSectionOfs))
+ else
+ for ( sal_uInt32 i = 0; i < nSections; i++ )
{
- Section aSection(aSectCLSID.data());
- aSection.Read(mpSvStream.get());
- maSections.push_back(std::make_unique<Section>(aSection));
+ mpSvStream->ReadBytes(aSectCLSID.data(), aSectCLSID.size());
+ sal_uInt32 nSectionOfs(0);
+ mpSvStream->ReadUInt32( nSectionOfs );
+ sal_uInt32 nCurrent = mpSvStream->Tell();
+ if (checkSeek(*mpSvStream, nSectionOfs))
+ {
+ Section aSection(aSectCLSID.data());
+ aSection.Read(mpSvStream.get());
+ maSections.push_back(std::make_unique<Section>(aSection));
+ }
+ mpSvStream->Seek( nCurrent );
}
- mpSvStream->Seek( nCurrent );
- }
}
PropRead& PropRead::operator=( const PropRead& rPropRead )
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index a3915844078b..a1a79a67815f 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -191,7 +191,7 @@ namespace accessibility
if (aHint)
{
Broadcast(*aHint);
- }
+ }
}
} // end of namespace accessibility
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 01d36ee93155..64a149a1334d 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -135,8 +135,8 @@ void SdModule::Execute(SfxRequest& rReq)
break;
default:
break;
- }
}
+ }
}
break;
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 045a61a725bc..44cb043aa185 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -743,13 +743,13 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
* If 3D-rotation bodies are about to be created,
* end creation now
**********************************************************/
- Degree100 nAngle1 = GetAngle(aPnt - mpView->GetRef1());
- nAngle1 -= 27000_deg100;
- nAngle1 = NormAngle36000(nAngle1);
- bool bMirrorSide1 = nAngle1 < 18000_deg100;
+ Degree100 nAngle1 = GetAngle(aPnt - mpView->GetRef1());
+ nAngle1 -= 27000_deg100;
+ nAngle1 = NormAngle36000(nAngle1);
+ bool bMirrorSide1 = nAngle1 < 18000_deg100;
- if (bMirrorSide0 != bMirrorSide1)
- {
+ if (bMirrorSide0 != bMirrorSide1)
+ {
bSuppressChangesOfSelection = true;
mpWindow->EnterWait();
mpView->End3DCreation();
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index b0b8163ff57d..8751a7c6f212 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1005,7 +1005,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx const * pPresSettings )
beans::PropertyState_DIRECT_VALUE );
if( mbUsePen )
- {
+ {
aProperties.emplace_back( "UserPaintColor" ,
// User paint color is black by default.
-1, Any( mnUserPaintColor ),
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index 3f47b7663f2c..3016d4b977e0 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -344,7 +344,7 @@ void PreviewRenderer::PaintFrame()
mpPreviewDevice->SetFillColor();
mpPreviewDevice->DrawRect(aPaintRectangle);
mpPreviewDevice->EnableMapMode();
- }
+ }
}
void PreviewRenderer::SetupOutputSize (
diff --git a/sd/source/ui/unoidl/unosrch.cxx b/sd/source/ui/unoidl/unosrch.cxx
index f8e1da8f02dc..271429c8cdaf 100644
--- a/sd/source/ui/unoidl/unosrch.cxx
+++ b/sd/source/ui/unoidl/unosrch.cxx
@@ -448,9 +448,9 @@ uno::Reference< text::XTextRange > SdUnoSearchReplaceShape::Search( const uno::
if( xEnumAccess.is() )
{
- uno::Reference< container::XEnumeration > xPortionEnum( xEnumAccess->createEnumeration() );
- if( xPortionEnum.is() )
- {
+ uno::Reference< container::XEnumeration > xPortionEnum( xEnumAccess->createEnumeration() );
+ if( xPortionEnum.is() )
+ {
while(xPortionEnum->hasMoreElements())
{
uno::Reference< text::XTextRange > xPortion( xPortionEnum->nextElement(), uno::UNO_QUERY );
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index b3f9b1468b28..60cab73f7b06 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -130,7 +130,7 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest const & rReq )
return;
}
}
- }
+ }
}
Invalidate();
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 0628fd865420..7f4039a0fc5d 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -882,7 +882,7 @@ void ViewShellManager::Implementation::CreateShells()
}
}
}
- }
+ }
}
void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) const