[Libreoffice-commits] core.git: canvas/source fpicker/source sal/osl shell/source stoc/source tools/source vcl/win

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 31 10:00:11 UTC 2019


 canvas/source/directx/dx_textlayout_drawhelper.cxx         |    4 ++--
 fpicker/source/win32/VistaFilePickerImpl.cxx               |    4 ++--
 sal/osl/w32/file.cxx                                       |    4 ++--
 shell/source/win32/shlxthandler/util/iso8601_converter.cxx |    2 +-
 stoc/source/typeconv/convert.cxx                           |    4 ++--
 tools/source/stream/strmwnt.cxx                            |    2 +-
 vcl/win/gdi/salprn.cxx                                     |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 553fcbbb39a674df34475fc92a1ee3410d68c215
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jan 30 14:28:53 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jan 31 10:59:40 2019 +0100

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

diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 7441bbbf933b..a1ee370b0d85 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -134,7 +134,7 @@ namespace dxcanvas
             {
                 const Size aSize = xVirtualDevice->GetFontMetric( aFont ).GetFontSize();
                 const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 );
-                double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
+                double fStretch = rFontMatrix.m00 + rFontMatrix.m01;
 
                 if( !::basegfx::fTools::equalZero( fDividend) )
                     fStretch /= fDividend;
@@ -264,7 +264,7 @@ namespace dxcanvas
         {
             const Size aSize = xVirtualDevice->GetFontMetric( aFont ).GetFontSize();
             const double fDividend( rFontMatrix.m10 + rFontMatrix.m11 );
-            double fStretch = (rFontMatrix.m00 + rFontMatrix.m01);
+            double fStretch = rFontMatrix.m00 + rFontMatrix.m01;
 
             if( !::basegfx::fTools::equalZero( fDividend) )
                 fStretch /= fDividend;
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx
index d404e71b71d4..368af5562fbd 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -425,7 +425,7 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)
     ::osl::ResettableMutexGuard aLock(m_aMutex);
 
     OUString sTitle;
-    ::sal_Int32     nRealIndex = (nIndex-1); // COM dialog base on 1 ... filter container on 0 .-)
+    ::sal_Int32     nRealIndex = nIndex-1; // COM dialog base on 1 ... filter container on 0 .-)
     if (
         (nRealIndex >= 0                         ) &&
         (m_lFilters.getFilterNameByIndex(nRealIndex, sTitle))
@@ -1002,7 +1002,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
                     if ( SUCCEEDED(hResult) && nFileType > 0 )
                     {
                         // COM dialog base on 1 ... filter container on 0 .-)
-                        ::size_t nRealIndex = (nFileType-1);
+                        ::size_t nRealIndex = nFileType-1;
                         OUString sFilter;
                         if (m_lFilters.getFilterByIndex(nRealIndex, sFilter))
                         {
diff --git a/sal/osl/w32/file.cxx b/sal/osl/w32/file.cxx
index 0c3f3d9621fe..a3600844fd29 100644
--- a/sal/osl/w32/file.cxx
+++ b/sal/osl/w32/file.cxx
@@ -312,7 +312,7 @@ oslFileError FileHandle_Impl::readFileAt(
         for (*pBytesRead = 0; nBytesRequested > 0;)
         {
             LONGLONG const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
-            SIZE_T   const bufpos = (nOffset % m_bufsiz);
+            SIZE_T   const bufpos = nOffset % m_bufsiz;
 
             if (bufptr != m_bufptr)
             {
@@ -391,7 +391,7 @@ oslFileError FileHandle_Impl::writeFileAt(
         for (*pBytesWritten = 0; nBytesToWrite > 0;)
         {
             LONGLONG const bufptr = (nOffset / m_bufsiz) * m_bufsiz;
-            SIZE_T   const bufpos = (nOffset % m_bufsiz);
+            SIZE_T   const bufpos = nOffset % m_bufsiz;
             if (bufptr != m_bufptr)
             {
                 // flush current buffer
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index bf5a23d4da90..7521aa57b0e6 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -139,7 +139,7 @@ std::wstring iso8601_duration_to_local_duration(const std::wstring& iso8601durat
 
     if (days.length() > 0)
     {
-        int h = ((_wtoi(days.c_str()) * 24) + _wtoi(hours.c_str()));
+        int h = (_wtoi(days.c_str()) * 24) + _wtoi(hours.c_str());
         wchar_t buff[10];
         _itow(h, buff, 10);
         hours = buff;
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index bcde920b2942..fd644c64b820 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -64,11 +64,11 @@ static const sal_Int64 SAL_INT64_MIN =
 
 /* MS Visual C++ no conversion from unsigned __int64 to double */
 #ifdef _MSC_VER
-static const double DOUBLE_SAL_UINT64_MAX = (((double(SAL_INT64_MAX)) * 2) + 1);
+static const double DOUBLE_SAL_UINT64_MAX = ((double(SAL_INT64_MAX)) * 2) + 1;
 
 static double unsigned_int64_to_double( sal_uInt64 n )
 {
-    sal_uInt64 n2 = (n / 3);
+    sal_uInt64 n2 = n / 3;
     n -= (2 * n2);
     return (static_cast<double>(static_cast<sal_Int64>(n2)) * 2.0) + static_cast<double>(static_cast<sal_Int64>(n));
 }
diff --git a/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 74e570367ab7..a0aa5c769b1c 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.cxx
@@ -343,7 +343,7 @@ void SvFileStream::Open( const OUString& rFilename, StreamMode nMode )
         ErrCode nErr = ::GetSvError( GetLastError() );
         if(nErr==SVSTREAM_ACCESS_DENIED || nErr==SVSTREAM_SHARING_VIOLATION)
         {
-            nMode &= (~StreamMode::WRITE);
+            nMode &= ~StreamMode::WRITE;
             nAccessMode = GENERIC_READ;
             // OV, 28.1.97: Win32 sets file to length 0
             // if Openaction is CREATE_ALWAYS
diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx
index bcfb83315fb6..9b4085684d81 100644
--- a/vcl/win/gdi/salprn.cxx
+++ b/vcl/win/gdi/salprn.cxx
@@ -397,7 +397,7 @@ static bool ImplUpdateSalJobSetup( WinSalInfoPrinter const * pPrinter, ImplJobSe
     if ( pInst && pVisibleDlgParent )
         nMutexCount = pInst->ReleaseYieldMutexAll();
 
-    BYTE* pOutDevMode = (reinterpret_cast<BYTE*>(pOutBuffer) + pOutBuffer->mnDriverOffset);
+    BYTE* pOutDevMode = reinterpret_cast<BYTE*>(pOutBuffer) + pOutBuffer->mnDriverOffset;
     nRet = DocumentPropertiesW( hWnd, hPrn,
                                 pPrinterNameW,
                                 reinterpret_cast<LPDEVMODEW>(pOutDevMode), reinterpret_cast<LPDEVMODEW>(const_cast<BYTE *>(pInBuffer)), nMode );


More information about the Libreoffice-commits mailing list