More loplugin:cstylecast on Windows

Automatic rewrite (of loplugin:cstylecast and loplugin:unnecessaryparen) after
cab0427cadddb3aaf1349c66f2fa13a4234ba4b2 "Enable loplugin:cstylecast for some
more cases" and a409d32e7f6fc09e041079d6dbc3c927497adfed "More
loplugin:cstylecast"

Change-Id: Ib3355159dd08333e1b7a8d091caf2069cdcc7862
Reviewed-on: https://gerrit.libreoffice.org/48317
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 26 insertions, 26 deletions

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 731c453c9cf0..fb333d862a61 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -141,7 +141,7 @@ void DocumentHolder::LoadDocInFrame( bool bPluginMode )
             aSeq[nLen-1] = beans::PropertyValue(
                 "PluginMode",
                 -1,
-                uno::Any((sal_Int16) 3),
+                uno::Any(sal_Int16(3)),
                 beans::PropertyState_DIRECT_VALUE);
         }
 
@@ -538,18 +538,18 @@ BOOL DocumentHolder::InPlaceMenuCreate()
     int help = count-1;
 
     // start with 1, because we don't include "File"
-    WORD pos = (WORD)mgw.width[0];
+    WORD pos = static_cast<WORD>(mgw.width[0]);
     CopyToOLEMenu(m_nMenuHandle,1,hMenu,pos);
     mgw.width[1] = 1;
 
     // insert object menu here
-    pos = ((WORD)(mgw.width[0] + mgw.width[1] + mgw.width[2]));
+    pos = static_cast<WORD>(mgw.width[0] + mgw.width[1] + mgw.width[2]);
     for(WORD i = 2; i < help-1; ++i,++pos)
         CopyToOLEMenu(m_nMenuHandle,i,hMenu,pos);
     mgw.width[3] = help - 3;
 
     // insert help menu
