From 7f33ed417b2e29e5470724ea76967f64699a2662 Mon Sep 17 00:00:00 2001
From: Carsten Driesner <cd@openoffice.org>
Date: Mon, 17 Jan 2011 15:06:54 +0100
Subject: removetooltypes01: #i112600# Remove tools types from sw

---
 sw/source/ui/app/mainwn.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sw/source/ui/app/mainwn.cxx')

diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index e6085a4a8662..d9750b737617 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -58,7 +58,7 @@ static SvPtrarr *pProgressContainer = 0;
 
 static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell )
 {
-    for ( USHORT i = 0; i < pProgressContainer->Count(); ++i )
+    for ( sal_uInt16 i = 0; i < pProgressContainer->Count(); ++i )
     {
         SwProgress *pTmp = (SwProgress*)(*pProgressContainer)[i];
         if ( pTmp->pDocShell == pDocShell )
@@ -68,7 +68,7 @@ static SwProgress *lcl_SwFindProgress( SwDocShell *pDocShell )
 }
 
 
-void StartProgress( USHORT nMessResId, long nStartValue, long nEndValue,
+void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
                     SwDocShell *pDocShell )
 {
     if( !SW_MOD()->IsEmbeddedLoadSave() )
@@ -88,8 +88,8 @@ void StartProgress( USHORT nMessResId, long nStartValue, long nEndValue,
             pProgress->pProgress = new SfxProgress( pDocShell,
                                                     SW_RESSTR(nMessResId),
                                                     nEndValue - nStartValue,
-                                                    FALSE,
-                                                    TRUE );
+                                                    sal_False,
+                                                    sal_True );
             pProgress->nStartCount = 1;
             pProgress->pDocShell = pDocShell;
             pProgressContainer->Insert( (void*)pProgress, 0 );
@@ -115,7 +115,7 @@ void EndProgress( SwDocShell *pDocShell )
     if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
     {
         SwProgress *pProgress = 0;
-        USHORT i;
+        sal_uInt16 i;
         for ( i = 0; i < pProgressContainer->Count(); ++i )
         {
             SwProgress *pTmp = (SwProgress*)(*pProgressContainer)[i];
@@ -141,7 +141,7 @@ void EndProgress( SwDocShell *pDocShell )
 }
 
 
-void SetProgressText( USHORT nId, SwDocShell *pDocShell )
+void SetProgressText( sal_uInt16 nId, SwDocShell *pDocShell )
 {
     if( pProgressContainer && !SW_MOD()->IsEmbeddedLoadSave() )
     {
-- 
cgit