1 files changed, 17 insertions, 17 deletions

diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
index 6c59f5fa2b51..76595b111c12 100755
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
@@ -270,7 +270,7 @@ IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent)
     mpPageSet->ReleaseMouse();
     if (GetDispatcher() != NULL &&  pEvent != NULL)
     {
-        USHORT nIndex = mpPageSet->GetItemId (pEvent->GetPosPixel());
+        sal_uInt16 nIndex = mpPageSet->GetItemId (pEvent->GetPosPixel());
         if (nIndex > 0)
             mpPageSet->SelectItem (nIndex);
     }
@@ -286,7 +286,7 @@ IMPL_LINK(MasterPagesSelector, ContextMenuCallback, CommandEvent*, pEvent)
     // center.
     if (GetShellManager() != NULL)
         GetShellManager()->MoveToTop (this);
-    const USHORT nIndex = mpPageSet->GetSelectItemId();
+    const sal_uInt16 nIndex = mpPageSet->GetSelectItemId();
     if (nIndex > 0 && pEvent!=NULL)
     {
         // The position of the upper left corner of the context menu is
@@ -328,7 +328,7 @@ SdPage* MasterPagesSelector::GetSelectedMasterPage (void)
     const ::osl::MutexGuard aGuard (maMutex);
 
     SdPage* pMasterPage = NULL;
-    USHORT nIndex = mpPageSet->GetSelectItemId();
+    sal_uInt16 nIndex = mpPageSet->GetSelectItemId();
     UserData* pData = GetUserData(nIndex);
     if (pData != NULL)
     {
@@ -350,7 +350,7 @@ void MasterPagesSelector::AssignMasterPageToAllSlides (SdPage* pMasterPage)
         if (pMasterPage == NULL)
             break;
 
-        USHORT nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
+        sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
         if (nPageCount == 0)
             break;
 
@@ -360,7 +360,7 @@ void MasterPagesSelector::AssignMasterPageToAllSlides (SdPage* pMasterPage)
         String sFullLayoutName (pMasterPage->GetLayoutName());
         ::sd::slidesorter::SharedPageSelection pPageList (
             new ::sd::slidesorter::SlideSorterViewShell::PageSelection());
-        for (USHORT nPageIndex=0; nPageIndex<nPageCount; nPageIndex++)
+        for (sal_uInt16 nPageIndex=0; nPageIndex<nPageCount; nPageIndex++)
         {
             SdPage* pPage = mrDocument.GetSdPage (nPageIndex, PK_STANDARD);
             if (pPage != NULL
@@ -441,9 +441,9 @@ void MasterPagesSelector::NotifyContainerChangeEvent (const MasterPageContainerC
             if (nIndex >= 0)
             {
                 mpPageSet->SetItemImage (
-                    (USHORT)nIndex,
+                    (sal_uInt16)nIndex,
                     mpContainer->GetPreviewForToken(rEvent.maChildToken));
-                mpPageSet->Invalidate(mpPageSet->GetItemRect((USHORT)nIndex));
+                mpPageSet->Invalidate(mpPageSet->GetItemRect((sal_uInt16)nIndex));
             }
         }
         break;
@@ -478,7 +478,7 @@ MasterPagesSelector::UserData* MasterPagesSelector::GetUserData (int nIndex) con
     const ::osl::MutexGuard aGuard (maMutex);
 
     if (nIndex>0 && nIndex<=mpPageSet->GetItemCount())
-        return reinterpret_cast<UserData*>(mpPageSet->GetItemData((USHORT)nIndex));
+        return reinterpret_cast<UserData*>(mpPageSet->GetItemData((sal_uInt16)nIndex));
     else
         return NULL;
 }
@@ -495,7 +495,7 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData)
         UserData* pOldData = GetUserData(nIndex);
         if (pOldData!=NULL && pOldData!=pData)
             delete pOldData;
-        mpPageSet->SetItemData((USHORT)nIndex, pData);
+        mpPageSet->SetItemData((sal_uInt16)nIndex, pData);
     }
 }
 
@@ -578,7 +578,7 @@ void MasterPagesSelector::Execute (SfxRequest& rRequest)
                 SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
                 if (pDispatcher != NULL)
                 {
-                    USHORT nIndex = mpPageSet->GetSelectItemId();
+                    sal_uInt16 nIndex = mpPageSet->GetSelectItemId();
                     pDispatcher->Execute(SID_MASTERPAGE, SFX_CALLMODE_SYNCHRON);
                     mpPageSet->SelectItem (nIndex);
                     mrBase.GetDrawController().setCurrentPage(xSelectedMaster);
@@ -615,7 +615,7 @@ void MasterPagesSelector::GetState (SfxItemSet& rItemSet)
 
 
 void MasterPagesSelector::SetItem (
-    USHORT nIndex,
+    sal_uInt16 nIndex,
     MasterPageContainer::Token aToken)
 {
     const ::osl::MutexGuard aGuard (maMutex);
@@ -664,7 +664,7 @@ void MasterPagesSelector::SetItem (
 
 
 void MasterPagesSelector::AddTokenToIndexEntry (
-    USHORT nIndex,
+    sal_uInt16 nIndex,
     MasterPageContainer::Token aToken)
 {
     const ::osl::MutexGuard aGuard (maMutex);
@@ -676,7 +676,7 @@ void MasterPagesSelector::AddTokenToIndexEntry (
 
 
 void MasterPagesSelector::RemoveTokenToIndexEntry (
-    USHORT nIndex,
+    sal_uInt16 nIndex,
     MasterPageContainer::Token aNewToken)
 {
     const ::osl::MutexGuard aGuard (maMutex);
@@ -702,7 +702,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage)
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
-    for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
+    for (sal_uInt16 nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
     {
         UserData* pData = GetUserData(nIndex);
         if (pData != NULL)
@@ -722,7 +722,7 @@ void MasterPagesSelector::UpdateAllPreviews (void)
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
-    for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
+    for (sal_uInt16 nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
     {
         UserData* pData = GetUserData(nIndex);
         if (pData != NULL)
@@ -745,7 +745,7 @@ void MasterPagesSelector::ClearPageSet (void)
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
-    for (USHORT nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
+    for (sal_uInt16 nIndex=1; nIndex<=mpPageSet->GetItemCount(); nIndex++)
     {
         UserData* pData = GetUserData(nIndex);
         if (pData != NULL)
@@ -817,7 +817,7 @@ void MasterPagesSelector::UpdateItemList (::std::auto_ptr<ItemList> pNewItemList
     ItemList::const_iterator iCurrentItem (maCurrentItemList.begin());
     ItemList::const_iterator iNewEnd (pNewItemList->end());
     ItemList::const_iterator iCurrentEnd (maCurrentItemList.end());
-    USHORT nIndex (1);
+    sal_uInt16 nIndex (1);
 
     // Update existing items.
     for ( ; iNewItem!=iNewEnd && iCurrentItem!=iCurrentEnd; ++iNewItem, ++iCurrentItem,++nIndex)