[Libreoffice-commits] core.git: cui/source embedserv/source extensions/source sal/osl shell/source tools/source vcl/win

Stephan Bergmann sbergman at redhat.com
Mon Nov 27 20:06:51 UTC 2017


 cui/source/options/optpath.cxx                   |    2 +-
 embedserv/source/embed/intercept.cxx             |    4 ++--
 extensions/source/activex/so_activex.cxx         |    2 +-
 sal/osl/w32/socket.cxx                           |    6 +++---
 shell/source/win32/simplemail/smplmailclient.cxx |    2 +-
 tools/source/stream/strmwnt.cxx                  |    4 ++--
 vcl/win/gdi/salnativewidgets-luna.cxx            |    4 ++--
 vcl/win/gdi/salprn.cxx                           |    2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 2eb0cadf0395c60198e36307222de3dd1e7729a6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 27 15:02:28 2017 +0100

    loplugin:unnecessaryparen (clang-cl)
    
    Change-Id: I5452235287fd5986de25ee542edd57bf1abded52
    Reviewed-on: https://gerrit.libreoffice.org/45338
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 6651c2d22dff..d6595644bdb1 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -496,7 +496,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
 // Unix is case sensitive
         ( sNewPathStr != sWritable );
 #else
-        ( !sNewPathStr.equalsIgnoreAsciiCase( sWritable ) );
+        !sNewPathStr.equalsIgnoreAsciiCase( sWritable );
 #endif
 
     if ( bChanged )
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index 8924d33d8ee0..b383f040a803 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -233,7 +233,7 @@ void Interceptor::generateFeatureStateEvent()
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
                 aStateEvent.FeatureDescriptor = "SaveCopyTo";
-                aStateEvent.State <<= (OUString("($3)"));
+                aStateEvent.State <<= OUString("($3)");
             }
             else
             {
@@ -345,7 +345,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "SaveCopyTo";
         aStateEvent.IsEnabled = true;
         aStateEvent.Requery = false;
-        aStateEvent.State <<= (OUString("($3)"));
+        aStateEvent.State <<= OUString("($3)");
         Control->statusChanged(aStateEvent);
 
         {
diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx
index 2b59692ed804..e5df921505fb 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -737,7 +737,7 @@ STDAPI DllRegisterServer()
 
     HMODULE aCurModule = GetModuleHandleW( bX64 ? X64_LIB_NAME : X32_LIB_NAME );
     DWORD nLibNameLen = sal::static_int_cast<DWORD>(
-            wcslen((bX64) ? X64_LIB_NAME : X32_LIB_NAME));
+            wcslen(bX64 ? X64_LIB_NAME : X32_LIB_NAME));
 
     if( aCurModule )
     {
diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index b3d1e9f52e63..a369d7ab8d87 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -1234,7 +1234,7 @@ sal_Bool SAL_CALL osl_isReceiveReady (
                    &fds,                        /* check read operations */
                    nullptr,                     /* check write ops */
                    nullptr,                     /* ckeck for OOB */
-                   (pTimeout) ? &tv : nullptr)==1); /* use timeout? */
+                   pTimeout ? &tv : nullptr)==1); /* use timeout? */
 }
 
 /*****************************************************************************/
@@ -1263,7 +1263,7 @@ sal_Bool SAL_CALL osl_isSendReady (
                    nullptr,                     /* check read operations */
                    &fds,                        /* check write ops */
                    nullptr,                     /* ckeck for OOB */
-                   (pTimeout) ? &tv : nullptr)==1); /* use timeout? */
+                   pTimeout ? &tv : nullptr)==1); /* use timeout? */
 }
 
 sal_Bool SAL_CALL osl_isExceptionPending (
@@ -1289,7 +1289,7 @@ sal_Bool SAL_CALL osl_isExceptionPending (
                    nullptr,                     /* check read operations */
                    nullptr,                     /* check write ops */
                    &fds,                        /* ckeck for OOB */
-                   (pTimeout) ? &tv : nullptr)==1); /* use timeout? */
+                   pTimeout ? &tv : nullptr)==1); /* use timeout? */
 }
 
 sal_Bool SAL_CALL osl_shutdownSocket (
diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx
index b38061c37037..75cdf75eda11 100644
--- a/shell/source/win32/simplemail/smplmailclient.cxx
+++ b/shell/source/win32/simplemail/smplmailclient.cxx
@@ -102,7 +102,7 @@ namespace /* private */
 
         if (senddocUrl.isEmpty())
         {
-            senddocUrl = ( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc.exe");
+            senddocUrl = "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc.exe";
             rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure
         }
         return senddocUrl;
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 6a549deddcaa..8a626ecc7c76 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -293,9 +293,9 @@ void SvFileStream::Open( const OUString& rFilename, StreamMode nMode )
     if( nMode & StreamMode::SHARE_DENYALL)
         nShareMode = 0;
 
-    if( (nMode & StreamMode::READ) )
+    if( nMode & StreamMode::READ )
         nAccessMode |= GENERIC_READ;
-    if( (nMode & StreamMode::WRITE) )
+    if( nMode & StreamMode::WRITE )
         nAccessMode |= GENERIC_WRITE;
 
     if( nAccessMode == GENERIC_READ )       // ReadOnly ?
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index 73e780ca1584..864e6041d48c 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1075,7 +1075,7 @@ bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
             }
             else if( nPart == ControlPart::MenuItem )
             {
-                if( (nState & ControlState::ENABLED) )
+                if( nState & ControlState::ENABLED )
                     iState = (nState & ControlState::SELECTED) ? MPI_HOT : MPI_NORMAL;
                 else
                     iState = (nState & ControlState::SELECTED) ? MPI_DISABLEDHOT : MPI_DISABLED;
@@ -1083,7 +1083,7 @@ bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc,
             }
             else if( nPart == ControlPart::MenuItemCheckMark || nPart == ControlPart::MenuItemRadioMark )
             {
-                if( (nState & ControlState::PRESSED) )
+                if( nState & ControlState::PRESSED )
                 {
                     RECT aBGRect = rc;
                     if( aValue.getType() == ControlType::MenuPopup )
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index a961bbf4ace2..d107a90717ff 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -973,7 +973,7 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter const * pPrinter, const Imp
             }
         }
     }
-    if( (nFlags & JobSetFlags::DUPLEXMODE) )
+    if( nFlags & JobSetFlags::DUPLEXMODE )
     {
         switch( pSetupData->GetDuplexMode() )
         {


More information about the Libreoffice-commits mailing list