4 files changed, 14 insertions, 14 deletions
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 5a975ec80c49..50acfad99a25 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -273,8 +273,8 @@ void LayoutMenu::Resize()
 
             int nRowCount = CalculateRowCount (aItemSize, nColumnCount);
 
-            SetColCount ((sal_uInt16)nColumnCount);
-            SetLineCount ((sal_uInt16)nRowCount);
+            SetColCount (static_cast<sal_uInt16>(nColumnCount));
+            SetLineCount (static_cast<sal_uInt16>(nRowCount));
         }
     }
 
@@ -579,7 +579,7 @@ void LayoutMenu::Command (const CommandEvent& rEvent)
                 }
                 else
                 {
-                    if (GetSelectItemId() == (sal_uInt16)-1)
+                    if (GetSelectItemId() == sal_uInt16(-1))
                         return;
                     ::tools::Rectangle aBBox (GetItemRect(GetSelectItemId()));
                     aMenuPosition = aBBox.Center();
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 1e13ccf9493c..48deb2505e4e 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -683,14 +683,14 @@ MasterPageContainer::Token MasterPageContainer::Implementation::PutMasterPage (
 bool MasterPageContainer::Implementation::HasToken (Token aToken) const
 {
     return aToken>=0
-        && (unsigned)aToken<maContainer.size()
+        && static_cast<unsigned>(aToken)<maContainer.size()
         && maContainer[aToken].get()!=nullptr;
 }
 
 const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (
     Token aToken) const
 {
-    if (aToken>=0 && (unsigned)aToken<maContainer.size())
+    if (aToken>=0 && static_cast<unsigned>(aToken)<maContainer.size())
         return maContainer[aToken];
     else
         return SharedMasterPageDescriptor();
@@ -698,7 +698,7 @@ const SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescrip
 
 SharedMasterPageDescriptor MasterPageContainer::Implementation::GetDescriptor (Token aToken)
 {
-    if (aToken>=0 && (unsigned)aToken<maContainer.size())
+    if (aToken>=0 && static_cast<unsigned>(aToken)<maContainer.size())
         return maContainer[aToken];
     else
         return SharedMasterPageDescriptor();
@@ -850,7 +850,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel()
                 if (xProperties.is())
                     xProperties->setPropertyValue(
                         "Layout",
-                        makeAny((sal_Int16)AUTOLAYOUT_TITLE));
+                        makeAny(sal_Int16(AUTOLAYOUT_TITLE)));
             }
         }
     }
@@ -978,7 +978,7 @@ bool MasterPageContainer::Implementation::UpdateDescriptor (
 
 void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken)
 {
-    if (aToken>=0 && (unsigned)aToken<maContainer.size())
+    if (aToken>=0 && static_cast<unsigned>(aToken)<maContainer.size())
     {
         maContainer[aToken].reset();
     }
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index a7b4eb40fccc..53d13a1112e9 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -415,9 +415,9 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC
             if (nIndex >= 0)
             {
                 PreviewValueSet::SetItemImage (
-                    (sal_uInt16)nIndex,
+                    static_cast<sal_uInt16>(nIndex),
                     mpContainer->GetPreviewForToken(rEvent.maChildToken));
-                PreviewValueSet::Invalidate(PreviewValueSet::GetItemRect((sal_uInt16)nIndex));
+                PreviewValueSet::Invalidate(PreviewValueSet::GetItemRect(static_cast<sal_uInt16>(nIndex)));
             }
         }
         break;
@@ -446,7 +446,7 @@ MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) con
     const ::osl::MutexGuard aGuard (maMutex);
 
     if (nIndex>0 && static_cast<unsigned int>(nIndex)<=PreviewValueSet::GetItemCount())
-        return static_cast<UserData*>(PreviewValueSet::GetItemData((sal_uInt16)nIndex));
+        return static_cast<UserData*>(PreviewValueSet::GetItemData(static_cast<sal_uInt16>(nIndex)));
     else
         return nullptr;
 }
@@ -460,7 +460,7 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData)
         UserData* pOldData = GetUserData(nIndex);
         if (pOldData!=nullptr && pOldData!=pData)
             delete pOldData;
-        PreviewValueSet::SetItemData((sal_uInt16)nIndex, pData);
+        PreviewValueSet::SetItemData(static_cast<sal_uInt16>(nIndex), pData);
     }
 }
 
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx
index c15d89d4e231..c145cb25ef1b 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -94,7 +94,7 @@ sal_uInt16 PreviewValueSet::CalculateColumnCount (int nWidth) const
         else if (mnMaxColumnCount>0 && nColumnCount>mnMaxColumnCount)
             nColumnCount = mnMaxColumnCount;
     }
-    return (sal_uInt16)nColumnCount;
+    return static_cast<sal_uInt16>(nColumnCount);
 }
 
 sal_uInt16 PreviewValueSet::CalculateRowCount (sal_uInt16 nColumnCount) const
@@ -108,7 +108,7 @@ sal_uInt16 PreviewValueSet::CalculateRowCount (sal_uInt16 nColumnCount) const
             nRowCount = 1;
     }
 
-    return (sal_uInt16)nRowCount;
+    return static_cast<sal_uInt16>(nRowCount);
 }
 
 sal_Int32 PreviewValueSet::GetPreferredHeight (sal_Int32 nWidth)