From 6333dcf6f18c5d5a03e5daa267f89c06a528b698 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 20 Feb 2019 14:01:08 +0100 Subject: loplugin:indentation (macOS) * Some .m/.mm files that still contained tabs instead of spaces have been cleaned up with Emacs' untabify (and apple_remote/source/HIDRemoteControlDevice.m needed further manual adaptions): apple_remote/source/GlobalKeyboardDevice.m apple_remote/source/HIDRemoteControlDevice.m apple_remote/source/KeyspanFrontRowControl.m apple_remote/source/RemoteControl.m vcl/osx/a11yrolehelper.mm * Some of the changes predate 0626e66d761de18f62e4d00d427903032da9d517 "Avoid loplugin:indentation after preproc conditional inclusion lines" and would likely have no longer been flagged since. Change-Id: Ibf5faffa743c7f79b36109d9879eb79d63c8c40f Reviewed-on: https://gerrit.libreoffice.org/68090 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- vcl/osx/DataFlavorMapping.cxx | 6 +++--- vcl/osx/a11yrolehelper.mm | 10 +++++----- vcl/osx/a11ywrapper.mm | 2 +- vcl/osx/salframeview.mm | 2 +- vcl/source/outdev/text.cxx | 14 +++++++------- vcl/source/window/winproc.cxx | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'vcl') diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index de8dc8c41338..2390e797ad4e 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -400,7 +400,7 @@ Any PNGDataProvider::getOOoData() oOOData = mData; } - return oOOData; + return oOOData; } class FileListDataProvider : public DataProviderBaseImpl @@ -483,9 +483,9 @@ DataFlavorMapper::~DataFlavorMapper() DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDataFlavor) const { - DataFlavor oOOFlavor; + DataFlavor oOOFlavor; - for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++) + for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++) { if ([systemDataFlavor caseInsensitiveCompare:const_cast(flavorMap[i].SystemFlavor)] == NSOrderedSame) { diff --git a/vcl/osx/a11yrolehelper.mm b/vcl/osx/a11yrolehelper.mm index 0723fbc9c2d3..e42b2d53db8b 100644 --- a/vcl/osx/a11yrolehelper.mm +++ b/vcl/osx/a11yrolehelper.mm @@ -268,11 +268,11 @@ using namespace ::com::sun::star::uno; } +(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole { - id roleDescription; - if ( [ subRole length ] == 0 ) - roleDescription = NSAccessibilityRoleDescription( role, nil ); - else - roleDescription = NSAccessibilityRoleDescription( role, subRole ); + id roleDescription; + if ( [ subRole length ] == 0 ) + roleDescription = NSAccessibilityRoleDescription( role, nil ); + else + roleDescription = NSAccessibilityRoleDescription( role, subRole ); return roleDescription; } diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm index e24b83e5e2c0..555835021650 100644 --- a/vcl/osx/a11ywrapper.mm +++ b/vcl/osx/a11ywrapper.mm @@ -886,7 +886,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { // Make sure the focused object is a descendant of self // do { // if( self == ancestor ) - return focusedUIElement; + return focusedUIElement; // ancestor = [ ancestor accessibilityAttributeValue: NSAccessibilityParentAttribute ]; // } while( nil != ancestor ); diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index a3f727719e74..baf5fa96773e 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -566,7 +566,7 @@ static AquaSalFrame* getMouseContainerFrame() NSPoint aPt = [NSEvent mouseLocation]; NSRect aFrameRect = [pDispatchFrame->getNSWindow() frame]; - if ( ! NSPointInRect( aPt, aFrameRect ) ) + if ( ! NSPointInRect( aPt, aFrameRect ) ) { // no, it is not // now we need to find the one it may be in diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 45b9848c051a..68b7a4ffc250 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -856,13 +856,13 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, if(mpFontInstance->mpConversion) pLayoutCache = nullptr; - #ifdef MACOSX - // FIXME: tdf#112990 - // Cache text layout crashes on mac with OpenGL enabled - // Force it to not use the cache - if(OpenGLHelper::isVCLOpenGLEnabled()) - pLayoutCache = nullptr; - #endif +#ifdef MACOSX + // FIXME: tdf#112990 + // Cache text layout crashes on mac with OpenGL enabled + // Force it to not use the cache + if(OpenGLHelper::isVCLOpenGLEnabled()) + pLayoutCache = nullptr; +#endif std::unique_ptr pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, nullptr, SalLayoutFlags::NONE, nullptr, pLayoutCache); if(pSalLayout) diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index dccd084f668d..b0e1ea918115 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -2065,7 +2065,7 @@ static void ImplHandleSalKeyMod( vcl::Window* pWindow, SalKeyModEvent const * pE if ( nOldCode != nNewCode ) { #ifdef MACOSX - nNewCode |= pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & ~(KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3); + nNewCode |= pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & ~(KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | KEY_MOD3); #else nNewCode |= pWindow->ImplGetWindowImpl()->mpFrameData->mnMouseCode & ~(KEY_SHIFT | KEY_MOD1 | KEY_MOD2); #endif -- cgit