-    pos = (WORD)(mgw.width[0] + mgw.width[1] + mgw.width[2] +
+    pos = static_cast<WORD>(mgw.width[0] + mgw.width[1] + mgw.width[2] +
                  mgw.width[3] + mgw.width[4]);
     CopyToOLEMenu(m_nMenuHandle,WORD(help),hMenu,pos);
     mgw.width[5] = 1;
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index c05e9d2def12..11b1709c71c1 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -118,8 +118,8 @@ STDMETHODIMP EmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pM
     }
     else
     {
-        CLIPFORMAT cf_embSource = (CLIPFORMAT)RegisterClipboardFormatW( L"Embed Source" );
-        CLIPFORMAT cf_embObj = (CLIPFORMAT)RegisterClipboardFormatW( L"Embedded Object" );
+        CLIPFORMAT cf_embSource = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embed Source" ));
+        CLIPFORMAT cf_embObj = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
         if ( pFormatetc->cfFormat == cf_embSource || pFormatetc->cfFormat == cf_embObj )
         {
             if ( !( pFormatetc->tymed & TYMED_ISTORAGE ) )
@@ -157,8 +157,8 @@ STDMETHODIMP EmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM
       || pFormatetc->dwAspect == DVASPECT_DOCPRINT )
         return DV_E_DVASPECT;
 
-    CLIPFORMAT cf_embSource = (CLIPFORMAT)RegisterClipboardFormatW( L"Embed Source" );
-    CLIPFORMAT cf_embObj = (CLIPFORMAT)RegisterClipboardFormatW( L"Embedded Object" );
+    CLIPFORMAT cf_embSource = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embed Source" ));
+    CLIPFORMAT cf_embObj = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
 
     if ( pFormatetc->cfFormat == cf_embSource || pFormatetc->cfFormat == cf_embObj )
     {
@@ -204,8 +204,8 @@ STDMETHODIMP EmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
         }
         else
         {
-            CLIPFORMAT cf_embSource = (CLIPFORMAT)RegisterClipboardFormatW( L"Embed Source" );
-            CLIPFORMAT cf_embObj = (CLIPFORMAT)RegisterClipboardFormatW( L"Embedded Object" );
+            CLIPFORMAT cf_embSource = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embed Source" ));
+            CLIPFORMAT cf_embObj = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
             if ( pFormatetc->cfFormat == cf_embSource || pFormatetc->cfFormat == cf_embObj )
             {
                 if ( !( pFormatetc->tymed & TYMED_ISTORAGE ) )
@@ -241,8 +241,8 @@ STDMETHODIMP EmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn
     }
     else
     {
-        CLIPFORMAT cf_embSource = (CLIPFORMAT)RegisterClipboardFormatW( L"Embed Source" );
-        CLIPFORMAT cf_embObj = (CLIPFORMAT)RegisterClipboardFormatW( L"Embedded Object" );
+        CLIPFORMAT cf_embSource = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embed Source" ));
+        CLIPFORMAT cf_embObj = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
         if ( pFormatetcIn->cfFormat == cf_embSource || pFormatetcIn->cfFormat == cf_embObj )
         {
             pFormatetcOut->tymed = TYMED_ISTORAGE;
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index e60a6b102fed..b863cd8270ef 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -79,7 +79,7 @@ uno::Reference< io::XInputStream > createTempXInStreamFromIStream(
     hr = pStream->Stat( &aStat, STATFLAG_NONAME );
     if ( FAILED( hr ) ) return xResult;
 
-    sal_uInt32 nSize = (sal_uInt32)aStat.cbSize.QuadPart;
+    sal_uInt32 nSize = static_cast<sal_uInt32>(aStat.cbSize.QuadPart);
     sal_uInt32 nCopied = 0;
     uno::Sequence< sal_Int8 > aBuffer( nConstBufferSize );
     try
@@ -423,7 +423,7 @@ STDMETHODIMP EmbedDocument_Impl::InitNew( IStorage *pStg )
                 if ( hr == S_OK )
                 {
                     wchar_t const * aCurType = getStorageTypeFromGUID_Impl( &m_guid ); // ???
-                    CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatW( L"Embedded Object" );
+                    CLIPFORMAT cf = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
                     hr = WriteFmtUserTypeStg( pStg,
                                             cf,                         // ???
                                             const_cast<wchar_t *>(aCurType) );
@@ -743,7 +743,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
     if ( FAILED( hr ) || !m_pMasterStorage ) return E_FAIL;
 
     o3tl::u16string_view aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
-    CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatW( L"Embedded Object" );
+    CLIPFORMAT cf = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
     hr = WriteFmtUserTypeStg( m_pMasterStorage,
                             cf,                         // ???
                             const_cast<LPOLESTR>( o3tl::toW(aCurType.data())) );
@@ -794,7 +794,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
         if ( hr == S_OK )
         {
             aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ???
-            cf = (CLIPFORMAT)RegisterClipboardFormatW( L"Embedded Object" );
+            cf = static_cast<CLIPFORMAT>(RegisterClipboardFormatW( L"Embedded Object" ));
             hr = WriteFmtUserTypeStg( m_pMasterStorage,
                                     cf,                         // ???
                                     const_cast<LPOLESTR>( o3tl::toW(aCurType.data())) );
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index ac7a05857ad1..ba8582c97fad 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -89,7 +89,7 @@ HBRUSH HalftoneBrush()
     {
         WORD grayPattern[8];
         for (int i = 0; i < 8; i++)
-            grayPattern[i] = (WORD)(0x5555 << (i & 1));
+            grayPattern[i] = static_cast<WORD>(0x5555 << (i & 1));
         HBITMAP grayBitmap = CreateBitmap(8, 8, 1, 1, &grayPattern);
         if (grayBitmap != nullptr)
         {
@@ -292,7 +292,7 @@ int Tracker::HitTest(POINT point) const
     if (PtInRect(&rectTrue,point))
     {
         if ((m_nStyle & (resizeInside|resizeOutside)) != 0)
-            hitResult = (TrackerHit)HitTestHandles(point);
+            hitResult = static_cast<TrackerHit>(HitTestHandles(point));
         else
             hitResult = hitMiddle;
     }
@@ -325,7 +325,7 @@ BOOL Tracker::SetCursor(HWND pWnd, UINT nHitTest) const
     {
         // only for trackers with hatchedBorder (ie. in-place resizing)
         if (m_nStyle & hatchedBorder)
-            nHandle = (TrackerHit)9;
+            nHandle = TrackerHit(9);
     }
 
     ::SetCursor(afxCursors[nHandle]);
@@ -408,9 +408,9 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo)
             rectOld = m_rect;
             // handle resize cases (and part of move)
             if (px != nullptr)
-                *px = (int)(short)LOWORD(msg.lParam) - xDiff;
+                *px = static_cast<int>(static_cast<short>(LOWORD(msg.lParam))) - xDiff;
             if (py != nullptr)
-                *py = (int)(short)HIWORD(msg.lParam) - yDiff;
+                *py = static_cast<int>(static_cast<short>(HIWORD(msg.lParam))) - yDiff;
 
             // handle move case
             if (nHandle == hitMiddle)
@@ -639,7 +639,7 @@ void Tracker::Draw(HDC hDC) const
         {
             if (mask & (1<<i))
             {
-                GetHandleRect((TrackerHit)i, &rect);
+                GetHandleRect(static_cast<TrackerHit>(i), &rect);
                 // FillSolidRect(hDC,rect, RGB(0, 0, 0));
                 FillRect(hDC,&rect,hbrush);
             }
@@ -741,11 +741,11 @@ int Tracker::NormalizeHit(int nHandle) const
     const AFX_HANDLEINFO* pHandleInfo = &afxHandleInfo[nHandle];
     if (m_rect.right - m_rect.left < 0)
     {
-        nHandle = (TrackerHit)pHandleInfo->nInvertX;
+        nHandle = static_cast<TrackerHit>(pHandleInfo->nInvertX);
         pHandleInfo = &afxHandleInfo[nHandle];
     }
     if (m_rect.bottom - m_rect.top < 0)
-        nHandle = (TrackerHit)pHandleInfo->nInvertY;
+        nHandle = static_cast<TrackerHit>(pHandleInfo->nInvertY);
     return nHandle;
 }
 
@@ -765,9 +765,9 @@ int Tracker::HitTestHandles(POINT point) const
     {
         if (mask & (1<<i))
         {
-            GetHandleRect((TrackerHit)i, &rect);
+            GetHandleRect(static_cast<TrackerHit>(i), &rect);
             if (PtInRect(&rect,point))
-                return (TrackerHit)i;
+                return static_cast<TrackerHit>(i);
         }
     }