1 files changed, 21 insertions, 21 deletions

diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index ab108fd1991a..50c5e99ad4f9 100755
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -103,12 +103,12 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable)
             for (int nIndex=0; nIndex<nBookmarkCount; nIndex++)
             {
                 String sName (*(String*) pBookmarks->GetObject(nIndex));
-                BOOL bIsMasterPage;
+                sal_Bool bIsMasterPage;
 
-                // SdPage* GetMasterSdPage(USHORT nPgNum, PageKind ePgKind);
-                // USHORT GetMasterSdPageCount(PageKind ePgKind) const;
+                // SdPage* GetMasterSdPage(sal_uInt16 nPgNum, PageKind ePgKind);
+                // sal_uInt16 GetMasterSdPageCount(PageKind ePgKind) const;
 
-                USHORT nBMPage = pDocument->GetPageByName (
+                sal_uInt16 nBMPage = pDocument->GetPageByName (
                     sName, bIsMasterPage);
                 if ( ! bIsMasterPage)
                 {
@@ -172,7 +172,7 @@ void ViewClipboard::AssignMasterPage (
         // appended again by SetMasterPage() to the given name.  Don't ask.
         String sLayoutSuffix (RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR));
         sLayoutSuffix.Append (SdResId(STR_LAYOUT_OUTLINE));
-        USHORT nLength = sLayoutSuffix.Len();
+        sal_uInt16 nLength = sLayoutSuffix.Len();
         String sLayoutName (pMasterPage->GetLayoutName());
         if (String(sLayoutName, sLayoutName.Len()-nLength, nLength).Equals (
             sLayoutSuffix))
@@ -182,8 +182,8 @@ void ViewClipboard::AssignMasterPage (
             pPage->GetPageNum() / 2,
             sLayoutName,
             pSourceDocument,
-            FALSE, // Exchange the master page of only the target page.
-            FALSE // Keep unused master pages.
+            sal_False, // Exchange the master page of only the target page.
+            sal_False // Keep unused master pages.
             );
     }
     while (false);
@@ -192,16 +192,16 @@ void ViewClipboard::AssignMasterPage (
 
 
 
-USHORT ViewClipboard::DetermineInsertPosition  (
+sal_uInt16 ViewClipboard::DetermineInsertPosition  (
     const SdTransferable& )
 {
     SdDrawDocument* pDoc = mrView.GetDoc();
-    USHORT nPgCnt = pDoc->GetSdPageCount( PK_STANDARD );
+    sal_uInt16 nPgCnt = pDoc->GetSdPageCount( PK_STANDARD );
 
     // Insert position is the behind the last selected page or behind the
     // last page when the selection is empty.
-    USHORT nInsertPos = pDoc->GetSdPageCount( PK_STANDARD ) * 2 + 1;
-    for( USHORT nPage = 0; nPage < nPgCnt; nPage++ )
+    sal_uInt16 nInsertPos = pDoc->GetSdPageCount( PK_STANDARD ) * 2 + 1;
+    for( sal_uInt16 nPage = 0; nPage < nPgCnt; nPage++ )
     {
         SdPage* pPage = pDoc->GetSdPage( nPage, PK_STANDARD );
 
@@ -215,14 +215,14 @@ USHORT ViewClipboard::DetermineInsertPosition  (
 
 
 
-USHORT ViewClipboard::InsertSlides (
+sal_uInt16 ViewClipboard::InsertSlides (
     const SdTransferable& rTransferable,
-    USHORT nInsertPosition)
+    sal_uInt16 nInsertPosition)
 {
     SdDrawDocument* pDoc = mrView.GetDoc();
 
-    USHORT nInsertPgCnt = 0;
-    BOOL bMergeMasterPages = !rTransferable.HasSourceDoc( pDoc );
+    sal_uInt16 nInsertPgCnt = 0;
+    sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( pDoc );
 
     // Prepare the insertion.
     const List* pBookmarkList;
@@ -233,7 +233,7 @@ USHORT ViewClipboard::InsertSlides (
         // pages are inserted.
         pBookmarkList = &rTransferable.GetPageBookmarks();
         pDataDocSh = rTransferable.GetPageDocShell();
-        nInsertPgCnt = (USHORT)pBookmarkList->Count();
+        nInsertPgCnt = (sal_uInt16)pBookmarkList->Count();
     }
     else
     {
@@ -250,7 +250,7 @@ USHORT ViewClipboard::InsertSlides (
     {
         const ::vos::OGuard aGuard( Application::GetSolarMutex() );
         ::sd::Window* pWin = mrView.GetViewShell()->GetActiveWindow();
-        const BOOL bWait = pWin && pWin->IsWait();
+        const sal_Bool bWait = pWin && pWin->IsWait();
 
         if( bWait )
             pWin->LeaveWait();
@@ -258,14 +258,14 @@ USHORT ViewClipboard::InsertSlides (
         pDoc->InsertBookmarkAsPage(
             const_cast<List*>(pBookmarkList),
             NULL,
-            FALSE,
-            FALSE,
+            sal_False,
+            sal_False,
             nInsertPosition,
             (&rTransferable == SD_MOD()->pTransferDrag),
             pDataDocSh,
-            TRUE,
+            sal_True,
             bMergeMasterPages,
-            FALSE);
+            sal_False);
 
         if( bWait )
             pWin->EnterWait();