1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
index 7f4149d7e6fd..29018cb3a3ca 100644..100755
--- a/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
@@ -119,12 +119,12 @@ void CurrentMasterPagesSelector::LateInit (void)
 
 void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
 {
-    USHORT nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD);
+    sal_uInt16 nPageCount = mrDocument.GetMasterSdPageCount(PK_STANDARD);
     SdPage* pMasterPage;
     // Remember the names of the master pages that have been inserted to
     // avoid double insertion.
     ::std::set<String> aMasterPageNames;
-    for (USHORT nIndex=0; nIndex<nPageCount; nIndex++)
+    for (sal_uInt16 nIndex=0; nIndex<nPageCount; nIndex++)
     {
         pMasterPage = mrDocument.GetMasterSdPage (nIndex, PK_STANDARD);
         if (pMasterPage == NULL)
@@ -172,10 +172,10 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
 {
     // Iterate over all pages and for the selected ones put the name of
     // their master page into a set.
-    USHORT nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
+    sal_uInt16 nPageCount = mrDocument.GetSdPageCount(PK_STANDARD);
     SdPage* pPage;
     ::std::set<String> aNames;
-    USHORT nIndex;
+    sal_uInt16 nIndex;
     bool bLoop (true);
     for (nIndex=0; nIndex<nPageCount && bLoop; nIndex++)
     {
@@ -203,7 +203,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
     }
 
     // Find the items for the master pages in the set.
-    USHORT nItemCount (mpPageSet->GetItemCount());
+    sal_uInt16 nItemCount (mpPageSet->GetItemCount());
     for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++)
     {
         String sName (mpPageSet->GetItemText (nIndex));
@@ -232,7 +232,7 @@ void CurrentMasterPagesSelector::Execute (SfxRequest& rRequest)
                 // Removing the precious flag so that the following call to
                 // RemoveUnnessesaryMasterPages() will remove this master page.
                 pMasterPage->SetPrecious(false);
-                mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, FALSE, TRUE);
+                mrDocument.RemoveUnnecessaryMasterPages(pMasterPage, sal_False, sal_True);
             }
         }
         break;