diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-22 10:21:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-28 10:47:34 +0200 |
| commit | bfc1600c6ade6f006eb774bffe7caa9c948e8603 (patch) | |
| tree | c660fa18fc6a9e5f05c3cc58fa34411cdc4f4257 /vcl/unx/generic | |
| parent | f9514beb9bfed51aee69227797e74504afed31c6 (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 'vcl/unx/generic')
| -rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 15 | ||||
| -rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/freetypetextrender.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 4 |
4 files changed, 13 insertions, 12 deletions
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 9399cab30527..f7135eeada0a 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -769,15 +769,16 @@ void SalDisplay::ModifierMapping() { KeyCode aNumLock = XKeysymToKeycode( pDisp_, XK_Num_Lock ); - if( aNumLock ) for( int i = ShiftMapIndex; i <= Mod5MapIndex; i++ ) - { - if( pXModMap->modifiermap[i*pXModMap->max_keypermod] == aNumLock ) + if( aNumLock ) + for( int i = ShiftMapIndex; i <= Mod5MapIndex; i++ ) { - bNumLockFromXS_ = False; - nNumLockIndex_ = i; - break; + if( pXModMap->modifiermap[i*pXModMap->max_keypermod] == aNumLock ) + { + bNumLockFromXS_ = False; + nNumLockIndex_ = i; + break; + } } - } } XFreeModifiermap( pXModMap ); diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index 42896c694794..fe6f465b90b6 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -764,7 +764,7 @@ bool WMAdaptor::getNetWmName() && aRealType == XA_WINDOW && nFormat == 32 && nItems != 0 ) - { + { if ( ! GetGenericUnixSalData()->ErrorTrapPop( false ) ) { GetGenericUnixSalData()->ErrorTrapPush(); @@ -850,7 +850,7 @@ bool WMAdaptor::getNetWmName() } GetGenericUnixSalData()->ErrorTrapPush(); } - } + } GetGenericUnixSalData()->ErrorTrapPop(); } diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx index 0e6556b24588..b32b34c2051a 100644 --- a/vcl/unx/generic/gdi/freetypetextrender.cxx +++ b/vcl/unx/generic/gdi/freetypetextrender.cxx @@ -126,7 +126,7 @@ void FreeTypeTextRenderImpl::GetDevFontList( PhysicalFontCollection* pFontCollec aDFA.IncreaseQualityBy( 4096 ); const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID ); rFreetypeManager.AddFontFile(rFileName, nFaceNum, nVariantNum, aInfo.m_nID, aDFA); - } + } // announce glyphcache fonts rFreetypeManager.AnnounceFonts(pFontCollection); diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 6e1c392706a9..43f1b98a224a 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -1042,7 +1042,7 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon ) GetDisplay()->GetRootWindow( m_nXScreen ), &nCount ); for( int i = 0; i < nCount && !bGnomeIconSize; i++ ) - { + { char* pName = XGetAtomName( GetXDisplay(), pProps[i] ); if( pName ) { @@ -1050,7 +1050,7 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon ) bGnomeIconSize = true; XFree( pName ); } - } + } if( pProps ) XFree( pProps ); } |